diff options
| author | Dees Troy <dees_troy@teamw.in> | 2013-09-10 19:36:41 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@198.50.184.117> | 2013-09-12 16:11:13 +0200 |
| commit | b21cc64ca8f5a9d936d6ece7da120bc0bc65b49f (patch) | |
| tree | 47e1443a2b0591117a6ce5e20a5c3f05f61cca62 /gui/devices | |
| parent | Merge "Kang in older minzip for building in CM9 & CM7" into twrp2.7 (diff) | |
| download | android_bootable_recovery-b21cc64ca8f5a9d936d6ece7da120bc0bc65b49f.tar android_bootable_recovery-b21cc64ca8f5a9d936d6ece7da120bc0bc65b49f.tar.gz android_bootable_recovery-b21cc64ca8f5a9d936d6ece7da120bc0bc65b49f.tar.bz2 android_bootable_recovery-b21cc64ca8f5a9d936d6ece7da120bc0bc65b49f.tar.lz android_bootable_recovery-b21cc64ca8f5a9d936d6ece7da120bc0bc65b49f.tar.xz android_bootable_recovery-b21cc64ca8f5a9d936d6ece7da120bc0bc65b49f.tar.zst android_bootable_recovery-b21cc64ca8f5a9d936d6ece7da120bc0bc65b49f.zip | |
Diffstat (limited to '')
| -rwxr-xr-x | gui/devices/1024x600/res/ui.xml | 21 | ||||
| -rw-r--r-- | gui/devices/1024x768/res/ui.xml | 21 | ||||
| -rw-r--r-- | gui/devices/1080x1920/res/ui.xml | 23 | ||||
| -rw-r--r-- | gui/devices/1280x800/res/ui.xml | 21 | ||||
| -rw-r--r-- | gui/devices/1920x1200/res/ui.xml | 21 | ||||
| -rw-r--r-- | gui/devices/2560x1600/res/ui.xml | 23 | ||||
| -rw-r--r-- | gui/devices/320x480/res/ui.xml | 23 | ||||
| -rw-r--r-- | gui/devices/480x800/res/ui.xml | 23 | ||||
| -rw-r--r-- | gui/devices/480x854/res/ui.xml | 23 | ||||
| -rw-r--r-- | gui/devices/540x960/res/ui.xml | 23 | ||||
| -rw-r--r-- | gui/devices/720x1280/res/ui.xml | 23 | ||||
| -rwxr-xr-x | gui/devices/800x1280/res/ui.xml | 23 | ||||
| -rwxr-xr-x | gui/devices/800x480/res/ui.xml | 21 |
13 files changed, 203 insertions, 86 deletions
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index 2b7d20e2e..bbcaae1f5 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -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> diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index b625174a4..97b98c049 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -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> diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml index 25d3ed8ef..5ba884b13 100644 --- a/gui/devices/1080x1920/res/ui.xml +++ b/gui/devices/1080x1920/res/ui.xml @@ -1341,7 +1341,7 @@ <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> - <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" /> + <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" placement="5" /> <font resource="font" color="%button_text_color%" /> <text>Backup Name: %tw_backup_name%</text> <actions> @@ -1459,8 +1459,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"> @@ -1502,12 +1502,21 @@ <object type="button"> <highlight color="%highlight_color%" /> - <placement x="%col_center_x%" y="%row2_y%" /> + <placement x="%col1_x%" y="%row2_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="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</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> @@ -1517,7 +1526,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> @@ -1525,7 +1534,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> diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index b86f99171..66861f2cb 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -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> diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index 157005f1a..d1a7829ac 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -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> 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> diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index 0719a942c..893c90cfd 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -1328,7 +1328,7 @@ <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> - <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" /> + <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" placement="5" /> <font resource="font" color="%button_text_color%" /> <text>Backup Name: %tw_backup_name%</text> <actions> @@ -1446,8 +1446,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"> @@ -1489,12 +1489,21 @@ <object type="button"> <highlight color="%highlight_color%" /> - <placement x="%col_center_x%" y="%row2_y%" /> + <placement x="%col1_x%" y="%row2_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="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</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> @@ -1504,7 +1513,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> @@ -1512,7 +1521,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> diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index b7b527bb9..690028106 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -1328,7 +1328,7 @@ <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> - <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" /> + <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" placement="5" /> <font resource="font" color="%button_text_color%" /> <text>Backup Name: %tw_backup_name%</text> <actions> @@ -1446,8 +1446,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"> @@ -1489,12 +1489,21 @@ <object type="button"> <highlight color="%highlight_color%" /> - <placement x="%col_center_x%" y="%row2_y%" /> + <placement x="%col1_x%" y="%row2_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="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</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> @@ -1504,7 +1513,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> @@ -1512,7 +1521,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> diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index cb6577f20..09c507767 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -1327,7 +1327,7 @@ <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> - <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" /> + <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" placement="5" /> <font resource="font" color="%button_text_color%" /> <text>Backup Name: %tw_backup_name%</text> <actions> @@ -1445,8 +1445,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"> @@ -1488,12 +1488,21 @@ <object type="button"> <highlight color="%highlight_color%" /> - <placement x="%col_center_x%" y="%row2_y%" /> + <placement x="%col1_x%" y="%row2_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="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</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> @@ -1503,7 +1512,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> @@ -1511,7 +1520,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> diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index 078f1ae51..f636e2e0e 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -1328,7 +1328,7 @@ <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> - <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" /> + <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" placement="5" /> <font resource="font" color="%button_text_color%" /> <text>Backup Name: %tw_backup_name%</text> <actions> @@ -1446,8 +1446,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"> @@ -1489,12 +1489,21 @@ <object type="button"> <highlight color="%highlight_color%" /> - <placement x="%col_center_x%" y="%row2_y%" /> + <placement x="%col1_x%" y="%row2_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="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</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> @@ -1504,7 +1513,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> @@ -1512,7 +1521,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> diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index d2896cc94..316b20e78 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -1341,7 +1341,7 @@ <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> - <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" /> + <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" placement="5" /> <font resource="font" color="%button_text_color%" /> <text>Backup Name: %tw_backup_name%</text> <actions> @@ -1459,8 +1459,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"> @@ -1502,12 +1502,21 @@ <object type="button"> <highlight color="%highlight_color%" /> - <placement x="%col_center_x%" y="%row2_y%" /> + <placement x="%col1_x%" y="%row2_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="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</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> @@ -1517,7 +1526,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> @@ -1525,7 +1534,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> diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index ba7dba321..b85084142 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -1329,7 +1329,7 @@ <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> - <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" /> + <placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" placement="5" /> <font resource="font" color="%button_text_color%" /> <text>Backup Name: %tw_backup_name%</text> <actions> @@ -1447,8 +1447,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"> @@ -1490,12 +1490,21 @@ <object type="button"> <highlight color="%highlight_color%" /> - <placement x="%col_center_x%" y="%row2_y%" /> + <placement x="%col1_x%" y="%row2_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="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</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> @@ -1505,7 +1514,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> @@ -1513,7 +1522,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> diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index ba262bcce..cbd3b7da0 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -1741,8 +1741,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"> @@ -1784,12 +1784,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> @@ -1799,7 +1808,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> @@ -1807,7 +1816,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> |