[Orxonox-commit 2297] r7012 - in code/branches/presentation3: data/gui/layouts data/gui/scripts src/libraries/core

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-05-30 13:37:33 +0200 (Sun, 30 May 2010)
New Revision: 7012

Modified:
   code/branches/presentation3/data/gui/layouts/SettingsMenu.layout
   code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua
   code/branches/presentation3/src/libraries/core/GUIManager.cc
   code/branches/presentation3/src/libraries/core/GUIManager.h
Log:
Config values can now be changed in a menu.


Modified: code/branches/presentation3/data/gui/layouts/SettingsMenu.layout
===================================================================
--- code/branches/presentation3/data/gui/layouts/SettingsMenu.layout	2010-05-30 10:26:27 UTC (rev 7011)
+++ code/branches/presentation3/data/gui/layouts/SettingsMenu.layout	2010-05-30 11:37:33 UTC (rev 7012)
@@ -49,7 +49,6 @@
             </Window>
             <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}}" />
                 <Event Name="Clicked" Function="SettingsMenu.SettingsMiscellaneousButton_clicked"/>

Modified: code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua
===================================================================
--- code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua	2010-05-30 10:26:27 UTC (rev 7011)
+++ code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua	2010-05-30 11:37:33 UTC (rev 7012)
@@ -1,6 +1,6 @@
 -- MiscConfigMenu.lua
 
-local P = createMenuSheet("MiscConfigMenu")
+local P = createMenuSheet("MiscConfigMenu", true, TriBool.True, TriBool.True)
 
 P.commandList = {}
 P.nameList = {}

Modified: code/branches/presentation3/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/presentation3/src/libraries/core/GUIManager.cc	2010-05-30 10:26:27 UTC (rev 7011)
+++ code/branches/presentation3/src/libraries/core/GUIManager.cc	2010-05-30 11:37:33 UTC (rev 7012)
@@ -320,13 +320,13 @@
         this->rootWindow_->setProperty("Image", image);
     }
 
-    void GUIManager::keyPressed(const KeyEvent& evt)
+    void GUIManager::buttonPressed(const KeyEvent& evt)
     {
         this->protectedCall(boost::bind(&CEGUI::System::injectKeyDown, _1, evt.getKeyCode()));
         this->protectedCall(boost::bind(&CEGUI::System::injectChar, _1, evt.getText()));
     }
 
-    void GUIManager::keyReleased(const KeyEvent& evt)
+    void GUIManager::buttonReleased(const KeyEvent& evt)
     {
         this->protectedCall(boost::bind(&CEGUI::System::injectKeyUp, _1, evt.getKeyCode()));
     }

Modified: code/branches/presentation3/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/presentation3/src/libraries/core/GUIManager.h	2010-05-30 10:26:27 UTC (rev 7011)
+++ code/branches/presentation3/src/libraries/core/GUIManager.h	2010-05-30 11:37:33 UTC (rev 7012)
@@ -112,8 +112,8 @@
         bool protectedCall(FunctionType function);
 
         // keyHandler functions
-        void keyPressed (const KeyEvent& evt);
-        void keyReleased(const KeyEvent& evt);
+        void buttonPressed (const KeyEvent& evt);
+        void buttonReleased(const KeyEvent& evt);
 
         // mouseHandler functions
         void buttonPressed (MouseButtonCode::ByEnum id);