From fb50c9c33874278d6f0f3ce7cafcea13c591b959 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 30 Jul 2014 14:58:53 +0200
Subject: [PATCH] moving the button to xml

---
 data/gui/grand_prix_lose.stkgui            |  7 ++++---
 data/gui/grand_prix_win.stkgui             |  8 +++++---
 src/states_screens/grand_prix_cutscene.cpp | 18 ++++--------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/data/gui/grand_prix_lose.stkgui b/data/gui/grand_prix_lose.stkgui
index 743196dae..e08bb49f4 100644
--- a/data/gui/grand_prix_lose.stkgui
+++ b/data/gui/grand_prix_lose.stkgui
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <spacer width="10" proportion="1"/>
-        <button id="continue" x="20" width="250" align="left" text="Continue"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
+        <button id="continue" width="250" align="bottom" text="Continue"/>
+        <spacer width="20"/>
+        <button id="save"     width="250" align="bottom" text="Save Grand Prix"/>
     </div>
 </stkgui>
diff --git a/data/gui/grand_prix_win.stkgui b/data/gui/grand_prix_win.stkgui
index 743196dae..05d24c048 100644
--- a/data/gui/grand_prix_win.stkgui
+++ b/data/gui/grand_prix_win.stkgui
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <spacer width="10" proportion="1"/>
-        <button id="continue" x="20" width="250" align="left" text="Continue"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
+        <button id="continue" width="250" align="bottom" text="Continue"/>
+        <spacer width="20"/>
+        <button id="save"     width="250" align="bottom" text="Save Grand Prix"/>
     </div>
 </stkgui>
+
diff --git a/src/states_screens/grand_prix_cutscene.cpp b/src/states_screens/grand_prix_cutscene.cpp
index 484d9403c..533ac78d3 100644
--- a/src/states_screens/grand_prix_cutscene.cpp
+++ b/src/states_screens/grand_prix_cutscene.cpp
@@ -26,20 +26,10 @@ typedef GUIEngine::ButtonWidget Button;
 void GrandPrixCutscene::saveGPButton()
 {
     #ifdef IMPLEMENTATION_FINISHED
-    if (race_manager->getGrandPrix().getId() == "random")
-    {
-        core::stringw text = _("Save Grand Prix");
-        Button* save_button = new Button();
-        save_button->m_properties[GUIEngine::PROP_ID] = "save gp";
-        Button* c = getWidget<Button>("continue");
-        save_button->m_x = c->m_x + c->m_w + 20;
-        save_button->m_y = c->m_y;
-        save_button->m_w = GUIEngine::getFont()->getDimension(text.c_str()).Width + 30;
-        save_button->m_h = c->m_h;
-        save_button->setText(text);
-        save_button->add();
-        manualAddWidget(save_button);
-    }
+    if (race_manager->getGrandPrix().getId() != "random")
+        getWidget<Button>("save")->setVisible(false);
+    #else
+    getWidget<Button>("save")->setVisible(false);
     #endif
 }   // saveGPButton