Changeset 6266

Timestamp:

Dec 7, 2009, 9:45:39 PM (14 years ago)

Author:

dafrick

Message:

KeyBindMenu is working now. (Apart from some minor faults)
Found some commandExecutor("show/hideGUI …") in DecisionPopup, and another possible bug.
Added an InfoPopup

Location:

code/branches/presentation2

Files:

• data/gui/layouts/InfoPopup.layout (added)
• data/gui/layouts/KeyBindMenu.layout (modified) (4 diffs)
• data/gui/scripts/DecisionPopup.lua (modified) (2 diffs)
• data/gui/scripts/GUITools.lua (modified) (1 diff)
• data/gui/scripts/InfoPopup.lua (added)
• data/gui/scripts/InitialiseGUI.lua (modified) (1 diff)
• data/gui/scripts/KeyBindMenu.lua (modified) (1 diff)
• src/libraries/core/input/KeyBinderManager.cc (modified) (2 diffs)
• src/libraries/core/input/KeyBinderManager.h (modified) (3 diffs)

code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/KeyBindBackground" >
+    <Window Type="DefaultWindow" Name="orxonox/KeyBindMenu/Background" >
         <Property Name="InheritsAlpha" Value="False" />
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -14 +14 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
-            <Window Type="TaharezLook/ScrollablePane" Name="orxonox/KeyBindPane/" >
+            <Window Type="TaharezLook/ScrollablePane" Name="orxonox/KeyBindPane" >
                 <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
                 <Property Name="HorzStepSize" Value="0.1" />
@@ -24 +24 @@
                 <Property Name="HorzScrollPosition" Value="0" />
                 <Property Name="VertScrollPosition" Value="0" />
-                <AutoWindow NameSuffix="__auto_container__" >
-                    <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
-                    <Property Name="ChildExtentsArea" Value="l:0 t:0 r:0 b:0" />
-                </AutoWindow>
             </Window>
         </Window>
@@ -34 +30 @@
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
+            <Event Name="Clicked" Function="KeyBindMenu.KeyBindBackButton_clicked"/>
         </Window>
     </Window>

code/branches/presentation2/data/gui/scripts/DecisionPopup.lua

@@ -28 +28 @@
         P.functionPtr(true)
     end
-    orxonox.CommandExecutor:execute("hideGUI DecisionPopup")
+    hideGUI("DecisionPopup")
 end
 
@@ -35 +35 @@
         P.functionPtr(false)
     end
-    orxonox.CommandExecutor:execute("hideGUI DecisionPopup")
+    hideGUI("DecisionPopup")
 end
 

code/branches/presentation2/data/gui/scripts/GUITools.lua

@@ -1 +1 @@
 function openDecisionPopup( text, callbackPtr )
-    orxonox.CommandExecutor:execute("showGUI DecisionPopup false true")
---     showGUI("DecisionPopup", false, true)
-    DecisionPopup.setCallback(InGameMenu.callback)
+    showGUI("DecisionPopup", false, true)
+    DecisionPopup.setCallback(callbackPtr)
     DecisionPopup.setText(text)
 end
+
+function openInfoPopup( text, functionPtr )
+    showGUI("InfoPopup", false, true)
+    InfoPopup.setDo(functionPtr)
+    InfoPopup.setText(text)
+end

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

@@ -222 +222 @@
     return nil
 end
+
+function test(e)
+    debug(0, "Blubb")
+end

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

@@ -1 @@
--- NewMouseControlsMenu.lua
+-- KeyBindMenu.lua
 
 BasicGUI = require("BasicGUI")
 local P = BasicGUI:new() --inherit everything from the gui package
 if _REQUIREDNAME == nil then
-    NewMouseControlsMenu = P
+    KeyBindMenu = P
 else
     _G[_REQUIREDNAME] = P
 end
 
