From b2202d0a0fd697c6a5ea35f97a0aab97cc847e99 Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Wed, 1 Apr 2009 20:37:34 +0000
Subject: [PATCH] refined the option menu's skeleton

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3341 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/options_av.stkgui                    | 43 +++++++++++++++++++
 .../{options.stkgui => options_input.stkgui}  |  7 ++-
 data/gui/options_players.stkgui               | 15 +++++++
 src/gui/screen.cpp                            |  2 +-
 src/gui/screen_loader.cpp                     |  5 +++
 src/gui/state_manager.cpp                     | 27 +++++++++++-
 src/gui/state_manager.hpp                     |  1 +
 src/gui/widget.cpp                            | 35 +++++++++++++++
 src/gui/widget.hpp                            | 10 ++++-
 .../Xcode/STK_XCode.xcodeproj/project.pbxproj |  8 ++--
 10 files changed, 142 insertions(+), 11 deletions(-)
 create mode 100644 data/gui/options_av.stkgui
 rename data/gui/{options.stkgui => options_input.stkgui} (78%)
 create mode 100644 data/gui/options_players.stkgui

diff --git a/data/gui/options_av.stkgui b/data/gui/options_av.stkgui
new file mode 100644
index 000000000..9f47c3ba7
--- /dev/null
+++ b/data/gui/options_av.stkgui
@@ -0,0 +1,43 @@
+<div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
+
+<label align="center" text="SuperTuxKart Options"/>
+
+<ribbon id="options_choice" height="20%" width="75%" align="center">
+    <icon-button id="audio_video" width="128" height="128" icon="options_audio_video.png" text="Audio/Video"/>
+    <icon-button id="players" width="128" height="128" icon="options_players.png" text="Players"/>
+    <icon-button id="controls" width="128" height="128" icon="options_input.png" text="Controls"/>
+</ribbon>
+
+<spacer proportion="1" width="10" proportion="1"/>
+
+<label align="center" text="Audio/Video"/>
+
+<spacer proportion="1" width="10" proportion="1"/>
+
+<div width="75%" height="30" layout="horizontal-row" >
+    <label proportion="100%" height="100%" text="Music"/>
+    <!-- TODO - add check box -->
+    <gauge id="music_volume" proportion="100%" height="100%"/>
+</div>
+
+<spacer proportion="1" width="10" proportion="1"/>
+
+<div width="75%" height="30" layout="horizontal-row" >
+    <label proportion="100%" height="100%" text="Sound Effects"/>
+    <!-- TODO - add check box -->
+    <gauge id="sfx_volume" proportion="100%" height="100%"/>
+</div>
+
+
+<spacer proportion="2" width="10" proportion="1"/>
+
+<label align="center" text="Video"/>
+
+<spacer proportion="1" width="10" proportion="1"/>
+
+<!-- TODO - add resolution choice -->
+<label align="center" text="TODO"/>
+
+<spacer proportion="2" width="10" proportion="1"/>
+
+</div>
\ No newline at end of file
diff --git a/data/gui/options.stkgui b/data/gui/options_input.stkgui
similarity index 78%
rename from data/gui/options.stkgui
rename to data/gui/options_input.stkgui
index 205ac893d..cabaef2b9 100644
--- a/data/gui/options.stkgui
+++ b/data/gui/options_input.stkgui
@@ -2,14 +2,13 @@
 
 <label align="center" text="SuperTuxKart Options"/>
 
-<spacer proportion="1" width="10"/>
-
-<buttonbar id="options_choice" proportion="1" width="75%" align="center">
+<ribbon id="options_choice" height="20%" width="75%" align="center">
     <icon-button id="audio_video" width="128" height="128" icon="options_audio_video.png" text="Audio/Video"/>
     <icon-button id="players" width="128" height="128" icon="options_players.png" text="Players"/>
     <icon-button id="controls" width="128" height="128" icon="options_input.png" text="Controls"/>
-</buttonbar>
+</ribbon>
 
 <spacer proportion="1" width="10" proportion="1"/>
 
+
 </div>
