From 29c95f3a493658adbc19b82caba5c912c36d9789 Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Thu, 25 Aug 2016 20:23:17 +0000
Subject: [PATCH] GUI sprite / style cleanup.

Merge common/styles.xml (which contains only the special default style)
with common/common_styles.xml.
Rename common/common_sprites.xml to common/sprites.xml.

This was SVN commit r18637.
---
 .../mods/public/gui/common/common_styles.xml  | 173 ------------------
 .../{common_sprites.xml => sprites.xml}       |   0
 .../data/mods/public/gui/common/styles.xml    | 170 +++++++++++++++++
 .../data/mods/public/gui/page_civinfo.xml     |   3 +-
 .../data/mods/public/gui/page_gamesetup.xml   |   3 +-
 .../data/mods/public/gui/page_loadgame.xml    |   3 +-
 .../data/mods/public/gui/page_loading.xml     |   3 +-
 .../data/mods/public/gui/page_pregame.xml     |   3 +-
 .../data/mods/public/gui/page_replaymenu.xml  |   3 +-
 .../data/mods/public/gui/page_savegame.xml    |   3 +-
 .../data/mods/public/gui/page_session.xml     |   3 +-
 .../data/mods/public/gui/page_structree.xml   |   3 +-
 12 files changed, 179 insertions(+), 191 deletions(-)
 delete mode 100644 binaries/data/mods/public/gui/common/common_styles.xml
 rename binaries/data/mods/public/gui/common/{common_sprites.xml => sprites.xml} (100%)

diff --git a/binaries/data/mods/public/gui/common/common_styles.xml b/binaries/data/mods/public/gui/common/common_styles.xml
deleted file mode 100644
index 04f4c47541..0000000000
--- a/binaries/data/mods/public/gui/common/common_styles.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<styles>
-
-	<!--
-	==========================================
-	MENU TEXT STYLES
-	==========================================
-	-->
-
-	<style name="CenteredButtonText"
-		font="sans-bold-stroke-14"
-		textcolor="white"
-		text_align="center"
-		text_valign="center"
-	/>
-
-	<style name="LeftButtonText"
-		font="sans-bold-stroke-14"
-		textcolor="white"
-		text_align="left"
-		text_valign="top"
-	/>
-
-	<style name="RightButtonText"
-		font="sans-bold-stroke-14"
-		textcolor="white"
-		text_align="right"
-		text_valign="top"
-	/>
-
-	<style name="LeftLabelText"
-		font="sans-bold-stroke-14"
-		textcolor="gold"
-		text_align="left"
-		text_valign="center"
-	/>
-
-	<style name="RightLabelText"
-		font="sans-bold-stroke-14"
-		textcolor="gold"
-		text_align="right"
-		text_valign="center"
-	/>
-
-	<style name="CenteredLabelText"
-		font="sans-bold-stroke-14"
-		textcolor="gold"
-		text_align="center"
-		text_valign="center"
-	/>
-
-	<style name="LeftTabLabelText"
-		font="sans-bold-stroke-14"
-		textcolor="gold"
-		text_align="left"
-		text_valign="top"
-	/>
-
-	<style name="RightTabLabelText"
-		font="sans-bold-stroke-14"
-		textcolor="gold"
-		text_align="right"
-		text_valign="top"
-	/>
-
-	<style name="CenteredTabLabelText"
-		font="sans-bold-stroke-14"
-		textcolor="gold"
-		text_align="center"
-		text_valign="top"
-	/>
-
-	<style name="SmallLeftLabelText"
-		font="sans-12"
-		textcolor="white"
-		text_align="left"
-		text_valign="top"
-	/>
-
-	<style name="TitleText"
-		font="sans-bold-stroke-14"
-		textcolor="white"
-		text_align="center"
-		text_valign="center"
-	/>
-
-	<style name="LargeTitleText"
-		font="sans-bold-24"
-		textcolor="white"
-		text_align="center"
-		text_valign="center"
-	/>
-
-	<style name="MediumTitleText"
-		font="sans-bold-12"
-		textcolor="white"
-		text_align="center"
-		text_valign="center"
-	/>
-
-	<!--
-	==========================================
-	MENU WINDOW STYLES
-	==========================================
-	-->
-
-        <style 	name="TranslucentPanel"
-		sprite="BackgroundTranslucent"
-		buffer_zone="10"
-		font="sans-bold-stroke-14"
-		textcolor="white"
-		text_align="left"
-		text_valign="top"
-	/>
-
-        <style 	name="TranslucentPanelThinBorder"
-		sprite="TranslucentPanelThinBorder"
-		buffer_zone="10"
-		font="sans-bold-stroke-14"
-		textcolor="white"
-		text_align="left"
-		text_valign="top"
-	/>
-
-	<style 	name="StonePanelThinBorder"
-		sprite="StonePanelThinBorder"
-		buffer_zone="10"
-		text_align="left"
-		text_valign="top"
-	/>
-
-	<!--
-	==========================================
-	MENU CONTROL ELEMENT STYLES
-	==========================================
-	-->
-
-	<style 	name="StoneButtonFancy"
-		sprite="StoneButton"
-		sprite_disabled="StoneButtonDisabled"
-		sprite_over="StoneButtonFancyOver"
-		sprite_pressed="StoneButtonFancyGlow"
-		font="sans-bold-stroke-14"
-		textcolor="white"
-		text_align="center"
-		text_valign="center"
-		sound_pressed="audio/interface/ui/ui_button_click.ogg"
-	/>
-
-	<style 	name="StoneButton"
-		sprite="StoneButton"
-		sprite_disabled="StoneButtonDisabled"
-		sprite_over="StoneButtonOver"
-		sprite_pressed="StoneButtonGlow"
-		font="sans-bold-stroke-14"
-		textcolor="white"
-		text_align="center"
-		text_valign="center"
-		sound_pressed="audio/interface/ui/ui_button_click.ogg"
-	/>
-
-	<style name="MapPlayerList"
-		buffer_zone="8"
-		font="sans-14"
-		scrollbar="true"
-		scrollbar_style="ModernScrollBar"
-		scroll_bottom="false"
-		textcolor="white"
-		text_align="left"
-		text_valign="top"
-	/>
-</styles>
diff --git a/binaries/data/mods/public/gui/common/common_sprites.xml b/binaries/data/mods/public/gui/common/sprites.xml
similarity index 100%
rename from binaries/data/mods/public/gui/common/common_sprites.xml
rename to binaries/data/mods/public/gui/common/sprites.xml
diff --git a/binaries/data/mods/public/gui/common/styles.xml b/binaries/data/mods/public/gui/common/styles.xml
index 72af697096..1a76b90f4b 100644
--- a/binaries/data/mods/public/gui/common/styles.xml
+++ b/binaries/data/mods/public/gui/common/styles.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <styles>
+
 	<!--
 	==========================================
 	- DEFAULT STYLE: The style with the name 'default' is special, it will
