From a0ad028024453d4ad468650a4c376d178e21d448 Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 20 Aug 2011 01:28:17 +0000
Subject: [PATCH] Move language selection to the options screen

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9569 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/main.stkgui                     |   7 +-
 data/gui/options_ui.stkgui               |  20 ++-
 data/gui/options_video.stkgui            |   2 +-
 src/states_screens/main_menu_screen.cpp  | 155 +----------------------
 src/states_screens/options_screen_ui.cpp |  57 +++++++++
 5 files changed, 74 insertions(+), 167 deletions(-)

diff --git a/data/gui/main.stkgui b/data/gui/main.stkgui
index 56fea28b3..18f32cf55 100644
--- a/data/gui/main.stkgui
+++ b/data/gui/main.stkgui
@@ -32,10 +32,7 @@
         <spacer width="10" proportion="1"/>
         
         <bottombar width="100%" height="10%" layout="horizontal-row">
-            <div proportion="1" height="100%" layout="horizontal-row">
-                <icon-button id="lang_combo" icon="gui/dropdown.png" height="100%" align="center"/>
-            </div>
-            
+
             <spacer width="10" height="10" />
             
             <label proportion="3" height="100%" id="info_addons"
@@ -45,8 +42,6 @@
                
             <spacer width="10" height="10" />
             
-            <placeholder id="empty_for_now" proportion="1">
-            </placeholder>
         </bottombar>
         
     </div>
diff --git a/data/gui/options_ui.stkgui b/data/gui/options_ui.stkgui
index fc3f1c387..89a1918cb 100644
--- a/data/gui/options_ui.stkgui
+++ b/data/gui/options_ui.stkgui
@@ -16,14 +16,16 @@
     
     <box proportion="1" width="100%" layout="vertical-row">
         
-        <spacer height="20" width="10"/>
+        <spacer height="18" width="10"/>
 
         <!-- ************ SKIN CHOICE ************ -->
-        <label I18N="In the graphics settings" text="Skin"/>
+        <div layout="horizontal-row" width="100%" height="fit">
+            <label I18N="In the graphics settings" text="Skin" align="center"/>
+            <spacer width="20" height="20"/>
+            <spinner id="skinchoice" width="30%"/>
+        </div>
         
-        <spinner id="skinchoice" width="30%"/>
-        
-        <spacer width="20" height="40" />
+        <spacer width="20" height="18" />
         
         <div width="75%" height="fit" layout="horizontal-row" >
             <checkbox id="showfps"/>
@@ -43,8 +45,14 @@
             <label height="100%" I18N="In the ui settings" text="Minimal Race GUI"/>
         </div>
 
-        <spacer height="4" width="4"/>
+        <spacer height="18" width="4"/>
         
+        <!-- ************ LANGUAGE CHOICE ************ -->
+        
+        <list id="language" proportion="1" width="75%" align="center"/>
+        
+        <spacer height="18" width="4"/>
+
     </box>
 </div>
 
diff --git a/data/gui/options_video.stkgui b/data/gui/options_video.stkgui
index e69abb036..d003ee9ee 100644
--- a/data/gui/options_video.stkgui
+++ b/data/gui/options_video.stkgui
@@ -19,7 +19,7 @@
         <spacer height="20" width="10"/>
 
         <!-- ************ GRAPHICAL EFFECTS SETTINGS ************ -->
-        <div width="75%" height="50" layout="horizontal-row" >
+        <div width="75%" height="fit" layout="horizontal-row" >
             <label I18N="In the graphics settings" text="Graphical Effects Level" align="center"/>
             <spacer width="20" height="20"/>
             <gauge id="gfx_level" min_value="1" max_value="7" width="300" />
diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index c3df8a259..fc2786374 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -160,60 +160,6 @@ void MainMenuScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
         const core::stringw &news_text = news_manager->getNextNewsMessage();
         w->setText(news_text, true);
     }
