From b21cc64ca8f5a9d936d6ece7da120bc0bc65b49f Mon Sep 17 00:00:00 2001
From: Dees Troy <dees_troy@teamw.in>
Date: Tue, 10 Sep 2013 17:36:41 +0000
Subject: Pull ROM info from build.prop for backup names

Change-Id: I7847fca22b5d4f0a35da41625b15bd677a1e9768
---
 gui/devices/2560x1600/res/ui.xml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'gui/devices/2560x1600/res/ui.xml')

diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
index 3d6b65f5c..23b7c3e02 100644
--- a/gui/devices/2560x1600/res/ui.xml
+++ b/gui/devices/2560x1600/res/ui.xml
@@ -169,7 +169,7 @@
 		<variable name="filemanager_select_y" value="1360" />
 		<variable name="backup_name_text_y" value="440" />
 		<variable name="backup_name_button_y" value="950" />
-		<variable name="col_right_x" value="1870" />
+		<variable name="col_right_x" value="2510" />
 		<variable name="cancel_button_y" value="430" />
 		<variable name="terminal_console_y" value="0" />
 		<variable name="terminal_console_height" value="810" />
@@ -1733,8 +1733,8 @@
 
 		<page name="backupname1">
 			<object type="action">
-				<condition var1="tw_backup_name" op="=" var2="(Current Date)" />
-				<action function="set">tw_backup_name=</function>
+				<condition var1="tw_backup_name" op="=" var2="(Auto Generate)" />
+				<action function="generatebackupname"></function>
 			</object>
 
 			<object type="action">
@@ -1776,12 +1776,21 @@
 
 			<object type="button">
 				<highlight color="%highlight_color%" />
-				<placement x="%col_center_x%" y="%cancel_button_y%" />
+				<placement x="%col2_x%" y="%cancel_button_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Append Date</text>
+				<image resource="main_button" />
+				<action function="appenddatetobackupname"></action>
+			</object>
+
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col3_x%" y="%cancel_button_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>Cancel / Clear</text>
 				<image resource="main_button" />
 				<actions>
-					<action function="set">tw_backup_name=(Current Date)</action>
+					<action function="set">tw_backup_name=(Auto Generate)</action>
 					<action function="page">backup</action>
 				</actions>
 			</object>
@@ -1791,7 +1800,7 @@
 			<object type="action">
 				<touch key="home" />
 				<actions>
-					<action function="set">tw_backup_name=(Current Date)</action>
+					<action function="set">tw_backup_name=(Auto Generate)</action>
 					<action function="page">main</action>
 				</actions>
 			</object>
@@ -1799,7 +1808,7 @@
 			<object type="action">
 				<touch key="back" />
 				<actions>
-					<action function="set">tw_backup_name=(Current Date)</action>
+					<action function="set">tw_backup_name=(Auto Generate)</action>
 					<action function="page">backup</action>
 				</actions>
 			</object>
-- 
cgit v1.2.3