Index: binaries/data/config/default.cfg
===================================================================
--- binaries/data/config/default.cfg
+++ binaries/data/config/default.cfg
@@ -173,6 +173,7 @@
; > SYSTEM SETTINGS
exit = "" ; 'Custom' exit to desktop, SDL handles the native command via SDL_Quit.
+close = "Shift+Escape" ; Close the current page and ask for confirmation when exiting the game.
cancel = Escape ; Close or cancel the current dialog box/popup
confirm = Return ; Confirm the current command
pause = Pause, "Shift+Space" ; Pause/unpause game
Index: binaries/data/mods/mod/gui/modmod/modmod.xml
===================================================================
--- binaries/data/mods/mod/gui/modmod/modmod.xml
+++ binaries/data/mods/mod/gui/modmod/modmod.xml
@@ -193,7 +193,7 @@
Engine.Exit();
-
+
Cancel
closePage();
Index: binaries/data/mods/public/gui/campaigns/default_menu/CampaignMenu.xml
===================================================================
--- binaries/data/mods/public/gui/campaigns/default_menu/CampaignMenu.xml
+++ binaries/data/mods/public/gui/campaigns/default_menu/CampaignMenu.xml
@@ -54,7 +54,7 @@
-
+
Back to Main Menu
Index: binaries/data/mods/public/gui/campaigns/setup/CampaignSetupPage.xml
===================================================================
--- binaries/data/mods/public/gui/campaigns/setup/CampaignSetupPage.xml
+++ binaries/data/mods/public/gui/campaigns/setup/CampaignSetupPage.xml
@@ -46,7 +46,7 @@
-
+
Main Menu
Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/CancelButton.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/CancelButton.xml
+++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/CancelButton.xml
@@ -4,5 +4,6 @@
type="button"
style="StoneButton"
tooltip_style="onscreenToolTip"
+ hotkey="close"
z="21"
/>
Index: binaries/data/mods/public/gui/hotkeys/spec/engine.json
===================================================================
--- binaries/data/mods/public/gui/hotkeys/spec/engine.json
+++ binaries/data/mods/public/gui/hotkeys/spec/engine.json
@@ -7,6 +7,10 @@
},
"mapped_hotkeys": {
"general": {
+ "close": {
+ "name": "Close/Exit",
+ "desc": "Close the current page and ask for confirmation when exiting the game."
+ },
"cancel": {
"name": "Close/Cancel",
"desc": "Close or cancel the current dialog box/popup."
Index: binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
@@ -50,7 +50,7 @@
Index: binaries/data/mods/public/gui/manual/intro.txt
===================================================================
--- binaries/data/mods/public/gui/manual/intro.txt
+++ binaries/data/mods/public/gui/manual/intro.txt
@@ -41,6 +41,9 @@
[font="sans-bold-14"]Program-wide[font="sans-14"]
hotkey.exit – Immediately close the game, without asking for confirmation
+ hotkey.close – Close the current page and ask for confirmation when exiting the game
+ hotkey.cancel – Close all dialogs (chat, menu)
+ hotkey.confirm – Confirm the current command
hotkey.togglefullscreen – Toggle between fullscreen and windowed
hotkey.console.toggle – Toggle console
hotkey.fps.toggle – Toggle frame counter (FPS)
@@ -60,8 +63,7 @@
hotkey.quickload – Quickload
hotkey.session.gui.menu.toggle – Toggle menu
hotkey.timeelapsedcounter.toggle – Toggle time elapsed counter
- hotkey.cancel – Close all dialogs (chat, menu)
- hotkey.confirm – Open chat or send message
+ hotkey.chat – Open chat or send message
hotkey.teamchat – Send team chat
hotkey.privatechat – Chat with the previously selected private chat partner
hotkey.pause – Pause or resume the game
Index: binaries/data/mods/public/gui/pregame/MainMenuItems.js
===================================================================
--- binaries/data/mods/public/gui/pregame/MainMenuItems.js
+++ binaries/data/mods/public/gui/pregame/MainMenuItems.js
@@ -267,6 +267,7 @@
{
"caption": translate("Exit"),
"tooltip": translate("Exit the game."),
+ "hotkey": "close",
"onPress": () => {
messageBox(
400, 200,
Index: binaries/data/mods/public/gui/replaymenu/replay_menu.xml
===================================================================
--- binaries/data/mods/public/gui/replaymenu/replay_menu.xml
+++ binaries/data/mods/public/gui/replaymenu/replay_menu.xml
@@ -224,7 +224,7 @@
-
+
Main Menu
Engine.SwitchGuiPage("page_pregame.xml");
Index: binaries/data/mods/public/gui/session/MenuButtons.js
===================================================================
--- binaries/data/mods/public/gui/session/MenuButtons.js
+++ binaries/data/mods/public/gui/session/MenuButtons.js
@@ -259,6 +259,7 @@
{
this.button = button;
this.button.caption = translate("Exit");
+ this.button.hotkey = "close";
this.button.enabled = !Engine.IsAtlasRunning();
this.pauseControl = pauseControl;
}
Index: binaries/data/mods/public/gui/summary/summary.xml
===================================================================
--- binaries/data/mods/public/gui/summary/summary.xml
+++ binaries/data/mods/public/gui/summary/summary.xml
@@ -188,7 +188,7 @@
startReplay();
-
+
Continue
continueButton();