diff options
Diffstat (limited to 'gui/devices')
| -rw-r--r-- | gui/devices/480x854/res/ui.xml | 1 | ||||
| -rw-r--r-- | gui/devices/landscape/res/landscape.xml | 25 | ||||
| -rw-r--r-- | gui/devices/portrait/res/portrait.xml | 23 | ||||
| -rw-r--r-- | gui/devices/watch/res/watch.xml | 27 |
4 files changed, 75 insertions, 1 deletions
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index dd7efd720..c4ce65f35 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -50,6 +50,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" /> diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml index f66eb8bb6..eb6d9ddd6 100644 --- a/gui/devices/landscape/res/landscape.xml +++ b/gui/devices/landscape/res/landscape.xml @@ -670,7 +670,7 @@ <object type="button"> <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> - <placement x="%col4_x%" y="%slider_y%" /> + <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> <image resource="main_button" /> @@ -2157,6 +2157,17 @@ <object type="template" name="action_page_console" /> + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_medium_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Cancel</text> + <image resource="medium_button" /> + <actions> + <action function="cancelbackup"></action> + </actions> + </object> + <object type="template" name="progress_bar" /> <object type="action"> @@ -2165,6 +2176,7 @@ <object type="action"> <condition var1="tw_operation_state" var2="1" /> + <condition var1="tw_cancel_backup" var2="0" /> <actions> <action function="set">tw_back=backup</action> <action function="set">tw_complete_text1=Backup Complete</action> @@ -2173,6 +2185,17 @@ </actions> </object> + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <condition var1="tw_cancel_backup" var2="1" /> + <actions> + <action function="set">tw_back=backup</action> + <action function="set">tw_complete_text1=Backup Cancelled</action> + <action function="set">tw_show_reboot=1</action> + <action function="page">action_complete</action> + </actions> + </object> + <object type="template" name="footer" /> </page> diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml index bb8e37217..fe6167155 100644 --- a/gui/devices/portrait/res/portrait.xml +++ b/gui/devices/portrait/res/portrait.xml @@ -1867,6 +1867,17 @@ <object type="template" name="action_page_console" /> + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_medium_x%" y="%row4_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Cancel</text> + <image resource="medium_button" /> + <actions> + <action function="cancelbackup"></action> + </actions> + </object> + <object type="template" name="progress_bar" /> <object type="action"> @@ -1875,6 +1886,7 @@ <object type="action"> <condition var1="tw_operation_state" var2="1" /> + <condition var1="tw_cancel_backup" var2="0" /> <actions> <action function="set">tw_back=backup</action> <action function="set">tw_complete_text1=Backup Complete</action> @@ -1882,6 +1894,17 @@ <action function="page">action_complete</action> </actions> </object> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <condition var1="tw_cancel_backup" var2="1" /> + <actions> + <action function="set">tw_back=backup</action> + <action function="set">tw_complete_text1=Backup Cancelled</action> + <action function="set">tw_show_reboot=1</action> + <action function="page">action_complete</action> + </actions> + </object> </page> <page name="restore"> diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml index dc787b37c..49e172e3a 100644 --- a/gui/devices/watch/res/watch.xml +++ b/gui/devices/watch/res/watch.xml @@ -1859,6 +1859,21 @@ <object type="template" name="action_page_console" /> + + + <object type="template" name="progress_bar" /> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_medium_x%" y="%row4_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Cancel</text> + <image resource="medium_button" /> + <actions> + <action function="cancelbackup"></action> + </actions> + </object> + <object type="template" name="progress_bar" /> <object type="action"> @@ -1867,6 +1882,7 @@ <object type="action"> <condition var1="tw_operation_state" var2="1" /> + <condition var1="tw_cancel_backup" var2="0" /> <actions> <action function="set">tw_back=backup</action> <action function="set">tw_complete_text1=Backup Complete</action> @@ -1874,6 +1890,17 @@ <action function="page">action_complete</action> </actions> </object> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <condition var1="tw_cancel_backup" var2="1" /> + <actions> + <action function="set">tw_back=backup</action> + <action function="set">tw_complete_text1=Backup Cancelled</action> + <action function="set">tw_show_reboot=1</action> + <action function="page">action_complete</action> + </actions> + </object> </page> <page name="restore"> |