Convert unity theme to new format.

44 files changed, 8 insertions, 78 deletions

diff --git a/data/themes/unity/CMakeLists.txt b/data/themes/unity/CMakeLists.txt
index 06d4f2920..b9ac5df09 100644
--- a/data/themes/unity/CMakeLists.txt
+++ b/data/themes/unity/CMakeLists.txt
@@ -1,45 +1,10 @@
 SET (FILES
     beingpopup.xml
-    button.png
-    button_disabled.png
-    buttonhi.png
-    buttonpress.png
     char.xml
-    checkbox.png
-    close_button.png
     colors.xml
-    deepbox.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
     itempopup.xml
     popup.xml
-    progress.png
-    radioin.png
-    radioin_highlight.png
-    radioout.png
-    radioout_highlight.png
-    resize.png
-    selection.png
-    slider.png
-    slider_hilight.png
-    sticky_button.png
-    tab.png
-    tab_hilight.png
-    tabselected.png
     textpopup.xml
-    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/themes/unity/Makefile.am b/data/themes/unity/Makefile.am
index fb91baa5f..8285ddd3a 100644
--- a/data/themes/unity/Makefile.am
+++ b/data/themes/unity/Makefile.am
@@ -3,48 +3,13 @@ guidir = $(pkgdatadir)/data/themes/unity
 
 gui_DATA =				\
 	beingpopup.xml			\
-	button.png			\
-	button_disabled.png		\
-	buttonhi.png			\
-	buttonpress.png			\
 	char.xml			\
-	checkbox.png			\
-	close_button.png		\
 	colors.xml		\
-	deepbox.png			\
-	window.xml				\
-	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		\
 	itempopup.xml		\
 	popup.xml		\
-	progress.png		\
-	radioin.png			\
-	radioin_highlight.png		\
-	radioout.png			\
-	radioout_highlight.png		\
-	resize.png			\
-	selection.png			\
-	slider.png			\
-	slider_hilight.png		\
-	sticky_button.png		\
-	tab.png				\
-	tab_hilight.png			\
-	tabselected.png			\
 	textpopup.xml			\
-	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.png			\
+	window.xml
 
 EXTRA_DIST =				\
 	$(gui_DATA) \
diff --git a/data/themes/unity/beingpopup.xml b/data/themes/unity/beingpopup.xml
index 215d4528e..5b9c25bdb 100644
--- a/data/themes/unity/beingpopup.xml
+++ b/data/themes/unity/beingpopup.xml
@@ -1,5 +1,5 @@
 <skinset name="Default" image="window.png">
-	<widget type="Window">
+	<widget type="Window" xpos="260" ypos="0">
 		<!-- <option name="padding" value="5" /> -->
 		<!-- Top Row -->
 		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
diff --git a/data/themes/unity/button.png b/data/themes/unity/button.png
deleted file mode 100644
index 5e2bfbfc4..000000000
--- a/data/themes/unity/button.png
+++ /dev/null
diff --git a/data/themes/unity/button_disabled.png b/data/themes/unity/button_disabled.png
deleted file mode 100644
index b709473ae..000000000
--- a/data/themes/unity/button_disabled.png
+++ /dev/null
diff --git a/data/themes/unity/buttonhi.png b/data/themes/unity/buttonhi.png
deleted file mode 100644
index 83318d19a..000000000
--- a/data/themes/unity/buttonhi.png
+++ /dev/null
diff --git a/data/themes/unity/buttonpress.png b/data/themes/unity/buttonpress.png
deleted file mode 100644
index 5e2bfbfc4..000000000
--- a/data/themes/unity/buttonpress.png
+++ /dev/null
diff --git a/data/themes/unity/char.xml b/data/themes/unity/char.xml
index 215d4528e..5b9c25bdb 100644
--- a/data/themes/unity/char.xml
+++ b/data/themes/unity/char.xml
@@ -1,5 +1,5 @@
 <skinset name="Default" image="window.png">
-	<widget type="Window">
+	<widget type="Window" xpos="260" ypos="0">
 		<!-- <option name="padding" value="5" /> -->
 		<!-- Top Row -->
 		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
diff --git a/data/themes/unity/checkbox.png b/data/themes/unity/checkbox.png
deleted file mode 100644
index 2b1a1b5ec..000000000
--- a/data/themes/unity/checkbox.png
+++ /dev/null
diff --git a/data/themes/unity/close_button.png b/data/themes/unity/close_button.png
deleted file mode 100644
index 3eb0866be..000000000
--- a/data/themes/unity/close_button.png
+++ /dev/null
diff --git a/data/themes/unity/deepbox.png b/data/themes/unity/deepbox.png
deleted file mode 100644
index e6dae6a45..000000000
--- a/data/themes/unity/deepbox.png
+++ /dev/null
diff --git a/data/themes/unity/hscroll_left_default.png b/data/themes/unity/hscroll_left_default.png
deleted file mode 100644
index a5e588041..000000000
--- a/data/themes/unity/hscroll_left_default.png
+++ /dev/null
diff --git a/data/themes/unity/hscroll_left_highlight.png b/data/themes/unity/hscroll_left_highlight.png
deleted file mode 100644
index 38da69a96..000000000
--- a/data/themes/unity/hscroll_left_highlight.png
+++ /dev/null
diff --git a/data/themes/unity/hscroll_left_pressed.png b/data/themes/unity/hscroll_left_pressed.png
deleted file mode 100644
index 38da69a96..000000000
--- a/data/themes/unity/hscroll_left_pressed.png
+++ /dev/null
diff --git a/data/themes/unity/hscroll_right_default.png b/data/themes/unity/hscroll_right_default.png
deleted file mode 100644
index 3346f8c95..000000000
--- a/data/themes/unity/hscroll_right_default.png
+++ /dev/null
diff --git a/data/themes/unity/hscroll_right_highlight.png b/data/themes/unity/hscroll_right_highlight.png
deleted file mode 100644
index 76b62aeba..000000000
--- a/data/themes/unity/hscroll_right_highlight.png
+++ /dev/null
diff --git a/data/themes/unity/hscroll_right_pressed.png b/data/themes/unity/hscroll_right_pressed.png
deleted file mode 100644
index 76b62aeba..000000000
--- a/data/themes/unity/hscroll_right_pressed.png
+++ /dev/null
diff --git a/data/themes/unity/item_shortcut_bgr.png b/data/themes/unity/item_shortcut_bgr.png
deleted file mode 100644
index 03b9b9a79..000000000
--- a/data/themes/unity/item_shortcut_bgr.png
+++ /dev/null
diff --git a/data/themes/unity/itempopup.xml b/data/themes/unity/itempopup.xml
index 215d4528e..5b9c25bdb 100644
--- a/data/themes/unity/itempopup.xml
+++ b/data/themes/unity/itempopup.xml
@@ -1,5 +1,5 @@
 <skinset name="Default" image="window.png">
-	<widget type="Window">
+	<widget type="Window" xpos="260" ypos="0">
 		<!-- <option name="padding" value="5" /> -->
 		<!-- Top Row -->
 		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
diff --git a/data/themes/unity/popup.xml b/data/themes/unity/popup.xml
index 215d4528e..5b9c25bdb 100644
--- a/data/themes/unity/popup.xml
+++ b/data/themes/unity/popup.xml
@@ -1,5 +1,5 @@
 <skinset name="Default" image="window.png">
-	<widget type="Window">
+	<widget type="Window" xpos="260" ypos="0">
 		<!-- <option name="padding" value="5" /> -->
 		<!-- Top Row -->
 		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
diff --git a/data/themes/unity/progress.png b/data/themes/unity/progress.png
deleted file mode 100644
index 47c0724d4..000000000
--- a/data/themes/unity/progress.png
+++ /dev/null
diff --git a/data/themes/unity/radioin.png b/data/themes/unity/radioin.png
deleted file mode 100644
index 7c82fe0e0..000000000
--- a/data/themes/unity/radioin.png
+++ /dev/null
diff --git a/data/themes/unity/radioin_highlight.png b/data/themes/unity/radioin_highlight.png
deleted file mode 100644
index bdc5decd3..000000000
--- a/data/themes/unity/radioin_highlight.png
+++ /dev/null
diff --git a/data/themes/unity/radioout.png b/data/themes/unity/radioout.png
deleted file mode 100644
index 7fa4f97c4..000000000
--- a/data/themes/unity/radioout.png
+++ /dev/null
diff --git a/data/themes/unity/radioout_highlight.png b/data/themes/unity/radioout_highlight.png
deleted file mode 100644
index c43d19b9a..000000000
--- a/data/themes/unity/radioout_highlight.png
+++ /dev/null
diff --git a/data/themes/unity/resize.png b/data/themes/unity/resize.png
deleted file mode 100644
index 15f3fb9dd..000000000
--- a/data/themes/unity/resize.png
+++ /dev/null
diff --git a/data/themes/unity/selection.png b/data/themes/unity/selection.png
deleted file mode 100644
index 0dfceb7c5..000000000
--- a/data/themes/unity/selection.png
+++ /dev/null
diff --git a/data/themes/unity/slider.png b/data/themes/unity/slider.png
deleted file mode 100644
index 1762289b6..000000000
--- a/data/themes/unity/slider.png
+++ /dev/null
diff --git a/data/themes/unity/slider_hilight.png b/data/themes/unity/slider_hilight.png
deleted file mode 100644
index 99cda32d8..000000000
--- a/data/themes/unity/slider_hilight.png
+++ /dev/null
diff --git a/data/themes/unity/sticky_button.png b/data/themes/unity/sticky_button.png
deleted file mode 100644
index bed1b0a91..000000000
--- a/data/themes/unity/sticky_button.png
+++ /dev/null
diff --git a/data/themes/unity/tab.png b/data/themes/unity/tab.png
deleted file mode 100644
index 8b473466d..000000000
--- a/data/themes/unity/tab.png
+++ /dev/null
diff --git a/data/themes/unity/tab_hilight.png b/data/themes/unity/tab_hilight.png
deleted file mode 100644
index 2c2f84ed0..000000000
--- a/data/themes/unity/tab_hilight.png
+++ /dev/null
diff --git a/data/themes/unity/tabselected.png b/data/themes/unity/tabselected.png
deleted file mode 100644
index b2ad6ed13..000000000
--- a/data/themes/unity/tabselected.png
+++ /dev/null
diff --git a/data/themes/unity/textpopup.xml b/data/themes/unity/textpopup.xml
index 215d4528e..5b9c25bdb 100644
--- a/data/themes/unity/textpopup.xml
+++ b/data/themes/unity/textpopup.xml
@@ -1,5 +1,5 @@
 <skinset name="Default" image="window.png">
-	<widget type="Window">
+	<widget type="Window" xpos="260" ypos="0">
 		<!-- <option name="padding" value="5" /> -->
 		<!-- Top Row -->
 		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
diff --git a/data/themes/unity/vscroll_down_default.png b/data/themes/unity/vscroll_down_default.png
deleted file mode 100644
index d7e6b61ac..000000000
--- a/data/themes/unity/vscroll_down_default.png
+++ /dev/null
diff --git a/data/themes/unity/vscroll_down_highlight.png b/data/themes/unity/vscroll_down_highlight.png
deleted file mode 100644
index e3e5dbf3b..000000000
--- a/data/themes/unity/vscroll_down_highlight.png
+++ /dev/null
diff --git a/data/themes/unity/vscroll_down_pressed.png b/data/themes/unity/vscroll_down_pressed.png
deleted file mode 100644
index e3e5dbf3b..000000000
--- a/data/themes/unity/vscroll_down_pressed.png
+++ /dev/null
diff --git a/data/themes/unity/vscroll_grey.png b/data/themes/unity/vscroll_grey.png
deleted file mode 100644
index f18e7058d..000000000
--- a/data/themes/unity/vscroll_grey.png
+++ /dev/null
diff --git a/data/themes/unity/vscroll_highlight.png b/data/themes/unity/vscroll_highlight.png
deleted file mode 100644
index 157502dbc..000000000
--- a/data/themes/unity/vscroll_highlight.png
+++ /dev/null
diff --git a/data/themes/unity/vscroll_up_default.png b/data/themes/unity/vscroll_up_default.png
deleted file mode 100644
index 2b559dfda..000000000
--- a/data/themes/unity/vscroll_up_default.png
+++ /dev/null
diff --git a/data/themes/unity/vscroll_up_highlight.png b/data/themes/unity/vscroll_up_highlight.png
deleted file mode 100644
index f2b171d83..000000000
--- a/data/themes/unity/vscroll_up_highlight.png
+++ /dev/null
diff --git a/data/themes/unity/vscroll_up_pressed.png b/data/themes/unity/vscroll_up_pressed.png
deleted file mode 100644
index f2b171d83..000000000
--- a/data/themes/unity/vscroll_up_pressed.png
+++ /dev/null
diff --git a/data/themes/unity/window.png b/data/themes/unity/window.png
index c325c1f2e..c5bc7fce3 100644
--- a/data/themes/unity/window.png
+++ b/data/themes/unity/window.png
diff --git a/data/themes/unity/window.xml b/data/themes/unity/window.xml
index 410d07b4c..5ad20ea68 100644
--- a/data/themes/unity/window.xml
+++ b/data/themes/unity/window.xml
@@ -1,5 +1,5 @@
 <skinset name="Default" image="window.png">
-	<widget type="Window">
+	<widget type="Window" xpos="260" ypos="0">
 		<option name="padding" value="10" />
 		<!-- Top Row -->
 		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />