Changeset 6048 for code/branches/menu/data

Timestamp:

Nov 12, 2009, 11:32:41 AM (15 years ago)

Author:

scheusso

Message:

ESC handling in ingame menu: if theres already an opened GUI sheet then hide it, if not open the ingame menu
in mainmenu everything should remain the same

Location:

code/branches/menu/data

Files:

• defaultConfig/keybindings.ini (modified) (1 diff)
• gui/scripts/InGameMenu.lua (modified) (2 diffs)
• gui/scripts/InitialiseGUI.lua (modified) (3 diffs)

code/branches/menu/data/defaultConfig/keybindings.ini

@@ -23 +23 @@
 KeyEnd=boost
 KeyEquals=
-KeyEscape="exit"
+KeyEscape="toggleIngameGUI"
 KeyF="scale -1 moveUpDown"
 KeyF1="OverlayGroup toggleVisibility Debug"

code/branches/menu/data/gui/scripts/InGameMenu.lua

@@ -18 +18 @@
 -- events for ingamemenu
 function P.button_quit_clicked(e)
-    orxonox.CommandExecutor:execute("hideGUI InGameMenu")
-    orxonox.CommandExecutor:execute("exit")
+    openDecisionPopup( "Do you really want to quit the game?", InGameMenu.callback )
 end
 
@@ -34 +33 @@
 end
 
+function P.callback(doExit)
+    if doExit then
+        orxonox.CommandExecutor:execute("hideGUI InGameMenu")
+        orxonox.CommandExecutor:execute("exit")
+    end
+end
+
 return P
 

code/branches/menu/data/gui/scripts/InitialiseGUI.lua

@@ -21 +21 @@
 bHidePrevious = {}
 
+-- Require all tools
+require("GUITools")
+
 -- loads the GUI with the specified filename
 -- be sure to set the global variable "filename" before calling this function
@@ -28 +31 @@
     if loadedGui == nil then
         loadedGuiNS = require(filename)
+        if loadedGuiNS == nil then
+            return
+        end
         loadedGui = loadedGuiNS:load()
         loadedGUIs[filename] = loadedGui
@@ -147 +153 @@
 end
 
+function keyESC()
+    orxonox.CommandExecutor:execute("hideGUI "..activeSheets[nrOfActiveSheets])
+end
+
 function setBackground(filename)
     local newroot