From f4b9dd2f347b7e6c99329fc26c485adfe56e0cdb Mon Sep 17 00:00:00 2001 From: drdev Date: Tue, 31 Dec 2013 20:00:51 +0000 Subject: [PATCH] Update buttons on concede, restart, and exit prompts --- forge-gui/src/main/java/forge/control/FControl.java | 3 ++- forge-gui/src/main/java/forge/gui/match/CMatchUI.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/control/FControl.java b/forge-gui/src/main/java/forge/control/FControl.java index 33627e8758e..8457fca14e9 100644 --- a/forge-gui/src/main/java/forge/control/FControl.java +++ b/forge-gui/src/main/java/forge/control/FControl.java @@ -172,11 +172,12 @@ public enum FControl implements KeyEventDispatcher { } public boolean canExitForge(boolean forRestart) { + String action = (forRestart ? "Restart" : "Exit"); String userPrompt = "Are you sure you wish to " + (forRestart ? "restart" : "exit") + " Forge?"; if (this.game != null) { userPrompt = "A game is currently active. " + userPrompt; } - if (!FOptionPane.showConfirmDialog(userPrompt, "Exit Forge", this.game == null)) { //default Yes if no game active + if (!FOptionPane.showConfirmDialog(userPrompt, action + " Forge", action, "Cancel", this.game == null)) { //default Yes if no game active return false; } if (!CDeckEditorUI.SINGLETON_INSTANCE.canSwitchAway(true)) { diff --git a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java index 4f4db06fa50..92655d3ccac 100644 --- a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java +++ b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java @@ -504,7 +504,7 @@ public enum CMatchUI implements ICDoc, IMenuProvider { String userPrompt = "This will end the current game and you will not be able to resume.\n\n" + "Concede anyway?"; - if (FOptionPane.showConfirmDialog(userPrompt, "Concede Game?", false)) { + if (FOptionPane.showConfirmDialog(userPrompt, "Concede Game?", "Concede", "Cancel", false)) { Singletons.getControl().stopGame(); } }