From acda722dae4b02982b3ba2a18946f419ff158c29 Mon Sep 17 00:00:00 2001
From: Christopher Oelmueller <chris.oelmueller@gmail.com>
Date: Wed, 18 Apr 2012 21:59:14 +0100
Subject: [PATCH] * Move gui background graphics to proper place

Removed unused image.
---
 .../images/background}/square_120.png               | Bin
 .../dummies => gui/images/background}/square_80.png | Bin
 .../images/background}/transparent.png              | Bin
 .../ingame/tabwidget/boatbuilder/boatbuilder.xml    |   2 +-
 .../boatbuilder/boatbuilder_confirm.xmlfoo          |   2 +-
 .../tabwidget/boatbuilder/boatbuilder_fisher.xmlfoo |  10 +++++-----
 .../tabwidget/boatbuilder/boatbuilder_trade.xml     |  10 +++++-----
 .../tabwidget/boatbuilder/boatbuilder_war1.xml      |   8 ++++----
 .../tabwidget/boatbuilder/boatbuilder_war2.xmlfoo   |   8 ++++----
 .../gui/xml/mainmenu/singleplayer/sp_free_maps.xml  |  10 +++++-----
 10 files changed, 25 insertions(+), 25 deletions(-)
 rename content/{gfx/dummies => gui/images/background}/square_120.png (100%)
 rename content/{gfx/dummies => gui/images/background}/square_80.png (100%)
 rename content/{gfx/dummies => gui/images/background}/transparent.png (100%)

diff --git a/content/gfx/dummies/square_120.png b/content/gui/images/background/square_120.png
similarity index 100%
rename from content/gfx/dummies/square_120.png
rename to content/gui/images/background/square_120.png
diff --git a/content/gfx/dummies/square_80.png b/content/gui/images/background/square_80.png
similarity index 100%
rename from content/gfx/dummies/square_80.png
rename to content/gui/images/background/square_80.png
diff --git a/content/gfx/dummies/transparent.png b/content/gui/images/background/transparent.png
similarity index 100%
rename from content/gfx/dummies/transparent.png
rename to content/gui/images/background/transparent.png
diff --git a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder.xml b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder.xml
index 1ddc02fcf36..e2362b34b7e 100644
--- a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder.xml
+++ b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder.xml
@@ -34,7 +34,7 @@
 			comment="Information about the ship currently under construction at the boat builder" />
 		<HBox name="queue_container"></HBox>
 		<Label name="headline_BB_builtship_label" position="0,43" text=""/>
-		<Icon image="content/gfx/dummies/square_120.png" position="0,65"
+		<Icon image="content/gui/images/background/square_120.png" position="0,65"
 			name="BB_cur_ship_bg" />
 		<Icon name="BB_cur_ship_icon" position="2,67" />
 		<VBox position="125,75" name="BB_upgrades_box"/> 	<!-- translations? -->
diff --git a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_confirm.xmlfoo b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_confirm.xmlfoo
index dc566cdf8e5..755259e3d2b 100644
--- a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_confirm.xmlfoo
+++ b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_confirm.xmlfoo
@@ -11,7 +11,7 @@
 
 	<Container position="20,110" size="95,95" >
 		<!--Current order pic-->
-		<Icon image="content/gfx/dummies/square_80.png" position="15,15" helptext="(like in the selection tabs)" />
+		<Icon image="content/gui/images/background/square_80.png" position="15,15" helptext="(like in the selection tabs)" />
 	</Container>
 
 	<Container position="130,110" size="260,100" >
diff --git a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_fisher.xmlfoo b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_fisher.xmlfoo
index cedc8e03e31..67f2f027f60 100644
--- a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_fisher.xmlfoo
+++ b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_fisher.xmlfoo
@@ -14,25 +14,25 @@
 
 	<Container position="20,95" size="260,450" >
 		<!-- Ship images
-		<Icon image="content/gfx/dummies/square_80.png" position="0,20"
+		<Icon image="content/gui/images/background/square_80.png" position="0,20"
 				helptext="Fishing Boat: \nUsed by: Fisher \nStorage: 1 slot of 1t \nCannons: none
 					\nSpeed: average \nHealth: 40" /> -->
