From c39795b4455ed1e29051f073d499a6fae9234a64 Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Thu, 4 Jul 2013 01:10:49 +0000
Subject: [PATCH] add close button on track info dialog, as requested on forum

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13071 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/track_info_dialog.stkgui             | 130 ++++++++++--------
 .../dialogs/track_info_dialog.cpp             |   5 +
 2 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/data/gui/track_info_dialog.stkgui b/data/gui/track_info_dialog.stkgui
index 68353008d..d93259056 100644
--- a/data/gui/track_info_dialog.stkgui
+++ b/data/gui/track_info_dialog.stkgui
@@ -1,69 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
 
-<div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
-  
-  <label id="name" width="100%" text_align="center"/>
+<div x="1%" y="1%" width="99%" height="99%">
 
-  <spacer width="1" height="5%"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
 
-  <div width="95%" proportion="5" layout="horizontal-row">
-      
-    <!-- Left pane -->
-    <div proportion="1" height="100%" layout="vertical-row">
-      <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
-      
-      <spacer width="1" height="2%"/>
-      
-      <div width="95%" height="fit" layout="horizontal-row">
-        <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
-        <spacer width="2%" height="1"/>
-        <label id="highscore1" proportion="1" text="(Empty)"/>
-      </div>
-      
-      <spacer width="1" height="2%"/>
-      
-      <div width="95%" height="fit" layout="horizontal-row">
-        <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
-        <spacer width="2%" height="1"/>
-        <label id="highscore2" proportion="1" text="(Empty)"/>
-      </div>
-      
-      <spacer width="1" height="2%"/>
-      
-      <div width="95%" height="fit" layout="horizontal-row">
-        <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
-        <spacer width="2%" height="1"/>
-        <label id="highscore3" proportion="1" text="(Empty)"/>
-      </div>
-      
-      <spacer width="1" proportion="1"/>
-      
-      <label id="author" width="100%" text_align="center" word_wrap="true"/>
+        <label id="name" width="100%" text_align="center"/>
+
+        <spacer width="1" height="5%"/>
+
+        <div width="95%" proportion="5" layout="horizontal-row">
+            
+        <!-- Left pane -->
+        <div proportion="1" height="100%" layout="vertical-row">
+            <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
+            
+            <spacer width="1" height="2%"/>
+            
+            <div width="95%" height="fit" layout="horizontal-row">
+            <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
+            <spacer width="2%" height="1"/>
+            <label id="highscore1" proportion="1" text="(Empty)"/>
+            </div>
+            
+            <spacer width="1" height="2%"/>
+            
+            <div width="95%" height="fit" layout="horizontal-row">
+            <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
+            <spacer width="2%" height="1"/>
+            <label id="highscore2" proportion="1" text="(Empty)"/>
+            </div>
+            
+            <spacer width="1" height="2%"/>
+            
+            <div width="95%" height="fit" layout="horizontal-row">
+            <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
+            <spacer width="2%" height="1"/>
+            <label id="highscore3" proportion="1" text="(Empty)"/>
+            </div>
+            
+            <spacer width="1" proportion="1"/>
+            
+            <label id="author" width="100%" text_align="center" word_wrap="true"/>
+        </div>
+
+        <!-- Right pane -->
+        <div proportion="1" height="100%" layout="vertical-row">
+            <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
+            </placeholder>
+            <div width="75%" height="fit" layout="horizontal-row" >
+                <spacer proportion="1" height="2" />
+                <checkbox id="reverse"/>
+                <spacer width="20" height="2" />
+                <label id="reverse-text" height="100%" I18N="Drive the track reverse" text="Reverse"/>
+                <spacer proportion="1" height="2" />
+            </div>
+            
+        </div>
+        </div>
+
+        <spacer width="1" height="5%"/>
+
+        <spinner id="lapcountspinner" width="50%" min_value="1" max_value="20" align="center" wrap_around="true"
+            I18N="In the track setup screen (number of laps choice, where %i is the number)" text="%i laps"/>
+
+        <spacer width="1" height="5%"/>
+
+        <button id="start" text="Start Race" align="center"/>
+
+        <spacer width="1" height="2%"/>
     </div>
     
-    <!-- Right pane -->
-    <div proportion="1" height="100%" layout="vertical-row">
-        <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
-        </placeholder>
-        <div width="75%" height="fit" layout="horizontal-row" >
-            <spacer width="40" height="2" />
-            <checkbox id="reverse"/>
-            <spacer width="20" height="2" />
-            <label id="reverse-text" height="100%" I18N="Drive the track reverse" text="Reverse"/>
-        </div>
-        
-    </div>
-  </div>
-  
-  <spacer width="1" height="5%"/>
-  
-  <spinner id="lapcountspinner" width="50%" min_value="1" max_value="20" align="center" wrap_around="true"
-        I18N="In the track setup screen (number of laps choice, where %i is the number)" text="%i laps"/>
-  
-  <spacer width="1" height="5%"/>
-  
-  <button id="start" text="Start Race" align="center"/>
-  
-  <spacer width="1" height="1%"/>
+    <icon-button id="closePopup" x="0" y="0" width="8%" height="8%" icon="gui/back.png"/>
+
 </div>
 </stkgui>
diff --git a/src/states_screens/dialogs/track_info_dialog.cpp b/src/states_screens/dialogs/track_info_dialog.cpp
index 77d7822f7..a9ea32304 100644
--- a/src/states_screens/dialogs/track_info_dialog.cpp
+++ b/src/states_screens/dialogs/track_info_dialog.cpp
@@ -264,6 +264,11 @@ GUIEngine::EventPropagation TrackInfoDialog::processEvent(const std::string& eve
         onEnterPressedInternal();
         return GUIEngine::EVENT_BLOCK;
     }
+    else if (eventSource == "closePopup")
+    {
+        ModalDialog::dismiss();
+        return GUIEngine::EVENT_BLOCK;
+    }
     else if (eventSource == "reverse")
     {
         race_manager->setReverseTrack(m_checkbox->getState());