@@ -20,4 +21,173 @@
 		buffer_zone="5"
 		multiline="false"
 	/>
+
+	<!--
+	==========================================
+	MENU TEXT STYLES
+	==========================================
+	-->
+
+	<style name="CenteredButtonText"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<style name="LeftButtonText"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<style name="RightButtonText"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="right"
+		text_valign="top"
+	/>
+
+	<style name="LeftLabelText"
+		font="sans-bold-stroke-14"
+		textcolor="gold"
+		text_align="left"
+		text_valign="center"
+	/>
+
+	<style name="RightLabelText"
+		font="sans-bold-stroke-14"
+		textcolor="gold"
+		text_align="right"
+		text_valign="center"
+	/>
+
+	<style name="CenteredLabelText"
+		font="sans-bold-stroke-14"
+		textcolor="gold"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<style name="LeftTabLabelText"
+		font="sans-bold-stroke-14"
+		textcolor="gold"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<style name="RightTabLabelText"
+		font="sans-bold-stroke-14"
+		textcolor="gold"
+		text_align="right"
+		text_valign="top"
+	/>
+
+	<style name="CenteredTabLabelText"
+		font="sans-bold-stroke-14"
+		textcolor="gold"
+		text_align="center"
+		text_valign="top"
+	/>
+
+	<style name="SmallLeftLabelText"
+		font="sans-12"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<style name="TitleText"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<style name="LargeTitleText"
+		font="sans-bold-24"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<style name="MediumTitleText"
+		font="sans-bold-12"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<!--
+	==========================================
+	MENU WINDOW STYLES
+	==========================================
+	-->
+
+        <style 	name="TranslucentPanel"
+		sprite="BackgroundTranslucent"
+		buffer_zone="10"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+	/>
+
+        <style 	name="TranslucentPanelThinBorder"
+		sprite="TranslucentPanelThinBorder"
+		buffer_zone="10"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<style 	name="StonePanelThinBorder"
+		sprite="StonePanelThinBorder"
+		buffer_zone="10"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<!--
+	==========================================
+	MENU CONTROL ELEMENT STYLES
+	==========================================
+	-->
+
+	<style 	name="StoneButtonFancy"
+		sprite="StoneButton"
+		sprite_disabled="StoneButtonDisabled"
+		sprite_over="StoneButtonFancyOver"
+		sprite_pressed="StoneButtonFancyGlow"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+		sound_pressed="audio/interface/ui/ui_button_click.ogg"
+	/>
+
+	<style 	name="StoneButton"
+		sprite="StoneButton"
+		sprite_disabled="StoneButtonDisabled"
+		sprite_over="StoneButtonOver"
+		sprite_pressed="StoneButtonGlow"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+		sound_pressed="audio/interface/ui/ui_button_click.ogg"
+	/>
+
+	<style name="MapPlayerList"
+		buffer_zone="8"
+		font="sans-14"
+		scrollbar="true"
+		scrollbar_style="ModernScrollBar"
+		scroll_bottom="false"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+	/>
 </styles>
