[Orxonox-commit 3233] r7924 - code/branches/usability/data/gui/scripts

[landauf at orxonox.net]

Author: landauf
Date: 2011-02-20 01:10:38 +0100 (Sun, 20 Feb 2011)
New Revision: 7924

Modified:
   code/branches/usability/data/gui/scripts/KeyBindMenu.lua
   code/branches/usability/data/gui/scripts/MiscConfigMenu.lua
   code/branches/usability/data/gui/scripts/MouseControlsMenu.lua
   code/branches/usability/data/gui/scripts/MultiplayerMenu.lua
   code/branches/usability/data/gui/scripts/SettingsMenu.lua
Log:
 - 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

Modified: code/branches/usability/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/usability/data/gui/scripts/KeyBindMenu.lua	2011-02-20 00:02:51 UTC (rev 7923)
+++ code/branches/usability/data/gui/scripts/KeyBindMenu.lua	2011-02-20 00:10:38 UTC (rev 7924)
@@ -99,6 +99,12 @@
 
     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
 
 function P.KeyNameNiceifier(key)

Modified: code/branches/usability/data/gui/scripts/MiscConfigMenu.lua
===================================================================
--- code/branches/usability/data/gui/scripts/MiscConfigMenu.lua	2011-02-20 00:02:51 UTC (rev 7923)
+++ code/branches/usability/data/gui/scripts/MiscConfigMenu.lua	2011-02-20 00:10:38 UTC (rev 7924)
@@ -84,6 +84,11 @@
 
     P.createLines()
 
+    P:initButtons(1, 1)
+    P:setButton(1, 1, {
+            ["button"] = winMgr:getWindow("orxonox/MiscConfigMenu/MiscConfigBackButton"),
+            ["callback"]  = P.MiscConfigBackButton_clicked
+    })
 end
 
 function P.createLine(k)

Modified: code/branches/usability/data/gui/scripts/MouseControlsMenu.lua
===================================================================
--- code/branches/usability/data/gui/scripts/MouseControlsMenu.lua	2011-02-20 00:02:51 UTC (rev 7923)
+++ code/branches/usability/data/gui/scripts/MouseControlsMenu.lua	2011-02-20 00:10:38 UTC (rev 7924)
@@ -31,6 +31,12 @@
     else
         invert_active = false
     end
+
+    P:initButtons(1, 1)
+    P:setButton(1, 1, {
+            ["button"] = winMgr:getWindow("orxonox/MouseControlsBackButton"),
+            ["callback"]  = P.MouseControlsBackButton_clicked
+    })
 end
 
 function P.MouseControlsMouseNormalScrollbar_changed(e)

Modified: code/branches/usability/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/usability/data/gui/scripts/MultiplayerMenu.lua	2011-02-20 00:02:51 UTC (rev 7923)
+++ code/branches/usability/data/gui/scripts/MultiplayerMenu.lua	2011-02-20 00:10:38 UTC (rev 7924)
@@ -9,7 +9,7 @@
 function P.onLoad()
     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)
 
     P:setButton(1, 1, {
@@ -22,10 +22,12 @@
             ["callback"]  = P.MultiplayerHostButton_clicked
     })
 
-    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
 
 function P.onShow()

Modified: code/branches/usability/data/gui/scripts/SettingsMenu.lua
===================================================================
--- code/branches/usability/data/gui/scripts/SettingsMenu.lua	2011-02-20 00:02:51 UTC (rev 7923)
+++ code/branches/usability/data/gui/scripts/SettingsMenu.lua	2011-02-20 00:10:38 UTC (rev 7924)
@@ -32,6 +32,8 @@
             ["button"] = winMgr:getWindow("orxonox/SettingsMenu/SettingsBackButton"),
             ["callback"]  = P.SettingsBackButton_clicked
     })
+
+    P:setButton(4, 2, P:getButton(4, 1))
 end
 
 function P.SettingsGameplayButton_clicked(e)