From 781e689f37fdf3c234be227602317917fb1db579 Mon Sep 17 00:00:00 2001
From: Kra1o5 <kra1o5x@gmail.com>
Date: Mon, 10 Mar 2014 00:37:26 +0100
Subject: Fix incorrect alignment of Restore Defaults button in some themes

Change-Id: I11bd9fea2a900a92794c5c297846eb87265eeee7
---
 gui/devices/1080x1920/res/ui.xml | 16 ++++++++--------
 gui/devices/1200x1920/res/ui.xml | 16 ++++++++--------
 gui/devices/320x480/res/ui.xml   | 16 ++++++++--------
 gui/devices/480x800/res/ui.xml   | 16 ++++++++--------
 gui/devices/480x854/res/ui.xml   | 16 ++++++++--------
 gui/devices/540x960/res/ui.xml   | 16 ++++++++--------
 gui/devices/720x1280/res/ui.xml  | 16 ++++++++--------
 gui/devices/800x1280/res/ui.xml  | 16 ++++++++--------
 8 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml
index c336dbade..b960cbcbe 100644
--- a/gui/devices/1080x1920/res/ui.xml
+++ b/gui/devices/1080x1920/res/ui.xml
@@ -2464,21 +2464,21 @@
 				<action function="page">screen</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%col2_x%" y="%row4_y%" />
+                        <object type="button">
+				<placement x="%col1_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Vibration Duration</text>
+				<text>Restore Defaults</text>
 				<image resource="main_button" />
-				<action function="page">Vibrate</action>
+				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<placement x="%col_x%" y="%row4_y%" />
+				<highlight color="%highlight_color%" />
+				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Restore Defaults</text>
+				<text>Vibration Duration</text>
 				<image resource="main_button" />
-				<action function="restoredefaultsettings"></action>
+				<action function="page">Vibrate</action>
 			</object>
 
 			<object type="action">
diff --git a/gui/devices/1200x1920/res/ui.xml b/gui/devices/1200x1920/res/ui.xml
index 175121632..eb5098cfb 100644
--- a/gui/devices/1200x1920/res/ui.xml
+++ b/gui/devices/1200x1920/res/ui.xml
@@ -2467,21 +2467,21 @@
 				<action function="page">screen</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%col2_x%" y="%row4_y%" />
+                        <object type="button">
+				<placement x="%col1_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Vibration Duration</text>
+				<text>Restore Defaults</text>
 				<image resource="main_button" />
-				<action function="page">Vibrate</action>
+				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<placement x="%col_x%" y="%row4_y%" />
+				<highlight color="%highlight_color%" />
+				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Restore Defaults</text>
+				<text>Vibration Duration</text>
 				<image resource="main_button" />
-				<action function="restoredefaultsettings"></action>
+				<action function="page">Vibrate</action>
 			</object>
 
 			<object type="action">
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index 5b6fa02bb..8a6308fda 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -2451,21 +2451,21 @@
 				<action function="page">screen</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%col2_x%" y="%row4_y%" />
+                        <object type="button">
+				<placement x="%col1_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Vibration Duration</text>
+				<text>Restore Defaults</text>
 				<image resource="main_button" />
-				<action function="page">Vibrate</action>
+				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<placement x="%col_x%" y="%row4_y%" />
+				<highlight color="%highlight_color%" />
+				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Restore Defaults</text>
+				<text>Vibration Duration</text>
 				<image resource="main_button" />
-				<action function="restoredefaultsettings"></action>
+				<action function="page">Vibrate</action>
 			</object>
 
 			<object type="action">
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index be2db8f9b..d8cbbec80 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -2451,21 +2451,21 @@
 				<action function="page">screen</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%col2_x%" y="%row4_y%" />
+                        <object type="button">
+				<placement x="%col1_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Vibration Duration</text>
+				<text>Restore Defaults</text>
 				<image resource="main_button" />
-				<action function="page">Vibrate</action>
+				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<placement x="%col_x%" y="%row4_y%" />
+				<highlight color="%highlight_color%" />
+				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Restore Defaults</text>
+				<text>Vibration Duration</text>
 				<image resource="main_button" />
-				<action function="restoredefaultsettings"></action>
+				<action function="page">Vibrate</action>
 			</object>
 
 			<object type="action">
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index 42e6749ed..91888eaf6 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -2450,21 +2450,21 @@
 				<action function="page">screen</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%col2_x%" y="%row4_y%" />
+                        <object type="button">
+				<placement x="%col1_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Vibration Duration</text>
+				<text>Restore Defaults</text>
 				<image resource="main_button" />
-				<action function="page">Vibrate</action>
+				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<placement x="%col_x%" y="%row4_y%" />
+				<highlight color="%highlight_color%" />
+				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Restore Defaults</text>
+				<text>Vibration Duration</text>
 				<image resource="main_button" />
-				<action function="restoredefaultsettings"></action>
+				<action function="page">Vibrate</action>
 			</object>
 
 			<object type="action">
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index a60fb3db0..ace65ebfa 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -2451,21 +2451,21 @@
 				<action function="page">screen</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%col2_x%" y="%row4_y%" />
+                        <object type="button">
+				<placement x="%col1_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Vibration Duration</text>
+				<text>Restore Defaults</text>
 				<image resource="main_button" />
-				<action function="page">Vibrate</action>
+				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<placement x="%col_x%" y="%row4_y%" />
+				<highlight color="%highlight_color%" />
+				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Restore Defaults</text>
+				<text>Vibration Duration</text>
 				<image resource="main_button" />
-				<action function="restoredefaultsettings"></action>
+				<action function="page">Vibrate</action>
 			</object>
 
 			<object type="action">
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index 2cdd966c7..b0e931714 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -2464,21 +2464,21 @@
 				<action function="page">screen</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%col2_x%" y="%row4_y%" />
+                        <object type="button">
+				<placement x="%col1_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Vibration Duration</text>
+				<text>Restore Defaults</text>
 				<image resource="main_button" />
-				<action function="page">Vibrate</action>
+				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<placement x="%col_x%" y="%row4_y%" />
+				<highlight color="%highlight_color%" />
+				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Restore Defaults</text>
+				<text>Vibration Duration</text>
 				<image resource="main_button" />
-				<action function="restoredefaultsettings"></action>
+				<action function="page">Vibrate</action>
 			</object>
 
 			<object type="action">
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index fffe31cd8..94e39883e 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -2452,21 +2452,21 @@
 				<action function="page">screen</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%col2_x%" y="%row4_y%" />
+                        <object type="button">
+				<placement x="%col1_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Vibration Duration</text>
+				<text>Restore Defaults</text>
 				<image resource="main_button" />
-				<action function="page">Vibrate</action>
+				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<placement x="%col_x%" y="%row4_y%" />
+				<highlight color="%highlight_color%" />
+				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
-				<text>Restore Defaults</text>
+				<text>Vibration Duration</text>
 				<image resource="main_button" />
-				<action function="restoredefaultsettings"></action>
+				<action function="page">Vibrate</action>
 			</object>
 
 			<object type="action">
-- 
cgit v1.2.3