From 178d45d0e2e601e61313429ce5fc1a963ce3f7c8 Mon Sep 17 00:00:00 2001
From: WhiteTreePaladin <brian@wildfiregames.com>
Date: Sat, 4 Sep 2010 22:27:24 +0000
Subject: [PATCH] Added regular size cancel / close buttons to several menu
 areas (Fixes #558 and #560)

Moved main menu buttons to top right

This was SVN commit r8078.
---
 .../mods/public/gui/gamesetup/gamesetup.xml   | 16 +++-
 .../public/gui/gamesetup/gamesetup_mp.xml     |  5 ++
 .../data/mods/public/gui/manual/manual.xml    | 13 +++-
 .../data/mods/public/gui/pregame/mainmenu.xml | 73 +++++++++----------
 4 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 8d972b237b..30ac6daa65 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -80,9 +80,23 @@
 			textcolor="white"
 			sprite="bkTranslucent"
 			hidden="true"
-			size="260 100%-40 100%-150 100%"
+			size="260 100%-40 100%-290 100%"
 		>[Tooltip text]</object>
 
+		<object
+			type="button"
+			style="wheatButton"
+			font="serif-16"
+			size="100%-280 100%-40 100%-143 100%+3"
+			tooltip_style="onscreenToolTip"
+			tooltip="Click this button to return to the main menu."
+		>Cancel
+			<action on="Press"><![CDATA[
+				cancelSetup();
+				Engine.PopGuiPage();
+			]]></action>
+		</object>
+
 		<object
 			type="button"
 			style="wheatButton"
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
index c4202eace3..77dc395400 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
@@ -98,6 +98,11 @@
 
 		</object>
 
+		<object type="button" style="wheatButton" size="100%-103 100%-33 100%-3 100%-3">
+			Cancel
+			<action on="Press"><![CDATA[cancelSetup();]]></action>
+		</object>
+
 		<object name="pageJoin" hidden="true">
 		
 			<object type="text" size="0 0 400 30">
diff --git a/binaries/data/mods/public/gui/manual/manual.xml b/binaries/data/mods/public/gui/manual/manual.xml
index 9dac2867ee..a9f9c57b36 100644
--- a/binaries/data/mods/public/gui/manual/manual.xml
+++ b/binaries/data/mods/public/gui/manual/manual.xml
@@ -7,7 +7,7 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="bkTranslucent"/>
 
-	<object type="image" style="wheatWindow" size="100 100 100%-100 100%-100">
+	<object type="image" style="wheatWindow" size="150 100 100%-150 100%-100">
 
 		<object type="button" style="wheatExit" tooltip_style="snToolTip">
 			<action on="Press"><![CDATA[
@@ -15,12 +15,17 @@
 			]]></action>
 		</object>
 
-		<object type="image" sprite="wheatIndentFillVeryLight">
-
+		<object type="image" sprite="wheatIndentFillVeryLight" size="0 0 100% 100%-45">
 			<object name="mainText" type="text" style="textPanel"/>
-
 		</object>
 
+		<object type="button" style="wheatButton" tooltip_style="snToolTip" size="100%-103 100%-33 100%-3 100%-3">
+			Close
+			<action on="Press"><![CDATA[Engine.PopGuiPage();]]></action>
+		</object>
+		
 	</object>
+	
+
 
 </objects>
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index fe0741f31c..6f4e16e76a 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -108,30 +108,42 @@ Watch for updates or get involved in the development: http://wildfiregames.com/0
 		- MAIN MENU - RANDOM BUTTONS
 		==========================================
 		-->
+		
+			<object size="100%-400 0 100% 30">
+			<object type="button" style="wheatButton" size="0 0 100 30">
+				Manual
+				<action on="Press"><![CDATA[
+					Engine.PushGuiPage("page_manual.xml");
+				]]></action>
+			</object>
 
-		<object type="button" style="wheatButton" size="8 230 158 270">
-			How to play
-			<action on="Press"><![CDATA[
-				Engine.PushGuiPage("page_manual.xml");
-			]]></action>
-		</object>
+			<object type="button" style="wheatButton" size="100 0 200 30">
+				Website
+				<action on="Press"><![CDATA[
+					var url = "http://wildfiregames.com/0ad/";
+					Engine.OpenURL(url);
+					messageBox(400, 200, "Opening "+url+" in default web browser. Please wait...", "Opening page", 2);
+				]]></action>
+			</object>
 
-		<object type="button" style="wheatButton" size="8 275 158 315">
-			Visit our web site
-			<action on="Press"><![CDATA[
-				var url = "http://wildfiregames.com/0ad/";
-				Engine.OpenURL(url);
-				messageBox(400, 200, "Opening "+url+" in default web browser. Please wait...", "Opening page", 2);
-			]]></action>
-		</object>
+			<object type="button" style="wheatButton" size="200 0 300 30">
+				IRC
+				<action on="Press"><![CDATA[
+					var url = "http://webchat.quakenet.org/?channels=0ad";
+					Engine.OpenURL(url);
+					messageBox(400, 200, "Opening "+url+" in default web browser. Please wait...", "Opening page", 2);
+				]]></action>
+			</object>
 
-		<object type="button" style="wheatButton" size="8 320 158 360">
-			Chat on IRC
-			<action on="Press"><![CDATA[
-				var url = "http://webchat.quakenet.org/?channels=0ad";
-				Engine.OpenURL(url);
-				messageBox(400, 200, "Opening "+url+" in default web browser. Please wait...", "Opening page", 2);
-			]]></action>
+			<!-- MAIN MENU - EXIT BUTTON -->
+			<object type="button" style="wheatButton" name="pgExit" size="300 0 400 30">
+				Quit
+				<action on="Press"><![CDATA[
+					var btCaptions = ["Yes", "No"];
+					var btCode = [exit, null];
+					messageBox (400, 200, "Are you sure you want to quit [icon=iconProduct] A.D.?", "Confirmation", 0, btCaptions, btCode);
+				]]></action>
+			</object>
 		</object>
 
 		<!--
@@ -308,25 +320,6 @@ Watch for updates or get involved in the development: http://wildfiregames.com/0
 				"to learn more about [icon=iconProduct] A.D., participate in the community and meet the developers.\n\n", "About [icon=iconProduct] A.D.", 2, [], []);
 			]]></action>
 		</object>
-
-		<!--
-		==========================================
-		- MAIN MENU - EXIT BUTTON
-		==========================================
-		-->
-
-		<object	name="pgExit"
-			style="wheatExit"
-			type="button"
-			size="100%-18 2 100%-2 18"
-			tooltip="Tired of 0 A.D. ? Click here to leave and reenter the real world."
-		>
-			<action on="Press"><![CDATA[
-				var btCaptions = ["Yes, let me out!", "Nooooo!"];
-				var btCode = [exit, null];
-				messageBox (400, 200, "Do you really want to quit [icon=iconProduct] A.D.? This will cause a sudden return to reality.", "Confirmation", 0, btCaptions, btCode);
-			]]></action>
-		</object>
 	</object>
 
 	<!--