-		<Icon image="content/gfx/dummies/square_80.png" position="0,20" />
+		<Icon image="content/gui/images/background/square_80.png" position="0,20" />
 		<Icon image="content/gfx/units/ships/fishers/as_fisher0/idle/135/0.png" position="0,20" />
 		<OkButton position="60,70"  name="BB_build_fisher_1"
 				helptext="Build this ship!" />
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,107"
+		<Icon image="content/gui/images/background/square_80.png" position="0,107"
 				helptext="Used by: Fisher \nStorage: 4 slots of 1t
 					\nSpeed: average \nHealth: 60\nGets available after:\n Upgrade Boat Builder" />
 		<CancelButton position="60,157" helptext="Not yet implemented!" />
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,194"
+		<Icon image="content/gui/images/background/square_80.png" position="0,194"
 				helptext="Used by: Fisher \nStorage: 4 slots of 4t
 					\nSpeed: average \nHealth: 100\nGets available after:\n Build Shipyard" />
 		<CancelButton position="60,244" helptext="Not yet implemented!" />
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,281"
+		<Icon image="content/gui/images/background/square_80.png" position="0,281"
 				helptext="Used by: Whaling Station \nStorage: 4 slots of 1t
 					\nSpeed: slow \nHealth: 200 \nGets available after:\n Build Shipyard" />
 		<CancelButton position="60,331" helptext="Not yet implemented!" />
diff --git a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_trade.xml b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_trade.xml
index 122539b9a20..c5a35535f7f 100644
--- a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_trade.xml
+++ b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_trade.xml
@@ -11,22 +11,22 @@
 
 	<Container position="20,95" size="260,450" >
 		<!-- Ship images -->
-		<!--<Icon image="content/gfx/dummies/square_80.png" position="0,20"
+		<!--<Icon image="content/gui/images/background/square_80.png" position="0,20"
 				helptext="Boat: \nStorage: 3 slots of 15t \nCannons: none \nSpeed: fast \nHealth: 40" />-->
-		<Icon image="content/gfx/dummies/square_80.png" position="0,20" />
+		<Icon image="content/gui/images/background/square_80.png" position="0,20" />
 		<Icon image="content/gui/images/objects/ships/76/1000001.png" position="2,22"
 				helptext="Huker: \nStorage: 4 slots, 120t \nCannons: 0 \nHealth: 100" />
 		<OkButton position="60,70"  name="BB_build_trade_1"  helptext="Build this ship!" /><!--
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,107"
+		<Icon image="content/gui/images/background/square_80.png" position="0,107"
 				helptext="Courier Boat: \nStorage: 4 slots of 20t \nCannons: none \nSpeed: fast \nHealth: 80\nGets available after:\n Upgrade Boat Builder" />
 		<CancelButton position="60,157" helptext="Can't build this ship!" />
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,194"
+		<Icon image="content/gui/images/background/square_80.png" position="0,194"
 				helptext="Small merchant ship: \nStorage: 4 slots of 40t \nCannons: none \nSpeed: slow \nHealth: 150\nGets available after:\n Upgrade Boat Builder" />
 		<CancelButton position="60,244" helptext="Can't build this ship!" />
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,281"
+		<Icon image="content/gui/images/background/square_80.png" position="0,281"
 				helptext="Big merchant ship: \nStorage: 6 slots of 40t \nCannons: none \nSpeed: average \nHealth: 300 \nGets available after:\n Build Shipyard" />
 		<CancelButton position="60,331" helptext="Can't build this ship!" />-->
 
diff --git a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_war1.xml b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_war1.xml
index b537bbad99c..f769579a898 100644
--- a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_war1.xml
+++ b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_war1.xml
@@ -11,21 +11,21 @@
 
 	<Container position="20,95" size="260,450" >
 		<!-- Ship images -->
-		<Icon image="content/gfx/dummies/square_80.png" position="0,20" />
+		<Icon image="content/gui/images/background/square_80.png" position="0,20" />
 		<Icon image="content/gui/images/objects/ships/76/1000020.png" position="2,22"
 				helptext="Frigate: \nStorage: 4 slots, 30t \nCannons: 7 \nHealth: 200" />
 		<OkButton position="60,70"  name="BB_build_war1_1"  helptext="Build this ship!" /><!--
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,107"/>
+		<Icon image="content/gui/images/background/square_80.png" position="0,107"/>
 				helptext="Naval cutter: \nStorage: 2 slots of 15t \nCannons: 4 \nSpeed: x \nHealth: 100\nGets available after:\n Research 'Military Ships'" />
 		<CancelButton position="60,157" helptext="Can't build this ship!" />
 		<CancelButton position="60,70" helptext="Not yet implemented." />
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,194"/>
+		<Icon image="content/gui/images/background/square_80.png" position="0,194"/>
 				helptext="Bombadiere: \nStorage: x slots of xt \nCannons: x \nSpeed: x \nHealth: x\nGets available after:\n Research 'Military Ships'" />
 		<CancelButton position="60,70" helptext="Not yet implemented." />
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,281"
+		<Icon image="content/gui/images/background/square_80.png" position="0,281"
 				helptext="Sloop-o'-war: \nStorage: x slots of xt \nCannons: x \nSpeed: x \nHealth: x \nGets available after:\n Research 'Military Ships'" />
 		<CancelButton position="60,70" helptext="Not yet implemented." />-->
 
