From e2b2902cd75951a67714f279a9e6b992b2e0064d Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Wed, 30 Jul 2014 09:32:59 -0500
Subject: Minor tweaks to watch ui.xml files

Change-Id: I9448eed41e43c4fce575b7ed12b5270a1d75f99b
---
 gui/devices/240x240/res/ui.xml | 5 +----
 gui/devices/320x320/res/ui.xml | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'gui')

diff --git a/gui/devices/240x240/res/ui.xml b/gui/devices/240x240/res/ui.xml
index 92cc12e6a..4cc25dd87 100644
--- a/gui/devices/240x240/res/ui.xml
+++ b/gui/devices/240x240/res/ui.xml
@@ -48,7 +48,6 @@
 	<variables>
 		<variable name="col1_x" value="6" />
 		<variable name="col2_x" value="126" />
-		<variable name="col3_x" value="180" />
 		<variable name="col_center_x" value="62" />
 		<variable name="col_center_medium_x" value="122" />
 		<variable name="center_x" value="120" />
@@ -60,7 +59,6 @@
 		<variable name="row2_y" value="65" />
 		<variable name="row3_y" value="110" />
 		<variable name="row4_y" value="155" />
-		<variable name="row5_y" value="200" />
 		<variable name="row_queue_y" value="134" />
 		<variable name="row1_header_y" value="0" />
 		<variable name="row1_text_y" value="16" />
@@ -78,7 +76,6 @@
 		<variable name="row13_text_y" value="208" />
 		<variable name="zip_status_y" value="224" />
 		<variable name="backup_text_y" value="60" />
-		<variable name="tz_selected_y" value="44" />
 		<variable name="tz_set_y" value="200" />
 		<variable name="tz_current_y" value="184" />
 		<variable name="col_progressbar_x" value="25" />
@@ -233,7 +230,7 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="170" y="3" />
+				<placement x="236" y="3" placement="1" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
 					<condition var1="tw_battery" op=">" var2="0" />
diff --git a/gui/devices/320x320/res/ui.xml b/gui/devices/320x320/res/ui.xml
index ad84a07f9..a9be8c985 100644
--- a/gui/devices/320x320/res/ui.xml
+++ b/gui/devices/320x320/res/ui.xml
@@ -159,8 +159,8 @@
 		<variable name="sdswap_text_y" value="47" />
 		<variable name="sdfilesystem_text_y" value="92" />
 		<variable name="sdfilesystem_button_y" value="120" />
-		<variable name="lock_x" value="72" />
-		<variable name="lock_y" value="46" />
+		<variable name="lock_x" value="96" />
+		<variable name="lock_y" value="70" />
 		<variable name="filemanager_select_x" value="130" />
 		<variable name="filemanager_select_y" value="280" />
 		<variable name="terminal_console_height" value="126" />
@@ -224,13 +224,13 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="100" y="3" />
+				<placement x="200" y="3" />
 				<text>%tw_time%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="170" y="3" />
+				<placement x="316" y="3" placement="1" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
 					<condition var1="tw_battery" op=">" var2="0" />
-- 
cgit v1.2.3