-P.filename = "NewMouseControlsMenu"
-P.layoutString = "NewMouseControlsMenu.layout"
+P.filename = "KeyBindMenu"
+P.layoutString = "KeyBindMenu.layout"
+
+function P:init()
+    commandList = {}
+    table.insert(commandList, "fire 0")
+    table.insert(commandList, "fire 1")
+    table.insert(commandList, "fire 2")
+
+    local lineHeight = 30
+    
+    local window = winMgr:getWindow("orxonox/KeyBindPane")
+
+    for k,v in pairs(commandList) do
+        local button = winMgr:createWindow("TaharezLook/Button", "orxonox/KeyBindPane/Binding" .. k .. "/Button")
+        local command = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/Binding" .. k .. "/Command")
+        local line = winMgr:createWindow("DefaultWindow", "orxonox/KeyBindPane/Binding" .. k)
+        
+        line:setSize(CEGUI.UVector2(CEGUI.UDim(1,-13),CEGUI.UDim(0, lineHeight)))
+        button:setSize(CEGUI.UVector2(CEGUI.UDim(0.4, 0), CEGUI.UDim(1, 0)))
+        command:setSize(CEGUI.UVector2(CEGUI.UDim(0.6, 0), CEGUI.UDim(1, 0)))
+        
+        button:setPosition(CEGUI.UVector2(CEGUI.UDim(0.6, 0),CEGUI.UDim(0, 0)))
+        command:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0),CEGUI.UDim(0, 0)))
+        line:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0),CEGUI.UDim(0, lineHeight*(k-1))))
+        
+        button:setText(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(v))
+        command:setText(v)
+        
+        orxonox.KeyBinderManager:getInstance():subscribeEventHelper(button, "Clicked", P.filename .. ".KeyBindButton_clicked")
+        --button:subscribeScriptedEvent("EventClicked", P.filename .. ".KeyBindButton_clicked")
+        
+        line:addChildWindow(command)
+        line:addChildWindow(button)
+        window:addChildWindow(line)
+    end
+end
+
+function P.KeyBindButton_clicked(e)
+    local we = CEGUI.toWindowEventArgs(e)
+    local name = we.window:getName()
+    commandNr = tonumber(string.match(name, "%d+"))
+    
+    openInfoPopup("Press any button/key or move a mouse/joystick axis.", KeyBindMenu.keybind)
+
+end
+
+function P.keybind()
+    orxonox.KeyBinderManager:getInstance():keybind(commandList[commandNr])
+end
 
 function P.KeyBindBackButton_clicked(e)
-    hideGUI("NewMouseControlsMenu")
+    hideGUI("KeyBindMenu")
     debug("event: back")
 end

code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc

@@ -37 +37 @@
 #include "InputManager.h"
 #include "KeyDetector.h"
+
+#include <CEGUIWindow.h>
 
 namespace orxonox
@@ -90 +92 @@
         else
             this->bDefaultFileLoaded_ = false;
+    }
+    
+    void KeyBinderManager::subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function)
+    {
+        window->subscribeScriptedEvent(event, function);
     }
 

code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h

@@ -36 +36 @@
 #include "util/Singleton.h"
 #include "core/OrxonoxClass.h"
+
+#include <CEGUIForwardRefs.h>
 
 namespace orxonox //tolua_export
@@ -79 +81 @@
         void setToDefault()
             { this->setCurrent(this->defaultFilename_); }
+            
+        void subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function); //tolua_export
 
         //! Returns a pointer to a KeyBinder (creates it if not yet loaded)
@@ -91 +95 @@
 
         //! Bind 'command' to any key pressed after this call (use with care!)
-        inline void keybind(const std::string& command)
-            { this->keybindInternal(command, false); }
+        inline void keybind(const std::string& command) { this->keybindInternal(command, false); } //tolua_export
         //! Bind 'command' to any key pressed after this call (use with care!), but temporarily (no file save)
         inline void tkeybind(const std::string& command)