-    
-    IconButtonWidget* lang_combo = this->getWidget<IconButtonWidget>("lang_combo");
-    if (lang_combo != NULL)
-    {
-        irr::gui::ScalableFont* font = GUIEngine::getFont();
-        
-        // I18N: Enter the name of YOUR language here, do not literally translate the word "English"
-        core::stringw language_name = _("English");
-        
-        const int LEFT_MARGIN = 5;
-        const int arrow_width = (int)(lang_combo->m_h*0.6f); // the arrow is about half wide as the combo is high
-
-        // Below is a not-too-pretty hack. When language name is too long to fit the space allocated by the STK
-        // widget, resize the irrlicht element (but don't resize the STK widget on top of it, because we don't
-        // want the change of size to be permanent - if we switch back to another language the combo needs
-        // to shrink back)
-        int element_width = lang_combo->getIrrlichtElement()->getRelativePosition().getWidth();
-        const int text_w = (int)font->getDimension(language_name.c_str()).Width;
-        const int needed_additional_space = text_w - (element_width - arrow_width - LEFT_MARGIN);
-        if (needed_additional_space > 0)
-        {
-            // language name too long to fit
-            gui::IGUIElement* el = lang_combo->getIrrlichtElement();
-            core::recti pos = el->getRelativePosition();
-            pos.UpperLeftCorner.X -= needed_additional_space;
-            el->setRelativePosition( pos );
-        }
-        
-        element_width = lang_combo->getIrrlichtElement()->getRelativePosition().getWidth();
-        
-        const int elem_x = lang_combo->getIrrlichtElement()->getRelativePosition().UpperLeftCorner.X;
-        font->draw(language_name,
-                   core::rect<s32>(elem_x + LEFT_MARGIN,
-                                   lang_combo->m_y,
-                                   // don't go over combo arrow
-                                   (int)(elem_x + LEFT_MARGIN + (element_width - arrow_width)),
-                                   lang_combo->m_y + lang_combo->m_h),
-                   // center horizontally only if there is enough room, irrlicht's centering algorithm
-                   // seems to give weird results when space is too tight
-                   video::SColor(255,0,0,0), (element_width - text_w > 5) /* hcenter */, true /* vcenter */);
-        
-        // Close popup when focus lost
-        if (m_lang_popup != NULL)
-        {
-            Widget* focus = GUIEngine::getFocusForPlayer(PLAYER_ID_GAME_MASTER);
-            const core::position2d<s32> mouse = irr_driver->getDevice()->getCursorControl()->getPosition();
-            if (mouse.X < m_lang_popup->m_x - 50 || mouse.X > m_lang_popup->m_x + m_lang_popup->m_w + 50 ||
-                mouse.Y < m_lang_popup->m_y - 50  || // we don't check if mouse Y is too large because the mouse will come from the bottom
-                (focus != NULL && focus->getType() == WTYPE_RIBBON))
-            {
-                closeLangPopup();
-            }
-        }
-    }
 }
 // ------------------------------------------------------------------------------------------------------
 
