From 52504bbfa8653af877cc6b38bc68322e6b41adb7 Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Thu, 25 Aug 2016 13:59:25 +0000
Subject: [PATCH] GUI style / sprite cleanup.

Move civ icon overlay entries from common/ to session/.
Move main menu entries from common/ to pregame/.
Remove unused pgButton.

This was SVN commit r18634.
---
 .../mods/public/gui/common/common_sprites.xml | 71 ------------------
 .../mods/public/gui/common/common_styles.xml  | 24 ------
 .../data/mods/public/gui/pregame/sprites.xml  | 73 +++++++++++++++++--
 .../data/mods/public/gui/pregame/styles.xml   | 16 +++-
 .../data/mods/public/gui/session/sprites.xml  |  7 ++
 .../data/mods/public/gui/session/styles.xml   |  6 ++
 6 files changed, 90 insertions(+), 107 deletions(-)

diff --git a/binaries/data/mods/public/gui/common/common_sprites.xml b/binaries/data/mods/public/gui/common/common_sprites.xml
index 57945e1c86..165d20b145 100644
--- a/binaries/data/mods/public/gui/common/common_sprites.xml
+++ b/binaries/data/mods/public/gui/common/common_sprites.xml
@@ -67,64 +67,6 @@
 	==========================================
 	-->
 
-	<sprite name="MainMenuPanel">
-		<image	texture="global/tile/stone_background.png"
-			real_texture_placement="28 0 292 264"
-			texture_size="0 0 240 240"
-		/>
-
-		<image	texture="pregame/shading/menu_panel_background_shading.png"
-			texture_size="0 0 100% 100%"
-			size="0 0 100% 100%"
-		/>
-
-                <!-- top -->
-		<image	backcolor="230 190 80"
-			size="2 0 100%-2 2"
-		/>
-
-                <!-- bottom -->
-		<image	backcolor="230 190 80"
-			size="2 100%-2 100%-2 100%"
-		/>
-
-                <!-- left -->
-		<image	backcolor="230 190 80"
-			size="0 0 2 100%"
-		/>
-	</sprite>
-
-        <sprite name="MainMenuPanelRightBorder">
-                <!-- right -->
-		<image	backcolor="230 190 80"
-			size="0 0 100% 100%"
-		/>
-        </sprite>
-
-	<sprite name="SubmenuPanel">
-		<image	texture="global/tile/stone_background.png"
-			real_texture_placement="32 0 292 264"
-			texture_size="0 0 240 240"
-		/>
-
-		<image	texture="pregame/shading/menu_panel_background_shading.png"
-			texture_size="0 0 100% 100%"
-			size="0 0 100% 100%"
-		/>
-
-		<!-- sides -->
-		<image	backcolor="230 190 80"
-			size="0 0 100%-2 2"
-		/>
-		<image	backcolor="230 190 80"
-			size="100%-2 0 100% 100%"
-		/>
-		<image	backcolor="230 190 80"
-			size="0 100%-2 100%-2 100%"
-		/>
-		<!-- no left border here -->
-	</sprite>
-
 	<sprite name="TranslucentPanelThinBorder">
 		<image 	backcolor="0 0 0 85"
 			size="0 0 100% 100%"
@@ -303,17 +245,4 @@
 		/>
         </sprite>
 
-	<!--
-	==========================================
-	CIV ICON
-	==========================================
-	-->
-
-	<sprite name="CivIconOver">
-		<image
-			texture="session/portraits/emblems/states/hover.png"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
 </sprites>
diff --git a/binaries/data/mods/public/gui/common/common_styles.xml b/binaries/data/mods/public/gui/common/common_styles.xml
index cbc46bf11c..04f4c47541 100644
--- a/binaries/data/mods/public/gui/common/common_styles.xml
+++ b/binaries/data/mods/public/gui/common/common_styles.xml
@@ -123,20 +123,6 @@
 		text_valign="top"
 	/>
 
-	<style 	name="MainMenuPanel"
-		sprite="MainMenuPanel"
-		buffer_zone="10"
-		text_align="left"
-		text_valign="top"
-	/>
-
-        <style 	name="SubmenuPanel"
-		sprite="SubmenuPanel"
-		buffer_zone="10"
-		text_align="left"
-		text_valign="top"
-	/>
-
 	<style 	name="StonePanelThinBorder"
 		sprite="StonePanelThinBorder"
 		buffer_zone="10"
@@ -184,14 +170,4 @@
 		text_align="left"
 		text_valign="top"
 	/>
-		<!--
-	==========================================
-	CIV ICON
-	==========================================
-	-->
-	<style 	name="CivIconOverlay"
-		sprite=""
-		sprite_over="CivIconOver"
-		sound_pressed="audio/interface/ui/ui_button_click.ogg"
-	/>
 </styles>
