epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10733 from abcdefg30/leaveEditor

Browse Source 
Fix the misleading wording of the confirm dialogs
This commit is contained in:
Oliver Brakmann
2016-02-12 20:49:37 +01:00
parent b8942d4298 6fa4b2bbda
commit 781d173b7d
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs
View File

@@ -317,7 +317,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (after != null) if (after != null)
after(newUid); after(newUid);
}, },
confirmText: "Delete"); confirmText: "Delete",
onCancel: () => { });
} }
void DeleteAllMaps(string[] maps, Action<string> after) void DeleteAllMaps(string[] maps, Action<string> after)
@@ -331,7 +332,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (after != null) if (after != null)
after(WidgetUtils.ChooseInitialMap(null)); after(WidgetUtils.ChooseInitialMap(null));
}, },
confirmText: "Delete"); confirmText: "Delete",
onCancel: () => { });
} }
} }
} }

6
OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs
View File

@@ -410,7 +410,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (after != null) if (after != null)
after.Invoke(); after.Invoke();
}, },
confirmText: "Delete"); confirmText: "Delete",
onCancel: () => { });
}; };
{ {
@@ -450,7 +451,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (selectedReplay == null) if (selectedReplay == null)
SelectFirstVisibleReplay(); SelectFirstVisibleReplay();
}, },
confirmText: "Delete All"); confirmText: "Delete All",
onCancel: () => { });
}; };
} }
} }

2
mods/cnc/chrome/dialogs.yaml
View File

@@ -162,7 +162,7 @@ Container@CONFIRM_PROMPT:
Y: 89 Y: 89
Width: 140 Width: 140
Height: 35 Height: 35
Text: Abort Text: Confirm
Button@OTHER_BUTTON: Button@OTHER_BUTTON:
Key: r Key: r
X: 210 X: 210

2
mods/ra/chrome/confirmation-dialogs.yaml
View File

@@ -21,7 +21,7 @@ Background@CONFIRM_PROMPT:
Y: PARENT_BOTTOM - 45 Y: PARENT_BOTTOM - 45
Width: 160 Width: 160
Height: 25 Height: 25
Text: Abort Text: Confirm
Font: Bold Font: Bold
Key: return Key: return
Button@OTHER_BUTTON: Button@OTHER_BUTTON: