Change scrollarea theming.

22 files changed, 80 insertions, 28 deletions

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 2fefbfe6c..67c1352d7 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -9,12 +9,6 @@ SET (FILES
     colors.xml
     deepbox.png
     equipmentbox.png
-    hscroll_left_default.png
-    hscroll_left_highlight.png
-    hscroll_left_pressed.png
-    hscroll_right_default.png
-    hscroll_right_highlight.png
-    hscroll_right_pressed.png
     item_shortcut_bgr.png
     mouse.png
     progress-indicator.png
@@ -23,6 +17,11 @@ SET (FILES
     radioout.png
     radioout_highlight.png
     resize.png
+    scroll.xml
+    scroll_background.xml
+    scroll_highlighted.xml
+    scrollbuttons.xml
+    scrollbuttons_pressed.xml
     selection.png
     slider.png
     slider_hilight.png
@@ -38,14 +37,6 @@ SET (FILES
     target-cursor-normal-m.png
     target-cursor-normal-s.png
     unknown-item.png
-    vscroll_down_default.png
-    vscroll_down_highlight.png
-    vscroll_down_pressed.png
-    vscroll_grey.png
-    vscroll_highlight.png
-    vscroll_up_default.png
-    vscroll_up_highlight.png
-    vscroll_up_pressed.png
     window.png
     window.xml
     )
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 0e3e13a1e..e59e2d79a 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -12,12 +12,6 @@ gui_DATA =				\
 	colors.xml			\
 	deepbox.png			\
 	equipmentbox.png	\
-	hscroll_left_default.png	\
-	hscroll_left_highlight.png	\
-	hscroll_left_pressed.png	\
-	hscroll_right_default.png	\
-	hscroll_right_highlight.png	\
-	hscroll_right_pressed.png	\
 	item_shortcut_bgr.png		\
 	mouse.png			\
 	progress-indicator.png		\
@@ -26,6 +20,11 @@ gui_DATA =				\
 	radioout.png			\
 	radioout_highlight.png		\
 	resize.png			\
+	scroll.xml			\
+	scroll_background.xml	\
+	scroll_highlighted.xml	\
+	scrollbuttons.xml			\
+	scrollbuttons_pressed.xml\
 	selection.png			\
 	slider.png			\
 	slider_hilight.png		\
@@ -41,14 +40,6 @@ gui_DATA =				\
 	target-cursor-normal-m.png		\
 	target-cursor-normal-s.png		\
 	unknown-item.png		\
-	vscroll_down_default.png	\
-	vscroll_down_highlight.png	\
-	vscroll_down_pressed.png	\
-	vscroll_grey.png		\
-	vscroll_highlight.png		\
-	vscroll_up_default.png		\
-	vscroll_up_highlight.png	\
-	vscroll_up_pressed.png		\
 	window.png			\
 	window.xml
 
diff --git a/data/graphics/gui/hscroll_left_default.png b/data/graphics/gui/hscroll_left_default.png
deleted file mode 100644
index 2f763d302..000000000
--- a/data/graphics/gui/hscroll_left_default.png
+++ /dev/null
diff --git a/data/graphics/gui/hscroll_left_highlight.png b/data/graphics/gui/hscroll_left_highlight.png
deleted file mode 100644
index 6be5ae259..000000000
--- a/data/graphics/gui/hscroll_left_highlight.png
+++ /dev/null
diff --git a/data/graphics/gui/hscroll_left_pressed.png b/data/graphics/gui/hscroll_left_pressed.png
deleted file mode 100644
index b8ebcb463..000000000
--- a/data/graphics/gui/hscroll_left_pressed.png
+++ /dev/null
diff --git a/data/graphics/gui/hscroll_right_default.png b/data/graphics/gui/hscroll_right_default.png
deleted file mode 100644
index 33fdddd0a..000000000
--- a/data/graphics/gui/hscroll_right_default.png
+++ /dev/null
diff --git a/data/graphics/gui/hscroll_right_highlight.png b/data/graphics/gui/hscroll_right_highlight.png
deleted file mode 100644
index e9e633eac..000000000
--- a/data/graphics/gui/hscroll_right_highlight.png
+++ /dev/null
diff --git a/data/graphics/gui/hscroll_right_pressed.png b/data/graphics/gui/hscroll_right_pressed.png
deleted file mode 100644
index 53972f2bb..000000000
--- a/data/graphics/gui/hscroll_right_pressed.png
+++ /dev/null
diff --git a/data/graphics/gui/scroll.xml b/data/graphics/gui/scroll.xml
new file mode 100644
index 000000000..0bcdf9ad8
--- /dev/null
+++ b/data/graphics/gui/scroll.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="164">
+		<!-- 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" />
+		<part type="top-right-corner" xpos="7" ypos="0" width="4" height="4" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="4" height="11" />
+		<part type="bg-quad" xpos="4" ypos="4" width="3" height="11" />
+		<part type="right-edge" xpos="7" ypos="4" width="4" height="11" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="15" width="4" height="4" />
+		<part type="bottom-edge" xpos="4" ypos="15" width="3" height="4" />
+		<part type="bottom-right-corner" xpos="7" ypos="15" width="4" height="4" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/scroll_background.xml b/data/graphics/gui/scroll_background.xml
new file mode 100644
index 000000000..4a63cf25c
--- /dev/null
+++ b/data/graphics/gui/scroll_background.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="186">
+		<!-- 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/scroll_highlighted.xml b/data/graphics/gui/scroll_highlighted.xml
new file mode 100644
index 000000000..4833972cf
--- /dev/null
+++ b/data/graphics/gui/scroll_highlighted.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="57" ypos="164">
+		<!-- 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" />
+		<part type="top-right-corner" xpos="7" ypos="0" width="4" height="4" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="4" height="11" />
+		<part type="bg-quad" xpos="4" ypos="4" width="3" height="11" />
+		<part type="right-edge" xpos="7" ypos="4" width="4" height="11" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="15" width="4" height="4" />
+		<part type="bottom-edge" xpos="4" ypos="15" width="3" height="4" />
+		<part type="bottom-right-corner" xpos="7" ypos="15" width="4" height="4" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/scrollbuttons.xml b/data/graphics/gui/scrollbuttons.xml
new file mode 100644
index 000000000..2c57cd0ba
--- /dev/null
+++ b/data/graphics/gui/scrollbuttons.xml
@@ -0,0 +1,8 @@
+<skinset name="Default" image="window.png">
+    <widget type="Window" xpos="41" ypos="100">
+        <part type="left" xpos="0" ypos="0" width="12" height="12" />
+        <part type="right" xpos="0" ypos="16" width="12" height="12" />
+        <part type="down" xpos="0" ypos="32" width="12" height="12" />
+        <part type="up" xpos="0" ypos="48" width="12" height="12" />
+    </widget>
+</skinset>
diff --git a/data/graphics/gui/scrollbuttons_pressed.xml b/data/graphics/gui/scrollbuttons_pressed.xml
new file mode 100644
index 000000000..f4fb89f15
--- /dev/null
+++ b/data/graphics/gui/scrollbuttons_pressed.xml
@@ -0,0 +1,8 @@
+<skinset name="Default" image="window.png">
+    <widget type="Window" xpos="57" ypos="100">
+        <part type="left" xpos="0" ypos="0" width="12" height="12" />
+        <part type="right" xpos="0" ypos="16" width="12" height="12" />
+        <part type="down" xpos="0" ypos="32" width="12" height="12" />
+        <part type="up" xpos="0" ypos="48" width="12" height="12" />
+    </widget>
+</skinset>
diff --git a/data/graphics/gui/vscroll_down_default.png b/data/graphics/gui/vscroll_down_default.png
deleted file mode 100644
index c4292489e..000000000
--- a/data/graphics/gui/vscroll_down_default.png
+++ /dev/null
diff --git a/data/graphics/gui/vscroll_down_highlight.png b/data/graphics/gui/vscroll_down_highlight.png
deleted file mode 100644
index ac88f7c73..000000000
--- a/data/graphics/gui/vscroll_down_highlight.png
+++ /dev/null
diff --git a/data/graphics/gui/vscroll_down_pressed.png b/data/graphics/gui/vscroll_down_pressed.png
deleted file mode 100644
index 9dcc89f6f..000000000
--- a/data/graphics/gui/vscroll_down_pressed.png
+++ /dev/null
diff --git a/data/graphics/gui/vscroll_grey.png b/data/graphics/gui/vscroll_grey.png
deleted file mode 100644
index f99da4676..000000000
--- a/data/graphics/gui/vscroll_grey.png
+++ /dev/null
diff --git a/data/graphics/gui/vscroll_highlight.png b/data/graphics/gui/vscroll_highlight.png
deleted file mode 100644
index 2e0fcbfc1..000000000
--- a/data/graphics/gui/vscroll_highlight.png
+++ /dev/null
diff --git a/data/graphics/gui/vscroll_up_default.png b/data/graphics/gui/vscroll_up_default.png
deleted file mode 100644
index 1cecc3512..000000000
--- a/data/graphics/gui/vscroll_up_default.png
+++ /dev/null
diff --git a/data/graphics/gui/vscroll_up_highlight.png b/data/graphics/gui/vscroll_up_highlight.png
deleted file mode 100644
index 7b5009f39..000000000
--- a/data/graphics/gui/vscroll_up_highlight.png
+++ /dev/null
diff --git a/data/graphics/gui/vscroll_up_pressed.png b/data/graphics/gui/vscroll_up_pressed.png
deleted file mode 100644
index 2320ec42f..000000000
--- a/data/graphics/gui/vscroll_up_pressed.png
+++ /dev/null
diff --git a/data/graphics/gui/window.png b/data/graphics/gui/window.png
index a0d5da63c..81a1526dc 100644
--- a/data/graphics/gui/window.png
+++ b/data/graphics/gui/window.png