Changeset 6266 for code/branches/presentation2/src/libraries

Timestamp:

Dec 7, 2009, 9:45:39 PM (15 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/src/libraries/core/input

Files:

• KeyBinderManager.cc (modified) (2 diffs)
• KeyBinderManager.h (modified) (3 diffs)

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)