Changeset 8078 for code/branches/usability/data/gui

Timestamp:

Mar 15, 2011, 9:09:58 PM (14 years ago)

Author:

dafrick

Message:

Reverting changes made in revision 8035, that based the menu navigation on console commands, due to implemential difficulties of the hacks to make menu navigation work fully.
So, at the moment, we'll have to make due with the old version of the menu navigation implementation.

Location:

code/branches/usability/data/gui/scripts

Files:

• GUISheet.lua (modified) (2 diffs)
• GraphicsMenu.lua (modified) (1 diff)
• MenuSheet.lua (modified) (1 diff)
• SheetManager.lua (modified) (6 diffs)

code/branches/usability/data/gui/scripts/GUISheet.lua

@@ -29 +29 @@
 
 -- Override this function if you want to react on keystrokes
-function P:onKeyPressed(mode)
+function P:onKeyPressed()
 end
 
@@ -85 +85 @@
 
 -- Handles key pressed while the gui sheed is displayed
-function P:keyPressed(mode)
+function P:keyPressed()
     if self.buttons then
-        if mode == "down" then     -- key down
+        if code == "208" then     -- key down
             self:moveSelectionRow(1)
-        elseif mode == "up" then -- key up
+        elseif code == "200" then -- key up
             self:moveSelectionRow(-1)
-        elseif mode == "right" then -- key right
+        elseif code == "205" then -- key right
             self:moveSelectionColumn(1)
-        elseif mode == "left" then -- key left
+        elseif code == "203" then -- key left
             self:moveSelectionColumn(-1)
-        elseif mode == "enter" then -- key enter or key numpad enter
+        elseif code == "28" or code == "156"  then -- key enter or key numpad enter
             self:pressSelectedButton()
         end
     end
 
-    self:onKeyPressed(mode)
+    self:onKeyPressed()
 end
 

code/branches/usability/data/gui/scripts/GraphicsMenu.lua

@@ -1 +1 @@
 -- GraphicsMenu.lua
 
-local P = createMenuSheet("GraphicsMenu", true, TriBool.True, TriBool.True)
+local P = createMenuSheet("GraphicsMenu")
 
 P.resolutionList = {"custom", "640 x 480", "720 x 480", "720 x 576", "800 x 600", "1024 x 600", "1024 x 768", "1152 x 864", "1280 x 720", "1280 x 800", "1280 x 960", "1280 x 1024", "1360 x 768", "1440 x 900", "1600 x 900", "1600 x 1200", "1680 x 1050"}

code/branches/usability/data/gui/scripts/MenuSheet.lua

@@ -16 +16 @@
     newSheet.bHidePrevious  = handleDefArg(_bHidePrevious,  true)
     newSheet.tShowCursor    = handleDefArg(_tShowCusor,     TriBool.True)
-    newSheet.tUseKeyboard   = handleDefArg(_tUseKeyboard,   TriBool.Dontcare)
+    newSheet.tUseKeyboard   = handleDefArg(_tUseKeyboard,   TriBool.True)
     newSheet.bBlockJoyStick = handleDefArg(_bBlockJoyStick, false)
 

code/branches/usability/data/gui/scripts/SheetManager.lua

@@ -5 +5 @@
 local activeMenuSheets = {size = 0, topSheetTuple = nil}
 local menuSheetsRoot = guiMgr:getMenuRootWindow()
+local bInGameConsoleClosed = false
 local mainMenuLoaded = false
---orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed")
+orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed")
 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "Sized", "windowResized")
 
@@ -131 +132 @@
     if previous and previous.pressedEnter and menuSheet:hasSelection() == false then
         menuSheet:setSelectionNear(1, 1)
-    end
-
-    if activeMenuSheets.size > 0 then
-        guiMgr:guisActiveChanged(true)
     end
 
@@ -207 +204 @@
     end
 
-    if activeMenuSheets.size == 0 then
-        guiMgr:guisActiveChanged(false)
-    end
-
     sheetTuple.sheet:quit()
 end
@@ -224 +217 @@
     -- HUGE, very HUGE hacks!
 
-    -- Count the number of sheets that don't need input until the first that does.
+    -- If the InGameConsole is active, ignore the ESC command.
+    if bInGameConsoleClosed == true then
+        bInGameConsoleClosed = false
+        return
+    end
+
+    -- Count the number of sheets that don't need input till the first that does.
     local counter = noInputSheetIndex()
 
@@ -238 +237 @@
 end
 
--- Function to navigate the GUI, is called by the GUIManager, whenever a relevant key is pressed.
--- The mode specifies the action to be taken.
-function navigateGUI(mode)
+function keyPressed(e)
+    local we = tolua.cast(e, "CEGUI::KeyEventArgs")
     local sheet = activeMenuSheets[activeMenuSheets.size]
-    sheet.sheet:keyPressed(mode)
+    code = tostring(we.scancode)
+    -- Some preprocessing
+    if not mainMenuLoaded and not sheet.bNoInput then
+        if code == "1" then
+            keyESC()
+        elseif code == "0"then
+            orxonox.CommandExecutor:execute("InGameConsole openConsole")
+        end
+    end
+    sheet.sheet:keyPressed()
 end
 
@@ -286 +293 @@
     end
     return counter
+end
+
+function inGameConsoleClosed()
+    bInGameConsoleClosed = not bInGameConsoleClosed;
 end