Changeset 7012 for code/branches

Timestamp:

May 30, 2010, 1:37:33 PM (14 years ago)

Author:

dafrick

Message:

Config values can now be changed in a menu.

Location:

code/branches/presentation3

Files:

• data/gui/layouts/SettingsMenu.layout (modified) (1 diff)
• data/gui/scripts/MiscConfigMenu.lua (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (2 diffs)
• src/libraries/core/GUIManager.h (modified) (1 diff)

code/branches/presentation3/data/gui/layouts/SettingsMenu.layout

@@ -50 +50 @@
             <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/MiscellaneousButton" >
                 <Property Name="Text" Value="Miscellaneous" />
-                <Property Name="Disabled" Value="True" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.727272,0},{0.95,0},{0.909090,0}}" />

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

@@ -1 +1 @@
 -- MiscConfigMenu.lua
 
-local P = createMenuSheet("MiscConfigMenu")
+local P = createMenuSheet("MiscConfigMenu", true, TriBool.True, TriBool.True)
 
 P.commandList = {}

code/branches/presentation3/src/libraries/core/GUIManager.cc

@@ -321 +321 @@
     }
 
-    void GUIManager::keyPressed(const KeyEvent& evt)
+    void GUIManager::buttonPressed(const KeyEvent& evt)
     {
         this->protectedCall(boost::bind(&CEGUI::System::injectKeyDown, _1, evt.getKeyCode()));
@@ -327 +327 @@
     }
 
-    void GUIManager::keyReleased(const KeyEvent& evt)
+    void GUIManager::buttonReleased(const KeyEvent& evt)
     {
         this->protectedCall(boost::bind(&CEGUI::System::injectKeyUp, _1, evt.getKeyCode()));

code/branches/presentation3/src/libraries/core/GUIManager.h

@@ -113 +113 @@
 
         // keyHandler functions
-        void keyPressed (const KeyEvent& evt);
-        void keyReleased(const KeyEvent& evt);
+        void buttonPressed (const KeyEvent& evt);
+        void buttonReleased(const KeyEvent& evt);
 
         // mouseHandler functions