diff options
| -rw-r--r-- | gui/theme/common/landscape.xml | 54 | ||||
| -rw-r--r-- | gui/theme/common/portrait.xml | 57 | ||||
| -rw-r--r-- | gui/theme/common/watch.xml | 58 |
3 files changed, 65 insertions, 104 deletions
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml index df68a3a63..5c92fccd3 100644 --- a/gui/theme/common/landscape.xml +++ b/gui/theme/common/landscape.xml @@ -548,18 +548,7 @@ <text>{@reboot_system_btn=Reboot System}</text> <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_os1=No OS Installed! Are you}</action> - <action function="set">tw_text2={@no_osrb=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=Rebooting...}</action> - <action function="set">tw_action_text2=</action> - <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action> - <action function="page">rebootcheck</action> + <action function="page">reboot_system_routine</action> </actions> </button> @@ -734,6 +723,23 @@ </action> </page> + <page name="reboot_system_routine"> + <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_os1=No OS Installed! Are you}</action> + <action function="set">tw_text2={@no_osrb=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=Rebooting...}</action> + <action function="set">tw_action_text2=</action> + <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> + <action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action> + <action function="page">rebootcheck</action> + </action> + </page> + <page name="confirm_action"> <template name="page"/> @@ -914,18 +920,7 @@ <text>{@reboot_system_btn=Reboot System}</text> <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_os1=No OS Installed! Are you}</action> - <action function="set">tw_text2={@no_osrb=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=Rebooting...}</action> - <action function="set">tw_action_text2=</action> - <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action> - <action function="page">rebootcheck</action> + <action function="page">reboot_system_routine</action> </actions> </button> @@ -2589,16 +2584,7 @@ <text>{@rb_system_btn=System}</text> <actions> <action function="set">tw_back=reboot</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_os1=No OS Installed! Are you}</action> - <action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action> - <action function="set">tw_action_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_action_text2=</action> - <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action> - <action function="page">rebootcheck</action> + <action function="page">reboot_system_routine</action> </actions> </button> diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml index dbd43054b..e9be654a6 100644 --- a/gui/theme/common/portrait.xml +++ b/gui/theme/common/portrait.xml @@ -386,9 +386,9 @@ </checkbox> <checkbox> - <placement x="%indent%" y="%row13a_y%"/> + <placement x="%indent%" y="%row13a_y%" /> <text>{@install_reboot_chk=Reboot after installation is complete}</text> - <data variable="tw_install_reboot"/> + <data variable="tw_install_reboot" /> </checkbox> <checkbox> @@ -500,18 +500,7 @@ <text>{@reboot_system_btn=Reboot System}</text> <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_os1=No OS Installed! Are you}</action> - <action function="set">tw_text2={@no_osrb=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=Rebooting...}</action> - <action function="set">tw_action_text2=</action> - <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action> - <action function="page">rebootcheck</action> + <action function="page">reboot_system_routine</action> </actions> </button> @@ -686,6 +675,23 @@ </action> </page> + <page name="reboot_system_routine"> + <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_os1=No OS Installed! Are you}</action> + <action function="set">tw_text2={@no_osrb=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=Rebooting...}</action> + <action function="set">tw_action_text2=</action> + <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> + <action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action> + <action function="page">rebootcheck</action> + </action> + </page> + <page name="confirm_action"> <template name="page"/> @@ -866,18 +872,7 @@ <text>{@reboot_system_btn=Reboot System}</text> <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_os1=No OS Installed! Are you}</action> - <action function="set">tw_text2={@no_osrb=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=Rebooting...}</action> - <action function="set">tw_action_text2=</action> - <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action> - <action function="page">rebootcheck</action> + <action function="page">reboot_system_routine</action> </actions> </button> @@ -2708,15 +2703,7 @@ <text>{@rb_system_btn=System}</text> <actions> <action function="set">tw_back=reboot</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_os1=No OS Installed! Are you}</action> - <action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action> - <action function="set">tw_action_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action> - <action function="page">rebootcheck</action> + <action function="page">reboot_system_routine</action> </actions> </button> diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml index b61d3eff6..f1984091f 100644 --- a/gui/theme/common/watch.xml +++ b/gui/theme/common/watch.xml @@ -526,9 +526,9 @@ </checkbox> <checkbox> - <placement x="%indent%" y="%row4_y%"/> + <placement x="%indent%" y="%row4_y%" /> <text>{@install_reboot_chk=Reboot after installation is complete}</text> - <data variable="tw_install_reboot"/> + <data variable="tw_install_reboot" /> </checkbox> <button> @@ -704,18 +704,7 @@ <text>{@reboot_system_btn=Reboot System}</text> <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_os1=No OS Installed! Are you}</action> - <action function="set">tw_text2={@no_osrb=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=Rebooting...}</action> - <action function="set">tw_action_text2=</action> - <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_slider_text={@swipe_reboot_s= Reboot}</action> - <action function="page">rebootcheck</action> + <action function="page">reboot_system_routine</action> </actions> </button> @@ -928,6 +917,24 @@ </action> </page> + <page name="reboot_system_routine"> + <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_os1=No OS Installed! Are you}</action> + <action function="set">tw_text2={@no_osrb=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=Rebooting...}</action> + <action function="set">tw_action_text2=</action> + <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> + <action function="set">tw_slider_text={@swipe_reboot_s= Reboot}</action> + <action function="page">rebootcheck</action> + </action> + </page> + <page name="confirm_action"> <template name="page"/> @@ -1110,18 +1117,7 @@ <text>{@reboot_system_btn=Reboot System}</text> <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_os1=No OS Installed! Are you}</action> - <action function="set">tw_text2={@no_osrb=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=Rebooting...}</action> - <action function="set">tw_action_text2=</action> - <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_slider_text={@swipe_reboot_s= Reboot}</action> - <action function="page">rebootcheck</action> + <action function="page">reboot_system_routine</action> </actions> </button> @@ -3220,15 +3216,7 @@ <text>{@rb_system_btn=System}</text> <actions> <action function="set">tw_back=reboot</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_os1=No OS Installed! Are you}</action> - <action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action> - <action function="set">tw_action_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action> - <action function="set">tw_slider_text={@swipe_reboot_s= Reboot}</action> - <action function="page">rebootcheck</action> + <action function="page">reboot_system_routine</action> </actions> </button> |