Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 15, 2011, 9:09:58 PM (14 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/libraries/core
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/usability/src/libraries/core/GUIManager.cc

    r8035 r8078  
    103103    /*static*/ const std::string GUIManager::defaultScheme_ = "TaharezGreen";
    104104
    105     static const std::string __CC_navigateGUI_name = "navigateGUI";
    106 
    107105    SetConsoleCommand("showGUI", &GUIManager::showGUI).defaultValue(1, false).defaultValue(2, false);
    108106    SetConsoleCommand("hideGUI", &GUIManager::hideGUI);
    109107    SetConsoleCommand("toggleGUI", &GUIManager::toggleGUI).defaultValue(1, false).defaultValue(2, false);
    110     SetConsoleCommand(__CC_navigateGUI_name, &GUIManager::navigateGUI).deactivate();
    111 
    112     //! Strings that specify modes for the GUI navigation.
    113     /*static*/ const std::string GUIManager::NAVIGATE_UP = "up";
    114     /*static*/ const std::string GUIManager::NAVIGATE_DOWN = "down";
    115     /*static*/ const std::string GUIManager::NAVIGATE_LEFT = "left";
    116     /*static*/ const std::string GUIManager::NAVIGATE_RIGHT = "right";
    117     /*static*/ const std::string GUIManager::NAVIGATE_ENTER = "enter";
    118108
    119109    /**
     
    374364            this->rootWindow_->setProperty("Alpha", "1.0");
    375365        this->rootWindow_->setProperty("Image", image);
    376     }
    377 
    378     /**
    379     @brief
    380         Method to navigate the GUI, by specifying the mode of navigation.
    381     @param mode
    382         The mode of navigation, at this point can be either 'up', 'down', 'left', 'right' or 'enter'.
    383     */
    384     /*static*/ void GUIManager::navigateGUI(const std::string& mode)
    385     {
    386         if(mode == NAVIGATE_UP)
    387             GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_UP + "\")");
    388         else if(mode == NAVIGATE_DOWN)
    389             GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_DOWN + "\")");
    390         else if(mode == NAVIGATE_LEFT)
    391             GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_LEFT + "\")");
    392         else if(mode == NAVIGATE_RIGHT)
    393             GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_RIGHT + "\")");
    394         else if(mode == NAVIGATE_ENTER)
    395             GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_ENTER + "\")");
    396     }
    397 
    398     /**
    399     @brief
    400         Is called by lua to change whether there are any GUIs active at the moment.
    401     @param active
    402         Whether GUIs are active.
    403     */
    404     void GUIManager::guisActiveChanged(bool active)
    405     {
    406         if(this->GUIsActive_ == active)
    407             return;
    408         this->GUIsActive_ = active;
    409         if(this->GUIsActive_)
    410             ModifyConsoleCommand(__CC_navigateGUI_name).activate();
    411         else
    412             ModifyConsoleCommand(__CC_navigateGUI_name).deactivate();
    413366    }
    414367
  • code/branches/usability/src/libraries/core/GUIManager.h

    r8040 r8078  
    9595        void setBackgroundImage(const std::string& image);
    9696
    97         static void navigateGUI(const std::string& mode);
    98         void guisActiveChanged(bool active); // tolua_export
    99 
    10097        /**
    10198        @brief Helper method to get the developer's mode without having to export Core.h.
     
    134131        template <typename FunctionType>
    135132        bool protectedCall(FunctionType function);
    136 
    137         static const std::string NAVIGATE_UP;
    138         static const std::string NAVIGATE_DOWN;
    139         static const std::string NAVIGATE_LEFT;
    140         static const std::string NAVIGATE_RIGHT;
    141         static const std::string NAVIGATE_ENTER;
    142 
    143         bool GUIsActive_; //!< Whether there are any GUIs active at a given moment.
    144133
    145134        // keyHandler functions
Note: See TracChangeset for help on using the changeset viewer.