diff options
Diffstat (limited to 'gui/devices/1024x600/res')
| -rwxr-xr-x | gui/devices/1024x600/res/ui.xml | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index 7fcb75aa8..a210860fc 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -768,13 +768,16 @@ <text>Reboot System</text> <image resource="main_button" /> <actions> - <action function="set">tw_back=flash_done</action> + <action function="set">tw_back=main2</action> <action function="set">tw_action=reboot</action> <action function="set">tw_action_param=system</action> <action function="set">tw_has_action2=0</action> <action function="set">tw_text1=No OS Installed! Are you</action> <action function="set">tw_text2=sure you wish to reboot?</action> + <action function="set">tw_text3=</action> + <action function="set">tw_text4=</action> <action function="set">tw_action_text1=Rebooting...</action> + <action function="set">tw_action_text2=</action> <action function="set">tw_complete_text1=Rebooting...</action> <action function="set">tw_slider_text=Swipe to Reboot</action> <action function="page">rebootcheck</action> @@ -826,6 +829,7 @@ <action function="set">tw_cancel_action=</action> <action function="set">tw_cancel_param=</action> <action function="set">tw_show_exclamation=0</action> + <action function="set">tw_show_reboot=0</action> <action function="page">%tw_clear_destination%</action> </object> </page> @@ -928,20 +932,7 @@ <object type="template" name="progress_bar" /> <object type="action"> - <conditions> - <condition var1="tw_operation_state" var2="1" /> - <condition var1="tw_operation_status" var2="0" /> - </conditions> - <actions> - <action function="page">action_complete</action> - </actions> - </object> - - <object type="action"> - <conditions> - <condition var1="tw_operation_state" var2="1" /> - <condition var1="tw_operation_status" op="!=" var2="0" /> - </conditions> + <condition var1="tw_operation_state" var2="1" /> <actions> <action function="page">action_complete</action> </actions> @@ -989,6 +980,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Back</text> @@ -999,6 +991,29 @@ </actions> </object> + <object type="button"> + <condition var1="tw_show_reboot" var2="1" /> + <placement x="%col_center_x%" y="%slider_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Reboot System</text> + <image resource="main_button" /> + <actions> + <action function="set">tw_back=main2</action> + <action function="set">tw_action=reboot</action> + <action function="set">tw_action_param=system</action> + <action function="set">tw_has_action2=0</action> + <action function="set">tw_text1=No OS Installed! Are you</action> + <action function="set">tw_text2=sure you wish to reboot?</action> + <action function="set">tw_text3=</action> + <action function="set">tw_text4=</action> + <action function="set">tw_action_text1=Rebooting...</action> + <action function="set">tw_action_text2=</action> + <action function="set">tw_complete_text1=Rebooting...</action> + <action function="set">tw_slider_text=Swipe to Reboot</action> + <action function="page">rebootcheck</action> + </actions> + </object> + <object type="action"> <touch key="home" /> <actions> @@ -1961,6 +1976,7 @@ <actions> <action function="set">tw_back=backup</action> <action function="set">tw_complete_text1=Backup Complete</action> + <action function="set">tw_show_reboot=1</action> <action function="page">action_complete</action> </actions> </object> @@ -2293,25 +2309,11 @@ <object type="template" name="progress_bar" /> <object type="action"> - <conditions> - <condition var1="tw_operation_state" var2="1" /> - <condition var1="tw_operation_status" var2="0" /> - </conditions> - <actions> - <action function="set">tw_back=restore_select</action> - <action function="set">tw_complete_text1=Restore Complete</action> - <action function="page">action_complete</action> - </actions> - </object> - - <object type="action"> - <conditions> - <condition var1="tw_operation_state" var2="1" /> - <condition var1="tw_operation_status" var2="1" /> - </conditions> + <condition var1="tw_operation_state" var2="1" /> <actions> <action function="set">tw_back=restore_select</action> <action function="set">tw_complete_text1=Restore Complete</action> + <action function="set">tw_show_reboot=1</action> <action function="page">action_complete</action> </actions> </object> @@ -2577,6 +2579,7 @@ <action function="set">tw_action_text2=This will take a few minutes.</action> <action function="set">tw_complete_text1=Fix Permissions Complete</action> <action function="set">tw_slider_text=Swipe to Confirm</action> + <action function="set">tw_show_reboot=1</action> <action function="page">confirm_action</action> </actions> </object> @@ -2602,6 +2605,7 @@ <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="set">tw_show_reboot=1</action> <action function="page">action_page</action> </actions> </object> |