Changeset 7924 for code/branches/usability

Timestamp:

Feb 20, 2011, 1:10:38 AM (14 years ago)

Author:

landauf

Message:

• the "back" button of MultiplayerMenu and SettingsMenu now fills the whole row at the bottom, so it can be accessed from both columns by pressing 'down'
• added keyboard support for KeyBindMenu, MiscConfigMenu, and MouseControlsMenu

Location:

code/branches/usability/data/gui/scripts

Files:

• KeyBindMenu.lua (modified) (1 diff)
• MiscConfigMenu.lua (modified) (1 diff)
• MouseControlsMenu.lua (modified) (1 diff)
• MultiplayerMenu.lua (modified) (2 diffs)
• SettingsMenu.lua (modified) (1 diff)

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

@@ -100 +100 @@
     local funct = luaState:createLuaFunctor("KeyBindMenu.callback()")
     orxonox.KeyBinderManager:getInstance():registerKeybindCallback(funct)
+
+    P:initButtons(1, 1)
+    P:setButton(1, 1, {
+            ["button"] = winMgr:getWindow("orxonox/KeyBindBackButton"),
+            ["callback"]  = P.KeyBindBackButton_clicked
+    })
 end
 

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

@@ -85 +85 @@
     P.createLines()
 
+    P:initButtons(1, 1)
+    P:setButton(1, 1, {
+            ["button"] = winMgr:getWindow("orxonox/MiscConfigMenu/MiscConfigBackButton"),
+            ["callback"]  = P.MiscConfigBackButton_clicked
+    })
 end
 

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

@@ -32 +32 @@
         invert_active = false
     end
+
+    P:initButtons(1, 1)
+    P:setButton(1, 1, {
+            ["button"] = winMgr:getWindow("orxonox/MouseControlsBackButton"),
+            ["callback"]  = P.MouseControlsBackButton_clicked
+    })
 end
 

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

@@ -10 +10 @@
     P.multiplayerMode = "startClient"
 
-    --button are arranged in a 2x2 matrix, the left lower item is nil
+    --button are arranged in a 2x2 matrix, the lower items are both the back button
     P:initButtons(2, 2)
 
@@ -23 +23 @@
     })
 
-    P:setButton(2, 2, {
+    P:setButton(2, 1, {
             ["button"] = winMgr:getWindow("orxonox/MultiplayerBackButton"),
             ["callback"]  = P.MultiplayerBackButton_clicked
     })
+
+    P:setButton(2, 2, P:getButton(2, 1))
 end
 

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

@@ -33 +33 @@
             ["callback"]  = P.SettingsBackButton_clicked
     })
+
+    P:setButton(4, 2, P:getButton(4, 1))
 end