diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/action.cpp | 58 | ||||
| -rwxr-xr-x | gui/devices/1024x600/res/ui.xml | 156 | ||||
| -rw-r--r-- | gui/devices/1024x768/res/ui.xml | 144 | ||||
| -rw-r--r-- | gui/devices/1280x800/res/ui.xml | 144 | ||||
| -rw-r--r-- | gui/devices/1920x1200/res/ui.xml | 144 | ||||
| -rw-r--r-- | gui/devices/2560x1600/res/ui.xml | 144 | ||||
| -rw-r--r-- | gui/devices/320x480/res/ui.xml | 150 | ||||
| -rw-r--r-- | gui/devices/480x800/res/ui.xml | 150 | ||||
| -rw-r--r-- | gui/devices/480x854/res/ui.xml | 150 | ||||
| -rw-r--r-- | gui/devices/720x1280/res/ui.xml | 150 | ||||
| -rwxr-xr-x | gui/devices/800x1280/res/ui.xml | 150 | ||||
| -rwxr-xr-x | gui/devices/800x480/res/ui.xml | 144 | ||||
| -rw-r--r-- | gui/fileselector.cpp | 8 | ||||
| -rw-r--r-- | gui/gui.cpp | 4 |
14 files changed, 1665 insertions, 31 deletions
diff --git a/gui/action.cpp b/gui/action.cpp index f1dac1c9b..ca968d088 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -341,26 +341,16 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) DataManager::GetValue(TW_SIMULATE_ACTIONS, simulate); - if (function == "reboot") - { - //curtainClose(); this sometimes causes a crash - - sync(); - - if (arg == "recovery") - TWFunc::tw_reboot(rb_recovery); - else if (arg == "poweroff") - TWFunc::tw_reboot(rb_poweroff); - else if (arg == "bootloader") - TWFunc::tw_reboot(rb_bootloader); - else if (arg == "download") - TWFunc::tw_reboot(rb_download); - else - TWFunc::tw_reboot(rb_system); + if (function == "reboot") + { + //curtainClose(); this sometimes causes a crash - // This should never occur - return -1; - } + sync(); + DataManager::SetValue("tw_gui_done", 1); + DataManager::SetValue("tw_reboot_arg", arg); + + return 0; + } if (function == "home") { PageManager::SelectPackage("TWRP"); @@ -1143,6 +1133,36 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) } } } + if (function == "installsu") + { + int op_status = 0; + + operation_start("Install SuperSU"); + if (simulate) { + simulate_progress_bar(); + } else { + if (!TWFunc::Install_SuperSU()) + op_status = 1; + } + + operation_end(op_status, simulate); + return 0; + } + if (function == "fixsu") + { + int op_status = 0; + + operation_start("Fixing Superuser Permissions"); + if (simulate) { + simulate_progress_bar(); + } else { + if (!TWFunc::Fix_su_Perms()) + op_status = 1; + } + + operation_end(op_status, simulate); + return 0; + } } else { diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index fbdf14e93..383774e12 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -649,14 +649,6 @@ <image checked="checkbox_true" unchecked="checkbox_false" /> </object> - <object type="checkbox"> - <placement x="%col2_x%" y="%row8_text_y%" /> - <font resource="font" color="%text_color%" /> - <text>Force MD5 check on all zips?</text> - <data variable="tw_force_md5_check" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row10_text_y%" placement="5" /> @@ -975,6 +967,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -2682,6 +2716,7 @@ <actions> <action function="cmd">echo %tw_brightness_25% > "%tw_brightness_file%"</action> <action function="set">tw_brightness_display=25%</action> + <action function="set">tw_brightness=%tw_brightness_25%</action> </actions> </object> @@ -2694,6 +2729,7 @@ <actions> <action function="cmd">echo %tw_brightness_50% > "%tw_brightness_file%"</action> <action function="set">tw_brightness_display=50%</action> + <action function="set">tw_brightness=%tw_brightness_50%</action> </actions> </object> @@ -2706,6 +2742,7 @@ <actions> <action function="cmd">echo %tw_brightness_75% > "%tw_brightness_file%"</action> <action function="set">tw_brightness_display=75%</action> + <action function="set">tw_brightness=%tw_brightness_75%</action> </actions> </object> @@ -2718,6 +2755,7 @@ <actions> <action function="cmd">echo %tw_brightness_100% > "%tw_brightness_file%"</action> <action function="set">tw_brightness_display=100%</action> + <action function="set">tw_brightness=%tw_brightness_100%</action> </actions> </object> @@ -3891,5 +3929,107 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now? This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index 025362a15..6395c7443 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -967,6 +967,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -3887,5 +3929,107 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now? This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index 9529d1107..c806b8517 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -967,6 +967,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -3887,5 +3929,107 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now? This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index 5fe7fd525..1947ffa69 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -967,6 +967,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -3888,5 +3930,107 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now? This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml index 6d0e40558..e26bdb902 100644 --- a/gui/devices/2560x1600/res/ui.xml +++ b/gui/devices/2560x1600/res/ui.xml @@ -967,6 +967,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -3887,5 +3929,107 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now? This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index 38e7b1d34..58147d2aa 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -938,6 +938,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -3830,5 +3872,113 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_header_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_header_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index 60ad8280c..572d1b92b 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -937,6 +937,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -3829,5 +3871,113 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_header_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_header_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index a570faf72..09df8037c 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -936,6 +936,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -3828,5 +3870,113 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_header_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_header_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index 79de4ca86..6d9f061c4 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -950,6 +950,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -3842,5 +3884,113 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_header_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_header_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index 07ffec4e2..03e4e7001 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -938,6 +938,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -3830,5 +3872,113 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_header_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_header_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row3_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index f12c242e4..9501ad899 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -975,6 +975,48 @@ </object> </page> + <page name="singleaction_page"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>%tw_action_text1%</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5" /> + <text>%tw_action_text2%</text> + </object> + + <object type="template" name="action_page_console" /> + + <object type="template" name="progress_bar" /> + + <object type="action"> + <condition var1="tw_operation_state" var2="1" /> + <actions> + <action function="set">tw_page_done=1</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="0" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + </actions> + </object> + + <object type="action"> + <condition var1="tw_has_action2" var2="1" /> + <actions> + <action function="%tw_action%">%tw_action_param%</action> + <action function="%tw_action2%">%tw_action2_param%</action> + </actions> + </object> + </page> + <page name="action_complete"> <object type="template" name="header" /> @@ -3895,5 +3937,107 @@ <object type="template" name="footer" /> </page> + + <page name="installsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Install SuperSU?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Your device does not appear to be rooted.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Install SuperSU now? This will root your device.</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Install</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=installsu</action> + <action function="set">tw_action_text1=Installing SuperSU</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Install</text> + </object> + </page> + + <page name="fixsu"> + <object type="template" name="header" /> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5"/> + <text>Fix Superuser Permissions?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5"/> + <text>Root permissions appear to be lost.</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5"/> + <text>Fix root permissions now?</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5"/> + <text>(Fixes permissions on su binary & app)</text> + </object> + + <object type="button"> + <highlight color="%highlight_color%" /> + <placement x="%col_center_x%" y="%row2_medium_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Do Not Fix</text> + <image resource="main_button" /> + <action function="set">tw_page_done=1</action> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> + <actions> + <action function="set">tw_action=fixsu</action> + <action function="set">tw_action_text1=Fixing Root Permissions</action> + <action function="set">tw_action_text2=</action> + <action function="page">singleaction_page</action> + </actions> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Fix Root</text> + </object> + </page> </pages> </recovery> diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp index 66bf80f78..bc10f917d 100644 --- a/gui/fileselector.cpp +++ b/gui/fileselector.cpp @@ -790,19 +790,19 @@ bool GUIFileSelector::fileSort(FileData d1, FileData d2) case 3: // by size largest first if (d1.fileSize == d2.fileSize || d1.fileType == DT_DIR) // some directories report a different size than others - but this is not the size of the files inside the directory, so we just sort by name on directories return (strcasecmp(d1.fileName.c_str(), d2.fileName.c_str()) < 0); - return d1.fileSize > d2.fileSize; + return d1.fileSize < d2.fileSize; case -3: // by size smallest first if (d1.fileSize == d2.fileSize || d1.fileType == DT_DIR) // some directories report a different size than others - but this is not the size of the files inside the directory, so we just sort by name on directories return (strcasecmp(d1.fileName.c_str(), d2.fileName.c_str()) > 0); - return d1.fileSize < d2.fileSize; + return d1.fileSize > d2.fileSize; case 2: // by last modified date newest first if (d1.lastModified == d2.lastModified) return (strcasecmp(d1.fileName.c_str(), d2.fileName.c_str()) < 0); - return d1.lastModified > d2.lastModified; + return d1.lastModified < d2.lastModified; case -2: // by date oldest first if (d1.lastModified == d2.lastModified) return (strcasecmp(d1.fileName.c_str(), d2.fileName.c_str()) > 0); - return d1.lastModified < d2.lastModified; + return d1.lastModified > d2.lastModified; case -1: // by name descending return (strcasecmp(d1.fileName.c_str(), d2.fileName.c_str()) > 0); default: // should be a 1 - sort by name ascending diff --git a/gui/gui.cpp b/gui/gui.cpp index 7fd474a35..4788fe0df 100644 --- a/gui/gui.cpp +++ b/gui/gui.cpp @@ -423,6 +423,10 @@ runPages (void) PageManager::Render (); flip (); } + if (DataManager::GetIntValue("tw_gui_done") != 0) + { + break; + } } gGuiRunning = 0; |