summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xgui/devices/1024x600/res/ui.xml66
-rw-r--r--gui/devices/1024x768/res/ui.xml66
-rw-r--r--gui/devices/1280x800/res/ui.xml66
-rw-r--r--gui/devices/1920x1200/res/ui.xml66
-rw-r--r--gui/devices/320x480/res/ui.xml66
-rw-r--r--gui/devices/480x800/res/ui.xml66
-rw-r--r--gui/devices/480x854/res/ui.xml66
-rw-r--r--gui/devices/540x960/res/ui.xml66
-rw-r--r--gui/devices/720x1280/res/ui.xml66
-rwxr-xr-xgui/devices/800x1280/res/ui.xml66
-rwxr-xr-xgui/devices/800x480/res/ui.xml66
11 files changed, 385 insertions, 341 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>
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index 596c320e1..047213c48 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/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>
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index 4b06c0433..cbbfb86a6 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/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>
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 6ff72d643..8851dd1a5 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/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>
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index a98165b4a..27b039880 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -726,13 +726,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>
@@ -798,6 +801,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>
@@ -900,20 +904,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>
@@ -961,6 +952,7 @@
<object type="template" name="action_page_console" />
<object type="button">
+ <condition var1="tw_show_reboot" var2="0" />
<placement x="%col_center_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Back</text>
@@ -971,6 +963,29 @@
</actions>
</object>
+ <object type="button">
+ <condition var1="tw_show_reboot" var2="1" />
+ <placement x="%col_center_x%" y="%row4_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>
@@ -1540,6 +1555,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>
@@ -1870,25 +1886,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>
@@ -2551,6 +2553,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>
@@ -2600,6 +2603,7 @@
<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_show_reboot=1</action>
<action function="set">tw_cancel_action=adbsideloadcancel</action>
<action function="page">action_page</action>
</actions>
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index d348f3875..9548a1ef9 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -725,13 +725,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>
@@ -797,6 +800,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>
@@ -899,20 +903,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>
@@ -960,6 +951,7 @@
<object type="template" name="action_page_console" />
<object type="button">
+ <condition var1="tw_show_reboot" var2="0" />
<placement x="%col_center_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Back</text>
@@ -970,6 +962,29 @@
</actions>
</object>
+ <object type="button">
+ <condition var1="tw_show_reboot" var2="1" />
+ <placement x="%col_center_x%" y="%row4_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>
@@ -1539,6 +1554,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>
@@ -1869,25 +1885,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>
@@ -2550,6 +2552,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>
@@ -2599,6 +2602,7 @@
<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_show_reboot=1</action>
<action function="set">tw_cancel_action=adbsideloadcancel</action>
<action function="page">action_page</action>
</actions>
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index 7badfd3e7..101a27584 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -724,13 +724,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>
@@ -796,6 +799,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>
@@ -898,20 +902,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>
@@ -959,6 +950,7 @@
<object type="template" name="action_page_console" />
<object type="button">
+ <condition var1="tw_show_reboot" var2="0" />
<placement x="%col_center_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Back</text>
@@ -969,6 +961,29 @@
</actions>
</object>
+ <object type="button">
+ <condition var1="tw_show_reboot" var2="1" />
+ <placement x="%col_center_x%" y="%row4_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>
@@ -1538,6 +1553,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>
@@ -1868,25 +1884,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>
@@ -2549,6 +2551,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>
@@ -2598,6 +2601,7 @@
<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_show_reboot=1</action>
<action function="set">tw_cancel_action=adbsideloadcancel</action>
<action function="page">action_page</action>
</actions>
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index af8ea0d4d..195d52671 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -725,13 +725,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>
@@ -797,6 +800,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>
@@ -899,20 +903,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>
@@ -960,6 +951,7 @@
<object type="template" name="action_page_console" />
<object type="button">
+ <condition var1="tw_show_reboot" var2="0" />
<placement x="%col_center_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Back</text>
@@ -970,6 +962,29 @@
</actions>
</object>
+ <object type="button">
+ <condition var1="tw_show_reboot" var2="1" />
+ <placement x="%col_center_x%" y="%row4_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>
@@ -1539,6 +1554,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>
@@ -1869,25 +1885,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>
@@ -2550,6 +2552,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>
@@ -2599,6 +2602,7 @@
<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_show_reboot=1</action>
<action function="set">tw_cancel_action=adbsideloadcancel</action>
<action function="page">action_page</action>
</actions>
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index cf978cc04..73dba28a9 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -730,13 +730,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>
@@ -802,6 +805,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>
@@ -904,20 +908,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>
@@ -965,6 +956,7 @@
<object type="template" name="action_page_console" />
<object type="button">
+ <condition var1="tw_show_reboot" var2="0" />
<placement x="%col_center_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Back</text>
@@ -975,6 +967,29 @@
</actions>
</object>
+ <object type="button">
+ <condition var1="tw_show_reboot" var2="1" />
+ <placement x="%col_center_x%" y="%row4_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>
@@ -1544,6 +1559,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>
@@ -1874,25 +1890,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>
@@ -2555,6 +2557,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>
@@ -2604,6 +2607,7 @@
<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_show_reboot=1</action>
<action function="set">tw_cancel_action=adbsideloadcancel</action>
<action function="page">action_page</action>
</actions>
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index 54bc5dbed..fa5d47ce1 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -726,13 +726,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>
@@ -798,6 +801,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>
@@ -900,20 +904,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>
@@ -961,6 +952,7 @@
<object type="template" name="action_page_console" />
<object type="button">
+ <condition var1="tw_show_reboot" var2="0" />
<placement x="%col_center_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Back</text>
@@ -971,6 +963,29 @@
</actions>
</object>
+ <object type="button">
+ <condition var1="tw_show_reboot" var2="1" />
+ <placement x="%col_center_x%" y="%row4_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>
@@ -1540,6 +1555,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>
@@ -1870,25 +1886,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>
@@ -2551,6 +2553,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>
@@ -2600,6 +2603,7 @@
<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_show_reboot=1</action>
<action function="set">tw_cancel_action=adbsideloadcancel</action>
<action function="page">action_page</action>
</actions>
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 7832ebbc8..853f97a90 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 20:05:54 +0100