diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg index d41e941502..78482d0bd8 100644 --- a/binaries/data/config/default.cfg +++ b/binaries/data/config/default.cfg @@ -136,8 +136,9 @@ skycolor = "0 0 0" ; > SYSTEM SETTINGS exit = "Alt+F4", "Ctrl+Break", "Super+Q" ; Exit to desktop +cancel = Escape ; Close or cancel the current dialog box/popup leave = Escape ; End current game or Exit -confirm = Return ; Confirm the current command. +confirm = Return ; Confirm the current command pause = Pause ; Pause/unpause game screenshot = F2 ; Take PNG screenshot bigscreenshot = "Shift+F2" ; Take large BMP screenshot diff --git a/binaries/data/mods/mod/gui/modmod/modmod.xml b/binaries/data/mods/mod/gui/modmod/modmod.xml index 8c6030ceb2..a1bdd9bc4f 100644 --- a/binaries/data/mods/mod/gui/modmod/modmod.xml +++ b/binaries/data/mods/mod/gui/modmod/modmod.xml @@ -174,7 +174,7 @@ Engine.Exit(); - + Cancel closePage(); diff --git a/binaries/data/mods/public/gui/aiconfig/aiconfig.xml b/binaries/data/mods/public/gui/aiconfig/aiconfig.xml index b93cbfb48f..86e12d1817 100644 --- a/binaries/data/mods/public/gui/aiconfig/aiconfig.xml +++ b/binaries/data/mods/public/gui/aiconfig/aiconfig.xml @@ -32,7 +32,7 @@ - + Cancel Engine.PopGuiPage(); diff --git a/binaries/data/mods/public/gui/civinfo/civinfo.xml b/binaries/data/mods/public/gui/civinfo/civinfo.xml index 156908d883..5dd8d31656 100644 --- a/binaries/data/mods/public/gui/civinfo/civinfo.xml +++ b/binaries/data/mods/public/gui/civinfo/civinfo.xml @@ -114,6 +114,7 @@ type="button" style="StoneButton" size="100%-164 100%-52 100%-24 100%-24" + hotkey="cancel" > Close diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml index 1587a32de6..4788977568 100644 --- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml +++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml @@ -392,6 +392,7 @@ style="StoneButton" size="50%-70 370 50%+70 396" tooltip_style="onscreenToolTip" + hotkey="cancel" > OK Close more game options window diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml index 05c8e61828..08fbc9040d 100644 --- a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml +++ b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml @@ -100,7 +100,7 @@ - + Cancel cancelSetup(); diff --git a/binaries/data/mods/public/gui/lobby/lobby.xml b/binaries/data/mods/public/gui/lobby/lobby.xml index fae12bc100..19a49ef340 100644 --- a/binaries/data/mods/public/gui/lobby/lobby.xml +++ b/binaries/data/mods/public/gui/lobby/lobby.xml @@ -260,7 +260,7 @@ displayProfile("leaderboard"); - + Back Engine.GetGUIObjectByName("leaderboard").hidden = true; @@ -322,7 +322,7 @@ - + Back Engine.GetGUIObjectByName("profileFetch").hidden = true; diff --git a/binaries/data/mods/public/gui/lobby/prelobby.xml b/binaries/data/mods/public/gui/lobby/prelobby.xml index 8323918d41..9dd60abc99 100644 --- a/binaries/data/mods/public/gui/lobby/prelobby.xml +++ b/binaries/data/mods/public/gui/lobby/prelobby.xml @@ -93,7 +93,7 @@ - + Cancel if (Engine.GetGUIObjectByName("pageWelcome").hidden) diff --git a/binaries/data/mods/public/gui/locale/locale.xml b/binaries/data/mods/public/gui/locale/locale.xml index d7bcdee6ee..46dffbc86f 100644 --- a/binaries/data/mods/public/gui/locale/locale.xml +++ b/binaries/data/mods/public/gui/locale/locale.xml @@ -32,7 +32,7 @@ - + Cancel cancelSetup(); diff --git a/binaries/data/mods/public/gui/locale/locale_advanced.xml b/binaries/data/mods/public/gui/locale/locale_advanced.xml index 24f7deb146..a8a65a7246 100644 --- a/binaries/data/mods/public/gui/locale/locale_advanced.xml +++ b/binaries/data/mods/public/gui/locale/locale_advanced.xml @@ -61,7 +61,7 @@ - + Cancel cancelSetup(); diff --git a/binaries/data/mods/public/gui/manual/manual.xml b/binaries/data/mods/public/gui/manual/manual.xml index 29ec4a7998..601af9442d 100644 --- a/binaries/data/mods/public/gui/manual/manual.xml +++ b/binaries/data/mods/public/gui/manual/manual.xml @@ -16,13 +16,13 @@ - - + Close + diff --git a/binaries/data/mods/public/gui/msgbox/msgbox.js b/binaries/data/mods/public/gui/msgbox/msgbox.js index baa36e52ad..155483a424 100644 --- a/binaries/data/mods/public/gui/msgbox/msgbox.js +++ b/binaries/data/mods/public/gui/msgbox/msgbox.js @@ -8,9 +8,9 @@ function init(data) var mbButton2Obj = Engine.GetGUIObjectByName("mbButton2"); var mbButton3Obj = Engine.GetGUIObjectByName("mbButton3"); - var mbLeaveHotkey = Engine.GetGUIObjectByName("mbLeaveHotkey"); + var mbCancelHotkey = Engine.GetGUIObjectByName("mbCancelHotkey"); // Default behaviour - mbLeaveHotkey.onPress = function() + mbCancelHotkey.onPress = function() { Engine.PopGuiPage(); }; @@ -66,7 +66,7 @@ function init(data) mbButton1Obj.onPress = action; mbButton1Obj.hidden = false; - mbLeaveHotkey.onPress = action; + mbCancelHotkey.onPress = action; } if (data.buttonCaptions.length >= 2) { @@ -81,8 +81,6 @@ function init(data) mbButton2Obj.caption = data.buttonCaptions[1]; mbButton2Obj.onPress = action; mbButton2Obj.hidden = false; - - mbLeaveHotkey.onPress = action; } if (data.buttonCaptions.length >= 3) { @@ -97,8 +95,6 @@ function init(data) mbButton3Obj.caption = data.buttonCaptions[2]; mbButton3Obj.onPress = action; mbButton3Obj.hidden = false; - - mbLeaveHotkey.onPress = action; } switch (data.buttonCaptions.length) diff --git a/binaries/data/mods/public/gui/msgbox/msgbox.xml b/binaries/data/mods/public/gui/msgbox/msgbox.xml index 57de89ad07..1e9d9def18 100644 --- a/binaries/data/mods/public/gui/msgbox/msgbox.xml +++ b/binaries/data/mods/public/gui/msgbox/msgbox.xml @@ -6,7 +6,7 @@ - + - + Cancel closePage(); diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml index cc11939e57..b6fe5f578a 100644 --- a/binaries/data/mods/public/gui/pregame/mainmenu.xml +++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml @@ -125,6 +125,12 @@ ========================================== --> + + + closeMenu(); + + + diff --git a/binaries/data/mods/public/gui/savedgames/load.xml b/binaries/data/mods/public/gui/savedgames/load.xml index 159a569d9e..ac99ce9a77 100644 --- a/binaries/data/mods/public/gui/savedgames/load.xml +++ b/binaries/data/mods/public/gui/savedgames/load.xml @@ -21,7 +21,7 @@ size="24 24 100%-24 100%-100"> - + Cancel Engine.PopGuiPage(); diff --git a/binaries/data/mods/public/gui/savedgames/save.xml b/binaries/data/mods/public/gui/savedgames/save.xml index 64810a793f..815854895e 100644 --- a/binaries/data/mods/public/gui/savedgames/save.xml +++ b/binaries/data/mods/public/gui/savedgames/save.xml @@ -33,7 +33,7 @@ saveGame(); - + Cancel closeSave(true); diff --git a/binaries/data/mods/public/gui/session/hotkeys/misc.xml b/binaries/data/mods/public/gui/session/hotkeys/misc.xml index 308667bb62..348a8231e7 100644 --- a/binaries/data/mods/public/gui/session/hotkeys/misc.xml +++ b/binaries/data/mods/public/gui/session/hotkeys/misc.xml @@ -1,6 +1,6 @@ - + closeOpenDialogs(); diff --git a/binaries/data/mods/public/gui/session/menu.js b/binaries/data/mods/public/gui/session/menu.js index cc7540b603..b6c69e4faf 100644 --- a/binaries/data/mods/public/gui/session/menu.js +++ b/binaries/data/mods/public/gui/session/menu.js @@ -136,8 +136,8 @@ function resignMenuButton() closeMenu(); closeOpenDialogs(); pauseGame(); - var btCaptions = [translate("Yes"), translate("No")]; - var btCode = [resignGame, resumeGame]; + var btCaptions = [translate("No"), translate("Yes")]; + var btCode = [resumeGame, resignGame]; messageBox(400, 200, translate("Are you sure you want to resign?"), translate("Confirmation"), 0, btCaptions, btCode); } diff --git a/binaries/data/mods/public/gui/splashscreen/splashscreen.xml b/binaries/data/mods/public/gui/splashscreen/splashscreen.xml index e09a056023..e59802d8eb 100644 --- a/binaries/data/mods/public/gui/splashscreen/splashscreen.xml +++ b/binaries/data/mods/public/gui/splashscreen/splashscreen.xml @@ -18,7 +18,13 @@ - + + Known Issues (web) + + + OK - - Known Issues (web) - - diff --git a/binaries/data/mods/public/gui/structree/structree.xml b/binaries/data/mods/public/gui/structree/structree.xml index 93646930b1..a1f0dadc66 100644 --- a/binaries/data/mods/public/gui/structree/structree.xml +++ b/binaries/data/mods/public/gui/structree/structree.xml @@ -85,6 +85,7 @@ type="button" style="StoneButton" size="100%-164 100%-44 100%-16 100%-16" + hotkey="cancel" > Close closeStrucTree();