Add support for padding in progress bars.

Also fixed progress bars size.
New progress bar attributes:
    fillPadding - padding for will rectangle
    padding - normal padding for bar

13 files changed, 110 insertions, 0 deletions

diff --git a/data/graphics/gui/progressbar.xml b/data/graphics/gui/progressbar.xml
index b425025bb..dab818416 100644
--- a/data/graphics/gui/progressbar.xml
+++ b/data/graphics/gui/progressbar.xml
@@ -1,5 +1,7 @@
 <skinset name="Default" image="window.png">
 	<widget type="Window" xpos="73" ypos="164">
+        <option name="padding" value="1" />
+        <option name="fillPadding" value="3" />
 		<!-- Top Row -->
 		<part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
 		<part type="top-edge" xpos="4" ypos="0" width="3" height="4" />
diff --git a/data/themes/enchilado/CMakeLists.txt b/data/themes/enchilado/CMakeLists.txt
index 80fdfdb85..a008e8f86 100644
--- a/data/themes/enchilado/CMakeLists.txt
+++ b/data/themes/enchilado/CMakeLists.txt
@@ -3,6 +3,7 @@ SET (FILES
     colors.xml
     inventory.xml
     popup.xml
+    progressbar.xml
     quests.xml
     sell.xml
     server.xml
diff --git a/data/themes/enchilado/Makefile.am b/data/themes/enchilado/Makefile.am
index 65dbcc21c..041c1aaf8 100644
--- a/data/themes/enchilado/Makefile.am
+++ b/data/themes/enchilado/Makefile.am
@@ -6,6 +6,7 @@ gui_DATA =				\
 	colors.xml		\
 	inventory.xml		\
 	popup.xml		\
+	progressbar.xml		\
 	quests.xml		\
 	sell.xml		\
 	server.xml		\
diff --git a/data/themes/enchilado/progressbar.xml b/data/themes/enchilado/progressbar.xml
new file mode 100644
index 000000000..2ffd0966e
--- /dev/null
+++ b/data/themes/enchilado/progressbar.xml
@@ -0,0 +1,25 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="190" ypos="30">
+        <option name="padding" value="1" />
+        <option name="fillPadding" value="3" />
+
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+
+		<part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
+		<part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
+		<part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
+	</widget>
+</skinset>
diff --git a/data/themes/pink/CMakeLists.txt b/data/themes/pink/CMakeLists.txt
index 061d9a1e9..04e036ffa 100644
--- a/data/themes/pink/CMakeLists.txt
+++ b/data/themes/pink/CMakeLists.txt
@@ -5,6 +5,7 @@ SET (FILES
     inventory.xml
     popup.xml
     progress-indicator.png
+    progressbar.xml
     quests.xml
     sell.xml
     server.xml
diff --git a/data/themes/pink/Makefile.am b/data/themes/pink/Makefile.am
index 69e1d6b4e..025b043bd 100644
--- a/data/themes/pink/Makefile.am
+++ b/data/themes/pink/Makefile.am
@@ -8,6 +8,7 @@ gui_DATA =				\
 	inventory.xml		\
 	popup.xml		\
 	progress-indicator.png		\
+	progressbar.xml		\
 	quests.xml		\
 	sell.xml		\
 	server.xml		\
diff --git a/data/themes/pink/progressbar.xml b/data/themes/pink/progressbar.xml
new file mode 100644
index 000000000..f8d3563e2
--- /dev/null
+++ b/data/themes/pink/progressbar.xml
@@ -0,0 +1,25 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="250" ypos="0">
+        <option name="padding" value="1" />
+        <option name="fillPadding" value="3" />
+
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+		<part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
+		<part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
+		<part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
+		<part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
+		<part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
+		<part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
+
+		<part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
+		<part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
+		<part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
+	</widget>
+</skinset>
diff --git a/data/themes/unity/CMakeLists.txt b/data/themes/unity/CMakeLists.txt
index 3572a7dc1..c54c64723 100644
--- a/data/themes/unity/CMakeLists.txt
+++ b/data/themes/unity/CMakeLists.txt
@@ -5,6 +5,7 @@ SET (FILES
     inventory.xml
     npc.xml
     popup.xml
+    progressbar.xml
     quests.xml
     sell.xml
     server.xml
diff --git a/data/themes/unity/Makefile.am b/data/themes/unity/Makefile.am
index a27e3741b..735028301 100644
--- a/data/themes/unity/Makefile.am
+++ b/data/themes/unity/Makefile.am
@@ -8,6 +8,7 @@ gui_DATA =				\
 	inventory.xml		\
 	npc.xml		\
 	popup.xml		\
+	progressbar.xml		\
 	quests.xml		\
 	sell.xml		\
 	server.xml		\
diff --git a/data/themes/unity/progressbar.xml b/data/themes/unity/progressbar.xml
new file mode 100644
index 000000000..44d1e58f7
--- /dev/null
+++ b/data/themes/unity/progressbar.xml
@@ -0,0 +1,25 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="260" ypos="0">
+        <option name="padding" value="7" />
+        <option name="fillPadding" value="9" />
+
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+
+		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+	</widget>
+</skinset>
diff --git a/data/themes/wood/CMakeLists.txt b/data/themes/wood/CMakeLists.txt
index 8c984dba7..c62b25d47 100644
--- a/data/themes/wood/CMakeLists.txt
+++ b/data/themes/wood/CMakeLists.txt
@@ -5,6 +5,7 @@ SET (FILES
     item_shortcut_bgr.png
     mouse.png
     popup.xml
+    progressbar.xml
     quests.xml
     sell.xml
     server.xml
diff --git a/data/themes/wood/Makefile.am b/data/themes/wood/Makefile.am
index b2ada3479..11af7c229 100644
--- a/data/themes/wood/Makefile.am
+++ b/data/themes/wood/Makefile.am
@@ -8,6 +8,7 @@ gui_DATA =				\
 	item_shortcut_bgr.png		\
 	mouse.png			\
 	popup.xml			\
+	progressbar.xml			\
 	quests.xml			\
 	sell.xml			\
 	server.xml			\
diff --git a/data/themes/wood/progressbar.xml b/data/themes/wood/progressbar.xml
new file mode 100644
index 000000000..5a0113287
--- /dev/null
+++ b/data/themes/wood/progressbar.xml
@@ -0,0 +1,25 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="260" ypos="0">
+        <option name="padding" value="1" />
+        <option name="fillPadding" value="3" />
+
+		<!-- Top Row -->
+		<part type="top-left-corner" width="10" height="10" />
+		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+
+		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+	</widget>
+</skinset>