Merge pull request #10733 from abcdefg30/leaveEditor

Fix the misleading wording of the confirm dialogs
This commit is contained in:
Oliver Brakmann
2016-02-12 20:49:37 +01:00
4 changed files with 10 additions and 6 deletions

View File

@@ -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<string> after)
@@ -331,7 +332,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (after != null)
after(WidgetUtils.ChooseInitialMap(null));
},
confirmText: "Delete");
confirmText: "Delete",
onCancel: () => { });
}
}
}

View File

@@ -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: () => { });
};
}
}

View File

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

View File

@@ -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: