Fix issues with in-game screens

src/guiengine/abstract_state_manager.cpp

@@ -140,6 +140,9 @@ void AbstractStateManager::pushScreen(Screen* screen)
 
 void AbstractStateManager::replaceTopMostScreen(Screen* screen, GUIEngine::GameState gameState)
 {
+    if (gameState == GUIEngine::CURRENT)
+        gameState = getGameState();
+
     //assert(m_game_mode != GAME);
     // you need to close any dialog before calling this
     assert(!ModalDialog::isADialogActive());

src/guiengine/abstract_state_manager.hpp

@@ -40,7 +40,9 @@ namespace GUIEngine
     {
         MENU,
         GAME,
-        INGAME_MENU
+        INGAME_MENU,
+        /** Dummy GameState e. g. for parameters. */
+        CURRENT = MENU | GAME | INGAME_MENU
     };   // GameState
 
     /**
@@ -82,7 +84,7 @@ namespace GUIEngine
           * without displaying the second-topmost menu of the stack
           * in-between)
           */
-        void replaceTopMostScreen(Screen* screen, GUIEngine::GameState gameState = GUIEngine::MENU);
+        void replaceTopMostScreen(Screen* screen, GUIEngine::GameState gameState = GUIEngine::CURRENT);
 
         /**
           * \brief removes the menu at the top of the screens stack

src/states_screens/help_screen_1.cpp

@@ -89,13 +89,19 @@ void HelpScreen1::eventCallback(Widget* widget, const std::string& name, const i
     }
     else if (name == "category")
     {
-        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER).c_str();
+        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
-        //if (selection == "page1") StateManager::get()->replaceTopMostScreen(Help1Screen::getInstance());
+        Screen *screen = NULL;
-        //else
+        //if (selection == "page1")
-        if (selection == "page2") StateManager::get()->replaceTopMostScreen(HelpScreen2::getInstance());
+        //    screen = HelpScreen1::getInstance();
-        else if (selection == "page3") StateManager::get()->replaceTopMostScreen(HelpScreen3::getInstance());
+        if (selection == "page2")
-        else if (selection == "page4") StateManager::get()->replaceTopMostScreen(HelpScreen4::getInstance());
+            screen = HelpScreen2::getInstance();
+        else if (selection == "page3")
+            screen = HelpScreen3::getInstance();
+        else if (selection == "page4")
+            screen = HelpScreen4::getInstance();
+        if(screen)
+            StateManager::get()->replaceTopMostScreen(screen);
     }
     else if (name == "back")
     {

src/states_screens/help_screen_2.cpp

@@ -46,12 +46,19 @@ void HelpScreen2::eventCallback(Widget* widget, const std::string& name, const i
 {
     if (name == "category")
     {
-        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER).c_str();
+        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
-        if(selection == "page1") StateManager::get()->replaceTopMostScreen(HelpScreen1::getInstance());
+        Screen *screen = NULL;
-        //else if(selection == "page2") StateManager::get()->replaceTopMostScreen(HelpScreen2::getInstance());
+        if (selection == "page1")
-        else if(selection == "page3") StateManager::get()->replaceTopMostScreen(HelpScreen3::getInstance());
+            screen = HelpScreen1::getInstance();
-        else if(selection == "page4") StateManager::get()->replaceTopMostScreen(HelpScreen4::getInstance());
+        //else if (selection == "page2")
+        //    screen = HelpScreen2::getInstance();
+        else if (selection == "page3")
+            screen = HelpScreen3::getInstance();
+        else if (selection == "page4")
+            screen = HelpScreen4::getInstance();
+        if(screen)
+            StateManager::get()->replaceTopMostScreen(screen);
     }
     else if (name == "back")
     {

src/states_screens/help_screen_3.cpp

@@ -47,12 +47,20 @@ void HelpScreen3::eventCallback(Widget* widget, const std::string& name, const i
 {
     if (name == "category")
     {
-        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER).c_str();
         
-        if (selection == "page1") StateManager::get()->replaceTopMostScreen(HelpScreen1::getInstance());
+        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
-        else if (selection == "page2") StateManager::get()->replaceTopMostScreen(HelpScreen2::getInstance());
+
-        //else if(selection == "page3") StateManager::get()->replaceTopMostScreen(Help3Screen::getInstance());
+        Screen *screen = NULL;
-        else if(selection == "page4") StateManager::get()->replaceTopMostScreen(HelpScreen4::getInstance());
+        if (selection == "page1")
+            screen = HelpScreen1::getInstance();
+        else if (selection == "page2")
+            screen = HelpScreen2::getInstance();
+        //else if (selection == "page3")
+        //    screen = HelpScreen3::getInstance();
+        else if (selection == "page4")
+            screen = HelpScreen4::getInstance();
+        if(screen)
+            StateManager::get()->replaceTopMostScreen(screen);
     }
     else if (name == "back")
     {

src/states_screens/help_screen_4.cpp

@@ -47,11 +47,20 @@ void HelpScreen4::eventCallback(Widget* widget, const std::string& name, const i
 {
     if (name == "category")
     {
-        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER).c_str();
         
-        if (selection == "page1") StateManager::get()->replaceTopMostScreen(HelpScreen1::getInstance());
+        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
-        else if (selection == "page2") StateManager::get()->replaceTopMostScreen(HelpScreen2::getInstance());
+
-        else if(selection == "page3") StateManager::get()->replaceTopMostScreen(HelpScreen3::getInstance());
+        Screen *screen = NULL;
+        if (selection == "page1")
+            screen = HelpScreen1::getInstance();
+        else if (selection == "page2")
+            screen = HelpScreen2::getInstance();
+        else if (selection == "page3")
+            screen = HelpScreen3::getInstance();
+        //else if (selection == "page4")
+        //    screen = HelpScreen4::getInstance();
+        if(screen)
+            StateManager::get()->replaceTopMostScreen(screen);
     }
     else if (name == "back")
     {

src/states_screens/options_screen_audio.cpp

@@ -103,13 +103,21 @@ void OptionsScreenAudio::eventCallback(Widget* widget, const std::string& name,
 {
     if (name == "options_choice")
     {
-        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER).c_str();
+        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
-        if (selection == "tab_audio") StateManager::get()->replaceTopMostScreen(OptionsScreenAudio::getInstance());
+        Screen *screen = NULL;
-        else if (selection == "tab_video") StateManager::get()->replaceTopMostScreen(OptionsScreenVideo::getInstance());
+        //if (selection == "tab_audio")
-        else if (selection == "tab_players") StateManager::get()->replaceTopMostScreen(TabbedUserScreen::getInstance());
+        //    screen = OptionsScreenAudio::getInstance();
-        else if (selection == "tab_controls") StateManager::get()->replaceTopMostScreen(OptionsScreenInput::getInstance());
+        if (selection == "tab_video")
-        else if (selection == "tab_ui") StateManager::get()->replaceTopMostScreen(OptionsScreenUI::getInstance());
+            screen = OptionsScreenVideo::getInstance();
+        else if (selection == "tab_players")
+            screen = TabbedUserScreen::getInstance();
+        else if (selection == "tab_controls")
+            screen = OptionsScreenInput::getInstance();
+        else if (selection == "tab_ui")
+            screen = OptionsScreenUI::getInstance();
+        if(screen)
+            StateManager::get()->replaceTopMostScreen(screen);
     }
     else if(name == "back")
     {

src/states_screens/options_screen_input.cpp

@@ -154,6 +154,15 @@ void OptionsScreenInput::init()
     const std::string name2("devices");
     eventCallback(devices, name2, PLAYER_ID_GAME_MASTER);
      */
+    // Disable adding keyboard configurations
+    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
+    {
+        getWidget<ButtonWidget>("add_device")->setDeactivated();
+    }
+    else
+    {
+        getWidget<ButtonWidget>("add_device")->setActivated();
+    }
 }   // init
 
 // -----------------------------------------------------------------------------