\ No newline at end of file
diff --git a/data/gui/options_players.stkgui b/data/gui/options_players.stkgui
new file mode 100644
index 000000000..674417633
--- /dev/null
+++ b/data/gui/options_players.stkgui
@@ -0,0 +1,15 @@
+<div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
+
+<label align="center" text="SuperTuxKart Options"/>
+
+<ribbon id="options_choice" height="20%" width="75%" align="center">
+    <icon-button id="audio_video" width="128" height="128" icon="options_audio_video.png" text="Audio/Video"/>
+    <icon-button id="players" width="128" height="128" icon="options_players.png" text="Players"/>
+    <icon-button id="controls" width="128" height="128" icon="options_input.png" text="Controls"/>
+</ribbon>
+
+<spacer proportion="1" width="10" proportion="1"/>
+
+<list id="players" proportion="5" width="75%" align="center"/>
+
+</div>
\ No newline at end of file
diff --git a/src/gui/screen.cpp b/src/gui/screen.cpp
index 9b7d386d9..7eb335262 100644
--- a/src/gui/screen.cpp
+++ b/src/gui/screen.cpp
@@ -44,7 +44,7 @@ void Screen::addWidgets()
     
     // And tell the device to use our custom event receiver.
     GUIEngine::getDevice()->setEventReceiver(this);
-    
+
     // select the first widget
     Widget* w = getFirstWidget();
     if(w != NULL) GUIEngine::getGUIEnv()->setFocus( w->m_element );
diff --git a/src/gui/screen_loader.cpp b/src/gui/screen_loader.cpp
index ceaf56c8e..3e6086da7 100644
--- a/src/gui/screen_loader.cpp
+++ b/src/gui/screen_loader.cpp
@@ -102,6 +102,11 @@ void parseScreenFileDiv(irr::io::IrrXMLReader* xml, ptr_vector<Widget>& append_t
                     type = WTYPE_MODEL_VIEW;
                     append_to.push_back(new ModelViewWidget());
                 }
+                else if (!strcmp("list", xml->getNodeName()))
+                {
+                    type = WTYPE_LIST;
+                    append_to.push_back(new ListWidget());
+                }
                 else
                 {
                     std::cerr << "/!\\ Warning /!\\ : unknown tag found in STK GUI file  : '" << xml->getNodeName()  << "'" << std::endl;
diff --git a/src/gui/state_manager.cpp b/src/gui/state_manager.cpp
index fb86ff4e7..7ff27b165 100644
--- a/src/gui/state_manager.cpp
+++ b/src/gui/state_manager.cpp
@@ -94,7 +94,7 @@ namespace StateManager
             }
             else if (selection == "options")
             {
-                pushMenu("options.stkgui");
+                pushMenu("options_av.stkgui");
             }
         }
         
@@ -104,6 +104,24 @@ namespace StateManager
             StateManager::pushMenu("racesetup.stkgui");
         }
         
+        // -- options
+        if(name == "options_choice")
+        {
+            std::string selection = ((GUIEngine::RibbonWidget*)widget)->getSelectionName().c_str();
+            
+            if(selection == "audio_video") replaceTopMostMenu("options_av.stkgui");
+            else if(selection == "players") replaceTopMostMenu("options_players.stkgui");
+            else if(selection == "controls") replaceTopMostMenu("options_input.stkgui");
+            
+            // select the right tab - FIXME - add some kind of post-screen-activation callback to do this
+            GUIEngine::RibbonWidget* w = dynamic_cast<GUIEngine::RibbonWidget*>(GUIEngine::getCurrentScreen()->getWidget("options_choice"));
+            if(w != NULL)
+            {
+                w->select(selection);
+            }
+            
+        }
+        
         // -- race setup screen
         if(name == "gamemode")
         {
@@ -207,6 +225,13 @@ namespace StateManager
         g_game_mode = false;
         GUIEngine::switchToScreen(name.c_str());
     }
+    void replaceTopMostMenu(std::string name)
+    {
+        input_manager->setMode(InputManager::MENU);
+        g_menu_stack[g_menu_stack.size()-1] = name;
+        g_game_mode = false;
+        GUIEngine::switchToScreen(name.c_str());
+    }
     
     void popMenu()
     {
diff --git a/src/gui/state_manager.hpp b/src/gui/state_manager.hpp
index 533d15862..2ad63fc51 100644
--- a/src/gui/state_manager.hpp
+++ b/src/gui/state_manager.hpp
@@ -8,6 +8,7 @@ namespace StateManager
     void initGUI();
     
     void pushMenu(std::string name);
+    void replaceTopMostMenu(std::string name);
     void popMenu();
     void resetAndGoToMenu(std::string name);
     void enterGameState();
diff --git a/src/gui/widget.cpp b/src/gui/widget.cpp
index ded728581..673b60dc3 100644
--- a/src/gui/widget.cpp
+++ b/src/gui/widget.cpp
@@ -303,6 +303,22 @@ RibbonWidget::RibbonWidget(const RibbonType type)
     updateSelection();
 }
 // -----------------------------------------------------------------------------
