diff options
| author | Matt Mower <mowerm@gmail.com> | 2014-04-16 20:43:36 +0200 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2014-06-04 16:13:37 +0200 |
| commit | fb1c4ffaafae4843c7edb302351b7df48e02a990 (patch) | |
| tree | 284a58b5a5b9d827e409bd169a06c2a146a662be | |
| parent | Add options to repair or change file system (diff) | |
| download | android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar.gz android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar.bz2 android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar.lz android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar.xz android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar.zst android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.zip | |
Diffstat (limited to '')
66 files changed, 205 insertions, 2157 deletions
@@ -999,7 +999,7 @@ int DataManager::GetMagicValue(const string varName, string& value) int tw_military_time; now = time(0); current = localtime(&now); - GetValue(TW_MILITARY_TIME, tw_military_time); + GetValue(TW_MILITARY_TIME, tw_military_time); if (current->tm_hour >= 12) { if (tw_military_time == 1) @@ -1009,7 +1009,7 @@ int DataManager::GetMagicValue(const string varName, string& value) } else { - if (tw_military_time == 1) + if (tw_military_time == 1) sprintf(tmp, "%d:%02d", current->tm_hour, current->tm_min); else sprintf(tmp, "%d:%02d AM", current->tm_hour == 0 ? 12 : current->tm_hour, current->tm_min); diff --git a/fixPermissions.cpp b/fixPermissions.cpp index 3fed06c5e..121fe32fe 100644 --- a/fixPermissions.cpp +++ b/fixPermissions.cpp @@ -319,7 +319,7 @@ int fixPermissions::pchmod(string fn, string mode) { if (mode[n] == '1') mask |= S_IXOTH; } - } + } if (chmod(fn.c_str(), mask) != 0) { LOGERR("Unable to chmod '%s' %l\n", fn.c_str(), mask); @@ -615,7 +615,7 @@ int fixPermissions::getPackages() { name.clear(); next = next->next_sibling("package"); } - //Get updated packages + //Get updated packages next = pkgNode->first_node("updated-package"); if (next != NULL) { while (next->first_attribute("name") != NULL) { diff --git a/gui/action.cpp b/gui/action.cpp index 63a8085b1..d4d944dfb 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -88,7 +88,7 @@ GUIAction::GUIAction(xml_node<>* node) attr = child->first_attribute("function"); if (!attr) return; - + action.mFunction = attr->value(); action.mArg = child->value(); mActions.push_back(action); @@ -502,7 +502,7 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) gui_print("Simulating actions...\n"); return 0; } - + if (function == "restoredefaultsettings") { operation_start("Restore Defaults"); @@ -516,7 +516,7 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) operation_end(0, simulate); return 0; } - + if (function == "copylog") { operation_start("Copy Log"); @@ -533,7 +533,7 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) operation_end(0, simulate); return 0; } - + if (function == "compute" || function == "addsubtract") { if (arg.find("+") != string::npos) @@ -589,27 +589,27 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) LOGERR("Unable to perform compute '%s'\n", arg.c_str()); return -1; } - + if (function == "setguitimezone") { string SelectedZone; DataManager::GetValue(TW_TIME_ZONE_GUISEL, SelectedZone); // read the selected time zone into SelectedZone string Zone = SelectedZone.substr(0, SelectedZone.find(';')); // parse to get time zone string DSTZone = SelectedZone.substr(SelectedZone.find(';') + 1, string::npos); // parse to get DST component - + int dst; DataManager::GetValue(TW_TIME_ZONE_GUIDST, dst); // check wether user chose to use DST - + string offset; DataManager::GetValue(TW_TIME_ZONE_GUIOFFSET, offset); // pull in offset - + string NewTimeZone = Zone; if (offset != "0") NewTimeZone += ":" + offset; - + if (dst != 0) NewTimeZone += DSTZone; - + DataManager::SetValue(TW_TIME_ZONE_VAR, NewTimeZone); DataManager::update_tz_environment_variables(); return 0; @@ -619,7 +619,7 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) LOGERR("togglestorage action was deprecated from TWRP\n"); return 0; } - + if (function == "overlay") return gui_changeOverlay(arg); diff --git a/gui/basicTheme/mkTheme.sh b/gui/basicTheme/mkTheme.sh deleted file mode 100755 index 3b8d21be6..000000000 --- a/gui/basicTheme/mkTheme.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -cd res -zip -r ../ui.zip * -cd .. - diff --git a/gui/basicTheme/res/fonts/bluehighway-25.dat b/gui/basicTheme/res/fonts/bluehighway-25.dat Binary files differdeleted file mode 100755 index a0944c9aa..000000000 --- a/gui/basicTheme/res/fonts/bluehighway-25.dat +++ /dev/null diff --git a/gui/basicTheme/res/fonts/bluehighway-40.dat b/gui/basicTheme/res/fonts/bluehighway-40.dat Binary files differdeleted file mode 100755 index ce6d35c52..000000000 --- a/gui/basicTheme/res/fonts/bluehighway-40.dat +++ /dev/null diff --git a/gui/basicTheme/res/images/android.png b/gui/basicTheme/res/images/android.png Binary files differdeleted file mode 100644 index 73e94d8f0..000000000 --- a/gui/basicTheme/res/images/android.png +++ /dev/null diff --git a/gui/basicTheme/res/images/checkbox_checked.png b/gui/basicTheme/res/images/checkbox_checked.png Binary files differdeleted file mode 100644 index 2dd029dd7..000000000 --- a/gui/basicTheme/res/images/checkbox_checked.png +++ /dev/null diff --git a/gui/basicTheme/res/images/checkbox_empty.png b/gui/basicTheme/res/images/checkbox_empty.png Binary files differdeleted file mode 100644 index 1db36ffd1..000000000 --- a/gui/basicTheme/res/images/checkbox_empty.png +++ /dev/null diff --git a/gui/basicTheme/res/images/file.png b/gui/basicTheme/res/images/file.png Binary files differdeleted file mode 100644 index 133a681c6..000000000 --- a/gui/basicTheme/res/images/file.png +++ /dev/null diff --git a/gui/basicTheme/res/images/folder.png b/gui/basicTheme/res/images/folder.png Binary files differdeleted file mode 100644 index e4bc250cd..000000000 --- a/gui/basicTheme/res/images/folder.png +++ /dev/null diff --git a/gui/basicTheme/res/images/indeterminate001.png b/gui/basicTheme/res/images/indeterminate001.png Binary files differdeleted file mode 100644 index e6fa1c574..000000000 --- a/gui/basicTheme/res/images/indeterminate001.png +++ /dev/null diff --git a/gui/basicTheme/res/images/indeterminate002.png b/gui/basicTheme/res/images/indeterminate002.png Binary files differdeleted file mode 100644 index e1fceaba1..000000000 --- a/gui/basicTheme/res/images/indeterminate002.png +++ /dev/null diff --git a/gui/basicTheme/res/images/indeterminate003.png b/gui/basicTheme/res/images/indeterminate003.png Binary files differdeleted file mode 100644 index 670286743..000000000 --- a/gui/basicTheme/res/images/indeterminate003.png +++ /dev/null diff --git a/gui/basicTheme/res/images/indeterminate004.png b/gui/basicTheme/res/images/indeterminate004.png Binary files differdeleted file mode 100644 index ff65e0930..000000000 --- a/gui/basicTheme/res/images/indeterminate004.png +++ /dev/null diff --git a/gui/basicTheme/res/images/indeterminate005.png b/gui/basicTheme/res/images/indeterminate005.png Binary files differdeleted file mode 100644 index e61e2cc15..000000000 --- a/gui/basicTheme/res/images/indeterminate005.png +++ /dev/null diff --git a/gui/basicTheme/res/images/indeterminate006.png b/gui/basicTheme/res/images/indeterminate006.png Binary files differdeleted file mode 100644 index c9c21ba9c..000000000 --- a/gui/basicTheme/res/images/indeterminate006.png +++ /dev/null diff --git a/gui/basicTheme/res/images/qhd-medium-button.png b/gui/basicTheme/res/images/qhd-medium-button.png Binary files differdeleted file mode 100644 index c26298f8d..000000000 --- a/gui/basicTheme/res/images/qhd-medium-button.png +++ /dev/null diff --git a/gui/basicTheme/res/images/qhd-menu-button.png b/gui/basicTheme/res/images/qhd-menu-button.png Binary files differdeleted file mode 100644 index b14bed9c3..000000000 --- a/gui/basicTheme/res/images/qhd-menu-button.png +++ /dev/null diff --git a/gui/basicTheme/res/images/qhd-minus-button.png b/gui/basicTheme/res/images/qhd-minus-button.png Binary files differdeleted file mode 100644 index 5e265fa32..000000000 --- a/gui/basicTheme/res/images/qhd-minus-button.png +++ /dev/null diff --git a/gui/basicTheme/res/images/qhd-plus-button.png b/gui/basicTheme/res/images/qhd-plus-button.png Binary files differdeleted file mode 100644 index 9f073825c..000000000 --- a/gui/basicTheme/res/images/qhd-plus-button.png +++ /dev/null diff --git a/gui/basicTheme/res/images/qhd-small-button.png b/gui/basicTheme/res/images/qhd-small-button.png Binary files differdeleted file mode 100644 index 0d01b35a4..000000000 --- a/gui/basicTheme/res/images/qhd-small-button.png +++ /dev/null diff --git a/gui/basicTheme/res/images/qhd-sort-button.png b/gui/basicTheme/res/images/qhd-sort-button.png Binary files differdeleted file mode 100644 index bb4100b01..000000000 --- a/gui/basicTheme/res/images/qhd-sort-button.png +++ /dev/null diff --git a/gui/basicTheme/res/images/slideout.png b/gui/basicTheme/res/images/slideout.png Binary files differdeleted file mode 100644 index ff05d6251..000000000 --- a/gui/basicTheme/res/images/slideout.png +++ /dev/null diff --git a/gui/basicTheme/res/ui.xml b/gui/basicTheme/res/ui.xml deleted file mode 100644 index 3b3110135..000000000 --- a/gui/basicTheme/res/ui.xml +++ /dev/null @@ -1,1952 +0,0 @@ -<?xml version="1.0"?> - -<recovery> - <details> - <resolution width="540" height="960" /> - <author>TeamWin</author> - <title>Backup Naowz</title> - <description>Default basic theme</description> - <preview>preview.jpg</preview> - </details> - - <resources> - <resource name="font" type="font" filename="bluehighway-25" /> - <resource name="filelist" type="font" filename="bluehighway-40" /> - <resource name="android" type="image" filename="android" /> - <resource name="main_button" type="image" filename="qhd-menu-button" /> - <resource name="file_icon" type="image" filename="file" /> - <resource name="folder_icon" type="image" filename="folder" /> - <resource name="slideout" type="image" filename="slideout" /> - <resource name="progress" type="animation" filename="indeterminate" /> - <resource name="progress_empty" type="image" filename="progress_empty" /> - <resource name="progress_full" type="image" filename="progress_fill" /> - <resource name="checkbox_false" type="image" filename="checkbox_empty" /> - <resource name="checkbox_true" type="image" filename="checkbox_checked" /> - <resource name="small_button" type="image" filename="qhd-small-button" /> - <resource name="medium_button" type="image" filename="qhd-medium-button" /> - <resource name="sort_button" type="image" filename="qhd-sort-button" /> - <resource name="minus_button" type="image" filename="qhd-minus-button" /> - <resource name="plus_button" type="image" filename="qhd-plus-button" /> - </resources> - - <variables> - <variable name="col1_x" value="10" /> - <variable name="col2_x" value="277" /> - <variable name="col_center_x" value="143" /> - <variable name="row1_y" value="120" /> - <variable name="row2_y" value="312" /> - <variable name="row3_y" value="504" /> - <variable name="row4_y" value="696" /> - <variable name="col_progressbar_x" value="144" /> - <variable name="row_progressbar_y" value="920" /> - <variable name="col1_medium_x" value="10" /> - <variable name="col2_medium_x" value="150" /> - <variable name="col3_medium_x" value="290" /> - <variable name="col4_medium_x" value="430" /> - <variable name="row1_medium_y" value="130" /> - <variable name="row2_medium_y" value="230" /> - <variable name="row3_medium_y" value="330" /> - <variable name="row4_medium_y" value="430" /> - <variable name="row5_medium_y" value="530" /> - <variable name="row6_medium_y" value="630" /> - <variable name="row7_medium_y" value="730" /> - </variables> - - <templates> - <template name="header"> - <background color="black" /> - - <object type="button"> - <placement x="%col1_x%" y="10" /> - <font resource="font" color="black" /> - <text></text> - <image resource="android" /> - <condition var1="tw_busy" var2="0" /> - <action function="page">main</action> - </object> - - <object type="image"> - <image resource="android" /> - <placement x="%col1_x%" y="10" /> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="100" y="10" /> - <text>Team Win Recovery Project v%tw_version%</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="100" y="75" /> - <text>%tw_time%</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="250" y="75" /> - <condition var1="tw_battery" op=">" var2="0" /> - <text>Battery: %tw_battery%</text> - </object> - </template> - - <template name="footer"> - <object type="console"> - <slideout resource="slideout" x="240" y="920" /> - <placement x="0" y="0" w="540" h="960" /> - <color foreground="#B0B0B0" background="black" scroll="#303030" /> - <font resource="fixed" /> - </object> - </template> - </templates> - - <pages> - <page name="main"> - <object type="template" name="header" /> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Install</text> - <image resource="main_button" /> - <action function="page">install</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Wipe</text> - <image resource="main_button" /> - <action function="page">wipe</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row2_y%" /> - <font resource="font" color="black" /> - <text>Backup</text> - <image resource="main_button" /> - <action function="page">backup</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row2_y%" /> - <font resource="font" color="black" /> - <text>Restore</text> - <image resource="main_button" /> - <action function="page">restore</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row3_y%" /> - <font resource="font" color="black" /> - <text>Mount</text> - <image resource="main_button" /> - <action function="page">mount</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row3_y%" /> - <font resource="font" color="black" /> - <text>Settings</text> - <image resource="main_button" /> - <action function="page">settings</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row4_y%" /> - <font resource="font" color="black" /> - <text>Advanced</text> - <image resource="main_button" /> - <action function="page">advanced</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row4_y%" /> - <font resource="font" color="black" /> - <text>Reboot</text> - <image resource="main_button" /> - <action function="page">reboot</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="install"> - <object type="template" name="header" /> - - <object type="fileselector"> - <placement x="5" y="%row1_y%" w="530" h="660" /> - <icon folder="folder_icon" file="file_icon" /> - <background color="#454545" /> - <font resource="filelist" spacing="18" color="white" /> - <filter extn=".zip" folders="1" files="1" /> - <path name="tw_zip_location" default="/sdcard" /> - <data name="tw_filename" /> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="810" /> - <text>Sort Ascending:</text> - </object> - - <object type="button"> - <placement x="200" y="800" /> - <font resource="UItext" color="white" /> - <text>Name</text> - <image resource="sort_button" /> - <action function="set">tw_gui_sort_order=1</action> - </object> - - <object type="button"> - <placement x="280" y="800" /> - <font resource="UItext" color="white" /> - <text>Date</text> - <image resource="sort_button" /> - <action function="set">tw_gui_sort_order=2</action> - </object> - - <object type="button"> - <placement x="360" y="800" /> - <font resource="UItext" color="white" /> - <text>Size</text> - <image resource="sort_button" /> - <action function="set">tw_gui_sort_order=3</action> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="860" /> - <text>Sort Descending:</text> - </object> - - <object type="button"> - <placement x="200" y="850" /> - <font resource="UItext" color="white" /> - <text>Name</text> - <image resource="sort_button" /> - <action function="set">tw_gui_sort_order=-1</action> - </object> - - <object type="button"> - <placement x="280" y="850" /> - <font resource="UItext" color="white" /> - <text>Date</text> - <image resource="sort_button" /> - <action function="set">tw_gui_sort_order=-2</action> - </object> - - <object type="button"> - <placement x="360" y="850" /> - <font resource="UItext" color="white" /> - <text>Size</text> - <image resource="sort_button" /> - <action function="set">tw_gui_sort_order=-3</action> - </object> - - <object type="action"> - <condition var1="tw_filename" op="modified" /> - <action function="page">flash_confirm</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="flash_confirm"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="%row1_y%" /> - <text>WARNING: This operation may install incompatible software</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="135" /> - <text>and render your device unusable.</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="250" /> - <text>File to flash: %tw_filename%</text> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="550" /> - <font resource="font" color="black" /> - <text>Flash now</text> - <image resource="main_button" /> - <action function="flash">flash_zip</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">install</action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="flash_zip"> - <object type="template" name="header" /> - - <object type="console"> - <placement x="0" y="%row1_y%" w="540" h="620" /> - <color foreground="#B0B0B0" background="black" scroll="#303030" /> - <font resource="fixed" /> - </object> - - <object type="progressbar"> - <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> - <data name="ui_progress" /> - </object> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">flash_done</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="flash_done"> - <object type="template" name="header" /> - - <object type="console"> - <placement x="0" y="%row1_y%" w="540" h="390" /> - <color foreground="#B0B0B0" background="black" scroll="black" /> - <font resource="fixed" /> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="560" /> - <font resource="font" color="white" /> - <text>Main Menu</text> - <image resource="main_button" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="wipe"> - <object type="template" name="header" /> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Cache</text> - <image resource="main_button" /> - <action function="page">wipe_cache</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Dalvik Cache</text> - <image resource="main_button" /> - <action function="page">wipe_dalvik</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row2_y%" /> - <font resource="font" color="black" /> - <text>Factory Reset</text> - <image resource="main_button" /> - <action function="page">wipe_data</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row2_y%" /> - <font resource="font" color="black" /> - <text>Battery Stats</text> - <image resource="main_button" /> - <action function="page">wipe_battery</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row3_y%" /> - <font resource="font" color="black" /> - <text>Rotation</text> - <image resource="main_button" /> - <action function="page">wipe_rotate</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row3_y%" /> - <font resource="font" color="black" /> - <text>System</text> - <image resource="main_button" /> - <action function="page">wipe_system</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row4_y%" /> - <font resource="font" color="black" /> - <text>SD Card</text> - <image resource="main_button" /> - <action function="page">wipe_sdcard</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row4_y%" /> - <font resource="font" color="black" /> - <text>SD Ext</text> - <image resource="main_button" /> - <action function="page">wipe_sdext</action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="wipe_cache"> - <object type="template" name="header" /> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="470" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">wipe_done</action> - </object> - - <object type="action"> - <action function="wipe">/cache</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="wipe_dalvik"> - <object type="template" name="header" /> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="470" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">wipe_done</action> - </object> - - <object type="action"> - <action function="wipe">dalvik</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="wipe_rotate"> - <object type="template" name="header" /> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="470" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">wipe_done</action> - </object> - - <object type="action"> - <action function="wipe">rotate</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="wipe_data"> - <object type="template" name="header" /> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="470" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">wipe_done</action> - </object> - - <object type="action"> - <action function="wipe">data</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="wipe_system"> - <object type="template" name="header" /> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="470" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">wipe_done</action> - </object> - - <object type="action"> - <action function="wipe">/system</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="wipe_sdcard"> - <object type="template" name="header" /> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="470" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">wipe_done</action> - </object> - - <object type="action"> - <action function="wipe">/sdcard</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="wipe_sdext"> - <object type="template" name="header" /> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="470" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">wipe_done</action> - </object> - - <object type="action"> - <action function="wipe">/sd-ext</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="wipe_battery"> - <object type="template" name="header" /> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="470" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">wipe_done</action> - </object> - - <object type="action"> - <action function="wipe">battery</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="wipe_done"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="270" y="540" placement="4" /> - <text>Wipe complete</text> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="550" /> - <font resource="font" color="white" /> - <text>Back</text> - <image resource="main_button" /> - <action function="page">wipe</action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">wipe</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="backup"> - <object type="template" name="header" /> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Backup now</text> - <image resource="main_button" /> - <action function="page">backup_run</action> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="285" /> - <font resource="font" color="white" /> - <text>System</text> - <data variable="tw_backup_system" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="325" /> - <font resource="font" color="white" /> - <text>Data</text> - <data variable="tw_backup_data" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="365" /> - <font resource="font" color="white" /> - <text>Boot</text> - <data variable="tw_backup_boot" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="405" /> - <font resource="font" color="white" /> - <text>Recovery</text> - <data variable="tw_backup_recovery" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="445" /> - <font resource="font" color="white" /> - <text>Cache</text> - <data variable="tw_backup_cache" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="485" /> - <font resource="font" color="white" /> - <text>%tw_sp1_name%</text> - <data variable="tw_backup_sp1" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="525" /> - <font resource="font" color="white" /> - <text>.android_secure</text> - <conditions> - <condition var1="tw_has_android_secure" var2="1" /> - <condition var1="fileexists" var2="/and-sec" /> - </conditions> - <data variable="tw_backup_andsec" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="565" /> - <font resource="font" color="white" /> - <text>sd-ext</text> - <condition var1="fileexists" var2="/sd-ext" /> - <data variable="tw_backup_sdext" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="625" /> - <font resource="font" color="white" /> - <text>Enable Compression (Requires more time)</text> - <data variable="tw_use_compression" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="backup_run"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="270" y="440" placement="4" /> - <text>%tw_operation% %tw_partition%</text> - </object> - - <object type="progressbar"> - <placement x="%col_progressbar_x%" y="470" /> - <resource empty="progress_empty" full="progress_full" /> - <data name="ui_progress" /> - </object> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="470" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">backup_done</action> - </object> - - <object type="action"> - <action function="nandroid">backup</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="backup_done"> - <object type="action"> - <condition var1="tw_operation_status" var2="0" /> - <action function="page">backup_success</action> - </object> - - <object type="action"> - <condition var1="tw_operation_status" var2="1" /> - <action function="page">backup_failed</action> - </object> - </page> - - <page name="backup_success"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="270" y="445" placement="4" /> - <text>Your backup was successful!</text> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="570" /> - <font resource="font" color="white" /> - <text>Main Menu</text> - <image resource="main_button" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="backup_failed"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="270" y="445" placement="4" /> - <text>Your backup failed.</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="270" y="475" placement="4" /> - <text>Pull up the console for more details</text> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="570" /> - <font resource="font" color="white" /> - <text>Main Menu</text> - <image resource="main_button" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="restore"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="%row1_y%" /> - <text>Select packge to restore</text> - </object> - - <object type="fileselector"> - <placement x="5" y="140" w="530" h="780" /> - <icon folder="folder_icon" file="file_icon" /> - <background color="#303030" /> - <font resource="filelist" spacing="18" color="white" /> - <filter folders="1" files="0" nav="0" /> - <path name="tw_backups_folder" /> - <data name="tw_restore" default="" /> - </object> - - <object type="action"> - <condition var1="tw_restore" op="modified" /> - <action function="page">restore_setrestoredata</action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="restore_setrestoredata"> - <object type="action"> - <action function="readBackup"></action> - </object> - - <object type="action"> - <action function="page">restore_select</action> - </object> - </page> - - <page name="restore_select"> - <object type="template" name="header" /> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Restore now</text> - <image resource="main_button" /> - <action function="page">restore_run</action> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="285" /> - <font resource="font" color="white" /> - <text>System</text> - <condition var1="tw_restore_system" op=">=" var2="0" /> - <data variable="tw_restore_system" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="325" /> - <font resource="font" color="white" /> - <text>Data</text> - <condition var1="tw_restore_data" op=">=" var2="0" /> - <data variable="tw_restore_data" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="365" /> - <font resource="font" color="white" /> - <text>Boot</text> - <condition var1="tw_restore_boot" op=">=" var2="0" /> - <data variable="tw_restore_boot" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="405" /> - <font resource="font" color="white" /> - <text>Recovery</text> - <condition var1="tw_restore_recovery" op=">=" var2="0" /> - <data variable="tw_restore_recovery" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="445" /> - <font resource="font" color="white" /> - <text>Cache</text> - <condition var1="tw_restore_cache" op=">=" var2="0" /> - <data variable="tw_restore_cache" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="485" /> - <font resource="font" color="white" /> - <text>%tw_sp1_name%</text> - <condition var1="tw_restore_sp1" op=">=" var2="0" /> - <data variable="tw_restore_sp1" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="525" /> - <font resource="font" color="white" /> - <text>.android_secure</text> - <condition var1="tw_restore_andsec" op=">=" var2="0" /> - <data variable="tw_restore_andsec" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="565" /> - <font resource="font" color="white" /> - <text>sd-ext</text> - <condition var1="tw_restore_sdext" op=">=" var2="0" /> - <data variable="tw_restore_sdext" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">restore</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="restore_run"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="270" y="440" placement="4" /> - <text>%tw_operation% %tw_partition%</text> - </object> - - <object type="progressbar"> - <placement x="%col_progressbar_x%" y="470" /> - <resource empty="progress_empty" full="progress_full" /> - <data name="ui_progress" /> - </object> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="470" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">restore_done</action> - </object> - - <object type="action"> - <action function="nandroid">restore</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="restore_done"> - <object type="action"> - <condition var1="tw_operation_status" var2="0" /> - <action function="page">restore_success</action> - </object> - - <object type="action"> - <condition var1="tw_operation_status" var2="1" /> - <action function="page">restore_failed</action> - </object> - </page> - - <page name="restore_success"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="270" y="440" placement="4" /> - <text>Your restore was successful!</text> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="570" /> - <font resource="font" color="white" /> - <text>Main Menu</text> - <image resource="main_button" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="restore_failed"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="270" y="440" placement="4" /> - <text>Your restore failed.</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="270" y="475" placement="4" /> - <text>Pull up the console for more details</text> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="570" /> - <font resource="font" color="white" /> - <text>Main Menu</text> - <image resource="main_button" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="mount"> - <object type="template" name="header" /> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="white" /> - <condition var1="mounted" op="!=" var2="/system" /> - <text>Mount System</text> - <image resource="checkbox_false" /> - <action function="mount">/system</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="white" /> - <condition var1="mounted" op="=" var2="/system" /> - <text>Unmount System</text> - <image resource="checkbox_true" /> - <action function="umount">/system</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="160" /> - <font resource="font" color="white" /> - <condition var1="mounted" op="!=" var2="/data" /> - <text>Mount Data</text> - <image resource="checkbox_false" /> - <action function="mount">/data</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="160" /> - <font resource="font" color="white" /> - <condition var1="mounted" op="=" var2="/data" /> - <text>Unmount Data</text> - <image resource="checkbox_true" /> - <action function="umount">/data</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="200" /> - <font resource="font" color="white" /> - <condition var1="mounted" op="!=" var2="/cache" /> - <text>Mount Cache</text> - <image resource="checkbox_false" /> - <action function="mount">/cache</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="200" /> - <font resource="font" color="white" /> - <condition var1="mounted" op="=" var2="/cache" /> - <text>Unmount Cache</text> - <image resource="checkbox_true" /> - <action function="umount">/cache</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="260" /> - <font resource="font" color="black" /> - <text>Mount USB Storage</text> - <image resource="main_button" /> - <action function="page">usb_mount</action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="usb_mount"> - <object type="template" name="header" /> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Unmount</text> - <image resource="main_button" /> - <action function="page">usb_umount</action> - </object> - - <object type="action"> - <action function="mount">usb</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="usb_umount"> - <object type="action"> - <action function="unmount">usb</action> - </object> - - <object type="action"> - <action function="page">mount</action> - </object> - </page> - - <page name="reboot"> - <object type="template" name="header" /> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>System</text> - <image resource="main_button" /> - <action function="reboot">system</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Power Off</text> - <image resource="main_button" /> - <action function="reboot">poweroff</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row2_y%" /> - <font resource="font" color="black" /> - <text>Recovery</text> - <image resource="main_button" /> - <action function="reboot">recovery</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row2_y%" /> - <font resource="font" color="black" /> - <text>Bootloader</text> - <image resource="main_button" /> - <action function="reboot">bootloader</action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="settings"> - <object type="template" name="header" /> - - <object type="checkbox"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="white" /> - <text>Zip file signature verification?</text> - <data variable="tw_signed_zip_verify" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="160" /> - <font resource="font" color="white" /> - <text>Reboot after flashing a zip?</text> - <data variable="tw_reboot_after_flash_option" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="200" /> - <font resource="font" color="white" /> - <text>Force MD5 check on all zips?</text> - <data variable="tw_force_md5_check" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="240" /> - <font resource="font" color="white" /> - <text>Use rm -rf instead of formatting?</text> - <data variable="tw_rm_rf" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row2_y%" /> - <font resource="font" color="black" /> - <text>Time Zone</text> - <image resource="main_button" /> - <action function="page">timezonemain</action> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="%row4_y%" /> - <font resource="font" color="black" /> - <text>Restore Defaults</text> - <image resource="main_button" /> - <action function="restoredefaultsettings"></action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="timezonemain"> - <object type="template" name="header" /> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Minus (GMT 0 to -11)</text> - <image resource="main_button" /> - <action function="page">timezoneminus</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Plus (GMT +1 to +12)</text> - <image resource="main_button" /> - <action function="page">timezoneplus</action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">settings</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="timezoneminus"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="100" /> - <text>Selected: %tw_time_zone_guisel%</text> - </object> - - <object type="button"> - <placement x="%col1_medium_x%" y="%row1_medium_y%" /> - <font resource="font" color="black" /> - <text>GMT 0 CUT</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=CUT0;GDT</action> - </object> - - <object type="button"> - <placement x="%col2_medium_x%" y="%row1_medium_y%" /> - <font resource="font" color="black" /> - <text>GMT 0</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=GMT0;BST</action> - </object> - - <object type="button"> - <placement x="%col3_medium_x%" y="%row1_medium_y%" /> - <font resource="font" color="black" /> - <text>AZOREST -1</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=AZOREST1;AZOREDT</action> - </object> - - <object type="button"> - <placement x="%col4_medium_x%" y="%row1_medium_y%" /> - <font resource="font" color="black" /> - <text>FALKST -2</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=FALKST2;FALKDT</action> - </object> - - <object type="button"> - <placement x="%col1_medium_x%" y="%row2_medium_y%" /> - <font resource="font" color="black" /> - <text>GRNLNDST -3</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=GRNLNDST3;GRNLNDDT</action> - </object> - - <object type="button"> - <placement x="%col2_medium_x%" y="%row2_medium_y%" /> - <font resource="font" color="black" /> - <text>AST -4</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=AST4;ADT</action> - </object> - - <object type="button"> - <placement x="%col3_medium_x%" y="%row2_medium_y%" /> - <font resource="font" color="black" /> - <text>EST -5</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=EST5;EDT</action> - </object> - - <object type="button"> - <placement x="%col4_medium_x%" y="%row2_medium_y%" /> - <font resource="font" color="black" /> - <text>CST -6</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=CST6;CDT</action> - </object> - - <object type="button"> - <placement x="%col1_medium_x%" y="%row3_medium_y%" /> - <font resource="font" color="black" /> - <text>MST -7</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=MST7;MDT</action> - </object> - - <object type="button"> - <placement x="%col2_medium_x%" y="%row3_medium_y%" /> - <font resource="font" color="black" /> - <text>PST -8</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=PST8;PDT</action> - </object> - - <object type="button"> - <placement x="%col3_medium_x%" y="%row3_medium_y%" /> - <font resource="font" color="black" /> - <text>AST -9</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=AST9;ADT</action> - </object> - - <object type="button"> - <placement x="%col4_medium_x%" y="%row3_medium_y%" /> - <font resource="font" color="black" /> - <text>HST -10</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=HST10;HDT</action> - </object> - - <object type="button"> - <placement x="%col1_medium_x%" y="%row4_medium_y%" /> - <font resource="font" color="black" /> - <text>BST -11</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=BST11;BDT</action> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="%row5_medium_y%" /> - <font resource="font" color="white" /> - <text>Do you use daylight savings time (DST)?</text> - <data variable="tw_time_zone_guidst" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="580" /> - <text>Offset (usually 0): %tw_time_zone_guioffset%</text> - </object> - - <object type="button"> - <placement x="%col1_medium_x%" y="%row6_medium_y%" /> - <font resource="font" color="black" /> - <text>None</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guioffset=0</action> - </object> - - <object type="button"> - <placement x="%col2_medium_x%" y="%row6_medium_y%" /> - <font resource="font" color="black" /> - <text>15</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guioffset=15</action> - </object> - - <object type="button"> - <placement x="%col3_medium_x%" y="%row6_medium_y%" /> - <font resource="font" color="black" /> - <text>30</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guioffset=30</action> - </object> - - <object type="button"> - <placement x="%col4_medium_x%" y="%row6_medium_y%" /> - <font resource="font" color="black" /> - <text>45</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guioffset=45</action> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="720" /> - <font resource="font" color="black" /> - <text>Set Time Zone</text> - <image resource="main_button" /> - <action function="setguitimezone"></action> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="880" /> - <text>Current Time Zone: %tw_time_zone%</text> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">timezonemain</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="timezoneplus"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="100" /> - <text>Selected: %tw_time_zone_guisel%</text> - </object> - - <object type="button"> - <placement x="%col1_medium_x%" y="%row1_medium_y%" /> - <font resource="font" color="black" /> - <text>NFT +1</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=NFT-1;DFT</action> - </object> - - <object type="button"> - <placement x="%col2_medium_x%" y="%row1_medium_y%" /> - <font resource="font" color="black" /> - <text>USAST +2</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=USAST-2;USADT</action> - </object> - - <object type="button"> - <placement x="%col3_medium_x%" y="%row1_medium_y%" /> - <font resource="font" color="black" /> - <text>WET +2</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=WET-2;WET</action> - </object> - - <object type="button"> - <placement x="%col4_medium_x%" y="%row1_medium_y%" /> - <font resource="font" color="black" /> - <text>SAUST +3</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=SAUST-3;SAUDT</action> - </object> - - <object type="button"> - <placement x="%col1_medium_x%" y="%row2_medium_y%" /> - <font resource="font" color="black" /> - <text>MEST +3</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=MEST-3;MEDT</action> - </object> - - <object type="button"> - <placement x="%col2_medium_x%" y="%row2_medium_y%" /> - <font resource="font" color="black" /> - <text>WST +4</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=WST-4;WDT</action> - </object> - - <object type="button"> - <placement x="%col3_medium_x%" y="%row2_medium_y%" /> - <font resource="font" color="black" /> - <text>PAKST +5</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=PAKST-5;PAKDT</action> - </object> - - <object type="button"> - <placement x="%col4_medium_x%" y="%row2_medium_y%" /> - <font resource="font" color="black" /> - <text>TASHST +6</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=TASHST-6;TASHDT</action> - </object> - - <object type="button"> - <placement x="%col1_medium_x%" y="%row3_medium_y%" /> - <font resource="font" color="black" /> - <text>THAIST +7</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=THAIST-7;THAIDT</action> - </object> - - <object type="button"> - <placement x="%col2_medium_x%" y="%row3_medium_y%" /> - <font resource="font" color="black" /> - <text>TAIST +8</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=TAIST-8;TAIDT</action> - </object> - - <object type="button"> - <placement x="%col3_medium_x%" y="%row3_medium_y%" /> - <font resource="font" color="black" /> - <text>WAUST +8</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=WAUST-8;WAUDT</action> - </object> - - <object type="button"> - <placement x="%col4_medium_x%" y="%row3_medium_y%" /> - <font resource="font" color="black" /> - <text>KORST +9</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=KORST-9;KORDT</action> - </object> - - <object type="button"> - <placement x="%col1_medium_x%" y="%row4_medium_y%" /> - <font resource="font" color="black" /> - <text>JST +9</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=JST-9;JSTDT</action> - </object> - - <object type="button"> - <placement x="%col2_medium_x%" y="%row4_medium_y%" /> - <font resource="font" color="black" /> - <text>EET +10</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=EET-10;EETDT</action> - </object> - - <object type="button"> - <placement x="%col3_medium_x%" y="%row4_medium_y%" /> - <font resource="font" color="black" /> - <text>MET +11</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=MET-11;METDT</action> - </object> - - <object type="button"> - <placement x="%col4_medium_x%" y="%row4_medium_y%" /> - <font resource="font" color="black" /> - <text>NZST +12</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guisel=NZST-12;NZDT</action> - </object> - - <object type="checkbox"> - <placement x="%col1_x%" y="%row5_medium_y%" /> - <font resource="font" color="white" /> - <text>Do you use daylight savings time (DST)?</text> - <data variable="tw_time_zone_guidst" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="580" /> - <text>Offset (usually 0): %tw_time_zone_guioffset%</text> - </object> - - <object type="button"> - <placement x="%col1_medium_x%" y="%row6_medium_y%" /> - <font resource="font" color="black" /> - <text>None</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guioffset=0</action> - </object> - - <object type="button"> - <placement x="%col2_medium_x%" y="%row6_medium_y%" /> - <font resource="font" color="black" /> - <text>15</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guioffset=15</action> - </object> - - <object type="button"> - <placement x="%col3_medium_x%" y="%row6_medium_y%" /> - <font resource="font" color="black" /> - <text>30</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guioffset=30</action> - </object> - - <object type="button"> - <placement x="%col4_medium_x%" y="%row6_medium_y%" /> - <font resource="font" color="black" /> - <text>45</text> - <image resource="medium_button" /> - <action function="set">tw_time_zone_guioffset=45</action> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="720" /> - <font resource="font" color="black" /> - <text>Set Time Zone</text> - <image resource="main_button" /> - <action function="setguitimezone"></action> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="880" /> - <text>Current Time Zone: %tw_time_zone%</text> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">timezonemain</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="advanced"> - <object type="template" name="header" /> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Copy Log to SD</text> - <image resource="main_button" /> - <action function="copylog"></action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text>Fix Permissions</text> - <image resource="main_button" /> - <action function="page">fixperms</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row2_y%" /> - <font resource="font" color="black" /> - <text>Partition SD Card</text> - <image resource="main_button" /> - <action function="page">partsdcard</action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">main</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="partsdcard"> - <object type="template" name="header" /> - - <object type="button"> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="black" /> - <text></text> - <image resource="minus_button" /> - <action function="addsubtract">tw_sdext_size-128</action> - </object> - - <object type="button"> - <placement x="250" y="%row1_y%" /> - <font resource="font" color="black" /> - <text></text> - <image resource="plus_button" /> - <action function="addsubtract">tw_sdext_size+128</action> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="84" y="130" /> - <text>EXT Size: %tw_sdext_size%</text> - </object> - - <object type="button"> - <placement x="%col1_x%" y="180" /> - <font resource="font" color="black" /> - <text></text> - <image resource="minus_button" /> - <action function="addsubtract">tw_swap_size-32</action> - </object> - - <object type="button"> - <placement x="250" y="180" /> - <font resource="font" color="black" /> - <text></text> - <image resource="plus_button" /> - <action function="addsubtract">tw_swap_size+32</action> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="84" y="190" /> - <text>Swap Size: %tw_swap_size%</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="240" /> - <text>File system: %tw_sdpart_file_system%</text> - </object> - - <object type="button"> - <placement x="%col1_x%" y="280" /> - <font resource="font" color="black" /> - <text>EXT3</text> - <image resource="main_button" /> - <action function="set">tw_sdpart_file_system=ext3</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="280" /> - <font resource="font" color="black" /> - <text>EXT4</text> - <image resource="main_button" /> - <action function="set">tw_sdpart_file_system=ext4</action> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="460" /> - <text>You will lose all files on your SD card!</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="500" /> - <text>This action cannot be undone!</text> - </object> - - <object type="button"> - <placement x="%col_center_x%" y="540" /> - <font resource="font" color="black" /> - <text>Partition SD</text> - <image resource="main_button" /> - <action function="page">partsdcardaction</action> - </object> - - <object type="action"> - <touch key="home" /> - <action function="page">main</action> - </object> - - <object type="action"> - <touch key="back" /> - <action function="page">advanced</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="partsdcardaction"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="%row1_y%" /> - <text>Partitioning SD Card . . .</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="150" /> - <text>This may take a couple minutes.</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="180" /> - <text>The progress bar may not be accurate.</text> - </object> - - <object type="action"> - <action function="partitionsd"></action> - </object> - - <object type="progressbar"> - <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> - <data name="ui_progress" /> - </object> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">advanced</action> - </object> - - <object type="template" name="footer" /> - </page> - - <page name="fixperms"> - <object type="template" name="header" /> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="%row1_y%" /> - <text>Fixing Permissions . . .</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="150" /> - <text>This may take several minutes.</text> - </object> - - <object type="text" color="white"> - <font resource="font" /> - <placement x="%col1_x%" y="180" /> - <text>The progress bar may not be accurate.</text> - </object> - - <object type="action"> - <action function="fixpermissions"></action> - </object> - - <object type="progressbar"> - <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> - <data name="ui_progress" /> - </object> - - <object type="animation"> - <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource name="progress" /> - <speed fps="15" render="2" /> - <loop frame="1" /> - </object> - - <object type="action"> - <condition var1="tw_operation_state" var2="1" /> - <action function="page">advanced</action> - </object> - - <object type="template" name="footer" /> - </page> - </pages> -</recovery> - diff --git a/gui/basicTheme/ui.zip b/gui/basicTheme/ui.zip Binary files differdeleted file mode 100644 index a2fddee89..000000000 --- a/gui/basicTheme/ui.zip +++ /dev/null diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index 92a33c0e1..c0880a76a 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -279,7 +279,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -560,7 +560,7 @@ <data name="tw_filename" /> <selection name="tw_file" /> </object> - + <object type="template" name="sort_options" /> <object type="action"> @@ -616,7 +616,7 @@ <placement x="%center_x%" y="%row5_text_y%" placement="5" /> <text>%tw_file%</text> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row6_text_y%" placement="5" /> @@ -2806,13 +2806,13 @@ <touch key="back" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> <page name="timezone"> <object type="template" name="header" /> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row1_text_y%" placement="5" /> @@ -3291,7 +3291,7 @@ <object type="template" name="footer" /> </page> - + <page name="htcdumlock"> <object type="template" name="header" /> @@ -3381,7 +3381,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="overlay"></action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3389,7 +3389,7 @@ </object> </page> - + <page name="filemanagerlist"> <object type="template" name="header" /> @@ -3867,7 +3867,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3883,7 +3883,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index 2d8b07cf6..3409972d9 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -279,7 +279,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -560,7 +560,7 @@ <data name="tw_filename" /> <selection name="tw_file" /> </object> - + <object type="template" name="sort_options" /> <object type="action"> @@ -616,7 +616,7 @@ <placement x="%center_x%" y="%row5_text_y%" placement="5" /> <text>%tw_file%</text> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row6_text_y%" placement="5" /> @@ -2806,13 +2806,13 @@ <touch key="back" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> <page name="timezone"> <object type="template" name="header" /> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row1_text_y%" placement="5" /> @@ -3291,7 +3291,7 @@ <object type="template" name="footer" /> </page> - + <page name="htcdumlock"> <object type="template" name="header" /> @@ -3381,7 +3381,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="overlay"></action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3389,7 +3389,7 @@ </object> </page> - + <page name="filemanagerlist"> <object type="template" name="header" /> @@ -3867,7 +3867,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3883,7 +3883,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml index b11e6c134..21498a76e 100644 --- a/gui/devices/1080x1920/res/ui.xml +++ b/gui/devices/1080x1920/res/ui.xml @@ -268,7 +268,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -3894,7 +3894,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3910,7 +3910,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/1200x1920/res/ui.xml b/gui/devices/1200x1920/res/ui.xml index 313706ce2..9faff14d6 100644 --- a/gui/devices/1200x1920/res/ui.xml +++ b/gui/devices/1200x1920/res/ui.xml @@ -271,7 +271,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -3897,7 +3897,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3913,7 +3913,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index d52d3efcf..eeb59231f 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -279,7 +279,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -560,7 +560,7 @@ <data name="tw_filename" /> <selection name="tw_file" /> </object> - + <object type="template" name="sort_options" /> <object type="action"> @@ -616,7 +616,7 @@ <placement x="%center_x%" y="%row5_text_y%" placement="5" /> <text>%tw_file%</text> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row6_text_y%" placement="5" /> @@ -2806,13 +2806,13 @@ <touch key="back" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> <page name="timezone"> <object type="template" name="header" /> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row1_text_y%" placement="5" /> @@ -3291,7 +3291,7 @@ <object type="template" name="footer" /> </page> - + <page name="htcdumlock"> <object type="template" name="header" /> @@ -3381,7 +3381,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="overlay"></action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3389,7 +3389,7 @@ </object> </page> - + <page name="filemanagerlist"> <object type="template" name="header" /> @@ -3867,7 +3867,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3883,7 +3883,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/1600x2560/res/ui.xml b/gui/devices/1600x2560/res/ui.xml index bb28c0a54..a8e919def 100644 --- a/gui/devices/1600x2560/res/ui.xml +++ b/gui/devices/1600x2560/res/ui.xml @@ -271,7 +271,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index d0ab97731..4573dedb2 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -279,7 +279,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -560,7 +560,7 @@ <data name="tw_filename" /> <selection name="tw_file" /> </object> - + <object type="template" name="sort_options" /> <object type="action"> @@ -616,7 +616,7 @@ <placement x="%center_x%" y="%row5_text_y%" placement="5" /> <text>%tw_file%</text> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row6_text_y%" placement="5" /> @@ -2806,13 +2806,13 @@ <touch key="back" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> <page name="timezone"> <object type="template" name="header" /> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row1_text_y%" placement="5" /> @@ -3291,7 +3291,7 @@ <object type="template" name="footer" /> </page> - + <page name="htcdumlock"> <object type="template" name="header" /> @@ -3381,7 +3381,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="overlay"></action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3389,7 +3389,7 @@ </object> </page> - + <page name="filemanagerlist"> <object type="template" name="header" /> @@ -3867,7 +3867,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3883,7 +3883,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/240x240/res/ui.xml b/gui/devices/240x240/res/ui.xml index 3246a4024..c353d0198 100644 --- a/gui/devices/240x240/res/ui.xml +++ b/gui/devices/240x240/res/ui.xml @@ -255,7 +255,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -1487,7 +1487,7 @@ <text>Append Date</text> <action function="appenddatetobackupname"></action> </object> - + <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> @@ -2505,7 +2505,7 @@ <placement x="%center_x%" y="%row_offset_text_y%" placement="5" /> <text>Offset (usually 0): %tw_time_zone_guioffset%</text> </object> - + <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> @@ -2514,7 +2514,7 @@ <text>None</text> <action function="set">tw_time_zone_guioffset=0</action> </object> - + <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> @@ -2523,7 +2523,7 @@ <text>15</text> <action function="set">tw_time_zone_guioffset=15</action> </object> - + <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> @@ -2532,7 +2532,7 @@ <text>30</text> <action function="set">tw_time_zone_guioffset=30</action> </object> - + <object type="button"> <highlight color="%highlight_color%" /> <fill color="%button_fill_color%" /> @@ -2541,7 +2541,7 @@ <text>45</text> <action function="set">tw_time_zone_guioffset=45</action> </object> - + <object type="button"> <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%tz_set_y%" /> @@ -3452,7 +3452,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3468,7 +3468,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml index 65dc8e8f2..531e43f1c 100644 --- a/gui/devices/2560x1600/res/ui.xml +++ b/gui/devices/2560x1600/res/ui.xml @@ -279,7 +279,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -560,7 +560,7 @@ <data name="tw_filename" /> <selection name="tw_file" /> </object> - + <object type="template" name="sort_options" /> <object type="action"> @@ -616,7 +616,7 @@ <placement x="%center_x%" y="%row5_text_y%" placement="5" /> <text>%tw_file%</text> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row6_text_y%" placement="5" /> @@ -2806,13 +2806,13 @@ <touch key="back" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> <page name="timezone"> <object type="template" name="header" /> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row1_text_y%" placement="5" /> @@ -3291,7 +3291,7 @@ <object type="template" name="footer" /> </page> - + <page name="htcdumlock"> <object type="template" name="header" /> @@ -3381,7 +3381,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="overlay"></action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3389,7 +3389,7 @@ </object> </page> - + <page name="filemanagerlist"> <object type="template" name="header" /> @@ -3867,7 +3867,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3883,7 +3883,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index f8903a53b..e29245aba 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -261,7 +261,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -3881,7 +3881,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3897,7 +3897,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index db78cd752..54069f930 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -261,7 +261,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -3881,7 +3881,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3897,7 +3897,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index 617c19669..48fe8d6d5 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -260,7 +260,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -3880,7 +3880,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3896,7 +3896,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index b6fcc6000..665e6762a 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -261,7 +261,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -3881,7 +3881,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3897,7 +3897,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index 763fa44d0..3d69a352e 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -268,7 +268,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -3894,7 +3894,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3910,7 +3910,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index 134b899c9..7194373d4 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -262,7 +262,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -345,7 +345,7 @@ </template> <template name="footer"> - <object type="console"> + <object type="console"> <slideout resource="slideout" x="355" y="1220" /> <placement x="%console_x%" y="0" w="%console_width%" h="1220" /> <color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" /> @@ -3882,7 +3882,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3898,7 +3898,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index 2af9c9c76..ac9abc984 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -281,7 +281,7 @@ <template name="progress_bar"> <object type="progressbar"> <placement x="%col_progressbar_x%" y="%row_progressbar_y%" /> - <resource empty="progress_empty" full="progress_full" /> + <resource empty="progress_empty" full="progress_full" /> <data name="ui_progress" /> </object> @@ -568,7 +568,7 @@ <data name="tw_filename" /> <selection name="tw_file" /> </object> - + <object type="template" name="sort_options" /> <object type="action"> @@ -624,7 +624,7 @@ <placement x="%center_x%" y="%row5_text_y%" placement="5" /> <text>%tw_file%</text> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row6_text_y%" placement="5" /> @@ -2814,13 +2814,13 @@ <touch key="back" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> <page name="timezone"> <object type="template" name="header" /> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row1_text_y%" placement="5" /> @@ -3299,7 +3299,7 @@ <object type="template" name="footer" /> </page> - + <page name="htcdumlock"> <object type="template" name="header" /> @@ -3389,7 +3389,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="overlay"></action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3397,7 +3397,7 @@ </object> </page> - + <page name="filemanagerlist"> <object type="template" name="header" /> @@ -3875,7 +3875,7 @@ <resource base="slider" used="slider-used" touch="slider-touch" /> <action function="page">filemanageracction</action> </object> - + <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%slider_text_y%" placement="4" /> @@ -3891,7 +3891,7 @@ <touch key="home" /> <action function="page">main</action> </object> - + <object type="template" name="footer" /> </page> diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp index e1570edd0..4f90ca3a8 100644 --- a/gui/fileselector.cpp +++ b/gui/fileselector.cpp @@ -733,7 +733,7 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y) isHighlighted = false; last2Y = lastY; - lastY = y; + lastY = y; startSelection = -1; // Handle scrolling @@ -925,7 +925,7 @@ bool GUIFileSelector::fileSort(FileData d1, FileData d2) return -1; if (d2.fileName == TW_FILESELECTOR_UP_A_LEVEL) return 0; - + switch (mSortOrder) { 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 diff --git a/gui/gui.cpp b/gui/gui.cpp index c0bd008a9..b7680909c 100644 --- a/gui/gui.cpp +++ b/gui/gui.cpp @@ -429,7 +429,7 @@ static void * input_thread(void *cookie) state = 1; key_repeat = 0; } - } + } } return NULL; } @@ -688,9 +688,6 @@ extern "C" int gui_init(void) extern "C" int gui_loadResources(void) { - // unlink("/sdcard/video.last"); - // rename("/sdcard/video.bin", "/sdcard/video.last"); - // gRecorder = open("/sdcard/video.bin", O_CREAT | O_WRONLY); #ifndef TW_OEM_BUILD int check = 0; DataManager::GetValue(TW_IS_ENCRYPTED, check); diff --git a/gui/hardwarekeyboard.cpp b/gui/hardwarekeyboard.cpp index f2194938e..d8cdfd45a 100644 --- a/gui/hardwarekeyboard.cpp +++ b/gui/hardwarekeyboard.cpp @@ -33,7 +33,7 @@ HardwareKeyboard::HardwareKeyboard(void) HardwareKeyboard::~HardwareKeyboard() { - + } int HardwareKeyboard::KeyDown(int key_code) diff --git a/gui/listbox.cpp b/gui/listbox.cpp index bbfc9344a..e09ec5391 100644 --- a/gui/listbox.cpp +++ b/gui/listbox.cpp @@ -324,7 +324,7 @@ GUIListBox::GUIListBox(xml_node<>* node) : GUIObject(node) // Get the data for the list child = node->first_node("listitem"); if (!child) return; - + while (child) { ListData data; @@ -677,7 +677,7 @@ int GUIListBox::NotifyTouch(TOUCH_STATE state, int x, int y) isHighlighted = false; last2Y = lastY; - lastY = y; + lastY = y; startSelection = -1; // Handle scrolling diff --git a/gui/object.cpp b/gui/object.cpp index 543452caf..d496414c3 100644 --- a/gui/object.cpp +++ b/gui/object.cpp @@ -56,7 +56,7 @@ GUIObject::GUIObject(xml_node<>* node) attr = condition->first_attribute("var2"); if (attr) cond.mVar2 = attr->value(); - + mConditions.push_back(cond); condition = condition->next_sibling("condition"); @@ -166,7 +166,7 @@ int GUIObject::NotifyVarChange(const std::string& varName, const std::string& va if(varNameEmpty && iter->mCompareOp == "modified") { string val; - + // If this fails, val will not be set, which is perfect if (DataManager::GetValue(iter->mVar1, val)) { diff --git a/gui/pages.cpp b/gui/pages.cpp index 398224e17..6586cf8aa 100644 --- a/gui/pages.cpp +++ b/gui/pages.cpp @@ -66,7 +66,7 @@ int ConvertStrToColor(std::string str, COLOR* color) // Translate variables DataManager::GetValue(str, str); - + // Look for some defaults if (str == "black") return 0; else if (str == "white") { color->red = color->green = color->blue = 255; return 0; } @@ -150,8 +150,8 @@ int ActionObject::SetActionPos(int x, int y, int w, int h) if (x < 0 || y < 0) return -1; - mActionX = x; - mActionY = y; + mActionX = x; + mActionY = y; if (w || h) { mActionW = w; @@ -557,7 +557,7 @@ int PageSet::Load(ZipArchive* package) xml_node<>* parent; xml_node<>* child; xml_node<>* templates; - + parent = mDoc.first_node("recovery"); if (!parent) parent = mDoc.first_node("install"); @@ -792,13 +792,13 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string LOGERR("Unable to locate ui.xml in zip file\n"); goto error; } - + // Allocate the buffer for the file len = mzGetZipEntryUncompLen(ui_xml); xmlFile = (char*) malloc(len + 1); if (!xmlFile) goto error; - + if (!mzExtractZipEntryToBuffer(&zip, ui_xml, (unsigned char*) xmlFile)) { LOGERR("Unable to extract ui.xml\n"); @@ -823,7 +823,7 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string { LOGERR("Package %s failed to load.\n", name.c_str()); } - + // The first successful package we loaded is the base if (mBaseSet == NULL) mBaseSet = mCurrentSet; diff --git a/gui/partitionlist.cpp b/gui/partitionlist.cpp index 064b9df01..317e17805 100644 --- a/gui/partitionlist.cpp +++ b/gui/partitionlist.cpp @@ -691,7 +691,7 @@ int GUIPartitionList::NotifyTouch(TOUCH_STATE state, int x, int y) isHighlighted = false; last2Y = lastY; - lastY = y; + lastY = y; startSelection = -1; // Handle scrolling @@ -788,7 +788,7 @@ int GUIPartitionList::NotifyTouch(TOUCH_STATE state, int x, int y) } mList.at(actualSelection).selected = 1; mUpdate = 1; - + DataManager::SetValue(mVariable, str); } } else { diff --git a/gui/progressbar.cpp b/gui/progressbar.cpp index 83de4d13b..a4d132932 100644 --- a/gui/progressbar.cpp +++ b/gui/progressbar.cpp @@ -156,11 +156,15 @@ int GUIProgressBar::Update(void) cur -= min; min = 0; - if (cur < min) cur = min; - if (cur > max) cur = max; + if (cur < min) + cur = min; + if (cur > max) + cur = max; - if (max == 0) pos = 0; - else pos = (cur * mRenderW) / max; + if (max == 0) + pos = 0; + else + pos = (cur * mRenderW) / max; if (pos == mLastPos) return 0; diff --git a/gui/resources.cpp b/gui/resources.cpp index 6babc575c..7a50a899b 100644 --- a/gui/resources.cpp +++ b/gui/resources.cpp @@ -143,7 +143,7 @@ AnimationResource::AnimationResource(xml_node<>* node, ZipArchive* pZip) { if (ExtractResource(pZip, "images", fileName.str(), ".png", TMP_RESOURCE_NAME) != 0) break; - + if (res_create_surface(TMP_RESOURCE_NAME, &surface)) break; diff --git a/gui/resources.hpp b/gui/resources.hpp index 339e03ade..bef97dd88 100644 --- a/gui/resources.hpp +++ b/gui/resources.hpp @@ -28,7 +28,7 @@ protected: }; typedef enum { - TOUCH_START = 0, + TOUCH_START = 0, TOUCH_DRAG = 1, TOUCH_RELEASE = 2, TOUCH_HOLD = 3, diff --git a/gui/slider.cpp b/gui/slider.cpp index 692676561..98d2ddea3 100644 --- a/gui/slider.cpp +++ b/gui/slider.cpp @@ -134,7 +134,7 @@ int GUISlider::NotifyTouch(TOUCH_STATE state, int x, int y) switch (state) { case TOUCH_START: - if (x >= mRenderX && x <= mRenderX + sTouchW && + if (x >= mRenderX && x <= mRenderX + sTouchW && y >= mRenderY && y <= mRenderY + mRenderH) { sCurTouchX = x - (sTouchW / 2); diff --git a/gui/slidervalue.cpp b/gui/slidervalue.cpp index 972d1f728..c3ef69eac 100644 --- a/gui/slidervalue.cpp +++ b/gui/slidervalue.cpp @@ -126,8 +126,10 @@ GUISliderValue::GUISliderValue(xml_node<>* node) : GUIObject(node) string parsevalue = gui_parse_text(attr->value()); int def = atoi(parsevalue.c_str()); - if (def < mMin) def = mMin; - else if (def > mMax) def = mMax; + if (def < mMin) + def = mMin; + else if (def > mMax) + def = mMax; DataManager::SetValue(mVariable, def); } @@ -324,8 +326,10 @@ int GUISliderValue::Render(void) int GUISliderValue::Update(void) { - if (!isConditionTrue()) return mRendered ? 2 : 0; - if (!mRendered) return 2; + if (!isConditionTrue()) + return mRendered ? 2 : 0; + if (!mRendered) + return 2; if(mLabel) return mLabel->Update(); @@ -345,7 +349,8 @@ float GUISliderValue::pctFromValue(int value) int GUISliderValue::NotifyTouch(TOUCH_STATE state, int x, int y) { - if (!isConditionTrue()) return -1; + if (!isConditionTrue()) + return -1; static bool dragging = false; switch (state) diff --git a/htcdumlock/htcdumlock.c b/htcdumlock/htcdumlock.c index 4afa9c8e5..ec9469f8a 100644 --- a/htcdumlock/htcdumlock.c +++ b/htcdumlock/htcdumlock.c @@ -123,7 +123,7 @@ void get_device_id(void) } fclose(fp); } - + if (hardware_id[0] != 0) { if (verbose) printf("using hardware id for device id: '%s'\n", hardware_id); diff --git a/injecttwrp/injecttwrp.c b/injecttwrp/injecttwrp.c index e86b860ba..2d52ae077 100644 --- a/injecttwrp/injecttwrp.c +++ b/injecttwrp/injecttwrp.c @@ -352,7 +352,7 @@ int main(int argc, char** argv) { printf("This is not a properly formatted Samsung boot image!\nFailed\n"); return 1; } - + // Find the ramdisk return_val = find_gzip_recovery_ramdisk(boot_image, &address2); if (return_val < 0) { @@ -385,7 +385,7 @@ int main(int argc, char** argv) { printf("This is not a properly formatted Samsung boot image!\nFailed\n"); return 1; } - + // Find the ramdisk return_val = find_gzip_recovery_ramdisk(boot_image, &address2); if (return_val < 0) { diff --git a/minuitwrp/events.c b/minuitwrp/events.c index eb1490719..bd55e5ae9 100644 --- a/minuitwrp/events.c +++ b/minuitwrp/events.c @@ -184,9 +184,9 @@ static int vk_init(struct ev *e) close(vk_fd); if (len <= 0) return -1; - + vks[len] = '\0'; - + /* Parse a line like: keytype:keycode:centerx:centery:width:height:keytype2:keycode2:centerx2:... */ @@ -660,7 +660,7 @@ static int vk_modify(struct ev *e, struct input_event *ev) vibrate(VIBRATOR_TIME_MS); - // Mark that all further movement until lift is discard, + // Mark that all further movement until lift is discard, // and make sure we don't come back into this area discard = 1; downX = 0; diff --git a/minuitwrp/font_7x16.h b/minuitwrp/font_7x16.h index 31c94fce2..0f72b5386 100644 --- a/minuitwrp/font_7x16.h +++ b/minuitwrp/font_7x16.h @@ -10,6 +10,6 @@ struct { .cwidth = 7, .cheight = 16, .rundata = { -0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7e,0x82,0x03,0x82,0x7f,0x7f,0x5f,0x82,0x0b,0x82,0x14,0x81,0x0b,0x81,0x11,0x81,0x0c,0x82,0x09,0x81,0x08,0x81,0x07,0x81,0x03,0x81,0x06,0x83,0x68,0x83,0x04,0x81,0x04,0x83,0x17,0x81,0x05,0x81,0x01,0x81,0x0c,0x81,0x04,0x82,0x07,0x83,0x04,0x81,0x07,0x81,0x05,0x81,0x06,0x81,0x25,0x81,0x02,0x84,0x02,0x83,0x05,0x84,0x03,0x84,0x05,0x82,0x02,0x85,0x04,0x83,0x02,0x86,0x02,0x84,0x03,0x84,0x27,0x83,0x0b,0x82,0x03,0x85,0x04,0x83,0x02,0x84,0x03,0x86,0x01,0x86,0x03,0x83,0x02,0x81,0x04,0x81,0x01,0x85,0x04,0x83,0x02,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x82,0x03,0x81,0x02,0x84,0x02,0x85,0x03,0x84,0x02,0x85,0x03,0x84,0x01,0x87,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x82,0x05,0x81,0x01,0x81,0x04,0x82,0x05,0x81,0x01,0x86,0x03,0x81,0x04,0x81,0x08,0x81,0x05,0x82,0x0e,0x81,0x0a,0x81,0x11,0x81,0x0b,0x81,0x0b,0x81,0x14,0x81,0x08,0x81,0x37,0x81,0x30,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x05,0x81,0x01,0x81,0x05,0x81,0x01,0x81,0x03,0x83,0x02,0x81,0x02,0x81,0x05,0x81,0x07,0x81,0x07,0x81,0x05,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x22,0x81,0x03,0x81,0x02,0x81,0x04,0x81,0x04,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x04,0x82,0x02,0x81,0x07,0x81,0x03,0x81,0x05,0x82,0x01,0x81,0x04,0x81,0x01,0x82,0x02,0x81,0x26,0x81,0x03,0x81,0x03,0x83,0x04,0x82,0x03,0x81,0x04,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x07,0x81,0x03,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x08,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x06,0x82,0x02,0x82,0x01,0x82,0x03,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x01,0x81,0x04,0x82,0x02,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x03,0x81,0x06,0x82,0x03,0x81,0x05,0x81,0x07,0x81,0x04,0x81,0x02,0x81,0x18,0x81,0x11,0x81,0x0b,0x81,0x0b,0x81,0x14,0x81,0x08,0x81,0x37,0x81,0x30,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x05,0x81,0x01,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x05,0x81,0x07,0x81,0x06,0x81,0x07,0x81,0x04,0x83,0x05,0x81,0x1d,0x81,0x02,0x81,0x04,0x81,0x03,0x81,0x09,0x81,0x06,0x81,0x03,0x81,0x01,0x81,0x02,0x81,0x06,0x81,0x0a,0x81,0x02,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x14,0x81,0x08,0x81,0x0b,0x81,0x02,0x81,0x02,0x82,0x03,0x82,0x03,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x06,0x81,0x06,0x81,0x04,0x81,0x03,0x81,0x08,0x81,0x02,0x81,0x02,0x81,0x03,0x81,0x06,0x82,0x02,0x82,0x01,0x81,0x01,0x81,0x02,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x08,0x81,0x04,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x01,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x07,0x81,0x04,0x81,0x05,0x81,0x07,0x81,0x03,0x81,0x04,0x81,0x11,0x83,0x03,0x84,0x04,0x83,0x04,0x84,0x03,0x83,0x03,0x85,0x03,0x84,0x02,0x81,0x01,0x82,0x03,0x83,0x05,0x83,0x03,0x81,0x03,0x81,0x04,0x81,0x04,0x85,0x02,0x81,0x01,0x82,0x04,0x83,0x03,0x84,0x04,0x84,0x03,0x84,0x03,0x83,0x03,0x85,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x05,0x81,0x01,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x85,0x04,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x0b,0x86,0x01,0x81,0x01,0x81,0x04,0x82,0x02,0x81,0x03,0x82,0x0d,0x81,0x07,0x81,0x04,0x83,0x05,0x81,0x1c,0x81,0x03,0x81,0x04,0x81,0x03,0x81,0x09,0x81,0x06,0x81,0x02,0x82,0x01,0x81,0x02,0x85,0x02,0x81,0x01,0x83,0x06,0x81,0x02,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x06,0x81,0x06,0x83,0x0a,0x83,0x06,0x82,0x02,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x06,0x81,0x06,0x81,0x04,0x81,0x03,0x81,0x08,0x81,0x02,0x81,0x01,0x81,0x04,0x81,0x06,0x81,0x01,0x82,0x01,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x82,0x07,0x81,0x04,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x03,0x82,0x04,0x81,0x01,0x81,0x06,0x81,0x05,0x81,0x06,0x81,0x06,0x81,0x19,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x82,0x05,0x81,0x03,0x81,0x02,0x82,0x02,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x02,0x82,0x02,0x81,0x04,0x81,0x07,0x81,0x03,0x81,0x02,0x81,0x05,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x02,0x82,0x02,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x03,0x82,0x02,0x81,0x01,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x05,0x81,0x02,0x81,0x01,0x81,0x03,0x81,0x03,0x81,0x06,0x81,0x04,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x0c,0x81,0x01,0x81,0x03,0x83,0x06,0x82,0x04,0x82,0x0d,0x81,0x07,0x81,0x03,0x81,0x01,0x81,0x01,0x81,0x04,0x81,0x1c,0x81,0x03,0x81,0x02,0x81,0x01,0x81,0x03,0x81,0x08,0x81,0x04,0x83,0x03,0x81,0x02,0x81,0x06,0x82,0x01,0x82,0x02,0x82,0x04,0x81,0x04,0x84,0x02,0x81,0x03,0x82,0x03,0x81,0x06,0x81,0x04,0x82,0x05,0x86,0x05,0x82,0x03,0x82,0x03,0x81,0x02,0x83,0x02,0x81,0x02,0x81,0x02,0x85,0x02,0x81,0x06,0x81,0x04,0x81,0x01,0x86,0x01,0x86,0x01,0x81,0x03,0x82,0x01,0x86,0x03,0x81,0x08,0x81,0x02,0x83,0x04,0x81,0x06,0x81,0x01,0x82,0x01,0x81,0x01,0x81,0x01,0x82,0x01,0x81,0x01,0x81,0x04,0x81,0x01,0x85,0x02,0x81,0x04,0x81,0x01,0x85,0x03,0x84,0x04,0x81,0x04,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x03,0x82,0x05,0x81,0x06,0x82,0x05,0x81,0x06,0x81,0x06,0x81,0x1d,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x07,0x81,0x03,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x03,0x81,0x05,0x81,0x08,0x81,0x04,0x81,0x03,0x81,0x03,0x81,0x01,0x81,0x03,0x81,0x01,0x81,0x01,0x81,0x03,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x03,0x82,0x07,0x81,0x07,0x82,0x02,0x83,0x10,0x81,0x0c,0x81,0x01,0x81,0x05,0x83,0x02,0x82,0x01,0x82,0x02,0x81,0x02,0x81,0x01,0x81,0x0a,0x81,0x07,0x81,0x05,0x81,0x03,0x87,0x09,0x83,0x0c,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x07,0x81,0x08,0x81,0x01,0x81,0x03,0x81,0x07,0x81,0x01,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x02,0x83,0x01,0x81,0x0f,0x82,0x10,0x82,0x03,0x81,0x04,0x81,0x01,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x08,0x81,0x02,0x81,0x02,0x81,0x03,0x81,0x06,0x81,0x01,0x82,0x01,0x81,0x01,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x03,0x81,0x07,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x03,0x82,0x05,0x81,0x06,0x81,0x06,0x81,0x07,0x81,0x05,0x81,0x1a,0x84,0x02,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x03,0x81,0x02,0x85,0x04,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x07,0x81,0x03,0x82,0x07,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x03,0x81,0x06,0x83,0x05,0x81,0x04,0x81,0x03,0x81,0x03,0x81,0x01,0x81,0x03,0x81,0x01,0x81,0x01,0x81,0x04,0x81,0x05,0x81,0x01,0x81,0x05,0x81,0x06,0x81,0x06,0x81,0x06,0x81,0x07,0x83,0x18,0x86,0x04,0x81,0x01,0x81,0x04,0x81,0x02,0x81,0x01,0x81,0x02,0x83,0x0a,0x81,0x07,0x81,0x0c,0x81,0x1b,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x06,0x81,0x09,0x81,0x01,0x86,0x06,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x06,0x81,0x11,0x83,0x02,0x86,0x02,0x83,0x0a,0x81,0x01,0x81,0x02,0x81,0x02,0x84,0x02,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x08,0x81,0x02,0x81,0x02,0x82,0x02,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x06,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x82,0x03,0x82,0x01,0x82,0x03,0x81,0x02,0x81,0x04,0x81,0x05,0x81,0x07,0x81,0x07,0x81,0x05,0x81,0x19,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x03,0x81,0x02,0x81,0x08,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x07,0x81,0x03,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x03,0x81,0x09,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x03,0x81,0x01,0x81,0x03,0x82,0x01,0x82,0x03,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x07,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x0b,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x01,0x81,0x04,0x81,0x02,0x81,0x01,0x82,0x02,0x81,0x0c,0x81,0x05,0x81,0x0d,0x81,0x06,0x81,0x0d,0x81,0x05,0x81,0x06,0x81,0x02,0x81,0x04,0x81,0x05,0x81,0x05,0x81,0x04,0x81,0x05,0x81,0x02,0x81,0x03,0x82,0x02,0x81,0x02,0x82,0x03,0x81,0x04,0x81,0x04,0x81,0x01,0x81,0x03,0x81,0x04,0x81,0x06,0x81,0x09,0x81,0x08,0x81,0x08,0x81,0x04,0x81,0x02,0x83,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x07,0x81,0x03,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x03,0x82,0x02,0x81,0x02,0x81,0x02,0x81,0x07,0x81,0x02,0x82,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x82,0x03,0x81,0x03,0x81,0x03,0x81,0x02,0x81,0x04,0x81,0x04,0x82,0x07,0x81,0x08,0x81,0x04,0x81,0x19,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x82,0x05,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x07,0x81,0x03,0x81,0x02,0x81,0x05,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x03,0x81,0x05,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x05,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x82,0x04,0x81,0x08,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x0b,0x81,0x01,0x81,0x05,0x83,0x06,0x82,0x03,0x83,0x01,0x81,0x0b,0x81,0x05,0x81,0x0d,0x81,0x06,0x81,0x0d,0x81,0x05,0x81,0x06,0x84,0x02,0x85,0x02,0x86,0x02,0x84,0x06,0x81,0x03,0x84,0x03,0x84,0x03,0x81,0x06,0x84,0x03,0x83,0x05,0x81,0x06,0x81,0x1b,0x81,0x04,0x82,0x05,0x81,0x04,0x81,0x01,0x85,0x04,0x83,0x02,0x84,0x03,0x86,0x01,0x81,0x08,0x83,0x02,0x81,0x04,0x81,0x01,0x85,0x03,0x83,0x03,0x81,0x04,0x81,0x01,0x86,0x01,0x81,0x04,0x81,0x01,0x81,0x03,0x82,0x02,0x84,0x02,0x81,0x07,0x84,0x02,0x81,0x05,0x81,0x01,0x84,0x04,0x81,0x05,0x84,0x04,0x82,0x03,0x81,0x03,0x81,0x02,0x81,0x04,0x81,0x03,0x81,0x04,0x86,0x03,0x81,0x08,0x81,0x04,0x81,0x1a,0x84,0x02,0x84,0x04,0x83,0x04,0x84,0x03,0x83,0x05,0x81,0x05,0x84,0x02,0x81,0x03,0x81,0x02,0x85,0x05,0x81,0x03,0x81,0x03,0x81,0x05,0x82,0x02,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x03,0x81,0x03,0x83,0x03,0x84,0x04,0x84,0x03,0x81,0x06,0x83,0x05,0x83,0x03,0x84,0x04,0x81,0x05,0x81,0x01,0x81,0x03,0x81,0x03,0x81,0x04,0x81,0x04,0x85,0x04,0x81,0x06,0x81,0x06,0x81,0x2c,0x81,0x1c,0x82,0x03,0x82,0x13,0x81,0x13,0x81,0x54,0x81,0x22,0x81,0x79,0x81,0x43,0x82,0x08,0x81,0x02,0x82,0x47,0x81,0x13,0x81,0x26,0x81,0x0a,0x81,0x35,0x81,0x0d,0x83,0x04,0x81,0x04,0x83,0x2c,0x81,0x7f,0x44,0x83,0x76,0x81,0x7f,0x17,0x81,0x02,0x81,0x13,0x81,0x26,0x81,0x0a,0x81,0x34,0x81,0x15,0x81,0x7f,0x7f,0x7f,0x50,0x87,0x34,0x82,0x12,0x82,0x27,0x81,0x0a,0x81,0x33,0x82,0x7f,0x7f,0x7f,0x7f,0x7f,0x4b,0x00,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x00,0x49,0x44,0x41,0x54,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0x00,0x00,0x00,0x00,0x50,0x4c,0x54,0x45,0x00,0x00,0x00,0x00,0x62,0x4b,0x47,0x44,0x00,0x00,0x00,0x00,0x63,0x48,0x52,0x4d,0x00,0x00,0x00,0x00,0x67,0x41,0x4d,0x41,0x00,0x00,0x00,0x00,0x68,0x49,0x53,0x54,0x00,0x00,0x00,0x00,0x69,0x43,0x43,0x50,0x00,0x00,0x00,0x00,0x69,0x54,0x58,0x74,0x00,0x00,0x00,0x00,0x6f,0x46,0x46,0x73,0x00,0x00,0x00,0x00,0x70,0x43,0x41,0x4c,0x00,0x00,0x00,0x00,0x73,0x43,0x41,0x4c,0x00,0x00,0x00,0x00,0x70,0x48,0x59,0x73,0x00,0x00,0x00,0x00,0x73,0x42,0x49,0x54,0x00,0x00,0x00,0x00,0x73,0x50,0x4c,0x54,0x00,0x00,0x00,0x00,0x73,0x52,0x47,0x42,0x00,0x00,0x00,0x00,0x74,0x45,0x58,0x74,0x00,0x00,0x00,0x00,0x74,0x49,0x4d,0x45,0x00,0x00,0x00,0x00,0x74,0x52,0x4e,0x53,0x00,0x00,0x00,0x00,0x7a,0x54,0x58,0x74,0x00, +0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7e,0x82,0x03,0x82,0x7f,0x7f,0x5f,0x82,0x0b,0x82,0x14,0x81,0x0b,0x81,0x11,0x81,0x0c,0x82,0x09,0x81,0x08,0x81,0x07,0x81,0x03,0x81,0x06,0x83,0x68,0x83,0x04,0x81,0x04,0x83,0x17,0x81,0x05,0x81,0x01,0x81,0x0c,0x81,0x04,0x82,0x07,0x83,0x04,0x81,0x07,0x81,0x05,0x81,0x06,0x81,0x25,0x81,0x02,0x84,0x02,0x83,0x05,0x84,0x03,0x84,0x05,0x82,0x02,0x85,0x04,0x83,0x02,0x86,0x02,0x84,0x03,0x84,0x27,0x83,0x0b,0x82,0x03,0x85,0x04,0x83,0x02,0x84,0x03,0x86,0x01,0x86,0x03,0x83,0x02,0x81,0x04,0x81,0x01,0x85,0x04,0x83,0x02,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x82,0x03,0x81,0x02,0x84,0x02,0x85,0x03,0x84,0x02,0x85,0x03,0x84,0x01,0x87,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x82,0x05,0x81,0x01,0x81,0x04,0x82,0x05,0x81,0x01,0x86,0x03,0x81,0x04,0x81,0x08,0x81,0x05,0x82,0x0e,0x81,0x0a,0x81,0x11,0x81,0x0b,0x81,0x0b,0x81,0x14,0x81,0x08,0x81,0x37,0x81,0x30,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x05,0x81,0x01,0x81,0x05,0x81,0x01,0x81,0x03,0x83,0x02,0x81,0x02,0x81,0x05,0x81,0x07,0x81,0x07,0x81,0x05,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x22,0x81,0x03,0x81,0x02,0x81,0x04,0x81,0x04,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x04,0x82,0x02,0x81,0x07,0x81,0x03,0x81,0x05,0x82,0x01,0x81,0x04,0x81,0x01,0x82,0x02,0x81,0x26,0x81,0x03,0x81,0x03,0x83,0x04,0x82,0x03,0x81,0x04,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x07,0x81,0x03,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x08,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x06,0x82,0x02,0x82,0x01,0x82,0x03,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x01,0x81,0x04,0x82,0x02,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x03,0x81,0x06,0x82,0x03,0x81,0x05,0x81,0x07,0x81,0x04,0x81,0x02,0x81,0x18,0x81,0x11,0x81,0x0b,0x81,0x0b,0x81,0x14,0x81,0x08,0x81,0x37,0x81,0x30,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x05,0x81,0x01,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x05,0x81,0x07,0x81,0x06,0x81,0x07,0x81,0x04,0x83,0x05,0x81,0x1d,0x81,0x02,0x81,0x04,0x81,0x03,0x81,0x09,0x81,0x06,0x81,0x03,0x81,0x01,0x81,0x02,0x81,0x06,0x81,0x0a,0x81,0x02,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x14,0x81,0x08,0x81,0x0b,0x81,0x02,0x81,0x02,0x82,0x03,0x82,0x03,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x06,0x81,0x06,0x81,0x04,0x81,0x03,0x81,0x08,0x81,0x02,0x81,0x02,0x81,0x03,0x81,0x06,0x82,0x02,0x82,0x01,0x81,0x01,0x81,0x02,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x08,0x81,0x04,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x01,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x07,0x81,0x04,0x81,0x05,0x81,0x07,0x81,0x03,0x81,0x04,0x81,0x11,0x83,0x03,0x84,0x04,0x83,0x04,0x84,0x03,0x83,0x03,0x85,0x03,0x84,0x02,0x81,0x01,0x82,0x03,0x83,0x05,0x83,0x03,0x81,0x03,0x81,0x04,0x81,0x04,0x85,0x02,0x81,0x01,0x82,0x04,0x83,0x03,0x84,0x04,0x84,0x03,0x84,0x03,0x83,0x03,0x85,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x05,0x81,0x01,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x85,0x04,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x0b,0x86,0x01,0x81,0x01,0x81,0x04,0x82,0x02,0x81,0x03,0x82,0x0d,0x81,0x07,0x81,0x04,0x83,0x05,0x81,0x1c,0x81,0x03,0x81,0x04,0x81,0x03,0x81,0x09,0x81,0x06,0x81,0x02,0x82,0x01,0x81,0x02,0x85,0x02,0x81,0x01,0x83,0x06,0x81,0x02,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x06,0x81,0x06,0x83,0x0a,0x83,0x06,0x82,0x02,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x06,0x81,0x06,0x81,0x04,0x81,0x03,0x81,0x08,0x81,0x02,0x81,0x01,0x81,0x04,0x81,0x06,0x81,0x01,0x82,0x01,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x01,0x82,0x07,0x81,0x04,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x03,0x82,0x04,0x81,0x01,0x81,0x06,0x81,0x05,0x81,0x06,0x81,0x06,0x81,0x19,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x82,0x05,0x81,0x03,0x81,0x02,0x82,0x02,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x02,0x82,0x02,0x81,0x04,0x81,0x07,0x81,0x03,0x81,0x02,0x81,0x05,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x02,0x82,0x02,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x03,0x82,0x02,0x81,0x01,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x05,0x81,0x02,0x81,0x01,0x81,0x03,0x81,0x03,0x81,0x06,0x81,0x04,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x0c,0x81,0x01,0x81,0x03,0x83,0x06,0x82,0x04,0x82,0x0d,0x81,0x07,0x81,0x03,0x81,0x01,0x81,0x01,0x81,0x04,0x81,0x1c,0x81,0x03,0x81,0x02,0x81,0x01,0x81,0x03,0x81,0x08,0x81,0x04,0x83,0x03,0x81,0x02,0x81,0x06,0x82,0x01,0x82,0x02,0x82,0x04,0x81,0x04,0x84,0x02,0x81,0x03,0x82,0x03,0x81,0x06,0x81,0x04,0x82,0x05,0x86,0x05,0x82,0x03,0x82,0x03,0x81,0x02,0x83,0x02,0x81,0x02,0x81,0x02,0x85,0x02,0x81,0x06,0x81,0x04,0x81,0x01,0x86,0x01,0x86,0x01,0x81,0x03,0x82,0x01,0x86,0x03,0x81,0x08,0x81,0x02,0x83,0x04,0x81,0x06,0x81,0x01,0x82,0x01,0x81,0x01,0x81,0x01,0x82,0x01,0x81,0x01,0x81,0x04,0x81,0x01,0x85,0x02,0x81,0x04,0x81,0x01,0x85,0x03,0x84,0x04,0x81,0x04,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x03,0x82,0x05,0x81,0x06,0x82,0x05,0x81,0x06,0x81,0x06,0x81,0x1d,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x07,0x81,0x03,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x03,0x81,0x05,0x81,0x08,0x81,0x04,0x81,0x03,0x81,0x03,0x81,0x01,0x81,0x03,0x81,0x01,0x81,0x01,0x81,0x03,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x03,0x82,0x07,0x81,0x07,0x82,0x02,0x83,0x10,0x81,0x0c,0x81,0x01,0x81,0x05,0x83,0x02,0x82,0x01,0x82,0x02,0x81,0x02,0x81,0x01,0x81,0x0a,0x81,0x07,0x81,0x05,0x81,0x03,0x87,0x09,0x83,0x0c,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x07,0x81,0x08,0x81,0x01,0x81,0x03,0x81,0x07,0x81,0x01,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x02,0x83,0x01,0x81,0x0f,0x82,0x10,0x82,0x03,0x81,0x04,0x81,0x01,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x02,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x08,0x81,0x02,0x81,0x02,0x81,0x03,0x81,0x06,0x81,0x01,0x82,0x01,0x81,0x01,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x03,0x81,0x07,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x02,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x01,0x81,0x03,0x82,0x05,0x81,0x06,0x81,0x06,0x81,0x07,0x81,0x05,0x81,0x1a,0x84,0x02,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x03,0x81,0x02,0x85,0x04,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x07,0x81,0x03,0x82,0x07,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x03,0x81,0x06,0x83,0x05,0x81,0x04,0x81,0x03,0x81,0x03,0x81,0x01,0x81,0x03,0x81,0x01,0x81,0x01,0x81,0x04,0x81,0x05,0x81,0x01,0x81,0x05,0x81,0x06,0x81,0x06,0x81,0x06,0x81,0x07,0x83,0x18,0x86,0x04,0x81,0x01,0x81,0x04,0x81,0x02,0x81,0x01,0x81,0x02,0x83,0x0a,0x81,0x07,0x81,0x0c,0x81,0x1b,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x06,0x81,0x09,0x81,0x01,0x86,0x06,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x06,0x81,0x11,0x83,0x02,0x86,0x02,0x83,0x0a,0x81,0x01,0x81,0x02,0x81,0x02,0x84,0x02,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x08,0x81,0x02,0x81,0x02,0x82,0x02,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x02,0x81,0x01,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x06,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x82,0x03,0x82,0x01,0x82,0x03,0x81,0x02,0x81,0x04,0x81,0x05,0x81,0x07,0x81,0x07,0x81,0x05,0x81,0x19,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x03,0x81,0x02,0x81,0x08,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x07,0x81,0x03,0x81,0x01,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x03,0x81,0x09,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x03,0x81,0x01,0x81,0x03,0x82,0x01,0x82,0x03,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x07,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x0b,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x01,0x81,0x04,0x81,0x02,0x81,0x01,0x82,0x02,0x81,0x0c,0x81,0x05,0x81,0x0d,0x81,0x06,0x81,0x0d,0x81,0x05,0x81,0x06,0x81,0x02,0x81,0x04,0x81,0x05,0x81,0x05,0x81,0x04,0x81,0x05,0x81,0x02,0x81,0x03,0x82,0x02,0x81,0x02,0x82,0x03,0x81,0x04,0x81,0x04,0x81,0x01,0x81,0x03,0x81,0x04,0x81,0x06,0x81,0x09,0x81,0x08,0x81,0x08,0x81,0x04,0x81,0x02,0x83,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x02,0x81,0x03,0x81,0x01,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x07,0x81,0x03,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x06,0x81,0x04,0x81,0x01,0x81,0x03,0x82,0x02,0x81,0x02,0x81,0x02,0x81,0x07,0x81,0x02,0x82,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x82,0x03,0x81,0x03,0x81,0x03,0x81,0x02,0x81,0x04,0x81,0x04,0x82,0x07,0x81,0x08,0x81,0x04,0x81,0x19,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x82,0x05,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x04,0x81,0x07,0x81,0x03,0x81,0x02,0x81,0x05,0x81,0x04,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x02,0x81,0x03,0x81,0x03,0x81,0x05,0x81,0x03,0x81,0x04,0x81,0x04,0x81,0x03,0x81,0x04,0x81,0x05,0x81,0x01,0x81,0x04,0x81,0x01,0x81,0x04,0x82,0x04,0x81,0x08,0x81,0x06,0x81,0x06,0x81,0x17,0x81,0x0b,0x81,0x01,0x81,0x05,0x83,0x06,0x82,0x03,0x83,0x01,0x81,0x0b,0x81,0x05,0x81,0x0d,0x81,0x06,0x81,0x0d,0x81,0x05,0x81,0x06,0x84,0x02,0x85,0x02,0x86,0x02,0x84,0x06,0x81,0x03,0x84,0x03,0x84,0x03,0x81,0x06,0x84,0x03,0x83,0x05,0x81,0x06,0x81,0x1b,0x81,0x04,0x82,0x05,0x81,0x04,0x81,0x01,0x85,0x04,0x83,0x02,0x84,0x03,0x86,0x01,0x81,0x08,0x83,0x02,0x81,0x04,0x81,0x01,0x85,0x03,0x83,0x03,0x81,0x04,0x81,0x01,0x86,0x01,0x81,0x04,0x81,0x01,0x81,0x03,0x82,0x02,0x84,0x02,0x81,0x07,0x84,0x02,0x81,0x05,0x81,0x01,0x84,0x04,0x81,0x05,0x84,0x04,0x82,0x03,0x81,0x03,0x81,0x02,0x81,0x04,0x81,0x03,0x81,0x04,0x86,0x03,0x81,0x08,0x81,0x04,0x81,0x1a,0x84,0x02,0x84,0x04,0x83,0x04,0x84,0x03,0x83,0x05,0x81,0x05,0x84,0x02,0x81,0x03,0x81,0x02,0x85,0x05,0x81,0x03,0x81,0x03,0x81,0x05,0x82,0x02,0x81,0x01,0x81,0x01,0x81,0x02,0x81,0x03,0x81,0x03,0x83,0x03,0x84,0x04,0x84,0x03,0x81,0x06,0x83,0x05,0x83,0x03,0x84,0x04,0x81,0x05,0x81,0x01,0x81,0x03,0x81,0x03,0x81,0x04,0x81,0x04,0x85,0x04,0x81,0x06,0x81,0x06,0x81,0x2c,0x81,0x1c,0x82,0x03,0x82,0x13,0x81,0x13,0x81,0x54,0x81,0x22,0x81,0x79,0x81,0x43,0x82,0x08,0x81,0x02,0x82,0x47,0x81,0x13,0x81,0x26,0x81,0x0a,0x81,0x35,0x81,0x0d,0x83,0x04,0x81,0x04,0x83,0x2c,0x81,0x7f,0x44,0x83,0x76,0x81,0x7f,0x17,0x81,0x02,0x81,0x13,0x81,0x26,0x81,0x0a,0x81,0x34,0x81,0x15,0x81,0x7f,0x7f,0x7f,0x50,0x87,0x34,0x82,0x12,0x82,0x27,0x81,0x0a,0x81,0x33,0x82,0x7f,0x7f,0x7f,0x7f,0x7f,0x4b,0x00,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x00,0x49,0x44,0x41,0x54,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0x00,0x00,0x00,0x00,0x50,0x4c,0x54,0x45,0x00,0x00,0x00,0x00,0x62,0x4b,0x47,0x44,0x00,0x00,0x00,0x00,0x63,0x48,0x52,0x4d,0x00,0x00,0x00,0x00,0x67,0x41,0x4d,0x41,0x00,0x00,0x00,0x00,0x68,0x49,0x53,0x54,0x00,0x00,0x00,0x00,0x69,0x43,0x43,0x50,0x00,0x00,0x00,0x00,0x69,0x54,0x58,0x74,0x00,0x00,0x00,0x00,0x6f,0x46,0x46,0x73,0x00,0x00,0x00,0x00,0x70,0x43,0x41,0x4c,0x00,0x00,0x00,0x00,0x73,0x43,0x41,0x4c,0x00,0x00,0x00,0x00,0x70,0x48,0x59,0x73,0x00,0x00,0x00,0x00,0x73,0x42,0x49,0x54,0x00,0x00,0x00,0x00,0x73,0x50,0x4c,0x54,0x00,0x00,0x00,0x00,0x73,0x52,0x47,0x42,0x00,0x00,0x00,0x00,0x74,0x45,0x58,0x74,0x00,0x00,0x00,0x00,0x74,0x49,0x4d,0x45,0x00,0x00,0x00,0x00,0x74,0x52,0x4e,0x53,0x00,0x00,0x00,0x00,0x7a,0x54,0x58,0x74,0x00, } }; diff --git a/minuitwrp/mkfont.c b/minuitwrp/mkfont.c index 61a5edeb2..409316cb1 100644 --- a/minuitwrp/mkfont.c +++ b/minuitwrp/mkfont.c @@ -8,7 +8,7 @@ int main(int argc, char *argv) unsigned m; unsigned run_val; unsigned run_count; - + n = gimp_image.width * gimp_image.height; m = 0; x = gimp_image.pixel_data; @@ -23,7 +23,7 @@ int main(int argc, char *argv) printf(" .width = %d,\n .height = %d,\n .cwidth = %d,\n .cheight = %d,\n", gimp_image.width, gimp_image.height, gimp_image.width / 96, gimp_image.height); printf(" .rundata = {\n"); - + run_val = (*x ? 0 : 255); run_count = 1; n--; diff --git a/partition.cpp b/partition.cpp index e92fccfd2..699ed9d0c 100644 --- a/partition.cpp +++ b/partition.cpp @@ -359,7 +359,7 @@ bool TWPartition::Process_Fstab_Line(string Line, bool Display_Error) { Can_Be_Backed_Up = true; if (Mount(false) && !TWFunc::Path_Exists("/cache/recovery/.")) { LOGINFO("Recreating /cache/recovery folder.\n"); - if (mkdir("/cache/recovery", S_IRWXU | S_IRWXG | S_IWGRP | S_IXGRP) != 0) + if (mkdir("/cache/recovery", S_IRWXU | S_IRWXG | S_IWGRP | S_IXGRP) != 0) return -1; } } else if (Mount_Point == "/datadata") { @@ -1438,7 +1438,7 @@ void TWPartition::Check_FS_Type() { return; } - if (blkid_probe_lookup_value(pr, "TYPE", &type, NULL) < 0) { + if (blkid_probe_lookup_value(pr, "TYPE", &type, NULL) < 0) { blkid_free_probe(pr); LOGINFO("can't find filesystem on device %s\n", Actual_Block_Device.c_str()); return; @@ -1976,7 +1976,7 @@ void TWPartition::Recreate_Media_Folder(void) { } else if (!TWFunc::Path_Exists("/data/media")) { PartitionManager.Mount_By_Path(Symlink_Mount_Point, true); LOGINFO("Recreating /data/media folder.\n"); - mkdir("/data/media", S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); + mkdir("/data/media", S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); #ifdef HAVE_SELINUX perms.fixDataInternalContexts(); #endif @@ -1993,7 +1993,7 @@ void TWPartition::Recreate_AndSec_Folder(void) { } else if (!TWFunc::Path_Exists(Symlink_Path)) { LOGINFO("Recreating %s folder.\n", Backup_Name.c_str()); PartitionManager.Mount_By_Path(Symlink_Mount_Point, true); - mkdir(Symlink_Path.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); + mkdir(Symlink_Path.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); PartitionManager.UnMount_By_Path(Symlink_Mount_Point, true); } } diff --git a/partitionmanager.cpp b/partitionmanager.cpp index 452e5c245..47c2ebe49 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -510,7 +510,7 @@ int TWPartitionManager::Check_Backup_Name(bool Display_Error) { return 0; // A "0" (zero) means to use the current timestamp for the backup name for (index=0; index<copy_size; index++) { cur_char = (int)backup_name[index]; - if (cur_char == 32 || (cur_char >= 48 && cur_char <= 57) || (cur_char >= 65 && cur_char <= 91) || cur_char == 93 || cur_char == 95 || (cur_char >= 97 && cur_char <= 123) || cur_char == 125 || cur_char == 45 || cur_char == 46) { + if (cur_char == 32 || (cur_char >= 48 && cur_char <= 57) || (cur_char >= 65 && cur_char <= 91) || cur_char == 93 || cur_char == 95 || (cur_char >= 97 && cur_char <= 123) || cur_char == 125 || cur_char == 45 || cur_char == 46) { // These are valid characters // Numbers // Upper case letters @@ -528,7 +528,7 @@ int TWPartitionManager::Check_Backup_Name(bool Display_Error) { DataManager::GetValue(TW_BACKUPS_FOLDER_VAR, Backup_Loc); strcpy(backup_loc, Backup_Loc.c_str()); sprintf(tw_image_dir,"%s/%s", backup_loc, Backup_Name.c_str()); - if (TWFunc::Path_Exists(tw_image_dir)) { + if (TWFunc::Path_Exists(tw_image_dir)) { if (Display_Error) LOGERR("A backup with this name already exists.\n"); return -4; @@ -544,7 +544,7 @@ bool TWPartitionManager::Make_MD5(bool generate_md5, string Backup_Folder, strin string result; twrpDigest md5sum; - if (!generate_md5) + if (!generate_md5) return true; TWFunc::GUI_Operation_Text(TW_GENERATE_MD5_TEXT, "Generating MD5"); @@ -618,7 +618,7 @@ bool TWPartitionManager::Backup_Partition(TWPartition* Part, string Backup_Folde pos = (total_time - remain_time) / (float) total_time; DataManager::SetProgress(pos); - LOGINFO("Estimated Total time: %lu Estimated remaining time: %lu\n", total_time, remain_time); + LOGINFO("Estimated total time: %lu\nEstimated remaining time: %lu\n", total_time, remain_time); // And get the time if (Part->Backup_Method == 1) @@ -680,7 +680,7 @@ int TWPartitionManager::Run_Backup(void) { time_t start, stop, seconds, total_start, total_stop; size_t start_pos = 0, end_pos = 0; seconds = time(0); - t = localtime(&seconds); + t = localtime(&seconds); time(&total_start); @@ -747,7 +747,7 @@ int TWPartitionManager::Run_Backup(void) { } total_bytes = file_bytes + img_bytes; gui_print(" * Total number of partitions to back up: %d\n", partition_count); - gui_print(" * Total size of all data: %lluMB\n", total_bytes / 1024 / 1024); + gui_print(" * Total size of all data: %lluMB\n", total_bytes / 1024 / 1024); storage = Find_Partition_By_Path(DataManager::GetCurrentStoragePath()); if (storage != NULL) { free_space = storage->Free; @@ -762,7 +762,7 @@ int TWPartitionManager::Run_Backup(void) { return false; } img_bytes_remaining = img_bytes; - file_bytes_remaining = file_bytes; + file_bytes_remaining = file_bytes; gui_print("\n[BACKUP STARTED]\n"); gui_print(" * Backup Folder: %s\n", Full_Backup_Path.c_str()); @@ -802,23 +802,23 @@ int TWPartitionManager::Run_Backup(void) { time(&total_stop); int total_time = (int) difftime(total_stop, total_start); uint64_t actual_backup_size = du.Get_Folder_Size(Full_Backup_Path); - actual_backup_size /= (1024LLU * 1024LLU); + actual_backup_size /= (1024LLU * 1024LLU); int prev_img_bps, use_compression; unsigned long long prev_file_bps; DataManager::GetValue(TW_BACKUP_AVG_IMG_RATE, prev_img_bps); img_bps += (prev_img_bps * 4); - img_bps /= 5; + img_bps /= 5; - DataManager::GetValue(TW_USE_COMPRESSION_VAR, use_compression); + DataManager::GetValue(TW_USE_COMPRESSION_VAR, use_compression); if (use_compression) DataManager::GetValue(TW_BACKUP_AVG_FILE_COMP_RATE, prev_file_bps); - else + else DataManager::GetValue(TW_BACKUP_AVG_FILE_RATE, prev_file_bps); file_bps += (prev_file_bps * 4); - file_bps /= 5; + file_bps /= 5; - DataManager::SetValue(TW_BACKUP_AVG_IMG_RATE, img_bps); + DataManager::SetValue(TW_BACKUP_AVG_IMG_RATE, img_bps); if (use_compression) DataManager::SetValue(TW_BACKUP_AVG_FILE_COMP_RATE, file_bps); else @@ -1201,7 +1201,7 @@ int TWPartitionManager::Wipe_Dalvik_Cache(void) { if (stat("/sd-ext/dalvik-cache", &st) == 0) { TWFunc::removeDir("/sd-ext/dalvik-cache", false); - gui_print("Cleaned: /sd-ext/dalvik-cache...\n"); + gui_print("Cleaned: /sd-ext/dalvik-cache...\n"); } } gui_print("-- Dalvik Cache Directories Wipe Complete!\n\n"); @@ -1542,7 +1542,7 @@ int TWPartitionManager::Decrypt_Device(string Password) { property_set("ro.crypto.sd_fs_mnt_point", EXPAND(TW_INTERNAL_STORAGE_PATH)); #endif - property_set("rw.km_fips_status", "ready"); + property_set("rw.km_fips_status", "ready"); #endif @@ -1854,7 +1854,7 @@ int TWPartitionManager::Partition_SDCard(void) { tmpdevice += device; if (tmpdevice == Device) { // Adjust block size to byte size - total_size = (int)(blocks * 1024ULL / 1000000LLU); + total_size = (int)(blocks * 1024ULL / 1000000LLU); break; } } diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 1f784d359..73425342b 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -9,7 +9,7 @@ LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin -# Manage list +# Manage list RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/dump_image RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/flash_image RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/erase_image diff --git a/prebuilt/fix_permissions.sh b/prebuilt/fix_permissions.sh index 6d063f953..3723a126c 100755 --- a/prebuilt/fix_permissions.sh +++ b/prebuilt/fix_permissions.sh @@ -188,12 +188,12 @@ fp_start() $MOUNT /system > /dev/null 2>&1 SYSMOUNT=1 fi - + if $TEST $( $GREP -c " /data " "/proc/mounts" ) -eq 0; then $MOUNT /data > /dev/null 2>&1 DATAMOUNT=1 fi - + if $TEST -e /dev/block/mmcblk0p2 && $TEST $( $GREP -c " $SD_EXT_DIRECTORY " "/proc/mounts" ) -eq 0; then $MOUNT $SD_EXT_DIRECTORY > /dev/null 2>&1 SYSSDMOUNT=1 @@ -207,7 +207,7 @@ fp_start() if $TEST ! -e "$LOG_FILE"; then > $LOG_FILE fi - + fp_print "$0 $VERSION started at $FP_STARTTIME" } @@ -216,7 +216,7 @@ fp_chown_uid() FP_OLDUID=$1 FP_UID=$2 FP_FILE=$3 - + #if user ownership doesn't equal then change them if $TEST "$FP_OLDUID" != "$FP_UID"; then if $TEST $VERBOSE -ne 0; then @@ -233,7 +233,7 @@ fp_chown_gid() FP_OLDGID=$1 FP_GID=$2 FP_FILE=$3 - + #if group ownership doesn't equal then change them if $TEST "$FP_OLDGID" != "$FP_GID"; then if $TEST $VERBOSE -ne 0; then @@ -252,7 +252,7 @@ fp_chmod() FP_PERSTR=$2 FP_PERNUM=$3 FP_FILE=$4 - + #if the permissions are not equal if $TEST "$FP_OLDPER" != "$FP_PERSTR"; then if $TEST $VERBOSE -ne 0; then @@ -299,22 +299,22 @@ fp_package() GID=$UID APPDIR=$( $ECHO $CODEPATH | $SED 's%^\(.*\)/.*%\1%' ) APK=$( $ECHO $CODEPATH | $SED 's%^.*/\(.*\..*\)$%\1%' ) - + #debug if $TEST $DEBUG -eq 1; then fp_print "CODEPATH: $CODEPATH APPDIR: $APPDIR APK:$APK UID/GID:$UID:$GID" fi - + #check for existence of apk if $TEST -e $CODEPATH; then fp_print "Processing ($curnum of $endnum): $PACKAGE..." - + #lets get existing permissions of CODEPATH OLD_UGD=$( $LS -ln "$CODEPATH" ) OLD_PER=$( $ECHO $OLD_UGD | $CUT -d ' ' -f1 ) OLD_UID=$( $ECHO $OLD_UGD | $CUT -d ' ' -f3 ) OLD_GID=$( $ECHO $OLD_UGD | $CUT -d ' ' -f4 ) - + #apk source dirs if $TEST "$APPDIR" = "/system/app"; then #skip system apps if set @@ -345,7 +345,7 @@ fp_package() fi fi fi - + #the data/data for the package if $TEST -d "/data/data/$PACKAGE"; then #find all directories in /data/data/$PACKAGE @@ -356,14 +356,14 @@ fp_package() OLD_GID=$( $ECHO $dataline | $CUT -d ' ' -f4 ) FILEDIR=$( $ECHO $dataline | $CUT -d ' ' -f9 ) FOURDIR=$( $ECHO $FILEDIR | $CUT -d '/' -f5 ) - + #set defaults for iteration ISLIB=0 REVPERM=755 REVPSTR="rwxr-xr-x" REVUID=$UID REVGID=$GID - + if $TEST "$FOURDIR" = ""; then #package directory, perms:755 owner:$UID:$GID fp_chmod $OLD_PER "rwxr-xr-x" 755 "$FILEDIR" @@ -400,7 +400,7 @@ fp_package() REVPSTR="rwxrwx--x" fp_chmod $OLD_PER "rwxrwx--x" 771 "$FILEDIR" fi - + #change ownership of directories matched if $TEST "$ISLIB" = "1"; then fp_chown_uid $OLD_UID 1000 "$FILEDIR" @@ -409,21 +409,21 @@ fp_package() fp_chown_uid $OLD_UID $UID "$FILEDIR" fp_chown_gid $OLD_GID $GID "$FILEDIR" fi - + #if any files exist in directory with improper permissions reset them $FIND $FILEDIR -type f -maxdepth 1 ! -perm $REVPERM -exec $LS -ln {} \; | while read subline; do OLD_PER=$( $ECHO $subline | $CUT -d ' ' -f1 ) SUBFILE=$( $ECHO $subline | $CUT -d ' ' -f9 ) fp_chmod $OLD_PER $REVPSTR $REVPERM "$SUBFILE" done - + #if any files exist in directory with improper user reset them $FIND $FILEDIR -type f -maxdepth 1 ! -user $REVUID -exec $LS -ln {} \; | while read subline; do OLD_UID=$( $ECHO $subline | $CUT -d ' ' -f3 ) SUBFILE=$( $ECHO $subline | $CUT -d ' ' -f9 ) fp_chown_uid $OLD_UID $REVUID "$SUBFILE" done - + #if any files exist in directory with improper group reset them $FIND $FILEDIR -type f -maxdepth 1 ! -group $REVGID -exec $LS -ln {} \; | while read subline; do OLD_GID=$( $ECHO $subline | $CUT -d ' ' -f4 ) @@ -451,24 +451,24 @@ fp_end() if $TEST $SYSREMOUNT -eq 1; then $MOUNT -o remount,ro $DEVICE /system > /dev/null 2>&1 fi - + if $TEST $SYSSDMOUNT -eq 1; then $UMOUNT $SD_EXT_DIRECTORY > /dev/null 2>&1 fi - + if $TEST $SYSMOUNT -eq 1; then $UMOUNT /system > /dev/null 2>&1 fi - + if $TEST $DATAMOUNT -eq 1; then $UMOUNT /data > /dev/null 2>&1 fi - + FP_ENDTIME=$( $DATE +"%m-%d-%Y %H:%M:%S" ) FP_ENDEPOCH=$( $DATE +%s ) - + date_diff $FP_STARTEPOCH $FP_ENDEPOCH - + fp_print "$0 $VERSION ended at $FP_ENDTIME (Runtime:${FP_DDM}m${FP_DDS}s)" } diff --git a/prebuilt/install-recovery.sh b/prebuilt/install-recovery.sh index f62cf0b96..7c65d0ed5 100755 --- a/prebuilt/install-recovery.sh +++ b/prebuilt/install-recovery.sh @@ -10,7 +10,7 @@ /system/xbin/daemonsu --auto-daemon & -# Some apps like to run stuff from this script as well, that will +# Some apps like to run stuff from this script as well, that will # obviously break root - in your code, just search this file # for "install-recovery-2.sh", and if present, write there instead. diff --git a/prebuilt/relink-binaries.sh b/prebuilt/relink-binaries.sh index 2dd894317..37528531a 100755 --- a/prebuilt/relink-binaries.sh +++ b/prebuilt/relink-binaries.sh @@ -16,4 +16,4 @@ dest=$1 for ARG in $* do process_file $dest $ARG -done +done
\ No newline at end of file diff --git a/twrp-functions.cpp b/twrp-functions.cpp index fd974d234..2128c9635 100644 --- a/twrp-functions.cpp +++ b/twrp-functions.cpp @@ -550,7 +550,7 @@ int TWFunc::removeDir(const string path, bool skipParent) { if (p->d_type == DT_DIR) { r = removeDir(new_path, true); if (!r) { - if (p->d_type == DT_DIR) + if (p->d_type == DT_DIR) r = rmdir(new_path.c_str()); else LOGINFO("Unable to removeDir '%s': %s\n", new_path.c_str(), strerror(errno)); @@ -564,7 +564,7 @@ int TWFunc::removeDir(const string path, bool skipParent) { } closedir(d); - if (!r) { + if (!r) { if (skipParent) return 0; else |
