Changeset 8078 for code/branches/usability/src

Timestamp:

Mar 15, 2011, 9:09:58 PM (13 years ago)

Author:

dafrick

Message:

Reverting changes made in revision 8035, that based the menu navigation on console commands, due to implemential difficulties of the hacks to make menu navigation work fully.
So, at the moment, we'll have to make due with the old version of the menu navigation implementation.

Location:

code/branches/usability/src

Files:

• libraries/core/GUIManager.cc (modified) (2 diffs)
• libraries/core/GUIManager.h (modified) (2 diffs)
• orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
• orxonox/overlays/InGameConsole.cc (modified) (3 diffs)

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

@@ -103 +103 @@
     /*static*/ const std::string GUIManager::defaultScheme_ = "TaharezGreen";
 
-    static const std::string __CC_navigateGUI_name = "navigateGUI";
-
     SetConsoleCommand("showGUI", &GUIManager::showGUI).defaultValue(1, false).defaultValue(2, false);
     SetConsoleCommand("hideGUI", &GUIManager::hideGUI);
     SetConsoleCommand("toggleGUI", &GUIManager::toggleGUI).defaultValue(1, false).defaultValue(2, false);
-    SetConsoleCommand(__CC_navigateGUI_name, &GUIManager::navigateGUI).deactivate();
-
-    //! Strings that specify modes for the GUI navigation.
-    /*static*/ const std::string GUIManager::NAVIGATE_UP = "up";
-    /*static*/ const std::string GUIManager::NAVIGATE_DOWN = "down";
-    /*static*/ const std::string GUIManager::NAVIGATE_LEFT = "left";
-    /*static*/ const std::string GUIManager::NAVIGATE_RIGHT = "right";
-    /*static*/ const std::string GUIManager::NAVIGATE_ENTER = "enter";
 
     /**
@@ -374 +364 @@
             this->rootWindow_->setProperty("Alpha", "1.0");
         this->rootWindow_->setProperty("Image", image);
-    }
-
-    /**
-    @brief
-        Method to navigate the GUI, by specifying the mode of navigation.
-    @param mode
-        The mode of navigation, at this point can be either 'up', 'down', 'left', 'right' or 'enter'.
-    */
-    /*static*/ void GUIManager::navigateGUI(const std::string& mode)
-    {
-        if(mode == NAVIGATE_UP)
-            GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_UP + "\")");
-        else if(mode == NAVIGATE_DOWN)
-            GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_DOWN + "\")");
-        else if(mode == NAVIGATE_LEFT)
-            GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_LEFT + "\")");
-        else if(mode == NAVIGATE_RIGHT)
-            GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_RIGHT + "\")");
-        else if(mode == NAVIGATE_ENTER)
-            GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_ENTER + "\")");
-    }
-
-    /**
-    @brief
-        Is called by lua to change whether there are any GUIs active at the moment.
-    @param active
-        Whether GUIs are active.
-    */
-    void GUIManager::guisActiveChanged(bool active)
-    {
-        if(this->GUIsActive_ == active)
-            return;
-        this->GUIsActive_ = active;
-        if(this->GUIsActive_)
-            ModifyConsoleCommand(__CC_navigateGUI_name).activate();
-        else
-            ModifyConsoleCommand(__CC_navigateGUI_name).deactivate();
     }
 

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

@@ -95 +95 @@
         void setBackgroundImage(const std::string& image);
 
-        static void navigateGUI(const std::string& mode);
-        void guisActiveChanged(bool active); // tolua_export
-
         /**
         @brief Helper method to get the developer's mode without having to export Core.h.
@@ -134 +131 @@
         template <typename FunctionType>
         bool protectedCall(FunctionType function);
-
-        static const std::string NAVIGATE_UP;
-        static const std::string NAVIGATE_DOWN;
-        static const std::string NAVIGATE_LEFT;
-        static const std::string NAVIGATE_RIGHT;
-        static const std::string NAVIGATE_ENTER;
-
-        bool GUIsActive_; //!< Whether there are any GUIs active at a given moment.
 
         // keyHandler functions

code/branches/usability/src/orxonox/gamestates/GSMainMenu.cc

@@ -68 +68 @@
         RegisterRootObject(GSMainMenu);
 
-        InputManager::getInstance().createInputState("MainMenuHackery")->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
+        InputManager::getInstance().createInputState("MainMenuHackery", true, true)->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
 
         // create an empty Scene

code/branches/usability/src/orxonox/overlays/InGameConsole.cc

@@ -49 +49 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/command/ConsoleCommand.h"
+#include "core/GUIManager.h"
 #include "core/input/InputManager.h"
 #include "core/input/InputState.h"
@@ -533 +534 @@
         {
             this->bActive_ = false;
+            GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()"); // Notify the SheetManager in lua, that the console has been closed.
             InputManager::getInstance().leaveState("console");
             this->shell_->unregisterListener(this);
@@ -609 +611 @@
     /*static*/ void InGameConsole::closeConsole()
     {
+        GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()");  // Notify the SheetManager in lua, that the console has been closed, but not by ESC.
         InGameConsole::getInstance().deactivate();
     }