@@ -184,13 +193,21 @@ void OptionsScreenInput::eventCallback(Widget* widget, const std::string& name,
 
     if (name == "options_choice")
     {
-        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER).c_str();
+        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
-        if (selection == "tab_audio") StateManager::get()->replaceTopMostScreen(OptionsScreenAudio::getInstance());
+        Screen *screen = NULL;
-        else if (selection == "tab_video") StateManager::get()->replaceTopMostScreen(OptionsScreenVideo::getInstance());
+        if (selection == "tab_audio")
-        else if (selection == "tab_players") StateManager::get()->replaceTopMostScreen(TabbedUserScreen::getInstance());
+            screen = OptionsScreenAudio::getInstance();
-        else if (selection == "tab_controls") StateManager::get()->replaceTopMostScreen(OptionsScreenInput::getInstance());
+        else if (selection == "tab_video")
-        else if (selection == "tab_ui") StateManager::get()->replaceTopMostScreen(OptionsScreenUI::getInstance());
+            screen = OptionsScreenVideo::getInstance();
+        else if (selection == "tab_players")
+            screen = TabbedUserScreen::getInstance();
+        //else if (selection == "tab_controls")
+        //    screen = OptionsScreenInput::getInstance();
+        else if (selection == "tab_ui")
+            screen = OptionsScreenUI::getInstance();
+        if(screen)
+            StateManager::get()->replaceTopMostScreen(screen);
     }
     else if (name == "add_device")
     {

src/states_screens/options_screen_input2.cpp

@@ -150,6 +150,15 @@ void OptionsScreenInput2::init()
     actions->addItem(KartActionStrings[PA_MENU_CANCEL], L"" );
 
     updateInputButtons();
+
+    // Disable deletion keyboard configurations
+    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
+    {
+        getWidget<ButtonWidget>("delete")->setDeactivated();
+    } else
+    {
+        getWidget<ButtonWidget>("delete")->setActivated();
+    }
 }   // init
 
 // -----------------------------------------------------------------------------
