<div x="5%" y="0" width="90%" height="98%" layout="vertical-row" >
    
        <icon id="logo" align="center" proportion="8" width="100%" icon="gui/logo.png"/>
        
        <buttonbar id="menu_toprow" proportion="3" width="75%" align="center">
            <icon-button id="new" width="128" height="128" icon="gui/main_race.png"
                    I18N="Main menu button" text="Race"/>
            <icon-button id="network" width="128" height="128" icon="gui/main_options.png"
                    I18N="Main menu button" text="DEBUG"/>
            <icon-button id="challenges" width="128" height="128"
                         icon="gui/challenge.png"
                         I18N="Main menu button"  text="Challenges"/>
			<icon-button id="tutorial" width="128" height="128"
                         icon="gui/tutorial.png"
                         I18N="Main menu button"  text="Tutorial"/>
        </buttonbar>
        
        <spacer width="10" proportion="1"/>
        
        <buttonbar id="menu_bottomrow" proportion="3" width="85%" align="center">
            <icon-button id="options" width="128" height="128" icon="gui/main_options.png"
                    I18N="Main menu button"  text="Options"/>
            <icon-button id="help" width="128" height="128" icon="gui/main_help.png"
                    I18N="Main menu button" text="Help"/>
            <icon-button id="about" width="128" height="128" icon="gui/main_about.png"
                    I18N="Main menu button" text="About"/>
            <icon-button id="quit" width="128" height="128" icon="gui/main_quit.png"
                    I18N="Main menu button" text="Quit"/>
        </buttonbar>
        
        <spacer width="10" proportion="1"/>
        
    </div>

</stkgui>

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6940 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
aeonphyxius 2010-12-10 01:42:08 +00:00
parent fd55bc2273
commit 777292a74f
6 changed files with 35 additions and 3 deletions

View File

@ -12,6 +12,9 @@
<icon-button id="challenges" width="128" height="128"
icon="gui/challenge.png"
I18N="Main menu button" text="Challenges"/>
<icon-button id="tutorial" width="128" height="128"
icon="gui/tutorial.png"
I18N="Main menu button" text="Tutorial"/>
</buttonbar>
<spacer width="10" proportion="1"/>

View File

@ -260,6 +260,8 @@ namespace UserConfigParams
"Type of the renderer.") );
// ---- Debug - not saved to config file
/** If tutorial game mode debugging is enabled. */
PARAM_PREFIX bool m_tutorial_debug PARAM_DEFAULT( false );
/** If gamepad debugging is enabled. */
PARAM_PREFIX bool m_gamepad_debug PARAM_DEFAULT( false );
/** If material debugging (printing terrain specific slowdown) is enabled. */

View File

@ -31,13 +31,13 @@
<File name="../../network/message.cpp" open="0" top="0" tabpos="0">
<Cursor position="2505" topLine="68" />
</File>
<File name="../../states_screens/challenges.cpp" open="1" top="1" tabpos="3">
<File name="../../states_screens/challenges.cpp" open="0" top="0" tabpos="3">
<Cursor position="2262" topLine="33" />
</File>
<File name="../../states_screens/challenges.hpp" open="0" top="0" tabpos="0">
<Cursor position="0" topLine="10" />
</File>
<File name="../../states_screens/tutorial_screen.cpp" open="1" top="0" tabpos="2">
<File name="../../states_screens/tutorial_screen.cpp" open="1" top="1" tabpos="2">
<Cursor position="2440" topLine="48" />
</File>
<File name="../../states_screens/tutorial_screen.hpp" open="1" top="0" tabpos="1">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Version="9,00"
Name="supertuxkart"
ProjectGUID="{B1BC2764-1A43-4800-A654-788B0D05EDA2}"
RootNamespace="supertuxkart"
@ -486,6 +486,10 @@
RelativePath="..\..\modes\follow_the_leader.cpp"
>
</File>
<File
RelativePath="..\..\modes\game_tutorial.cpp"
>
</File>
<File
RelativePath="..\..\modes\linear_world.cpp"
>
@ -1046,6 +1050,10 @@
RelativePath="..\..\states_screens\tracks_screen.cpp"
>
</File>
<File
RelativePath="..\..\states_screens\tutorial_screen.cpp"
>
</File>
<Filter
Name="dialogs"
>
@ -1392,6 +1400,10 @@
RelativePath="..\..\modes\follow_the_leader.hpp"
>
</File>
<File
RelativePath="..\..\modes\game_tutorial.hpp"
>
</File>
<File
RelativePath="..\..\modes\linear_world.hpp"
>
@ -1940,6 +1952,10 @@
RelativePath="..\..\states_screens\tracks_screen.hpp"
>
</File>
<File
RelativePath="..\..\states_screens\tutorial_screen.hpp"
>
</File>
<Filter
Name="dialogs"
>

View File

@ -249,6 +249,10 @@ int handleCmdLine(int argc, char **argv)
{
UserConfigParams::m_gamepad_debug=true;
}
else if (sscanf(argv[i], "--tutorial-debug=%d",&n)==1) // ASV TBC
{
UserConfigParams::m_tutorial_debug=n;
}
else if(sscanf(argv[i], "--track-debug=%d",&n)==1)
{
UserConfigParams::m_track_debug=n;

View File

@ -37,6 +37,9 @@
#include "states_screens/state_manager.hpp"
#include "io/file_manager.hpp"
//FIXME : remove, temporary tutorial test
#include "states_screens/tutorial_screen.hpp"
// FIXME : remove, temporary test
#include "states_screens/feature_unlocked.hpp"
#include "states_screens/grand_prix_lose.hpp"
@ -223,6 +226,10 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, cons
{
StateManager::get()->pushScreen(ChallengesScreen::getInstance());
}
else if (selection == "tutorial")
{
StateManager::get()->pushScreen(TutorialScreen::getInstance());
}
#ifdef ADDONS_MANAGER
else if (selection == "addons")
{