From 8315bcce967809e4ecb1bfbeb191c5a3dc5b44f1 Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Sat, 18 Mar 2006 06:58:16 +0000
Subject: [PATCH] * Fixed invalid name bug that slipped in when I did a blind
 commit. (Minimap buttons aren't positioned right, but at least I've got some
 of them up.) * Split command backs into outer ring and inner bubble (so
 nested add_color can be used to illuminate only the interior). * Used nested
 add_color (when you have a new toy, you have to play with it) to make only
 the icon of a tab illuminate, which looks a lot better. * Removed garrison
 sprite definition, since that cell sheet is not long for this world.

This was SVN commit r3662.
---
 .../bkg/{command.dds => command_inner.dds}    |   0
 .../ui/session/icons/bkg/command_outer.dds    |   3 +
 .../data/mods/official/gui/test/4_session.xml |   6 +-
 .../data/mods/official/gui/test/sprite1.xml   | 200 ++++++++++--------
 4 files changed, 113 insertions(+), 96 deletions(-)
 rename binaries/data/mods/official/art/textures/ui/session/icons/bkg/{command.dds => command_inner.dds} (100%)
 create mode 100644 binaries/data/mods/official/art/textures/ui/session/icons/bkg/command_outer.dds

diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/command.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/command_inner.dds
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/icons/bkg/command.dds
rename to binaries/data/mods/official/art/textures/ui/session/icons/bkg/command_inner.dds
diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/command_outer.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/command_outer.dds
new file mode 100644
index 0000000000..3578740d68
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/command_outer.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2aa326cc789f1effa10ab15a397978e1b14de97ee44cd4c0b3bea37266ddd93
+size 21972
diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml
index e98ad0d59e..7502a59df0 100644
--- a/binaries/data/mods/official/gui/test/4_session.xml
+++ b/binaries/data/mods/official/gui/test/4_session.xml
@@ -138,13 +138,13 @@
 									switch (loop)
 									{
 										case 1:
-											tempObject.cell_id = cellGroup["MiniMap"]["territories"].id;
+											tempObject.cell_id = cellGroup["Minimap"]["territories"].id;
 										break;
 										case 2:
-											tempObject.cell_id = cellGroup["MiniMap"]["terrain"].id;
+											tempObject.cell_id = cellGroup["Minimap"]["terrain"].id;
 										break;
 										case 3:
-											tempObject.cell_id = cellGroup["MiniMap"]["chat"].id;
+											tempObject.cell_id = cellGroup["Minimap"]["chat"].id;
 										break;
 										default:
 										break;
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index 2938e03ec4..df836ce9e8 100644
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -796,19 +796,19 @@
 
 			<!-- Command (Disabled circle). -->
 			<sprite	name="snIconCommand">
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
 						size="0 0 100% 100%" 
 				/>
 			</sprite>
 			<sprite	name="snIconCommandOver">
 				<effect	add_color="42 42 42 0"/>
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
 						size="0 0 100% 100%" 
 				/>
 			</sprite>
 			<sprite	name="snIconCommandDisabled">
 				<effect	grayscale=""/>
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
 						size="0 0 100% 100%" 
 				/>
 			</sprite>
@@ -1680,6 +1680,7 @@
 				/>
 		</sprite>
 		<sprite	name="snIconSheetCommandOver">
+				<effect	add_color="42 42 42 0"/>		
 				<image	texture="session/icons/sheets/command.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
@@ -1694,16 +1695,10 @@
 		</sprite>		
 
 		<sprite	name="snIconSheetCommandButton">
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
 						size="0 0 100% 100%" 
 				/>		
-				<image	texture="session/icons/sheets/command.dds"
-						cell_size="64 64"
-						size="0 0 100% 100%"
-				/>
-		</sprite>
-		<sprite	name="snIconSheetCommandButtonOver">
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_inner.dds"
 						size="0 0 100% 100%" 
 				/>				
 				<image	texture="session/icons/sheets/command.dds"
@@ -1711,8 +1706,26 @@
 						size="0 0 100% 100%"
 				/>
 		</sprite>
+		<sprite	name="snIconSheetCommandButtonOver">
+				<image	texture="session/icons/bkg/command_outer.dds"
+						size="0 0 100% 100%" 
+				/>				
+				<image
+						texture="session/icons/bkg/command_inner.dds"
+						size="0 0 100% 100%"
+				>
+						<effect	add_color="42 42 42 0"/>
+				</image>
+				<image	texture="session/icons/sheets/command.dds"
+						cell_size="64 64"
+						size="0 0 100% 100%"
+				/>
+		</sprite>
 		<sprite	name="snIconSheetCommandButtonDisabled">
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
+						size="0 0 100% 100%" 
+				/>				
+				<image	texture="session/icons/bkg/command_inner.dds"
 						size="0 0 100% 100%" 
 				/>				
 				<image	texture="session/icons/sheets/command.dds"
@@ -1749,7 +1762,7 @@
 		</sprite>		
 
 		<sprite	name="snIconSheetFindButton">
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/minimap.dds"
 						size="0 0 100% 100%" 
 				/>		
 				<image	texture="session/icons/sheets/find.dds"
@@ -1759,7 +1772,7 @@
 		</sprite>
 		<sprite	name="snIconSheetFindButtonOver">
 				<effect	add_color="42 42 42 0"/>
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/minimap.dds"
 						size="0 0 100% 100%" 
 				/>				
 				<image	texture="session/icons/sheets/find.dds"
@@ -1769,7 +1782,7 @@
 		</sprite>
 		<sprite	name="snIconSheetFindButtonDisabled">
 				<effect	grayscale=""/>
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/minimap.dds"
 						size="0 0 100% 100%" 
 				/>				
 				<image	texture="session/icons/sheets/find.dds"
@@ -1835,63 +1848,6 @@
 				/>
 		</sprite>
 
-		<!--
-		==========================================
-		SESSION GUI - ICON SHEETS - GARRISON
-		==========================================
-		-->
-		
-		<sprite	name="snIconSheetGarrison">
-				<image	texture="session/icons/sheets/garrison.dds"
-						cell_size="64 64"
-						size="0 0 100% 100%"
-				/>
-		</sprite>
-		<sprite	name="snIconSheetGarrisonOver">
-				<effect	add_color="42 42 42 0"/>
-				<image	texture="session/icons/sheets/garrison.dds"
-						cell_size="64 64"
-						size="0 0 100% 100%"
-				/>
-		</sprite>
-		<sprite	name="snIconSheetGarrisonDisabled">
-				<effect	grayscale=""/>
-				<image	texture="session/icons/sheets/garrison.dds"
-						cell_size="64 64"
-						size="0 0 100% 100%"
-				/>
-		</sprite>		
-
-		<sprite	name="snIconSheetGarrisonButton">
-				<image	texture="session/icons/bkg/command.dds"
-						size="0 0 100% 100%" 
-				/>		
-				<image	texture="session/icons/sheets/garrison.dds"
-						cell_size="64 64"
-						size="0 0 100% 100%"
-				/>
-		</sprite>
-		<sprite	name="snIconSheetGarrisonButtonOver">
-				<effect	add_color="42 42 42 0"/>
-				<image	texture="session/icons/bkg/command.dds"
-						size="0 0 100% 100%" 
-				/>				
-				<image	texture="session/icons/sheets/garrison.dds"
-						cell_size="64 64"
-						size="0 0 100% 100%"
-				/>
-		</sprite>
-		<sprite	name="snIconSheetGarrisonButtonDisabled">
-				<effect	grayscale=""/>
-				<image	texture="session/icons/bkg/command.dds"
-						size="0 0 100% 100%" 
-				/>				
-				<image	texture="session/icons/sheets/garrison.dds"
-						cell_size="64 64"
-						size="0 0 100% 100%"
-				/>
-		</sprite>
-
 		<!--
 		==========================================
 		SESSION GUI - ICON SHEETS - GATHER
@@ -1920,19 +1876,28 @@
 		</sprite>		
 
 		<sprite	name="snIconSheetGatherButton">
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
 						size="0 0 100% 100%" 
-				/>		
+				/>				
+				<image
+						texture="session/icons/bkg/command_inner.dds"
+						size="0 0 100% 100%"
+				/>
 				<image	texture="session/icons/sheets/gather.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
 		</sprite>
 		<sprite	name="snIconSheetGatherButtonOver">
-				<effect	add_color="42 42 42 0"/>
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
 						size="0 0 100% 100%" 
 				/>				
+				<image
+						texture="session/icons/bkg/command_inner.dds"
+						size="0 0 100% 100%"
+				>
+						<effect	add_color="42 42 42 0"/>
+				</image>				
 				<image	texture="session/icons/sheets/gather.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
@@ -1940,9 +1905,13 @@
 		</sprite>
 		<sprite	name="snIconSheetGatherButtonDisabled">
 				<effect	grayscale=""/>
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
 						size="0 0 100% 100%" 
 				/>				
+				<image
+						texture="session/icons/bkg/command_inner.dds"
+						size="0 0 100% 100%"
+				/>
 				<image	texture="session/icons/sheets/gather.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
@@ -2034,7 +2003,7 @@
 		</sprite>		
 
 		<sprite	name="snIconSheetMiniMapButton">
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/minimap.dds"
 						size="0 0 100% 100%" 
 				/>		
 				<image	texture="session/icons/sheets/minimap.dds"
@@ -2044,7 +2013,7 @@
 		</sprite>
 		<sprite	name="snIconSheetMiniMapButtonOver">
 				<effect	add_color="42 42 42 0"/>
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/minimap.dds"
 						size="0 0 100% 100%" 
 				/>				
 				<image	texture="session/icons/sheets/minimap.dds"
@@ -2054,7 +2023,7 @@
 		</sprite>
 		<sprite	name="snIconSheetMiniMapButtonDisabled">
 				<effect	grayscale=""/>
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/minimap.dds"
 						size="0 0 100% 100%" 
 				/>				
 				<image	texture="session/icons/sheets/minimap.dds"
@@ -2091,19 +2060,28 @@
 		</sprite>		
 
 		<sprite	name="snIconSheetRankButton">
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
 						size="0 0 100% 100%" 
-				/>		
+				/>				
+				<image
+						texture="session/icons/bkg/command_inner.dds"
+						size="0 0 100% 100%"
+				/>
 				<image	texture="session/icons/sheets/rank.dds"
 						cell_size="32 32"
 						size="0 0 100% 100%"
 				/>
 		</sprite>
 		<sprite	name="snIconSheetRankButtonOver">
-				<effect	add_color="42 42 42 0"/>
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
 						size="0 0 100% 100%" 
 				/>				
+				<image
+						texture="session/icons/bkg/command_inner.dds"
+						size="0 0 100% 100%"
+				>
+						<effect	add_color="42 42 42 0"/>
+				</image>				
 				<image	texture="session/icons/sheets/rank.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
@@ -2111,9 +2089,13 @@
 		</sprite>
 		<sprite	name="snIconSheetRankButtonDisabled">
 				<effect	grayscale=""/>
-				<image	texture="session/icons/bkg/command.dds"
+				<image	texture="session/icons/bkg/command_outer.dds"
 						size="0 0 100% 100%" 
 				/>				
+				<image
+						texture="session/icons/bkg/command_inner.dds"
+						size="0 0 100% 100%"
+				/>
 				<image	texture="session/icons/sheets/rank.dds"
 						cell_size="32 32"
 						size="0 0 100% 100%"
@@ -2378,21 +2360,23 @@
 		<sprite	name="snIconSheetTabButton">
 				<image	texture="session/icons/bkg/tab.dds"
 						size="0 0 100% 100%" 
-				/>		
+				/>				
 				<image	texture="session/icons/sheets/tab.dds"
 						cell_size="64 64"
 						size="0 0 100% 100%"
 				/>
 		</sprite>
 		<sprite	name="snIconSheetTabButtonOver">
-				<effect	add_color="42 42 42 0"/>
 				<image	texture="session/icons/bkg/tab.dds"
-						size="0 0 100% 100%" 
-				/>				
-				<image	texture="session/icons/sheets/tab.dds"
-						cell_size="64 64"
 						size="0 0 100% 100%"
-				/>
+				/>		
+				<image
+						texture="session/icons/sheets/tab.dds"
+						cell_size="64 64"						
+						size="0 0 100% 100%"
+				>
+						<effect	add_color="42 42 42 0"/>
+				</image>
 		</sprite>
 		<sprite	name="snIconSheetTabButtonDisabled">
 				<effect	grayscale=""/>
@@ -2405,7 +2389,37 @@
 				/>
 		</sprite>		
 		
-		
+		<sprite	name="snIconSheetTabButton_H">
+				<image	texture="session/icons/bkg/tab_h.dds"
+						size="0 0 100% 100%" 
+				/>				
+				<image	texture="session/icons/sheets/tab.dds"
+						cell_size="64 64"
+						size="0 0 100% 100%"
+				/>
+		</sprite>
+		<sprite	name="snIconSheetTabButton_HOver">
+				<image	texture="session/icons/bkg/tab_h.dds"
+						size="0 0 100% 100%"
+				/>		
+				<image
+						texture="session/icons/sheets/tab.dds"
+						cell_size="64 64"						
+						size="0 0 100% 100%"
+				>
+						<effect	add_color="42 42 42 0"/>
+				</image>
+		</sprite>
+		<sprite	name="snIconSheetTabButton_HDisabled">
+				<effect	grayscale=""/>
+				<image	texture="session/icons/bkg/tab_h.dds"
+						size="0 0 100% 100%" 
+				/>				
+				<image	texture="session/icons/sheets/tab.dds"
+						cell_size="64 64"
+						size="0 0 100% 100%"
+				/>
+		</sprite>