+void RibbonWidget::select(std::string item)
+{
+    const int subbuttons_amount = m_children.size();
+    
+    for(int i=0; i<subbuttons_amount; i++)
+    {  
+        if(m_children[i].m_properties[PROP_ID] == item)
+        {
+            m_selection = i;
+            updateSelection();
+            return;
+        }
+    }
+
+}
+// -----------------------------------------------------------------------------
 bool RibbonWidget::rightPressed()
 {
     m_selection++;
@@ -976,3 +992,22 @@ void ModelViewWidget::setModel(SAnimatedMesh* mesh)
     ((IGUIMeshViewer*)m_element)->setMesh( mesh );
 }
 
+#if 0
+#pragma mark -
+#pragma mark List Widget
+#endif
+
+
+// -----------------------------------------------------------------------------
+void ListWidget::add()
+{
+    rect<s32> widget_size = rect<s32>(x, y, x + w, y + h);
+
+    IGUIListBox* list = GUIEngine::getGUIEnv()->addListBox (widget_size);
+    list->addItem( L"Hiker" );
+    list->addItem( L"Conso" );
+    list->addItem( L"Auria" );
+    list->addItem( L"MiniBjorn" );
+    list->addItem( L"Arthur" );
+    //list->setSelected(0);
+}
diff --git a/src/gui/widget.hpp b/src/gui/widget.hpp
index 135f45775..7593df73a 100644
--- a/src/gui/widget.hpp
+++ b/src/gui/widget.hpp
@@ -24,7 +24,8 @@ namespace GUIEngine
         WTYPE_SPACER,
         WTYPE_DIV,
         WTYPE_RIBBON_GRID,
-        WTYPE_MODEL_VIEW
+        WTYPE_MODEL_VIEW,
+        WTYPE_LIST
     };
     
     enum Property
@@ -226,6 +227,7 @@ namespace GUIEngine
         int getSelection() const { return m_selection; }
         RibbonType getRibbonType() const { return m_ribbon_type; }
         const std::string& getSelectionName() { return m_children[m_selection].m_properties[PROP_ID]; }
+        void select(std::string item);
         
         RibbonWidget(const RibbonType type=RIBBON_COMBO);
     };
@@ -291,5 +293,11 @@ namespace GUIEngine
         void setModel(SAnimatedMesh* mesh);
     };
     
+    class ListWidget : public Widget
+    {
+    public:
+        void add();
+    };
+    
 }
 #endif
diff --git a/src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj b/src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj
index d6ca4eaec..6c00b1fd3 100644
--- a/src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj
+++ b/src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj
@@ -1180,17 +1180,17 @@
 				9505577D0F696A900056E88C /* my_button.hpp */,
 				95C1E3FF0F699427005D33E6 /* font.cpp */,
 				95C1E4020F69943D005D33E6 /* font.hpp */,
+				95C1E3F10F699079005D33E6 /* race_gui.cpp */,
+				95C1E3EB0F698F23005D33E6 /* race_gui.hpp */,
 				9505577F0F696A900056E88C /* screen.cpp */,
 				950557800F696A900056E88C /* screen.hpp */,
 				950557810F696A900056E88C /* screen_loader.cpp */,
+				953F038B0F6C880D00C77FE2 /* state_manager.cpp */,
+				953F038E0F6C8AD800C77FE2 /* state_manager.hpp */,
 				950557820F696A900056E88C /* skin.cpp */,
 				950557830F696A900056E88C /* skin.hpp */,
 				950557840F696A900056E88C /* widget.cpp */,
 				950557850F696A900056E88C /* widget.hpp */,
-				95C1E3F10F699079005D33E6 /* race_gui.cpp */,
-				95C1E3EB0F698F23005D33E6 /* race_gui.hpp */,
-				953F038B0F6C880D00C77FE2 /* state_manager.cpp */,
-				953F038E0F6C8AD800C77FE2 /* state_manager.hpp */,
 			);
 			name = gui;
 			path = games/supertuxkart/src/gui;