@@ -221,109 +167,10 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, cons
 {
     // most interesting stuff is in the ribbons, so start there
     RibbonWidget* ribbon = dynamic_cast<RibbonWidget*>(widget);
-    if (ribbon == NULL)
-    {
-        // Language selection combo
-        if (name == "lang_combo")
-        {
-            if (m_lang_popup == NULL)
-            {
-                // When the combo is clicked, show a pop-up list with the choices
-                IconButtonWidget* lang_combo = this->getWidget<IconButtonWidget>("lang_combo");
-                
-                m_lang_popup = new ListWidget();
-                m_lang_popup->m_properties[PROP_ID] = "lang_popup";
-                const core::dimension2d<u32> frame_size = irr_driver->getFrameSize();
-                
-                const int width = (int)(frame_size.Width*0.4f);
-                
-                const int MARGIN_ABOVE_POPUP = 50;
-                const int CLEAR_BOTTOM = 15;
-
-                const int height = lang_combo->m_y - MARGIN_ABOVE_POPUP - CLEAR_BOTTOM;
-                
-                m_lang_popup->m_x = lang_combo->m_x;
-                m_lang_popup->m_y = lang_combo->m_y - height - CLEAR_BOTTOM;
-                m_lang_popup->m_w = width;
-                m_lang_popup->m_h = height;
-                
-                m_lang_popup->add();
-
-                m_lang_popup->m_properties[PROP_ID] = "language_popup";
-                
-                // I18N: in the language choice, to select the same language as the OS
-                m_lang_popup->addItem("system", _("System Language"));
-
-                const std::vector<std::string>* lang_list = translations->getLanguageList();
-                const int amount = lang_list->size();
-                for (int n=0; n<amount; n++)
-                {
-                    std::string code_name = (*lang_list)[n];
-                    std::string nice_name = tinygettext::Language::from_name(code_name.c_str()).get_name();
-                    m_lang_popup->addItem(code_name, core::stringw(code_name.c_str()) + " (" +
-                                                     nice_name.c_str() + ")");
-                }
-
-                manualAddWidget(m_lang_popup);
-                
-                m_lang_popup->setSelectionID( m_lang_popup->getItemID(UserConfigParams::m_language) );
-                m_lang_popup->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
-            }
-            else
-            {
-                closeLangPopup();
-            }
-        }
-        else if (name == "language_popup")
-        {
-            std::string selection = m_lang_popup->getSelectionInternalName();
-
-            closeLangPopup();
-            
-            delete translations;
-            
-            if (selection == "system")
-            {
-#ifdef WIN32
-                _putenv("LANGUAGE=");
-#else
-                setenv( "LANGUAGE", "", 1);
-#endif
-            }
-            else
-            {
-#ifdef WIN32
-                std::string s=std::string("LANGUAGE=")+selection.c_str();
-                _putenv(s.c_str());
-#else
-                setenv("LANGUAGE", selection.c_str(), 1);
-#endif
-            }
-            
-            translations = new Translations();
-            GUIEngine::getStateManager()->hardResetAndGoToScreen<MainMenuScreen>();
-            
-            GUIEngine::getFont()->updateRTL();
-            GUIEngine::getTitleFont()->updateRTL();
-            GUIEngine::getSmallFont()->updateRTL();
-            
-            UserConfigParams::m_language = selection.c_str();
-            user_config->saveConfig();
-        }
-        
-        return;
-    }
     
-    // When the lang popup is shown, ignore all other widgets
-    // FIXME: for some reasons, irrlicht widgets appear to be click-through, this is why
-    //        this hack is needed
-    if (m_lang_popup != NULL)
-    {
-        return;
-    }
+    if (ribbon == NULL) return; // what's that event??
     
     // ---- A ribbon icon was clicked
-    
     std::string selection = ribbon->getSelectionIDString(PLAYER_ID_GAME_MASTER);
     
 #if DEBUG_MENU_ITEM
diff --git a/src/states_screens/options_screen_ui.cpp b/src/states_screens/options_screen_ui.cpp
index f937bec6d..dcb246718 100644
--- a/src/states_screens/options_screen_ui.cpp
+++ b/src/states_screens/options_screen_ui.cpp
@@ -22,13 +22,16 @@
 #include "audio/sfx_manager.hpp"
 #include "audio/sfx_base.hpp"
 #include "graphics/irr_driver.hpp"
+#include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
 #include "guiengine/widgets/spinner_widget.hpp"
 #include "guiengine/widget.hpp"
 #include "io/file_manager.hpp"
+#include "states_screens/main_menu_screen.hpp"
 #include "states_screens/options_screen_audio.hpp"
 #include "states_screens/options_screen_input.hpp"
 #include "states_screens/options_screen_players.hpp"
@@ -152,6 +155,25 @@ void OptionsScreenUI::init()
         skinSelector->setValue(0);
         GUIEngine::reloadSkin();
     }
+    
+    // --- language
+    ListWidget* list_widget = getWidget<ListWidget>("language");
+    
+    // I18N: in the language choice, to select the same language as the OS
+    list_widget->addItem("system", _("System Language"));
+    
+    const std::vector<std::string>* lang_list = translations->getLanguageList();
+    const int amount = lang_list->size();
+    for (int n=0; n<amount; n++)
+    {
+        std::string code_name = (*lang_list)[n];
+        std::string nice_name = tinygettext::Language::from_name(code_name.c_str()).get_name();
+        list_widget->addItem(code_name, core::stringw(code_name.c_str()) + " (" +
+                             nice_name.c_str() + ")");
+    }
+        
+    list_widget->setSelectionID( list_widget->getItemID(UserConfigParams::m_language) );
+    
 }   // init
 
 // -----------------------------------------------------------------------------
@@ -211,6 +233,41 @@ void OptionsScreenUI::eventCallback(Widget* widget, const std::string& name, con
         UserConfigParams::m_minimal_race_gui = 
             !UserConfigParams::m_minimal_race_gui;
     }
+    else if (name == "language")
+    {
+        ListWidget* list_widget = getWidget<ListWidget>("language");
+        std::string selection = list_widget->getSelectionInternalName();
+        
+        delete translations;
+        
+        if (selection == "system")
+        {
+#ifdef WIN32
+            _putenv("LANGUAGE=");
+#else
+            setenv( "LANGUAGE", "", 1);
+#endif
+        }
+        else
+        {
+#ifdef WIN32
+            std::string s=std::string("LANGUAGE=")+selection.c_str();
+            _putenv(s.c_str());
+#else
+            setenv("LANGUAGE", selection.c_str(), 1);
+#endif
+        }
+        
+        translations = new Translations();
+        GUIEngine::getStateManager()->hardResetAndGoToScreen<MainMenuScreen>();
+        
+        GUIEngine::getFont()->updateRTL();
+        GUIEngine::getTitleFont()->updateRTL();
+        GUIEngine::getSmallFont()->updateRTL();
+        
+        UserConfigParams::m_language = selection.c_str();
+        user_config->saveConfig();
+    }
     
 }   // eventCallback