From e778c34078a45037a839f78948efe9cbb4147b69 Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 6 Sep 2009 18:50:41 +0000
Subject: [PATCH] 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
---
 data/gui/options_av.stkgui                        | 7 +++++--
 data/gui/options_input.stkgui                     | 3 ++-
 data/gui/options_players.stkgui                   | 3 ++-
 src/states_screens/dialogs/race_paused_dialog.cpp | 5 +++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/data/gui/options_av.stkgui b/data/gui/options_av.stkgui
index e256662e1..dc7f15196 100644
--- a/data/gui/options_av.stkgui
+++ b/data/gui/options_av.stkgui
@@ -60,7 +60,9 @@
                            width="100%" square_items="false"
                            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" />
         
     </box>
@@ -69,6 +71,7 @@
     
 </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>
diff --git a/data/gui/options_input.stkgui b/data/gui/options_input.stkgui
index 22975d43e..6ee4b496e 100644
--- a/data/gui/options_input.stkgui
+++ b/data/gui/options_input.stkgui
@@ -108,6 +108,7 @@
  <spacer width="50" height="40" /> 
 </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>
diff --git a/data/gui/options_players.stkgui b/data/gui/options_players.stkgui
index fef007752..7d2e2580a 100644
--- a/data/gui/options_players.stkgui
+++ b/data/gui/options_players.stkgui
@@ -45,6 +45,7 @@
 
 </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>
diff --git a/src/states_screens/dialogs/race_paused_dialog.cpp b/src/states_screens/dialogs/race_paused_dialog.cpp
index 12ddaf2be..c0d5cd6e4 100644
--- a/src/states_screens/dialogs/race_paused_dialog.cpp
+++ b/src/states_screens/dialogs/race_paused_dialog.cpp
@@ -234,14 +234,15 @@ bool RacePausedDialog::processEvent(std::string& eventSource)
         }
         else if (selection == "help")
         {
-            // TODO
             dismiss();
             StateManager::get()->pushMenu("help1.stkgui");
             return true;
         }
         else if (selection == "options")
         {
-            // TODO
+            dismiss();
+            StateManager::get()->pushMenu("options_av.stkgui");
+            return true;
         }
         else if (selection == "restart")
         {