Improve theming.

Add support for theming button.

11 files changed, 74 insertions, 8 deletions

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index b262a5ac3..2fefbfe6c 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -1,10 +1,7 @@
 SET (FILES
     bubble.png
-    button.png
-    button_disabled.png
-    buttonhi.png
+    button.xml
     buttonplay.png
-    buttonpress.png
     checkbox.png
     circle-gray.png
     circle-green.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 6f294fa45..0e3e13a1e 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -3,11 +3,8 @@ guidir = $(pkgdatadir)/data/graphics/gui
 
 gui_DATA =				\
 	bubble.png			\
-	button.png			\
-	button_disabled.png		\
-	buttonhi.png			\
+	button.xml			\
 	buttonplay.png			\
-	buttonpress.png			\
 	checkbox.png			\
 	circle-gray.png			\
 	circle-green.png		\
diff --git a/data/graphics/gui/button.png b/data/graphics/gui/button.png
deleted file mode 100644
index 9ebbea639..000000000
--- a/data/graphics/gui/button.png
+++ /dev/null
diff --git a/data/graphics/gui/button.xml b/data/graphics/gui/button.xml
new file mode 100644
index 000000000..899030820
--- /dev/null
+++ b/data/graphics/gui/button.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="0">
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+		<part type="top-edge" xpos="9" ypos="0" width="8" height="5" />
+		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+		<part type="bg-quad" xpos="9" ypos="4" width="8" height="16" />
+		<part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+		<part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" />
+		<part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/button_disabled.png b/data/graphics/gui/button_disabled.png
deleted file mode 100644
index 0ce3aa6ff..000000000
--- a/data/graphics/gui/button_disabled.png
+++ /dev/null
diff --git a/data/graphics/gui/button_disabled.xml b/data/graphics/gui/button_disabled.xml
new file mode 100644
index 000000000..8194bf4d5
--- /dev/null
+++ b/data/graphics/gui/button_disabled.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="75">
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+		<part type="top-edge" xpos="9" ypos="0" width="8" height="5" />
+		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+		<part type="bg-quad" xpos="9" ypos="4" width="8" height="16" />
+		<part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+		<part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" />
+		<part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/button_highlighted.xml b/data/graphics/gui/button_highlighted.xml
new file mode 100644
index 000000000..356cee5ce
--- /dev/null
+++ b/data/graphics/gui/button_highlighted.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="25">
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+		<part type="top-edge" xpos="9" ypos="0" width="8" height="5" />
+		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+		<part type="bg-quad" xpos="9" ypos="4" width="8" height="16" />
+		<part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+		<part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" />
+		<part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/button_pressed.xml b/data/graphics/gui/button_pressed.xml
new file mode 100644
index 000000000..bd9de9e28
--- /dev/null
+++ b/data/graphics/gui/button_pressed.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="50">
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+		<part type="top-edge" xpos="9" ypos="0" width="8" height="5" />
+		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+		<part type="bg-quad" xpos="9" ypos="4" width="8" height="16" />
+		<part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+		<part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" />
+		<part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/buttonhi.png b/data/graphics/gui/buttonhi.png
deleted file mode 100644
index c47726346..000000000
--- a/data/graphics/gui/buttonhi.png
+++ /dev/null
diff --git a/data/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png
deleted file mode 100644
index e9cd17653..000000000
--- a/data/graphics/gui/buttonpress.png
+++ /dev/null
diff --git a/data/graphics/gui/window.png b/data/graphics/gui/window.png
index f0ef1af4b..a0d5da63c 100644
--- a/data/graphics/gui/window.png
+++ b/data/graphics/gui/window.png