From 19ec4ced91200c596477420bbf8cd746568f585b Mon Sep 17 00:00:00 2001
From: JoshuaJB <joshuajb@wildfiregames.com>
Date: Sat, 7 Feb 2015 19:18:06 +0000
Subject: [PATCH] Clean up the splashscreen. More concise wording, only modern
 styling, alignment fixes, larger click/touch targets, and code cleanup.

This was SVN commit r16287.
---
 .../mods/public/gui/page_splashscreen.xml     |  7 +----
 .../public/gui/splashscreen/splashscreen.txt  | 13 ++++++----
 .../public/gui/splashscreen/splashscreen.xml  | 26 +++++++------------
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/binaries/data/mods/public/gui/page_splashscreen.xml b/binaries/data/mods/public/gui/page_splashscreen.xml
index 02ccff2aa7..739a77fd86 100644
--- a/binaries/data/mods/public/gui/page_splashscreen.xml
+++ b/binaries/data/mods/public/gui/page_splashscreen.xml
@@ -4,13 +4,8 @@
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/sprite1.xml</include>
-    <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
-
     <include>splashscreen/styles.xml</include>
     <include>splashscreen/setup.xml</include>
     <include>splashscreen/splashscreen.xml</include>
+    <include>common/global.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/splashscreen/splashscreen.txt b/binaries/data/mods/public/gui/splashscreen/splashscreen.txt
index bb833b85b0..154cce0e67 100644
--- a/binaries/data/mods/public/gui/splashscreen/splashscreen.txt
+++ b/binaries/data/mods/public/gui/splashscreen/splashscreen.txt
@@ -1,9 +1,12 @@
-[font="sans-bold-16"]Thank you for installing 0 A.D.!
+
+[font="sans-bold-20"]  Thank you for installing 0 A.D. Empires Ascendant!
 [font="sans-16"]
-[icon="constructionIcon"]  This is an early experimental version of the game. Features are missing and it contains bugs.
+[imgleft="constructionIcon"]This game is still in development. Features are missing and it contains bugs.
 
-[icon="iconLag"]  The game lags when many units are moving.
+[imgleft="iconLag"]The game runs slowly when many units are moving.
 
-[icon="iconMap"]  Large maps can cause problems.
 
-[icon="iconFormation"]  Formations are currently not optimal, but you can toggle forming and disbanding formations as desired.
+[imgleft="iconMap"]Large maps can cause problems.
+
+
+[imgleft="iconFormation"]Formations are a work in progress, but you can toggle forming and disbanding formations as desired.
diff --git a/binaries/data/mods/public/gui/splashscreen/splashscreen.xml b/binaries/data/mods/public/gui/splashscreen/splashscreen.xml
index 11b3361cef..e09a056023 100644
--- a/binaries/data/mods/public/gui/splashscreen/splashscreen.xml
+++ b/binaries/data/mods/public/gui/splashscreen/splashscreen.xml
@@ -8,22 +8,17 @@
 	<object type="image" z="0" sprite="ModernFade"/>
 
 	<object type="image" style="ModernDialog" size="50%-274 50%-200 50%+274 50%+200">
-		<object type="text" style="TitleText" size="50%-128 -18 50%+128 14">
-			<translatableAttribute id="caption">Welcome to 0 A.D. !</translatableAttribute>
+		<object type="text" style="ModernLabelText" size="50%-128 -18 50%+128 14">
+			<translatableAttribute id="caption">Welcome!</translatableAttribute>
 		</object>
 
-			<object type="image" sprite="ModernDarkBoxGold" size="20 20 100%-20 100%-52">
-				<object name="mainText" type="text" style="textPanel"/>
-				<object size="8 100%-60 100% 100%">
-					<object size="0 20 100% 100%">
-						<object name="displaySplashScreenText" size="20 0 100% 100%" type="text" style="ModernLeftLabelText">
-							<translatableAttribute id="caption">Show this message in the future</translatableAttribute>
-						</object>
-						<object name="displaySplashScreen" size="0 50%-8 16 50%+8" type="checkbox" style="ModernTickBox"/>
-					</object>
-				</object>
+		<object name="mainText" type="text" sprite="ModernDarkBoxGold" style="textPanel" size="20 20 100%-20 100%-52">
+			<object name="displaySplashScreenText" size="30 100%-30 100% 100%-8" type="text" style="ModernLeftLabelText">
+				<translatableAttribute id="caption">Show this message in the future</translatableAttribute>
 			</object>
-		<object name="btnOK" type="button" style="StoneButton" tooltip_style="snToolTip" size="100%-184 100%-42 100%-20 100%-14">
+			<object name="displaySplashScreen" size="8 100%-30 22 100%-8" type="checkbox" style="ModernTickBox"/>
+		</object>
+		<object name="btnOK" type="button" style="ModernButtonRed" size="50%+5 100%-45 100%-18 100%-17">
 			<translatableAttribute id="caption">OK</translatableAttribute>
 			<action on="Press"><![CDATA[
 			if (Engine.GetGUIObjectByName("displaySplashScreen").checked)
@@ -34,12 +29,11 @@
 			Engine.PopGuiPageCB();
 			]]></action>
 		</object>
-		<object type="button" style="StoneButton" size="188 100%-42 352 100%-14">
-			<translatableAttribute id="caption">Known issues (web)</translatableAttribute>
+		<object type="button" style="ModernButtonRed" size="18 100%-45 50%-5 100%-17">
+			<translatableAttribute id="caption">Known Issues (web)</translatableAttribute>
 			<action on="Press"><![CDATA[
 				openURL("http://www.wildfiregames.com/forum/index.php?showtopic=15796");
 			]]></action>
 		</object>
 	</object>
-	
 </objects>