diff --git a/binaries/data/mods/public/gui/page_civinfo.xml b/binaries/data/mods/public/gui/page_civinfo.xml
index 0b19fd817e..299e197aa3 100644
--- a/binaries/data/mods/public/gui/page_civinfo.xml
+++ b/binaries/data/mods/public/gui/page_civinfo.xml
@@ -5,9 +5,8 @@
     <include>common/modern/sprites.xml</include>
 
     <include>common/setup.xml</include>
+    <include>common/sprites.xml</include>
     <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
 
     <include>civinfo/civinfo.xml</include>
     <include>civinfo/setup.xml</include>
diff --git a/binaries/data/mods/public/gui/page_gamesetup.xml b/binaries/data/mods/public/gui/page_gamesetup.xml
index fd8a615d3d..0a86a6ee89 100644
--- a/binaries/data/mods/public/gui/page_gamesetup.xml
+++ b/binaries/data/mods/public/gui/page_gamesetup.xml
@@ -5,9 +5,8 @@
     <include>common/modern/sprites.xml</include>
 
     <include>common/setup.xml</include>
+    <include>common/sprites.xml</include>
     <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
 
     <include>gamesetup/setup.xml</include>
     <include>gamesetup/sprites.xml</include>
diff --git a/binaries/data/mods/public/gui/page_loadgame.xml b/binaries/data/mods/public/gui/page_loadgame.xml
index a2dfa9c6e9..1f657c4f75 100644
--- a/binaries/data/mods/public/gui/page_loadgame.xml
+++ b/binaries/data/mods/public/gui/page_loadgame.xml
@@ -5,9 +5,8 @@
     <include>common/modern/sprites.xml</include>
 
     <include>common/setup.xml</include>
+    <include>common/sprites.xml</include>
     <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
 
     <include>savedgames/load.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_loading.xml b/binaries/data/mods/public/gui/page_loading.xml
index 087d82945a..b6f4837654 100644
--- a/binaries/data/mods/public/gui/page_loading.xml
+++ b/binaries/data/mods/public/gui/page_loading.xml
@@ -5,9 +5,8 @@
     <include>common/modern/sprites.xml</include>
 
     <include>common/setup.xml</include>
+    <include>common/sprites.xml</include>
     <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
     <include>common/init.xml</include>
 
     <include>loading/styles.xml</include>
diff --git a/binaries/data/mods/public/gui/page_pregame.xml b/binaries/data/mods/public/gui/page_pregame.xml
index c8a819ab6c..be89ddb1cd 100644
--- a/binaries/data/mods/public/gui/page_pregame.xml
+++ b/binaries/data/mods/public/gui/page_pregame.xml
@@ -5,9 +5,8 @@
     <include>common/modern/sprites.xml</include>
 
     <include>common/setup.xml</include>
+    <include>common/sprites.xml</include>
     <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
     <include>common/init.xml</include>
 
     <include>pregame/backgrounds/</include>
diff --git a/binaries/data/mods/public/gui/page_replaymenu.xml b/binaries/data/mods/public/gui/page_replaymenu.xml
index ee06c4fd44..98d36df792 100644
--- a/binaries/data/mods/public/gui/page_replaymenu.xml
+++ b/binaries/data/mods/public/gui/page_replaymenu.xml
@@ -5,9 +5,8 @@
     <include>common/modern/sprites.xml</include>
 
     <include>common/setup.xml</include>
+    <include>common/sprites.xml</include>
     <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
 
     <include>replaymenu/replay_menu.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_savegame.xml b/binaries/data/mods/public/gui/page_savegame.xml
index 0dba8411d3..5038533c65 100644
--- a/binaries/data/mods/public/gui/page_savegame.xml
+++ b/binaries/data/mods/public/gui/page_savegame.xml
@@ -5,9 +5,8 @@
     <include>common/modern/sprites.xml</include>
 
     <include>common/setup.xml</include>
+    <include>common/sprites.xml</include>
     <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
 
     <include>savedgames/save.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_session.xml b/binaries/data/mods/public/gui/page_session.xml
index 2246a13e5a..66d592d3d1 100644
--- a/binaries/data/mods/public/gui/page_session.xml
+++ b/binaries/data/mods/public/gui/page_session.xml
@@ -6,9 +6,8 @@
 
     <include>common/setup.xml</include>
     <include>common/setup_resources.xml</include>
+    <include>common/sprites.xml</include>
     <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
     <include>common/icon_sprites.xml</include>
     
     <include>session/sprites.xml</include>
diff --git a/binaries/data/mods/public/gui/page_structree.xml b/binaries/data/mods/public/gui/page_structree.xml
index 514b06a660..49c88f16f3 100644
--- a/binaries/data/mods/public/gui/page_structree.xml
+++ b/binaries/data/mods/public/gui/page_structree.xml
@@ -5,9 +5,8 @@
     <include>common/modern/sprites.xml</include>
 
     <include>common/setup_resources.xml</include>
+    <include>common/sprites.xml</include>
     <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
 
     <include>structree/styles.xml</include>
     <include>structree/sprites.xml</include>