From 351b7cf1ff682026485b0e7a8f7623fe356cdf84 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 9 Dec 2012 19:51:15 +0300
Subject: Add resize options for on screen joystick and buttons.

---
 data/graphics/gui/CMakeLists.txt  |  3 +--
 data/graphics/gui/Makefile.am     |  3 +--
 data/graphics/gui/dbutton.xml     | 22 ++++++++++++++++++++++
 data/graphics/gui/dpad_attack.xml | 22 ----------------------
 data/graphics/gui/dpad_cancel.xml | 22 ----------------------
 5 files changed, 24 insertions(+), 48 deletions(-)
 create mode 100644 data/graphics/gui/dbutton.xml
 delete mode 100644 data/graphics/gui/dpad_attack.xml
 delete mode 100644 data/graphics/gui/dpad_cancel.xml

(limited to 'data/graphics')

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 47cfed422..ad033c1fd 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -14,9 +14,8 @@ SET (FILES
     circle-on.xml
     colors.xml
     complete_icon.xml
+    dbutton.xml
     dpad.xml
-    dpad_attack.xml
-    dpad_cancel.xml
     dropdown.xml
     dropdown_background.xml
     dropdown_pressed.xml
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index ed1b1c59e..45135d8aa 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -17,9 +17,8 @@ gui_DATA =				\
 	circle-on.xml		\
 	colors.xml			\
 	complete_icon.xml		\
+	dbutton.xml		\
 	dpad.xml		\
-	dpad_attack.xml		\
-	dpad_cancel.xml		\
 	dropdown.xml		\
 	dropdown_background.xml		\
 	dropdown_pressed.xml		\
diff --git a/data/graphics/gui/dbutton.xml b/data/graphics/gui/dbutton.xml
new file mode 100644
index 000000000..ebf312aca
--- /dev/null
+++ b/data/graphics/gui/dbutton.xml
@@ -0,0 +1,22 @@
+<skinset name="Default" image="window.png">
+    <widget type="Window" xpos="486" ypos="232">
+        <option name="padding" value="20" />
+        <option name="x" value="0" />
+        <option name="y" value="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/dpad_attack.xml b/data/graphics/gui/dpad_attack.xml
deleted file mode 100644
index ebf312aca..000000000
--- a/data/graphics/gui/dpad_attack.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<skinset name="Default" image="window.png">
-    <widget type="Window" xpos="486" ypos="232">
-        <option name="padding" value="20" />
-        <option name="x" value="0" />
-        <option name="y" value="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/dpad_cancel.xml b/data/graphics/gui/dpad_cancel.xml
deleted file mode 100644
index 34702c197..000000000
--- a/data/graphics/gui/dpad_cancel.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<skinset name="Default" image="window.png">
-    <widget type="Window" xpos="486" ypos="232">
-        <option name="padding" value="20" />
-        <option name="x" value="100" />
-        <option name="y" value="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>
-- 
cgit v1.2.3-70-g09d2