From da4cf389bb2f49640816744c4e41b1559afe4721 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 21 Oct 2012 15:56:44 +0300
Subject: Rename theme file playerbox_background.xml to playerbox.xml

---
 data/graphics/gui/CMakeLists.txt             |  2 +-
 data/graphics/gui/Makefile.am                |  2 +-
 data/graphics/gui/playerbox.xml              | 19 +++++++++++++++++++
 data/graphics/gui/playerbox_background.xml   | 19 -------------------
 data/themes/jewelry/CMakeLists.txt           |  2 +-
 data/themes/jewelry/Makefile.am              |  2 +-
 data/themes/jewelry/playerbox.xml            | 19 +++++++++++++++++++
 data/themes/jewelry/playerbox_background.xml | 19 -------------------
 src/gui/widgets/playerbox.cpp                |  4 ++--
 9 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 data/graphics/gui/playerbox.xml
 delete mode 100644 data/graphics/gui/playerbox_background.xml
 create mode 100644 data/themes/jewelry/playerbox.xml
 delete mode 100644 data/themes/jewelry/playerbox_background.xml

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index b3822cbdb..01b14ce9a 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -31,7 +31,7 @@ SET (FILES
     listbox.xml
     mouse.png
     ok.xml
-    playerbox_background.xml
+    playerbox.xml
     popup.xml
     progress-indicator.png
     progressbar.xml
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 3f789b401..91ace3d34 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -34,7 +34,7 @@ gui_DATA =				\
 	listbox.xml			\
 	mouse.png			\
 	ok.xml			\
-	playerbox_background.xml	\
+	playerbox.xml	\
 	popup.xml			\
 	progress-indicator.png		\
 	progressbar.xml			\
diff --git a/data/graphics/gui/playerbox.xml b/data/graphics/gui/playerbox.xml
new file mode 100644
index 000000000..5fc994df5
--- /dev/null
+++ b/data/graphics/gui/playerbox.xml
@@ -0,0 +1,19 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="186">
+		<option name="drawbackground" value="1" />
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
+		<part type="top-edge" xpos="3" ypos="0" width="26" height="4" />
+		<part type="top-right-corner" xpos="28" ypos="0" width="4" height="4" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="3" width="4" height="26" />
+		<part type="bg-quad" xpos="3" ypos="3" width="26" height="26" />
+		<part type="right-edge" xpos="28" ypos="3" width="4" height="26" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="28" width="4" height="4" />
+		<part type="bottom-edge" xpos="3" ypos="28" width="26" height="4" />
+		<part type="bottom-right-corner" xpos="28" ypos="28" width="4" height="4" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/playerbox_background.xml b/data/graphics/gui/playerbox_background.xml
deleted file mode 100644
index 5fc994df5..000000000
--- a/data/graphics/gui/playerbox_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="186">
-		<option name="drawbackground" value="1" />
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
-		<part type="top-edge" xpos="3" ypos="0" width="26" height="4" />
-		<part type="top-right-corner" xpos="28" ypos="0" width="4" height="4" />
-
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="3" width="4" height="26" />
-		<part type="bg-quad" xpos="3" ypos="3" width="26" height="26" />
-		<part type="right-edge" xpos="28" ypos="3" width="4" height="26" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="28" width="4" height="4" />
-		<part type="bottom-edge" xpos="3" ypos="28" width="26" height="4" />
-		<part type="bottom-right-corner" xpos="28" ypos="28" width="4" height="4" />
-	</widget>
-</skinset>
diff --git a/data/themes/jewelry/CMakeLists.txt b/data/themes/jewelry/CMakeLists.txt
index b80297e38..092cd95ae 100644
--- a/data/themes/jewelry/CMakeLists.txt
+++ b/data/themes/jewelry/CMakeLists.txt
@@ -29,7 +29,7 @@ SET (FILES
     mouse.png
     npc.xml
     ok.xml
-    playerbox_background.xml
+    playerbox.xml
     popup.xml
     progressbar.xml
     quests.xml
diff --git a/data/themes/jewelry/Makefile.am b/data/themes/jewelry/Makefile.am
index 5532b8818..fc5981c93 100644
--- a/data/themes/jewelry/Makefile.am
+++ b/data/themes/jewelry/Makefile.am
@@ -32,7 +32,7 @@ gui_DATA =				\
 	mouse.png		\
 	npc.xml		\
 	ok.xml		\
-	playerbox_background.xml		\
+	playerbox.xml		\
 	popup.xml		\
 	progressbar.xml		\
 	quests.xml		\
diff --git a/data/themes/jewelry/playerbox.xml b/data/themes/jewelry/playerbox.xml
new file mode 100644
index 000000000..1e18e42fe
--- /dev/null
+++ b/data/themes/jewelry/playerbox.xml
@@ -0,0 +1,19 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="186">
+		<option name="drawbackground" value="1" />
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
+		<part type="top-edge" xpos="5" ypos="0" width="20" height="5" />
+		<part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="5" width="5" height="20" />
+		<part type="bg-quad" xpos="5" ypos="5" width="20" height="20" />
+		<part type="right-edge" xpos="27" ypos="5" width="5" height="20" />
+		
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
+		<part type="bottom-edge" xpos="5" ypos="27" width="20" height="5" />
+		<part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
+	</widget>
+</skinset>
diff --git a/data/themes/jewelry/playerbox_background.xml b/data/themes/jewelry/playerbox_background.xml
deleted file mode 100644
index 1e18e42fe..000000000
--- a/data/themes/jewelry/playerbox_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="186">
-		<option name="drawbackground" value="1" />
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-		<part type="top-edge" xpos="5" ypos="0" width="20" height="5" />
-		<part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
-
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="5" width="5" height="20" />
-		<part type="bg-quad" xpos="5" ypos="5" width="20" height="20" />
-		<part type="right-edge" xpos="27" ypos="5" width="5" height="20" />
-		
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
-		<part type="bottom-edge" xpos="5" ypos="27" width="20" height="5" />
-		<part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
-	</widget>
-</skinset>
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 4511a8544..7fbe68f7f 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -73,9 +73,9 @@ void PlayerBox::init(std::string skin)
     if (Theme::instance())
     {
         if (skin.empty())
-            skin = "playerbox_background.xml";
+            skin = "playerbox.xml";
         mSkin = Theme::instance()->loadSkinRect(mBackground,
-            skin, "background.xml");
+            skin, "playerbox_background.xml");
         if (mSkin)
             mDrawBackground = (mSkin->getOption("drawbackground") != 0);
     }
-- 
cgit v1.2.3-70-g09d2