diff --git a/binaries/data/mods/public/gui/pregame/sprites.xml b/binaries/data/mods/public/gui/pregame/sprites.xml
index b498aabc0e..0e4b406267 100644
--- a/binaries/data/mods/public/gui/pregame/sprites.xml
+++ b/binaries/data/mods/public/gui/pregame/sprites.xml
@@ -2,13 +2,70 @@
 
 <sprites>
 
-		<sprite name="pgUserReportBox">
-			<image
-				backcolor="0 0 0 220"
-				size="0 0 100% 100%"
-				border="true"
-				bordercolor="200 200 200"
-			/>
-		</sprite>
+	<sprite name="MainMenuPanel">
+		<image texture="global/tile/stone_background.png"
+			real_texture_placement="28 0 292 264"
+			texture_size="0 0 240 240"
+		/>
+
+		<image texture="pregame/shading/menu_panel_background_shading.png"
+			texture_size="0 0 100% 100%"
+			size="0 0 100% 100%"
+		/>
+
+		<!-- top -->
+		<image backcolor="230 190 80"
+			size="2 0 100%-2 2"
+		/>
+
+		<!-- bottom -->
+		<image backcolor="230 190 80"
+			size="2 100%-2 100%-2 100%"
+		/>
+
+		<!-- left -->
+		<image backcolor="230 190 80"
+			size="0 0 2 100%"
+		/>
+	</sprite>
+
+	<sprite name="MainMenuPanelRightBorder">
+		<!-- right -->
+		<image backcolor="230 190 80"
+			size="0 0 100% 100%"
+		/>
+	</sprite>
+
+	<sprite name="SubmenuPanel">
+		<image texture="global/tile/stone_background.png"
+			real_texture_placement="32 0 292 264"
+			texture_size="0 0 240 240"
+		/>
+
+		<image texture="pregame/shading/menu_panel_background_shading.png"
+			texture_size="0 0 100% 100%"
+			size="0 0 100% 100%"
+		/>
+
+		<!-- sides -->
+		<image backcolor="230 190 80"
+			size="0 0 100%-2 2"
+		/>
+		<image backcolor="230 190 80"
+			size="100%-2 0 100% 100%"
+		/>
+		<image backcolor="230 190 80"
+			size="0 100%-2 100%-2 100%"
+		/>
+		<!-- no left border here -->
+	</sprite>
+
+	<sprite name="pgUserReportBox">
+		<image backcolor="0 0 0 220"
+			size="0 0 100% 100%"
+			border="true"
+			bordercolor="200 200 200"
+		/>
+	</sprite>
 
 </sprites>
diff --git a/binaries/data/mods/public/gui/pregame/styles.xml b/binaries/data/mods/public/gui/pregame/styles.xml
index db4c149b08..0bf0570c08 100644
--- a/binaries/data/mods/public/gui/pregame/styles.xml
+++ b/binaries/data/mods/public/gui/pregame/styles.xml
@@ -2,9 +2,18 @@
 
 <styles>
 
-	<style name="pgButton"
-		tooltip_style="pgToolTip"
-		tooltip=""
+	<style name="MainMenuPanel"
+		sprite="MainMenuPanel"
+		buffer_zone="10"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<style name="SubmenuPanel"
+		sprite="SubmenuPanel"
+		buffer_zone="10"
+		text_align="left"
+		text_valign="top"
 	/>
 
 	<style name="userReportPanel"
@@ -17,5 +26,4 @@
 		textcolor="white"
 	/>
 
-
 </styles>
diff --git a/binaries/data/mods/public/gui/session/sprites.xml b/binaries/data/mods/public/gui/session/sprites.xml
index fcead24c21..ff292b6146 100644
--- a/binaries/data/mods/public/gui/session/sprites.xml
+++ b/binaries/data/mods/public/gui/session/sprites.xml
@@ -97,6 +97,13 @@
 		/>
 	</sprite>
 
+	<sprite name="CivIconOver">
+		<image
+			texture="session/portraits/emblems/states/hover.png"
+			size="0 0 100% 100%"
+		/>
+	</sprite>
+
 	<!-- Map Panel -->
 	<sprite name="mapPanel">
 		<image backcolor="0 0 0"
diff --git a/binaries/data/mods/public/gui/session/styles.xml b/binaries/data/mods/public/gui/session/styles.xml
index dad833bf74..a0cf4155fe 100644
--- a/binaries/data/mods/public/gui/session/styles.xml
+++ b/binaries/data/mods/public/gui/session/styles.xml
@@ -188,6 +188,12 @@
     <!-- ================================  ================================ -->
     <!-- Icon Styles -->
     <!-- ================================  ================================ -->
+	<style name="CivIconOverlay"
+		sprite=""
+		sprite_over="CivIconOver"
+		sound_pressed="audio/interface/ui/ui_button_click.ogg"
+	/>
+
     <style name="commandIcon"
 	   sprite="command"
 	   ghost="true"