diff options
Diffstat (limited to 'gui')
-rw-r--r-- | gui/devices/320x480/res/ui.xml | 92 | ||||
-rw-r--r-- | gui/devices/480x800/res/ui.xml | 38 | ||||
-rw-r--r-- | gui/devices/720x1280/res/ui.xml | 38 |
3 files changed, 141 insertions, 27 deletions
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index f3e138401..f9ef6609c 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -47,6 +47,7 @@ <variable name="col1_x" value="8" /> <variable name="col2_x" value="162" /> <variable name="col_center_x" value="85" /> + <variable name="col_center_medium_x" value="122" /> <variable name="center_x" value="160" /> <variable name="row1_y" value="84" /> <variable name="row2_y" value="174" /> @@ -442,7 +443,7 @@ <object type="button"> <placement x="%col1_x%" y="%row1_text_y%" /> - <font resource="mediumfont" color="%text_color%" /> + <font resource="font" color="%text_color%" /> <conditions> <condition var1="tw_has_dual_storage" var2="1" /> <condition var1="tw_use_external_storage" var2="1" /> @@ -454,7 +455,7 @@ <object type="button"> <placement x="%col1_x%" y="%row1_text_y%" /> - <font resource="mediumfont" color="%text_color%" /> + <font resource="font" color="%text_color%" /> <conditions> <condition var1="tw_has_dual_storage" var2="1" /> <condition var1="tw_use_external_storage" var2="0" /> @@ -466,7 +467,7 @@ <object type="button"> <placement x="%col2_x%" y="%row1_text_y%" /> - <font resource="mediumfont" color="%text_color%" /> + <font resource="font" color="%text_color%" /> <conditions> <condition var1="tw_has_dual_storage" var2="1" /> <condition var1="tw_use_external_storage" var2="1" /> @@ -478,7 +479,7 @@ <object type="button"> <placement x="%col2_x%" y="%row1_text_y%" /> - <font resource="mediumfont" color="%text_color%" /> + <font resource="font" color="%text_color%" /> <conditions> <condition var1="tw_has_dual_storage" var2="1" /> <condition var1="tw_use_external_storage" var2="0" /> @@ -548,7 +549,7 @@ </object> <object type="text" color="%text_color%"> - <font resource="mediumfont" /> + <font resource="font" /> <placement x="%center_x%" y="%row4_text_y%" placement="5" /> <text>%tw_zip_location%</text> </object> @@ -560,7 +561,7 @@ </object> <object type="text" color="%text_color%"> - <font resource="mediumfont" /> + <font resource="font" /> <placement x="%center_x%" y="%row6_text_y%" placement="5" /> <text>%tw_file%</text> </object> @@ -574,7 +575,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row8_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Zip file signature verification.</text> + <text>Zip file signature verification?</text> <data variable="tw_signed_zip_verify" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -582,7 +583,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row9_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Force MD5 check on all zips.</text> + <text>Force MD5 check on all zips?</text> <data variable="tw_force_md5_check" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -591,14 +592,14 @@ <condition var1="tw_has_injecttwrp" var2="1" /> <placement x="%col1_x%" y="%row10_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Inject TWRP after install.</text> + <text>Inject TWRP after install?</text> <data variable="tw_inject_after_zip" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> <object type="text" color="%text_color%"> <font resource="font" /> - <placement x="%center_x%" y="%row11_text_y%" placement="5" /> + <placement x="%center_x%" y="%row12_text_y%" placement="5" /> <text>File %tw_zip_queue_count% of max of 10</text> </object> @@ -666,7 +667,7 @@ </object> <object type="text" color="%text_color%"> - <font resource="mediumfont" /> + <font resource="font" /> <placement x="%center_x%" y="%row18_text_y%" placement="5" /> <text>%tw_filename%</text> </object> @@ -788,6 +789,9 @@ <action function="set">tw_has_action2=0</action> <action function="set">tw_action2=</action> <action function="set">tw_action2_param=</action> + <action function="set">tw_has_cancel=0</action> + <action function="set">tw_cancel_action=</action> + <action function="set">tw_cancel_param=</action> <action function="page">%tw_clear_destination%</action> </object> </page> @@ -870,6 +874,15 @@ <object type="template" name="action_page_console" /> + <object type="button"> + <condition var1="tw_has_cancel" var2="1" /> + <placement x="%col_center_medium_x%" y="%row4_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Cancel</text> + <image resource="medium_button" /> + <action function="%tw_cancel_action%">%tw_cancel_param%</action> + </object> + <object type="template" name="progress_bar" /> <object type="action"> @@ -1093,7 +1106,7 @@ <action function="set">tw_has_action2=1</action> <action function="set">tw_action2=set</action> <action function="set">tw_action2_param=tw_zip_location=/sdcard</action> - <action function="set">tw_text1=Wipe External Storage (SD Card)?</action> + <action function="set">tw_text1=Wipe External Storage (SD card)?</action> <action function="set">tw_action_text1=Wiping External Storage...</action> <action function="set">tw_complete_text1=External Storage Wipe Complete</action> <action function="set">tw_slider_text=Swipe to Wipe</action> @@ -1322,7 +1335,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row15_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Enable compression.</text> + <text>Enable Compression (Requires more time)</text> <data variable="tw_use_compression" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -1330,7 +1343,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row16_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Skip MD5 generation during backup.</text> + <text>Skip MD5 generation on backups</text> <data variable="tw_skip_md5_generate" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -1722,7 +1735,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row14_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Enable MD5 verification of backup files.</text> + <text>Enable MD5 checking of backup files</text> <data variable="tw_skip_md5_check" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -1921,7 +1934,7 @@ <condition var1="tw_has_external" var2="1" /> <condition var1="mounted" op="!=" var2="EXTERNAL" /> </conditions> - <text>Mount SD Card</text> + <text>Mount SDCard</text> <image resource="checkbox_false" /> <action function="mount">EXTERNAL</action> </object> @@ -1933,7 +1946,7 @@ <condition var1="tw_has_external" var2="1" /> <condition var1="mounted" op="=" var2="EXTERNAL" /> </conditions> - <text>Unmount SD Card</text> + <text>Unmount SDCard</text> <image resource="checkbox_true" /> <action function="umount">EXTERNAL</action> </object> @@ -2260,7 +2273,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row1_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Zip file signature verification.</text> + <text>Zip file signature verification?</text> <data variable="tw_signed_zip_verify" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -2268,7 +2281,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row2_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Force MD5 check on all zips.</text> + <text>Force MD5 check on all zips?</text> <data variable="tw_force_md5_check" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -2276,7 +2289,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row3_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Use rm -rf instead of formatting.</text> + <text>Use rm -rf instead of formatting?</text> <data variable="tw_rm_rf" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -2284,7 +2297,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row4_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Skip MD5 generation during backup.</text> + <text>Skip MD5 generation on backups</text> <data variable="tw_skip_md5_generate" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -2292,7 +2305,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row5_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Enable MD5 verification of backup files.</text> + <text>Enable MD5 checking of backup files</text> <data variable="tw_skip_md5_check" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -2300,7 +2313,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row6_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Ignore image size errors during backup.</text> + <text>Ignore image size errors during backup</text> <data variable="tw_ignore_image_size" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -2308,7 +2321,7 @@ <object type="checkbox"> <placement x="%col1_x%" y="%row7_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Simulate actions for theme testing.</text> + <text>Simulate most actions for theme testing</text> <data variable="tw_simulate_actions" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -2317,7 +2330,7 @@ <condition var1="tw_simulate_actions" var2="1" /> <placement x="%col1_x%" y="%row8_text_y%" /> <font resource="font" color="%text_color%" /> - <text>Simulate failure for actions.</text> + <text>Simulate failure for actions</text> <data variable="tw_simulate_fail" /> <image checked="checkbox_true" unchecked="checkbox_false" /> </object> @@ -2393,7 +2406,7 @@ </object> <object type="checkbox"> - <placement x="%col1_x%" y="%row10_text_y%" /> + <placement x="%col1_x%" y="%row11_text_y%" /> <font resource="font" color="%text_color%" /> <text>Do you use daylight savings time (DST)?</text> <data variable="tw_time_zone_guidst" /> @@ -2402,7 +2415,7 @@ <object type="text" color="%text_color%"> <font resource="font" /> - <placement x="%center_x%" y="%row11_text_y%" placement="5" /> + <placement x="%center_x%" y="%row12_text_y%" placement="5" /> <text>Offset (usually 0): %tw_time_zone_guioffset%</text> </object> @@ -2534,6 +2547,31 @@ </object> <object type="button"> + <placement x="%col2_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Reload Theme</text> + <image resource="main_button" /> + <action function="reload"></action> + </object> + + <object type="button"> + <placement x="%col1_x%" y="%row4_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>ADB Sideload</text> + <image resource="main_button" /> + <actions> + <action function="set">tw_back=advanced</action> + <action function="set">tw_action=adbsideload</action> + <action function="set">tw_action_text1=ADB Sideload</action> + <action function="set">tw_action_text2=Usage: adb sideload filename.zip</action> + <action function="set">tw_complete_text1=ADB Sideload Complete</action> + <action function="set">tw_has_cancel=1</action> + <action function="set">tw_cancel_action=adbsideloadcancel</action> + <action function="page">action_page</action> + </actions> + </object> + + <object type="button"> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index e5b6d8262..c98c1c4d1 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -46,6 +46,7 @@ <variable name="col1_x" value="10" /> <variable name="col2_x" value="240" /> <variable name="col_center_x" value="128" /> + <variable name="col_center_medium_x" value="183" /> <variable name="center_x" value="240" /> <variable name="row1_y" value="140" /> <variable name="row2_y" value="290" /> @@ -787,6 +788,9 @@ <action function="set">tw_has_action2=0</action> <action function="set">tw_action2=</action> <action function="set">tw_action2_param=</action> + <action function="set">tw_has_cancel=0</action> + <action function="set">tw_cancel_action=</action> + <action function="set">tw_cancel_param=</action> <action function="page">%tw_clear_destination%</action> </object> </page> @@ -869,6 +873,15 @@ <object type="template" name="action_page_console" /> + <object type="button"> + <condition var1="tw_has_cancel" var2="1" /> + <placement x="%col_center_medium_x%" y="%row4_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Cancel</text> + <image resource="medium_button" /> + <action function="%tw_cancel_action%">%tw_cancel_param%</action> + </object> + <object type="template" name="progress_bar" /> <object type="action"> @@ -2533,6 +2546,31 @@ </object> <object type="button"> + <placement x="%col2_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Reload Theme</text> + <image resource="main_button" /> + <action function="reload"></action> + </object> + + <object type="button"> + <placement x="%col1_x%" y="%row4_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>ADB Sideload</text> + <image resource="main_button" /> + <actions> + <action function="set">tw_back=advanced</action> + <action function="set">tw_action=adbsideload</action> + <action function="set">tw_action_text1=ADB Sideload</action> + <action function="set">tw_action_text2=Usage: adb sideload filename.zip</action> + <action function="set">tw_complete_text1=ADB Sideload Complete</action> + <action function="set">tw_has_cancel=1</action> + <action function="set">tw_cancel_action=adbsideloadcancel</action> + <action function="page">action_page</action> + </actions> + </object> + + <object type="button"> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index eb4b5b909..35e7de61d 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -44,6 +44,7 @@ <variable name="col1_x" value="10" /> <variable name="col2_x" value="383" /> <variable name="col_center_x" value="191" /> + <variable name="col_center_medium_x" value="275" /> <variable name="center_x" value="360" /> <variable name="row1_y" value="170" /> <variable name="row2_y" value="410" /> @@ -790,6 +791,9 @@ <action function="set">tw_has_action2=0</action> <action function="set">tw_action2=</action> <action function="set">tw_action2_param=</action> + <action function="set">tw_has_cancel=0</action> + <action function="set">tw_cancel_action=</action> + <action function="set">tw_cancel_param=</action> <action function="page">%tw_clear_destination%</action> </object> </page> @@ -872,6 +876,15 @@ <object type="template" name="action_page_console" /> + <object type="button"> + <condition var1="tw_has_cancel" var2="1" /> + <placement x="%col_center_medium_x%" y="%row4_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Cancel</text> + <image resource="medium_button" /> + <action function="%tw_cancel_action%">%tw_cancel_param%</action> + </object> + <object type="template" name="progress_bar" /> <object type="action"> @@ -2536,6 +2549,31 @@ </object> <object type="button"> + <placement x="%col2_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Reload Theme</text> + <image resource="main_button" /> + <action function="reload"></action> + </object> + + <object type="button"> + <placement x="%col1_x%" y="%row4_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>ADB Sideload</text> + <image resource="main_button" /> + <actions> + <action function="set">tw_back=advanced</action> + <action function="set">tw_action=adbsideload</action> + <action function="set">tw_action_text1=ADB Sideload</action> + <action function="set">tw_action_text2=Usage: adb sideload filename.zip</action> + <action function="set">tw_complete_text1=ADB Sideload Complete</action> + <action function="set">tw_has_cancel=1</action> + <action function="set">tw_cancel_action=adbsideloadcancel</action> + <action function="page">action_page</action> + </actions> + </object> + + <object type="button"> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> |