From 3604d901b171b8e2857f45b09a93323027376535 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 11 Feb 2016 16:11:03 +0100 Subject: [PATCH 1/2] Fix the missleading wording of the confirm dialogs --- mods/cnc/chrome/dialogs.yaml | 2 +- mods/ra/chrome/confirmation-dialogs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/cnc/chrome/dialogs.yaml b/mods/cnc/chrome/dialogs.yaml index 3c52a68939..a72038eafd 100644 --- a/mods/cnc/chrome/dialogs.yaml +++ b/mods/cnc/chrome/dialogs.yaml @@ -162,7 +162,7 @@ Container@CONFIRM_PROMPT: Y: 89 Width: 140 Height: 35 - Text: Abort + Text: Confirm Button@OTHER_BUTTON: Key: r X: 210 diff --git a/mods/ra/chrome/confirmation-dialogs.yaml b/mods/ra/chrome/confirmation-dialogs.yaml index 3fdf96e4ce..595b9d9048 100644 --- a/mods/ra/chrome/confirmation-dialogs.yaml +++ b/mods/ra/chrome/confirmation-dialogs.yaml @@ -21,7 +21,7 @@ Background@CONFIRM_PROMPT: Y: PARENT_BOTTOM - 45 Width: 160 Height: 25 - Text: Abort + Text: Confirm Font: Bold Key: return Button@OTHER_BUTTON: From 6fa4b2bbdae649f62a8fc6a1fe6aba058971667c Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Thu, 11 Feb 2016 19:47:20 +0100 Subject: [PATCH 2/2] Fix missing 'Cancel' buttons on some confirmation prompts --- OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs | 6 ++++-- OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs index 2a8b44e900..ef4fe121d6 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs @@ -317,7 +317,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (after != null) after(newUid); }, - confirmText: "Delete"); + confirmText: "Delete", + onCancel: () => { }); } void DeleteAllMaps(string[] maps, Action after) @@ -331,7 +332,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (after != null) after(WidgetUtils.ChooseInitialMap(null)); }, - confirmText: "Delete"); + confirmText: "Delete", + onCancel: () => { }); } } } diff --git a/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs index 8b7a420f8a..5c0032e2aa 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs @@ -410,7 +410,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (after != null) after.Invoke(); }, - confirmText: "Delete"); + confirmText: "Delete", + onCancel: () => { }); }; { @@ -450,7 +451,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (selectedReplay == null) SelectFirstVisibleReplay(); }, - confirmText: "Delete All"); + confirmText: "Delete All", + onCancel: () => { }); }; } }