diff --git a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_war2.xmlfoo b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_war2.xmlfoo
index e648ab56980..5337b584044 100644
--- a/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_war2.xmlfoo
+++ b/content/gui/xml/ingame/tabwidget/boatbuilder/boatbuilder_war2.xmlfoo
@@ -11,19 +11,19 @@
 
 	<Container position="20,95" size="260,450" >
 		<!-- Ship images -->
-		<Icon image="content/gfx/dummies/square_80.png" position="0,20"
+		<Icon image="content/gui/images/background/square_80.png" position="0,20"
 				helptext="Galley: \nStorage: 1 slots of 40t \nCannons: 12 \nSpeed: fast \nHealth: 200" />
 		<CancelButton position="60,70" helptext="Can't build this ship!" />
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,107"
+		<Icon image="content/gui/images/background/square_80.png" position="0,107"
 				helptext="Big gunboat: \nStorage: 2 slots of 15t \nCannons: 20 \nSpeed: fast \nHealth: 150\nGets available after:\n  Build Shipyard" />
 		<CancelButton position="60,157" helptext="Can't build this ship!" />
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,194"
+		<Icon image="content/gui/images/background/square_80.png" position="0,194"
 				helptext="Corvette: \nStorage: 0 slots of 0t \nCannons: 0 \nSpeed:  \nHealth: 0\nGets available after:\n Build Shipyard" />
 		<CancelButton position="60,244" helptext="Can't build this ship!" />
 
-		<Icon image="content/gfx/dummies/square_80.png" position="0,281"
+		<Icon image="content/gui/images/background/square_80.png" position="0,281"
 				helptext="Frigate: \nStorage: 0 slots of 0t \nCannons: 0 \nSpeed:  \nHealth: 0 \nGets available after:\n Build Shipyard" />
 		<CancelButton position="60,331" helptext="Can't build this ship!" />
 
diff --git a/content/gui/xml/mainmenu/singleplayer/sp_free_maps.xml b/content/gui/xml/mainmenu/singleplayer/sp_free_maps.xml
index fed2f4482fd..832080abb86 100644
--- a/content/gui/xml/mainmenu/singleplayer/sp_free_maps.xml
+++ b/content/gui/xml/mainmenu/singleplayer/sp_free_maps.xml
@@ -13,19 +13,19 @@
 	<ScrollArea horizontal_scrollbar="1"  vertical_scrollbar="0"  name="opponent_list_area">
 		<HBox name="opponent_list">
 			<VBox>
-				<Icon image="content/gfx/dummies/square_80.png" helptext="Emma Stonard" />
+				<Icon image="content/gui/images/background/square_80.png" helptext="Emma Stonard" />
 			</VBox>
 			<VBox>
-				<Icon image="content/gfx/dummies/square_80.png" helptext="Arthur Gordon" />
+				<Icon image="content/gui/images/background/square_80.png" helptext="Arthur Gordon" />
 			</VBox>
 			<VBox>
-				<Icon image="content/gfx/dummies/square_80.png" helptext="Baron Hill" />
+				<Icon image="content/gui/images/background/square_80.png" helptext="Baron Hill" />
 			</VBox>
 			<VBox>
-				<Icon image="content/gfx/dummies/square_80.png" helptext="Cristina de Bolsena" />
+				<Icon image="content/gui/images/background/square_80.png" helptext="Cristina de Bolsena" />
 			</VBox>
 			<VBox>
-				<Icon image="content/gfx/dummies/square_80.png" helptext="Pietro Gonzale" />
+				<Icon image="content/gui/images/background/square_80.png" helptext="Pietro Gonzale" />
 			</VBox>
 		</HBox>
 	</ScrollArea>