Implemented viewing the options menu in-game

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4010 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2009-09-06 18:50:41 +00:00
parent 5aa52c20ce
commit e778c34078
4 changed files with 12 additions and 6 deletions

View File

@ -60,7 +60,9 @@
width="100%" square_items="false" width="100%" square_items="false"
align="center" child_width="128" child_height="128" max_height="150" /> align="center" child_width="128" child_height="128" max_height="150" />
<button id="apply_resolution" width="20%" height="30" <spacer height="10" width="10"/>
<button id="apply_resolution" width="40%" height="30"
I18N="In the video settings menu" text="Apply video changes" /> I18N="In the video settings menu" text="Apply video changes" />
</box> </box>
@ -69,6 +71,7 @@
</div> </div>
<button id="back" x="20" y="-40" width="250" height="35" align="left" text="Back to main menu"/> <button id="back" x="20" y="-40" width="250" height="35" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</stkgui> </stkgui>

View File

@ -108,6 +108,7 @@
<spacer width="50" height="40" /> <spacer width="50" height="40" />
</div> </div>
<button id="back" x="20" y="-40" width="250" height="35" align="left" text="Back to main menu"/> <button id="back" x="20" y="-40" width="250" height="35" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</stkgui> </stkgui>

View File

@ -45,6 +45,7 @@
</div> </div>
<button id="back" x="20" y="-40" width="250" height="35" align="left" text="Back to main menu"/> <button id="back" x="20" y="-40" width="250" height="35" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</stkgui> </stkgui>

View File

@ -234,14 +234,15 @@ bool RacePausedDialog::processEvent(std::string& eventSource)
} }
else if (selection == "help") else if (selection == "help")
{ {
// TODO
dismiss(); dismiss();
StateManager::get()->pushMenu("help1.stkgui"); StateManager::get()->pushMenu("help1.stkgui");
return true; return true;
} }
else if (selection == "options") else if (selection == "options")
{ {
// TODO dismiss();
StateManager::get()->pushMenu("options_av.stkgui");
return true;
} }
else if (selection == "restart") else if (selection == "restart")
{ {