@@ -443,18 +452,21 @@ void OptionsScreenInput2::eventCallback(Widget* widget,
     StateManager *sm = StateManager::get();
     if (name == "options_choice")
     {
-        const std::string &selection =
+        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
-          ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
+        Screen *screen = NULL;
         if (selection == "tab_audio")
-            sm->replaceTopMostScreen(OptionsScreenAudio::getInstance());
+            screen = OptionsScreenAudio::getInstance();
-        else if (selection == "tab_video")
+        //else if (selection == "tab_video")
-            sm->replaceTopMostScreen(OptionsScreenVideo::getInstance());
+        //    screen = OptionsScreenVideo::getInstance();
         else if (selection == "tab_players")
-            sm->replaceTopMostScreen(TabbedUserScreen::getInstance());
+            screen = TabbedUserScreen::getInstance();
+        //else if (selection == "tab_controls")
+        //    screen = OptionsScreenInput::getInstance();
         else if (selection == "tab_ui")
-            sm->replaceTopMostScreen(OptionsScreenUI::getInstance());
+            screen = OptionsScreenUI::getInstance();
-        else if (selection == "tab_controls") {}
+        if(screen)
+            StateManager::get()->replaceTopMostScreen(screen);
     }
     else if (name == "back_to_device_list")
     {

src/states_screens/options_screen_ui.cpp

@@ -206,12 +206,21 @@ void OptionsScreenUI::eventCallback(Widget* widget, const std::string& name, con
 {
     if (name == "options_choice")
     {
-        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER).c_str();
+        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
-        if (selection == "tab_audio") StateManager::get()->replaceTopMostScreen(OptionsScreenAudio::getInstance());
+        Screen *screen = NULL;
-        else if (selection == "tab_video") StateManager::get()->replaceTopMostScreen(OptionsScreenVideo::getInstance());
+        if (selection == "tab_audio")
-        else if (selection == "tab_players") StateManager::get()->replaceTopMostScreen(TabbedUserScreen::getInstance());
+            screen = OptionsScreenAudio::getInstance();
-        else if (selection == "tab_controls") StateManager::get()->replaceTopMostScreen(OptionsScreenInput::getInstance());
+        else if (selection == "tab_video")
+            screen = OptionsScreenVideo::getInstance();
+        else if (selection == "tab_players")
+            screen = TabbedUserScreen::getInstance();
+        else if (selection == "tab_controls")
+            screen = OptionsScreenInput::getInstance();
+        //else if (selection == "tab_ui")
+        //    screen = OptionsScreenUI::getInstance();
+        if(screen)
+            StateManager::get()->replaceTopMostScreen(screen);
     }
     else if(name == "back")
     {

src/states_screens/options_screen_video.cpp

@@ -167,15 +167,6 @@ void OptionsScreenVideo::init()
     if (UserConfigParams::m_fullscreen) rememberWinpos->setDeactivated();
     else rememberWinpos->setActivated();
 
-    // Enable back widgets if they were visited in-game previously
-    if (StateManager::get()->getGameState() != GUIEngine::INGAME_MENU)
-    {
-        res->setActivated();
-        full->setActivated();
-        applyBtn->setActivated();
-        gfx->setActivated();
-        getWidget<ButtonWidget>("custom")->setActivated();
-    }
 
     // --- get resolution list from irrlicht the first time
     if (!m_inited)
@@ -342,6 +333,15 @@ void OptionsScreenVideo::init()
         gfx->setDeactivated();
         getWidget<ButtonWidget>("custom")->setDeactivated();
     }
+    else
+    {
+        // Enable back widgets if they were visited in-game previously
+        res->setActivated();
+        full->setActivated();
+        applyBtn->setActivated();
+        gfx->setActivated();
+        getWidget<ButtonWidget>("custom")->setActivated();
+    }
 }   // init
 
 // ----------------------------------------------------------------------------
@@ -469,15 +469,13 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
 {
     if (name == "options_choice")
     {
-        std::string selection =
+        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
-            ((RibbonWidget*)widget)
-                                 ->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
         Screen *screen = NULL;
         if (selection == "tab_audio")
             screen = OptionsScreenAudio::getInstance();
-        else if (selection == "tab_video")
+        //else if (selection == "tab_video")
-            screen = OptionsScreenVideo::getInstance();
+        //    screen = OptionsScreenVideo::getInstance();
         else if (selection == "tab_players")
             screen = TabbedUserScreen::getInstance();
         else if (selection == "tab_controls")

src/states_screens/user_screen.cpp

@@ -108,6 +108,21 @@ void BaseUserScreen::init()
     else if (PlayerManager::get()->getNumPlayers() > 0)
         selectUser(0);
 
+    // Disable changing the user while in game
+    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
+    {
+        getWidget<IconButtonWidget>("ok")->setDeactivated();
+        getWidget<IconButtonWidget>("new_user")->setDeactivated();
+        getWidget<IconButtonWidget>("rename")->setDeactivated();
+        getWidget<IconButtonWidget>("delete")->setDeactivated();
+    }
+    else
+    {
+        getWidget<IconButtonWidget>("ok")->setActivated();
+        getWidget<IconButtonWidget>("new_user")->setActivated();
+        getWidget<IconButtonWidget>("rename")->setActivated();
+        getWidget<IconButtonWidget>("delete")->setActivated();
+    }
 }   // init
 
 // ----------------------------------------------------------------------------
@@ -572,16 +587,21 @@ void TabbedUserScreen::eventCallback(GUIEngine::Widget* widget,
 {
     if (name == "options_choice")
     {
-        const std::string &selection =
+        std::string selection = ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
-            ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
+
-        Screen *s;
+        Screen *screen = NULL;
-        if      (selection=="tab_audio"   ) s = OptionsScreenAudio::getInstance();
+        if (selection == "tab_audio")
-        else if (selection=="tab_video"   ) s = OptionsScreenVideo::getInstance();
+            screen = OptionsScreenAudio::getInstance();
-        else if (selection=="tab_players" ) s = TabbedUserScreen::getInstance();
+        else if (selection == "tab_video")
-        else if (selection=="tab_controls") s = OptionsScreenInput::getInstance();
+            screen = OptionsScreenVideo::getInstance();
-        else if (selection=="tab_ui"      ) s = OptionsScreenUI::getInstance();
+        //else if (selection == "tab_players")
-        assert(s);
+        //    screen = TabbedUserScreen::getInstance();
-        StateManager::get()->replaceTopMostScreen(s);
+        else if (selection == "tab_controls")
+            screen = OptionsScreenInput::getInstance();
+        else if (selection == "tab_ui")
+            screen = OptionsScreenUI::getInstance();
+        if(screen)
+            StateManager::get()->replaceTopMostScreen(screen);
     }
     else
         BaseUserScreen::eventCallback(widget, name, player_id);