diff options
| -rw-r--r-- | gui/Android.mk | 7 | ||||
| -rw-r--r-- | gui/action.cpp | 3 | ||||
| -rw-r--r-- | gui/blanktimer.cpp | 128 | ||||
| -rw-r--r-- | gui/blanktimer.hpp | 55 | ||||
| -rw-r--r-- | gui/button.cpp | 19 | ||||
| -rwxr-xr-x | gui/devices/1024x600/res/ui.xml | 114 | ||||
| -rw-r--r-- | gui/devices/1024x768/res/ui.xml | 114 | ||||
| -rw-r--r-- | gui/devices/1280x800/res/ui.xml | 114 | ||||
| -rw-r--r-- | gui/devices/1920x1200/res/ui.xml | 114 | ||||
| -rw-r--r-- | gui/devices/2560x1600/res/ui.xml | 114 | ||||
| -rw-r--r-- | gui/devices/320x480/res/ui.xml | 118 | ||||
| -rw-r--r-- | gui/devices/480x800/res/ui.xml | 118 | ||||
| -rw-r--r-- | gui/devices/480x854/res/ui.xml | 118 | ||||
| -rw-r--r-- | gui/devices/540x960/res/ui.xml | 118 | ||||
| -rw-r--r-- | gui/devices/720x1280/res/ui.xml | 126 | ||||
| -rwxr-xr-x | gui/devices/800x1280/res/ui.xml | 130 | ||||
| -rwxr-xr-x | gui/devices/800x480/res/ui.xml | 122 | ||||
| -rw-r--r-- | gui/fileselector.cpp | 65 | ||||
| -rw-r--r-- | gui/gui.cpp | 1012 | ||||
| -rw-r--r-- | gui/gui.h | 26 | ||||
| -rw-r--r-- | gui/listbox.cpp | 797 | ||||
| -rw-r--r-- | gui/objects.hpp | 33 | ||||
| -rw-r--r-- | partition.cpp | 10 | ||||
| -rw-r--r-- | twrp-functions.cpp | 49 | ||||
| -rw-r--r-- | twrp-functions.hpp | 104 | ||||
| -rw-r--r-- | twrpTar.cpp | 141 | ||||
| -rw-r--r-- | twrpTar.hpp | 10 | ||||
| -rw-r--r-- | variables.h | 360 |
28 files changed, 3100 insertions, 1139 deletions
diff --git a/gui/Android.mk b/gui/Android.mk index 58d9c4ba0..9e11e5e2d 100644 --- a/gui/Android.mk +++ b/gui/Android.mk @@ -19,7 +19,9 @@ LOCAL_SRC_FILES := \ slider.cpp \ listbox.cpp \ keyboard.cpp \ - input.cpp + input.cpp \ + blanktimer.cpp \ + ../minuitwrp/graphics.c ifneq ($(TWRP_CUSTOM_KEYBOARD),) LOCAL_SRC_FILES += $(TWRP_CUSTOM_KEYBOARD) @@ -46,6 +48,9 @@ endif ifneq ($(TW_EXTERNAL_STORAGE_PATH),) LOCAL_CFLAGS += -DTW_EXTERNAL_STORAGE_PATH=$(TW_EXTERNAL_STORAGE_PATH) endif +ifneq ($(TW_BRIGHTNESS_PATH),) + LOCAL_CFLAGS += -DTW_BRIGHTNESS_PATH=$(TW_BRIGHTNESS_PATH) +endif LOCAL_C_INCLUDES += bionic external/stlport/stlport $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION) diff --git a/gui/action.cpp b/gui/action.cpp index e56db2b76..f1dac1c9b 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -24,6 +24,7 @@ #include "../ui.h" #include "../adb_install.h" +#include "blanktimer.hpp" extern "C" { #include "../common.h" @@ -44,6 +45,7 @@ int gui_start(); #include "objects.hpp" extern RecoveryUI* ui; +extern blanktimer blankTimer; void curtainClose(void); @@ -323,6 +325,7 @@ void GUIAction::operation_end(const int operation_status, const int simulate) } DataManager::SetValue("tw_operation_state", 1); DataManager::SetValue(TW_ACTION_BUSY, 0); + blankTimer.resetTimerAndUnblank(); } int GUIAction::doAction(Action action, int isThreaded /* = 0 */) diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp new file mode 100644 index 000000000..f64bb5f45 --- /dev/null +++ b/gui/blanktimer.cpp @@ -0,0 +1,128 @@ +/* + Copyright 2012 bigbiff/Dees_Troy TeamWin + This file is part of TWRP/TeamWin Recovery Project. + + TWRP is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + TWRP is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with TWRP. If not, see <http://www.gnu.org/licenses/>. +*/ + +using namespace std; +#include "rapidxml.hpp" +using namespace rapidxml; +extern "C" { +#include "../minzip/Zip.h" +#include "../minuitwrp/minui.h" +} +#include <string> +#include <vector> +#include <map> +#include "resources.hpp" +#include <pthread.h> +#include <sys/time.h> +#include <time.h> +#include <unistd.h> +#include <pixelflinger/pixelflinger.h> +#include <linux/kd.h> +#include <linux/fb.h> +#include <sstream> +#include "pages.hpp" +#include "blanktimer.hpp" +extern "C" { +#include "../common.h" +#include "../recovery_ui.h" +} +#include "../twrp-functions.hpp" +#include "../variables.h" + +blanktimer::blanktimer(void) { + blanked = 0; + sleepTimer = 60; + orig_brightness = getBrightness(); +} + +int blanktimer::setTimerThread(void) { + pthread_t thread; + ThreadPtr blankptr = &blanktimer::setClockTimer; + PThreadPtr p = *(PThreadPtr*)&blankptr; + pthread_create(&thread, NULL, p, this); + return 0; +} + +void blanktimer::setBlank(int blank) { + pthread_mutex_lock(&blankmutex); + conblank = blank; + pthread_mutex_unlock(&blankmutex); +} + +int blanktimer::getBlank(void) { + return conblank; +} + +void blanktimer::setTimer(void) { + pthread_mutex_lock(&timermutex); + clock_gettime(CLOCK_MONOTONIC, &btimer); + pthread_mutex_unlock(&timermutex); +} + +timespec blanktimer::getTimer(void) { + return btimer; +} + +int blanktimer::setClockTimer(void) { + timespec curTime, diff; + while(1) { + usleep(1000); + clock_gettime(CLOCK_MONOTONIC, &curTime); + diff = TWFunc::timespec_diff(btimer, curTime); + if (diff.tv_sec > sleepTimer && conblank != 1) + setBlank(1); + if (conblank == 1 && blanked != 1) { + blanked = 1; + gr_fb_blank(conblank); + setBrightness(0); + PageManager::ChangeOverlay("lock"); + } + } + return -1; +} + +int blanktimer::getBrightness(void) { + string results; + string brightness_path = EXPAND(TW_BRIGHTNESS_PATH); + if ((TWFunc::read_file(brightness_path, results)) != 0) + return -1; + return atoi(results.c_str()); + +} + +int blanktimer::setBrightness(int brightness) { + string brightness_path = EXPAND(TW_BRIGHTNESS_PATH); + string bstring; + char buff[100]; + sprintf(buff, "%d", brightness); + bstring = buff; + if ((TWFunc::write_file(brightness_path, bstring)) != 0) + return -1; + return 0; +} + +void blanktimer::resetTimerAndUnblank(void) { + setTimer(); + if (blanked) { + setBrightness(orig_brightness); + blanked = 0; + setBlank(0); + gr_fb_blank(conblank); + gui_forceRender(); + } +} diff --git a/gui/blanktimer.hpp b/gui/blanktimer.hpp new file mode 100644 index 000000000..74712bd75 --- /dev/null +++ b/gui/blanktimer.hpp @@ -0,0 +1,55 @@ +/*
+ Copyright 2012 bigbiff/Dees_Troy TeamWin
+ This file is part of TWRP/TeamWin Recovery Project.
+
+ TWRP is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ TWRP is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with TWRP. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __BLANKTIMER_HEADER_HPP
+#define __BLANKTIMER_HEADER_HPP
+
+#include <pthread.h>
+#include <sys/time.h>
+
+using namespace std;
+
+class blanktimer {
+ public:
+ blanktimer(void);
+ int setTimerThread(void);
+ void resetTimerAndUnblank(void);
+
+ private:
+ void setBlank(int blank);
+ int getBlank(void);
+ void setTimer(void);
+ timespec getTimer(void);
+ int getBrightness(void);
+ int setBrightness(int brightness);
+ int setBlankTimer(void);
+ int setClockTimer(void);
+ typedef int (blanktimer::*ThreadPtr)(void);
+ typedef void* (*PThreadPtr)(void*);
+ pthread_mutex_t blankmutex;
+ pthread_mutex_t timermutex;
+ int conblank;
+ timespec btimer;
+ unsigned long long sleepTimer;
+ int orig_brightness;
+ int blanked;
+};
+
+extern blanktimer blankTimer;
+
+#endif // __BLANKTIMER_HEADER_HPP
diff --git a/gui/button.cpp b/gui/button.cpp index b9d1b52dc..a4c5ecb7c 100644 --- a/gui/button.cpp +++ b/gui/button.cpp @@ -37,6 +37,8 @@ GUIButton::GUIButton(xml_node<>* node) mButtonLabel = NULL; mAction = NULL; mRendered = false; + hasHighlightColor = false; + renderHighlight = false; if (!node) return; @@ -66,6 +68,17 @@ GUIButton::GUIButton(xml_node<>* node) mButtonIcon = PageManager::FindResource(attr->value()); } + memset(&mHighlightColor, 0, sizeof(COLOR)); + child = node->first_node("highlight"); + if (child) { + attr = child->first_attribute("color"); + if (attr) { + hasHighlightColor = true; + std::string color = attr->value(); + ConvertStrToColor(color, &mHighlightColor); + } + } + int x, y, w, h; if (mButtonImg) mButtonImg->GetRenderPos(x, y, w, h); SetRenderPos(x, y, w, h); @@ -96,6 +109,10 @@ int GUIButton::Render(void) gr_blit(mButtonIcon->GetResource(), 0, 0, mIconW, mIconH, mIconX, mIconY); if (mButtonLabel) ret = mButtonLabel->Render(); if (ret < 0) return ret; + if (renderHighlight && hasHighlightColor) { + gr_color(mHighlightColor.red, mHighlightColor.green, mHighlightColor.blue, mHighlightColor.alpha); + gr_fill(mRenderX, mRenderY, mRenderW, mRenderH); + } mRendered = true; return ret; } @@ -198,6 +215,7 @@ int GUIButton::NotifyTouch(TOUCH_STATE state, int x, int y) mButtonLabel->isHighlighted = false; if (mButtonImg != NULL) mButtonImg->isHighlighted = false; + renderHighlight = false; mRendered = false; } } else { @@ -207,6 +225,7 @@ int GUIButton::NotifyTouch(TOUCH_STATE state, int x, int y) mButtonLabel->isHighlighted = true; if (mButtonImg != NULL) mButtonImg->isHighlighted = true; + renderHighlight = true; mRendered = false; } } diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index be6750f8c..9d66a9021 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -104,6 +104,7 @@ <variable name="text_color" value="#A0A0A0" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="slider_x" value="307" /> <variable name="slider_y" value="470" /> <variable name="slider_text_y" value="520" /> @@ -149,6 +150,8 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="2" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> <variable name="zipstorage_text_y" value="88" /> <variable name="listbox_x" value="269" /> @@ -364,7 +367,7 @@ <object type="keyboard"> <placement x="0" y="341" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="65" width="92" /> <row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" key11="104:c:8" /> @@ -411,6 +414,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -422,6 +426,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -430,6 +435,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -438,6 +444,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -446,6 +453,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -454,6 +462,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -462,6 +471,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -470,6 +480,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -538,6 +549,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -545,13 +557,14 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_zip_location" default="/sdcard" /> <data name="select" /> </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -559,7 +572,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="0" files="1" /> <path name="tw_zip_location" /> <data name="tw_filename" /> @@ -651,6 +664,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col2_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -660,6 +674,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Queue</text> @@ -743,6 +758,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe Cache/Dalvik</text> @@ -763,6 +779,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -786,6 +803,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -839,6 +857,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -922,6 +941,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -981,6 +1001,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -993,6 +1014,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1082,6 +1104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1102,6 +1125,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1122,6 +1146,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1142,6 +1167,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1162,6 +1188,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1267,6 +1294,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row10_text_y%" /> <font resource="font" color="%text_color%" /> <conditions> @@ -1438,6 +1466,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -1474,6 +1503,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1491,6 +1521,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1508,6 +1539,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1526,6 +1558,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1544,6 +1577,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1565,6 +1599,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1586,6 +1621,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1613,6 +1649,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1631,6 +1668,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1849,6 +1887,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1857,6 +1896,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1924,6 +1964,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel / Clear</text> @@ -2037,12 +2078,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" nav="0" /> @@ -2062,6 +2104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2191,6 +2234,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -2203,6 +2247,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -2286,6 +2331,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2411,6 +2457,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2419,6 +2466,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2449,10 +2497,14 @@ </object> <object type="listbox"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%listbox_x%" y="%listbox_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2495,6 +2547,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>0</text> @@ -2503,6 +2556,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2511,6 +2565,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2519,6 +2574,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2527,6 +2583,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2563,6 +2620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2579,6 +2637,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2596,6 +2655,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2604,6 +2664,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2612,6 +2673,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2621,6 +2683,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2629,6 +2692,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2637,6 +2701,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2668,6 +2733,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2676,6 +2742,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2690,6 +2757,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2698,6 +2766,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2718,6 +2787,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2726,6 +2796,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col3_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2792,6 +2863,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2809,6 +2881,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2826,6 +2899,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2887,6 +2961,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -2894,7 +2969,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location1" default="/sdcard" /> <data name="select" /> @@ -2902,6 +2977,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2909,7 +2985,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="0" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2943,6 +3019,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -2974,6 +3051,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2987,6 +3065,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3000,6 +3079,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -3012,6 +3092,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3028,6 +3109,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3043,6 +3125,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3059,6 +3142,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3073,6 +3157,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3109,12 +3194,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" /> @@ -3135,6 +3221,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3178,6 +3265,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3227,6 +3315,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3275,6 +3364,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3436,6 +3526,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3501,6 +3592,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3508,7 +3600,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3528,6 +3620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3568,6 +3661,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3577,6 +3671,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%home_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -3586,6 +3681,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%back_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index 93e7b1f2e..cf74e0a35 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -104,6 +104,7 @@ <variable name="text_color" value="#A0A0A0" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="slider_x" value="307" /> <variable name="slider_y" value="600" /> <variable name="slider_text_y" value="650" /> @@ -149,6 +150,8 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="2" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> <variable name="zipstorage_text_y" value="88" /> <variable name="listbox_x" value="269" /> @@ -364,7 +367,7 @@ <object type="keyboard"> <placement x="0" y="408" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="90" width="85" /> <row1 key01="80:" key02="q" long02="1" key03="w" long03="2" key04="e" long04="3" key05="r" long05="4" key06="t" long06="5" key07="y" long07="6" key08="u" long08="7" key09="i" long09="8" key10="o" long10="9" key11="p" long11="0" key12="94:c:8" /> @@ -411,6 +414,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -422,6 +426,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -430,6 +435,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -438,6 +444,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -446,6 +453,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -454,6 +462,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -462,6 +471,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -470,6 +480,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -538,6 +549,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -545,13 +557,14 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_zip_location" default="/sdcard" /> <data name="select" /> </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -559,7 +572,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="0" files="1" /> <path name="tw_zip_location" /> <data name="tw_filename" /> @@ -651,6 +664,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col2_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -660,6 +674,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Queue</text> @@ -743,6 +758,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe Cache/Dalvik</text> @@ -763,6 +779,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -786,6 +803,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -839,6 +857,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -922,6 +941,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -981,6 +1001,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -993,6 +1014,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1082,6 +1104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1102,6 +1125,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1122,6 +1146,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1142,6 +1167,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1162,6 +1188,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1267,6 +1294,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row10_text_y%" /> <font resource="font" color="%text_color%" /> <conditions> @@ -1438,6 +1466,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -1474,6 +1503,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1491,6 +1521,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1508,6 +1539,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1526,6 +1558,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1544,6 +1577,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1565,6 +1599,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1586,6 +1621,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1613,6 +1649,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1631,6 +1668,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1849,6 +1887,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1857,6 +1896,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1924,6 +1964,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel / Clear</text> @@ -2037,12 +2078,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" nav="0" /> @@ -2062,6 +2104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2191,6 +2234,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -2203,6 +2247,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -2286,6 +2331,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2411,6 +2457,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2419,6 +2466,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2449,10 +2497,14 @@ </object> <object type="listbox"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%listbox_x%" y="%listbox_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2495,6 +2547,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>0</text> @@ -2503,6 +2556,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2511,6 +2565,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2519,6 +2574,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2527,6 +2583,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2563,6 +2620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2579,6 +2637,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2596,6 +2655,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2604,6 +2664,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2612,6 +2673,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2621,6 +2683,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2629,6 +2692,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2637,6 +2701,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2668,6 +2733,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2676,6 +2742,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2690,6 +2757,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2698,6 +2766,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2718,6 +2787,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2726,6 +2796,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col3_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2792,6 +2863,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2809,6 +2881,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2826,6 +2899,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2887,6 +2961,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -2894,7 +2969,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location1" default="/sdcard" /> <data name="select" /> @@ -2902,6 +2977,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2909,7 +2985,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="0" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2943,6 +3019,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -2974,6 +3051,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2987,6 +3065,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3000,6 +3079,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -3012,6 +3092,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3028,6 +3109,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3043,6 +3125,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3059,6 +3142,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3073,6 +3157,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3109,12 +3194,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" /> @@ -3135,6 +3221,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3178,6 +3265,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3227,6 +3315,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3275,6 +3364,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3436,6 +3526,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3501,6 +3592,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3508,7 +3600,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3528,6 +3620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3568,6 +3661,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3577,6 +3671,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%home_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -3586,6 +3681,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%back_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index 66d955a82..8e96c7bf6 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -104,6 +104,7 @@ <variable name="text_color" value="#A0A0A0" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="slider_x" value="435" /> <variable name="slider_y" value="600" /> <variable name="slider_text_y" value="650" /> @@ -149,6 +150,8 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="2" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> <variable name="zipstorage_text_y" value="88" /> <variable name="listbox_x" value="397" /> @@ -364,7 +367,7 @@ <object type="keyboard"> <placement x="0" y="438" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="91" width="106" /> <row1 key01="102:" key02="q" long02="1" key03="w" long03="2" key04="e" long04="3" key05="r" long05="4" key06="t" long06="5" key07="y" long07="6" key08="u" long08="7" key09="i" long09="8" key10="o" long10="9" key11="p" long11="0" key12="118:c:8" /> @@ -411,6 +414,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -422,6 +426,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -430,6 +435,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -438,6 +444,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -446,6 +453,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -454,6 +462,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -462,6 +471,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -470,6 +480,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -538,6 +549,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -545,13 +557,14 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_zip_location" default="/sdcard" /> <data name="select" /> </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -559,7 +572,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="0" files="1" /> <path name="tw_zip_location" /> <data name="tw_filename" /> @@ -651,6 +664,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col2_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -660,6 +674,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Queue</text> @@ -743,6 +758,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe Cache/Dalvik</text> @@ -763,6 +779,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -786,6 +803,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -839,6 +857,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -922,6 +941,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -981,6 +1001,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -993,6 +1014,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1082,6 +1104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1102,6 +1125,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1122,6 +1146,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1142,6 +1167,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1162,6 +1188,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1267,6 +1294,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row10_text_y%" /> <font resource="font" color="%text_color%" /> <conditions> @@ -1438,6 +1466,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -1474,6 +1503,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1491,6 +1521,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1508,6 +1539,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1526,6 +1558,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1544,6 +1577,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1565,6 +1599,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1586,6 +1621,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1613,6 +1649,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1631,6 +1668,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1849,6 +1887,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1857,6 +1896,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1924,6 +1964,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel / Clear</text> @@ -2037,12 +2078,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" nav="0" /> @@ -2062,6 +2104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2191,6 +2234,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -2203,6 +2247,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -2286,6 +2331,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2411,6 +2457,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2419,6 +2466,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2449,10 +2497,14 @@ </object> <object type="listbox"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%listbox_x%" y="%listbox_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2495,6 +2547,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>0</text> @@ -2503,6 +2556,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2511,6 +2565,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2519,6 +2574,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2527,6 +2583,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2563,6 +2620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2579,6 +2637,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2596,6 +2655,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2604,6 +2664,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2612,6 +2673,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2621,6 +2683,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2629,6 +2692,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2637,6 +2701,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2668,6 +2733,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2676,6 +2742,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2690,6 +2757,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2698,6 +2766,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2718,6 +2787,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2726,6 +2796,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col3_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2792,6 +2863,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2809,6 +2881,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2826,6 +2899,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2887,6 +2961,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -2894,7 +2969,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location1" default="/sdcard" /> <data name="select" /> @@ -2902,6 +2977,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2909,7 +2985,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="0" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2943,6 +3019,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -2974,6 +3051,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2987,6 +3065,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3000,6 +3079,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -3012,6 +3092,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3028,6 +3109,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3043,6 +3125,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3059,6 +3142,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3073,6 +3157,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3109,12 +3194,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" /> @@ -3135,6 +3221,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3178,6 +3265,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3227,6 +3315,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3275,6 +3364,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3436,6 +3526,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3501,6 +3592,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3508,7 +3600,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3528,6 +3620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3568,6 +3661,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3577,6 +3671,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%home_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -3586,6 +3681,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%back_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index 9b9befde7..cbe6353a8 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -104,6 +104,7 @@ <variable name="text_color" value="#A0A0A0" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="slider_x" value="630" /> <variable name="slider_y" value="1000" /> <variable name="slider_text_y" value="1075" /> @@ -149,6 +150,8 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="2" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> <variable name="zipstorage_text_y" value="130" /> <variable name="listbox_x" value="560" /> @@ -364,7 +367,7 @@ <object type="keyboard"> <placement x="0" y="684" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="129" width="159" /> <row1 key01="153:" key02="q" long02="1" key03="w" long03="2" key04="e" long04="3" key05="r" long05="4" key06="t" long06="5" key07="y" long07="6" key08="u" long08="7" key09="i" long09="8" key10="o" long10="9" key11="p" long11="0" key12="177:c:8" /> @@ -411,6 +414,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -422,6 +426,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -430,6 +435,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -438,6 +444,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -446,6 +453,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -454,6 +462,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -462,6 +471,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -470,6 +480,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -538,6 +549,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -545,13 +557,14 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_zip_location" default="/sdcard" /> <data name="select" /> </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -559,7 +572,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="0" files="1" /> <path name="tw_zip_location" /> <data name="tw_filename" /> @@ -651,6 +664,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col2_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -660,6 +674,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Queue</text> @@ -743,6 +758,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe Cache/Dalvik</text> @@ -763,6 +779,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -786,6 +803,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -839,6 +857,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -922,6 +941,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -981,6 +1001,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -993,6 +1014,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1082,6 +1104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1102,6 +1125,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1122,6 +1146,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1142,6 +1167,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1162,6 +1188,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1267,6 +1294,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row10_text_y%" /> <font resource="font" color="%text_color%" /> <conditions> @@ -1438,6 +1466,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -1474,6 +1503,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1491,6 +1521,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1508,6 +1539,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1526,6 +1558,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1544,6 +1577,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1565,6 +1599,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1586,6 +1621,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1613,6 +1649,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1631,6 +1668,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1849,6 +1887,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1857,6 +1896,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1924,6 +1964,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel / Clear</text> @@ -2037,12 +2078,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" nav="0" /> @@ -2062,6 +2104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2191,6 +2234,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -2203,6 +2247,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -2286,6 +2331,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2411,6 +2457,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2419,6 +2466,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2449,10 +2497,14 @@ </object> <object type="listbox"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%listbox_x%" y="%listbox_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2495,6 +2547,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>0</text> @@ -2503,6 +2556,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2511,6 +2565,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2519,6 +2574,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2527,6 +2583,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2563,6 +2620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2579,6 +2637,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2596,6 +2655,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2604,6 +2664,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2612,6 +2673,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2621,6 +2683,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2629,6 +2692,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2637,6 +2701,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2668,6 +2733,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2676,6 +2742,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2690,6 +2757,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2698,6 +2766,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2718,6 +2787,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2726,6 +2796,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col3_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2792,6 +2863,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2809,6 +2881,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2826,6 +2899,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2887,6 +2961,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -2894,7 +2969,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location1" default="/sdcard" /> <data name="select" /> @@ -2902,6 +2977,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2909,7 +2985,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="0" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2943,6 +3019,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -2974,6 +3051,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2987,6 +3065,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3000,6 +3079,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -3012,6 +3092,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3028,6 +3109,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3043,6 +3125,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3059,6 +3142,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3073,6 +3157,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3109,12 +3194,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" /> @@ -3135,6 +3221,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3178,6 +3265,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3227,6 +3315,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3275,6 +3364,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3436,6 +3526,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3501,6 +3592,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3508,7 +3600,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3528,6 +3620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3568,6 +3661,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3577,6 +3671,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%home_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -3586,6 +3681,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%back_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml index f53d720ab..834aa2a45 100644 --- a/gui/devices/2560x1600/res/ui.xml +++ b/gui/devices/2560x1600/res/ui.xml @@ -104,6 +104,7 @@ <variable name="text_color" value="#A0A0A0" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="slider_x" value="841" /> <variable name="slider_y" value="1335" /> <variable name="slider_text_y" value="1435" /> @@ -149,6 +150,8 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="2" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> <variable name="zipstorage_text_y" value="190" /> <variable name="listbox_x" value="680" /> @@ -364,7 +367,7 @@ <object type="keyboard"> <placement x="0" y="912" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="172" width="212" /> <row1 key01="204:" key02="q" long02="1" key03="w" long03="2" key04="e" long04="3" key05="r" long05="4" key06="t" long06="5" key07="y" long07="6" key08="u" long08="7" key09="i" long09="8" key10="o" long10="9" key11="p" long11="0" key12="236:c:8" /> @@ -411,6 +414,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -422,6 +426,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -430,6 +435,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -438,6 +444,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -446,6 +453,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -454,6 +462,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -462,6 +471,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -470,6 +480,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -538,6 +549,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -545,13 +557,14 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_zip_location" default="/sdcard" /> <data name="select" /> </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -559,7 +572,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="0" files="1" /> <path name="tw_zip_location" /> <data name="tw_filename" /> @@ -651,6 +664,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col2_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -660,6 +674,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Queue</text> @@ -743,6 +758,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe Cache/Dalvik</text> @@ -763,6 +779,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -786,6 +803,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -839,6 +857,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -922,6 +941,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -981,6 +1001,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -993,6 +1014,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1082,6 +1104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1102,6 +1125,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1122,6 +1146,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1142,6 +1167,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1162,6 +1188,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1267,6 +1294,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row10_text_y%" /> <font resource="font" color="%text_color%" /> <conditions> @@ -1438,6 +1466,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -1474,6 +1503,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1491,6 +1521,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1508,6 +1539,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1526,6 +1558,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1544,6 +1577,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1565,6 +1599,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1586,6 +1621,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1613,6 +1649,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1631,6 +1668,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1849,6 +1887,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1857,6 +1896,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1924,6 +1964,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel / Clear</text> @@ -2037,12 +2078,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" nav="0" /> @@ -2062,6 +2104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2191,6 +2234,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -2203,6 +2247,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -2286,6 +2331,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2411,6 +2457,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2419,6 +2466,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2449,10 +2497,14 @@ </object> <object type="listbox"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%listbox_x%" y="%listbox_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2495,6 +2547,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>0</text> @@ -2503,6 +2556,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2511,6 +2565,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2519,6 +2574,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2527,6 +2583,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2563,6 +2620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2579,6 +2637,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2596,6 +2655,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2604,6 +2664,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2612,6 +2673,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2621,6 +2683,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2629,6 +2692,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2637,6 +2701,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2668,6 +2733,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2676,6 +2742,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2690,6 +2757,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2698,6 +2766,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2718,6 +2787,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2726,6 +2796,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col3_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2792,6 +2863,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2809,6 +2881,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2826,6 +2899,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2887,6 +2961,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -2894,7 +2969,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location1" default="/sdcard" /> <data name="select" /> @@ -2902,6 +2977,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2909,7 +2985,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="0" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2943,6 +3019,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -2974,6 +3051,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2987,6 +3065,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3000,6 +3079,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -3012,6 +3092,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3028,6 +3109,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3043,6 +3125,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3059,6 +3142,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3073,6 +3157,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3109,12 +3194,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" /> @@ -3135,6 +3221,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3178,6 +3265,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3227,6 +3315,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3275,6 +3364,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3436,6 +3526,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3501,6 +3592,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3508,7 +3600,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3528,6 +3620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3568,6 +3661,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3577,6 +3671,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%home_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -3586,6 +3681,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%back_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index 88b366353..c8ff2fbba 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -96,6 +96,7 @@ <variable name="text_color" value="#FFFFFF" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="home_button_x" value="7" /> <variable name="home_button_y" value="460" /> <variable name="back_button_x" value="275" /> @@ -131,10 +132,12 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="1" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="12" /> <variable name="listbox_x" value="3" /> <variable name="listbox_width" value="313" /> - <variable name="listbox_tz_height" value="168" /> + <variable name="listbox_tz_height" value="189" /> <variable name="listbox_background" value="#303030" /> <variable name="listbox_spacing" value="12" /> <variable name="sd_plus_x" value="187" /> @@ -321,7 +324,7 @@ <object type="keyboard"> <placement x="0" y="253" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="52" width="32" /> <row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" /> @@ -368,6 +371,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -379,6 +383,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -387,6 +392,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -395,6 +401,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -403,6 +410,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -411,6 +419,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -420,6 +429,7 @@ <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -428,6 +438,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -496,6 +507,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -503,7 +515,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="1" files="1" /> <path name="tw_zip_location" default="/sdcard" /> <data name="tw_filename" /> @@ -622,6 +634,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col1_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> @@ -631,6 +644,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Zip Queue</text> @@ -702,6 +716,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe cache/dalvik</text> @@ -722,6 +737,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot System</text> @@ -744,6 +760,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -811,6 +828,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -894,6 +912,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col_center_medium_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -953,6 +972,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -965,6 +985,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1054,6 +1075,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1071,6 +1093,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1088,6 +1111,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1106,6 +1130,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1124,6 +1149,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1145,6 +1171,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1166,6 +1193,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1193,6 +1221,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1211,6 +1240,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1269,6 +1299,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1277,6 +1308,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%backup_name_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1503,6 +1535,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -1614,6 +1647,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> @@ -1621,7 +1655,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" nav="0" /> <path name="tw_backups_folder" /> <data name="tw_restore" default="" /> @@ -1661,6 +1695,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -1673,6 +1708,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -1851,6 +1887,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2052,7 +2089,6 @@ <condition var1="tw_boot_is_mountable" var2="1" /> <condition var1="mounted" op="=" var2="/boot" /> </conditions> - <placement x="%col1_x%" y="%row6_text_y%" /> <font resource="font" color="#A0A0A0" /> <text>Unmount Boot</text> @@ -2109,6 +2145,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_usb_storage" var2="1" /> <placement x="%col1_x%" y="row3_y" /> <font resource="font" color="%button_text_color%" /> @@ -2118,6 +2155,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2164,6 +2202,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -2198,6 +2237,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2218,6 +2258,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2238,6 +2279,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2258,6 +2300,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2278,6 +2321,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2385,6 +2429,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2393,6 +2438,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2416,17 +2462,15 @@ <page name="timezone"> <object type="template" name="header" /> - <object type="text" color="%text_color%"> - <font resource="font" /> - <placement x="%center_x%" y="%row1_header_y%" placement="5" /> - <text>Select Time Zone</text> - </object> - <object type="listbox"> - <placement x="%listbox_x%" y="%row1_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2469,6 +2513,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>None</text> @@ -2477,6 +2522,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2485,6 +2531,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2493,6 +2540,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2501,6 +2549,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%tz_set_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2537,6 +2586,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2553,6 +2603,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2570,6 +2621,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2579,6 +2631,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2587,6 +2640,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2595,6 +2649,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2603,6 +2658,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2611,6 +2667,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2620,6 +2677,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_injecttwrp" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2659,6 +2717,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2667,6 +2726,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2681,6 +2741,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2689,6 +2750,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2709,6 +2771,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2717,6 +2780,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col2_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2783,6 +2847,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2800,6 +2865,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2817,6 +2883,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2877,6 +2944,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2884,7 +2952,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <folders="1" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2918,6 +2986,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -2949,6 +3018,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2962,6 +3032,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2975,6 +3046,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -2987,6 +3059,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3003,6 +3076,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3018,6 +3092,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3034,6 +3109,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3048,6 +3124,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3084,6 +3161,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> @@ -3091,7 +3169,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location2" default="/" /> <data name="tw_filename2" /> @@ -3111,6 +3189,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3154,6 +3233,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3203,6 +3283,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3251,6 +3332,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3413,6 +3495,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3478,6 +3561,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3485,7 +3569,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3505,6 +3589,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3545,6 +3630,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index 98e4e156d..718921d76 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -96,6 +96,7 @@ <variable name="text_color" value="#FFFFFF" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="home_button_x" value="10" /> <variable name="home_button_y" value="766" /> <variable name="back_button_x" value="413" /> @@ -130,10 +131,12 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="2" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> <variable name="listbox_x" value="5" /> <variable name="listbox_width" value="470" /> - <variable name="listbox_tz_height" value="280" /> + <variable name="listbox_tz_height" value="310" /> <variable name="listbox_background" value="#303030" /> <variable name="listbox_spacing" value="18" /> <variable name="sd_plus_x" value="280" /> @@ -320,7 +323,7 @@ <object type="keyboard"> <placement x="0" y="450" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="78" width="48" /> <row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" /> @@ -367,6 +370,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -378,6 +382,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -386,6 +391,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -394,6 +400,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -402,6 +409,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -410,6 +418,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -419,6 +428,7 @@ <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -427,6 +437,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -495,6 +506,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -502,7 +514,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="1" files="1" /> <path name="tw_zip_location" default="/sdcard" /> <data name="tw_filename" /> @@ -621,6 +633,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col1_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> @@ -630,6 +643,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Zip Queue</text> @@ -701,6 +715,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe cache/dalvik</text> @@ -721,6 +736,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot System</text> @@ -743,6 +759,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -810,6 +827,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -893,6 +911,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col_center_medium_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -952,6 +971,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -964,6 +984,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1053,6 +1074,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1070,6 +1092,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1087,6 +1110,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1105,6 +1129,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1123,6 +1148,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1144,6 +1170,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1165,6 +1192,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1192,6 +1220,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1210,6 +1239,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1268,6 +1298,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1276,6 +1307,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%backup_name_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1502,6 +1534,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -1613,6 +1646,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> @@ -1620,7 +1654,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" nav="0" /> <path name="tw_backups_folder" /> <data name="tw_restore" default="" /> @@ -1660,6 +1694,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -1672,6 +1707,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -1850,6 +1886,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2051,7 +2088,6 @@ <condition var1="tw_boot_is_mountable" var2="1" /> <condition var1="mounted" op="=" var2="/boot" /> </conditions> - <placement x="%col1_x%" y="%row6_text_y%" /> <font resource="font" color="#A0A0A0" /> <text>Unmount Boot</text> @@ -2108,6 +2144,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_usb_storage" var2="1" /> <placement x="%col1_x%" y="row3_y" /> <font resource="font" color="%button_text_color%" /> @@ -2117,6 +2154,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2163,6 +2201,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -2197,6 +2236,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2217,6 +2257,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2237,6 +2278,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2257,6 +2299,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2277,6 +2320,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2384,6 +2428,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2392,6 +2437,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2415,17 +2461,15 @@ <page name="timezone"> <object type="template" name="header" /> - <object type="text" color="%text_color%"> - <font resource="font" /> - <placement x="%center_x%" y="%row1_header_y%" placement="5" /> - <text>Select Time Zone</text> - </object> - <object type="listbox"> - <placement x="%listbox_x%" y="%row1_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2468,6 +2512,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>None</text> @@ -2476,6 +2521,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2484,6 +2530,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2492,6 +2539,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2500,6 +2548,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%tz_set_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2536,6 +2585,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2552,6 +2602,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2569,6 +2620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2578,6 +2630,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2586,6 +2639,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2594,6 +2648,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2602,6 +2657,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2610,6 +2666,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2619,6 +2676,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_injecttwrp" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2658,6 +2716,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2666,6 +2725,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2680,6 +2740,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2688,6 +2749,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2708,6 +2770,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2716,6 +2779,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col2_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2782,6 +2846,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2799,6 +2864,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2816,6 +2882,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2876,6 +2943,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2883,7 +2951,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <folders="1" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2917,6 +2985,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -2948,6 +3017,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2961,6 +3031,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2974,6 +3045,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -2986,6 +3058,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3002,6 +3075,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3017,6 +3091,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3033,6 +3108,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3047,6 +3123,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3083,6 +3160,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> @@ -3090,7 +3168,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location2" default="/" /> <data name="tw_filename2" /> @@ -3110,6 +3188,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3153,6 +3232,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3202,6 +3282,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3250,6 +3331,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3412,6 +3494,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3477,6 +3560,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3484,7 +3568,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3504,6 +3588,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3544,6 +3629,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index 964d9deab..b8bd53f9c 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -95,6 +95,7 @@ <variable name="text_color" value="#FFFFFF" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="home_button_x" value="10" /> <variable name="home_button_y" value="820" /> <variable name="back_button_x" value="413" /> @@ -129,10 +130,12 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="2" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> <variable name="listbox_x" value="5" /> <variable name="listbox_width" value="470" /> - <variable name="listbox_tz_height" value="280" /> + <variable name="listbox_tz_height" value="310" /> <variable name="listbox_background" value="#303030" /> <variable name="listbox_spacing" value="18" /> <variable name="sd_plus_x" value="280" /> @@ -319,7 +322,7 @@ <object type="keyboard"> <placement x="0" y="504" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="78" width="48" /> <row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" /> @@ -366,6 +369,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -377,6 +381,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -385,6 +390,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -393,6 +399,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -401,6 +408,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -409,6 +417,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -418,6 +427,7 @@ <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -426,6 +436,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -494,6 +505,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -501,7 +513,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="1" files="1" /> <path name="tw_zip_location" default="/sdcard" /> <data name="tw_filename" /> @@ -620,6 +632,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col1_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> @@ -629,6 +642,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Zip Queue</text> @@ -700,6 +714,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe cache/dalvik</text> @@ -720,6 +735,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot System</text> @@ -742,6 +758,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -809,6 +826,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -892,6 +910,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col_center_medium_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -951,6 +970,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -963,6 +983,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1052,6 +1073,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1069,6 +1091,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1086,6 +1109,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1104,6 +1128,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1122,6 +1147,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1143,6 +1169,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1164,6 +1191,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1191,6 +1219,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1209,6 +1238,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1267,6 +1297,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1275,6 +1306,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%backup_name_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1501,6 +1533,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -1612,6 +1645,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> @@ -1619,7 +1653,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" nav="0" /> <path name="tw_backups_folder" /> <data name="tw_restore" default="" /> @@ -1659,6 +1693,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -1671,6 +1706,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -1849,6 +1885,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2050,7 +2087,6 @@ <condition var1="tw_boot_is_mountable" var2="1" /> <condition var1="mounted" op="=" var2="/boot" /> </conditions> - <placement x="%col1_x%" y="%row6_text_y%" /> <font resource="font" color="#A0A0A0" /> <text>Unmount Boot</text> @@ -2107,6 +2143,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_usb_storage" var2="1" /> <placement x="%col1_x%" y="row3_y" /> <font resource="font" color="%button_text_color%" /> @@ -2116,6 +2153,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2162,6 +2200,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -2196,6 +2235,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2216,6 +2256,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2236,6 +2277,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2256,6 +2298,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2276,6 +2319,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2383,6 +2427,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2391,6 +2436,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2414,17 +2460,15 @@ <page name="timezone"> <object type="template" name="header" /> - <object type="text" color="%text_color%"> - <font resource="font" /> - <placement x="%center_x%" y="%row1_header_y%" placement="5" /> - <text>Select Time Zone</text> - </object> - <object type="listbox"> - <placement x="%listbox_x%" y="%row1_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2467,6 +2511,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>None</text> @@ -2475,6 +2520,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2483,6 +2529,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2491,6 +2538,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2499,6 +2547,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%tz_set_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2535,6 +2584,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2551,6 +2601,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2568,6 +2619,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2577,6 +2629,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2585,6 +2638,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2593,6 +2647,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2601,6 +2656,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2609,6 +2665,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2618,6 +2675,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_injecttwrp" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2657,6 +2715,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2665,6 +2724,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2679,6 +2739,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2687,6 +2748,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2707,6 +2769,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2715,6 +2778,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col2_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2781,6 +2845,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2798,6 +2863,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2815,6 +2881,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2875,6 +2942,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2882,7 +2950,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <folders="1" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2916,6 +2984,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -2947,6 +3016,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2960,6 +3030,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2973,6 +3044,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -2985,6 +3057,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3001,6 +3074,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3016,6 +3090,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3032,6 +3107,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3046,6 +3122,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3082,6 +3159,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> @@ -3089,7 +3167,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location2" default="/" /> <data name="tw_filename2" /> @@ -3109,6 +3187,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3152,6 +3231,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3201,6 +3281,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3249,6 +3330,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3411,6 +3493,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3476,6 +3559,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3483,7 +3567,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3503,6 +3587,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3543,6 +3628,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index 1ff4821ac..01e7f7ae8 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -96,6 +96,7 @@ <variable name="text_color" value="#FFFFFF" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="home_button_x" value="10" /> <variable name="home_button_y" value="919" /> <variable name="back_button_x" value="466" /> @@ -130,10 +131,12 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="2" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> <variable name="listbox_x" value="5" /> <variable name="listbox_width" value="530" /> - <variable name="listbox_tz_height" value="390" /> + <variable name="listbox_tz_height" value="420" /> <variable name="listbox_background" value="#303030" /> <variable name="listbox_spacing" value="18" /> <variable name="sd_plus_x" value="280" /> @@ -320,7 +323,7 @@ <object type="keyboard"> <placement x="0" y="600" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="78" width="54" /> <row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" /> @@ -367,6 +370,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -378,6 +382,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -386,6 +391,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -394,6 +400,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -402,6 +409,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -410,6 +418,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -419,6 +428,7 @@ <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -427,6 +437,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -495,6 +506,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -502,7 +514,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="1" files="1" /> <path name="tw_zip_location" default="/sdcard" /> <data name="tw_filename" /> @@ -621,6 +633,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col1_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> @@ -630,6 +643,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Zip Queue</text> @@ -701,6 +715,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe cache/dalvik</text> @@ -721,6 +736,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot System</text> @@ -743,6 +759,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -810,6 +827,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -893,6 +911,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col_center_medium_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -952,6 +971,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -964,6 +984,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1053,6 +1074,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1070,6 +1092,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1087,6 +1110,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1105,6 +1129,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1123,6 +1148,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1144,6 +1170,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1165,6 +1192,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1192,6 +1220,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1210,6 +1239,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1268,6 +1298,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1276,6 +1307,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%backup_name_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1502,6 +1534,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -1613,6 +1646,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> @@ -1620,7 +1654,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" nav="0" /> <path name="tw_backups_folder" /> <data name="tw_restore" default="" /> @@ -1660,6 +1694,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -1672,6 +1707,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -1850,6 +1886,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2051,7 +2088,6 @@ <condition var1="tw_boot_is_mountable" var2="1" /> <condition var1="mounted" op="=" var2="/boot" /> </conditions> - <placement x="%col1_x%" y="%row6_text_y%" /> <font resource="font" color="#A0A0A0" /> <text>Unmount Boot</text> @@ -2108,6 +2144,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_usb_storage" var2="1" /> <placement x="%col1_x%" y="row3_y" /> <font resource="font" color="%button_text_color%" /> @@ -2117,6 +2154,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2163,6 +2201,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -2197,6 +2236,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2217,6 +2257,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2237,6 +2278,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2257,6 +2299,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2277,6 +2320,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2384,6 +2428,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2392,6 +2437,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2415,17 +2461,15 @@ <page name="timezone"> <object type="template" name="header" /> - <object type="text" color="%text_color%"> - <font resource="font" /> - <placement x="%center_x%" y="%row1_header_y%" placement="5" /> - <text>Select Time Zone</text> - </object> - <object type="listbox"> - <placement x="%listbox_x%" y="%row1_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2468,6 +2512,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>None</text> @@ -2476,6 +2521,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2484,6 +2530,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2492,6 +2539,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2500,6 +2548,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%tz_set_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2536,6 +2585,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2552,6 +2602,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2569,6 +2620,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2578,6 +2630,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2586,6 +2639,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2594,6 +2648,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2602,6 +2657,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2610,6 +2666,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2619,6 +2676,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_injecttwrp" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2658,6 +2716,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2666,6 +2725,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2680,6 +2740,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2688,6 +2749,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2708,6 +2770,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2716,6 +2779,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col2_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2782,6 +2846,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2799,6 +2864,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2816,6 +2882,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2876,6 +2943,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2883,7 +2951,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <folders="1" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2917,6 +2985,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -2948,6 +3017,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2961,6 +3031,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2974,6 +3045,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -2986,6 +3058,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3002,6 +3075,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3017,6 +3091,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3033,6 +3108,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3047,6 +3123,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3083,6 +3160,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> @@ -3090,7 +3168,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location2" default="/" /> <data name="tw_filename2" /> @@ -3110,6 +3188,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3153,6 +3232,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3202,6 +3282,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3250,6 +3331,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3412,6 +3494,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3477,6 +3560,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3484,7 +3568,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3504,6 +3588,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3544,6 +3629,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index 5f39a2f8d..fa51706ff 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -100,6 +100,7 @@ <variable name="text_color" value="#FFFFFF" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="home_button_x" value="10" /> <variable name="home_button_y" value="1226" /> <variable name="back_button_x" value="625" /> @@ -135,10 +136,12 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="2" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="36" /> <variable name="listbox_x" value="5" /> <variable name="listbox_width" value="710" /> - <variable name="listbox_tz_height" value="540" /> + <variable name="listbox_tz_height" value="590" /> <variable name="listbox_background" value="#303030" /> <variable name="listbox_spacing" value="16" /> <variable name="sd_plus_x" value="350" /> @@ -204,6 +207,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%home_button_x%" y="%home_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -213,6 +217,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%back_button_x%" y="%back_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -250,6 +255,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col1_button_x%" y="%sort_asc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Name</text> @@ -258,6 +264,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Date</text> @@ -266,6 +273,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Size</text> @@ -280,6 +288,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col1_button_x%" y="%sort_desc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Name</text> @@ -288,6 +297,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Date</text> @@ -296,6 +306,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Size</text> @@ -325,7 +336,7 @@ <object type="keyboard"> <placement x="0" y="800" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="106" width="72" /> <row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" /> @@ -372,6 +383,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -383,6 +395,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -391,6 +404,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -399,6 +413,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -407,6 +422,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -415,6 +431,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -424,6 +441,7 @@ <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -432,6 +450,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -500,6 +519,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -507,7 +527,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="1" files="1" /> <path name="tw_zip_location" default="/sdcard" /> <data name="tw_filename" /> @@ -626,6 +646,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col1_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> @@ -635,6 +656,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Zip Queue</text> @@ -706,6 +728,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe cache/dalvik</text> @@ -726,6 +749,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot System</text> @@ -748,6 +772,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -815,6 +840,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -898,6 +924,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col_center_medium_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -957,6 +984,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -969,6 +997,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1058,6 +1087,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1075,6 +1105,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1092,6 +1123,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1110,6 +1142,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1128,6 +1161,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1149,6 +1183,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1170,6 +1205,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1197,6 +1233,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1215,6 +1252,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1273,6 +1311,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1281,6 +1320,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%backup_name_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1507,6 +1547,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -1618,6 +1659,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> @@ -1625,7 +1667,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" nav="0" /> <path name="tw_backups_folder" /> <data name="tw_restore" default="" /> @@ -1665,6 +1707,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -1677,6 +1720,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -1855,6 +1899,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2056,7 +2101,6 @@ <condition var1="tw_boot_is_mountable" var2="1" /> <condition var1="mounted" op="=" var2="/boot" /> </conditions> - <placement x="%col1_x%" y="%row6_text_y%" /> <font resource="font" color="#A0A0A0" /> <text>Unmount Boot</text> @@ -2113,6 +2157,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_usb_storage" var2="1" /> <placement x="%col1_x%" y="row3_y" /> <font resource="font" color="%button_text_color%" /> @@ -2122,6 +2167,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2168,6 +2214,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -2202,6 +2249,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2222,6 +2270,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2242,6 +2291,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2262,6 +2312,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2282,6 +2333,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2389,6 +2441,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2397,6 +2450,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2420,17 +2474,15 @@ <page name="timezone"> <object type="template" name="header" /> - <object type="text" color="%text_color%"> - <font resource="font" /> - <placement x="%center_x%" y="%row1_header_y%" placement="5" /> - <text>Select Time Zone</text> - </object> - <object type="listbox"> - <placement x="%listbox_x%" y="%row1_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2473,6 +2525,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>None</text> @@ -2481,6 +2534,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2489,6 +2543,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2497,6 +2552,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2505,6 +2561,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%tz_set_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2541,6 +2598,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2557,6 +2615,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2574,6 +2633,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2583,6 +2643,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2591,6 +2652,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2599,6 +2661,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2607,6 +2670,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2615,6 +2679,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2624,6 +2689,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_injecttwrp" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2663,6 +2729,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2671,6 +2738,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2685,6 +2753,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2693,6 +2762,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2713,6 +2783,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2721,6 +2792,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col2_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2787,6 +2859,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2804,6 +2877,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2821,6 +2895,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2881,6 +2956,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2888,7 +2964,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <folders="1" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2922,6 +2998,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -2953,6 +3030,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2966,6 +3044,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2979,6 +3058,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -2991,6 +3071,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3007,6 +3088,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3022,6 +3104,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3038,6 +3121,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3052,6 +3136,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3088,6 +3173,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> @@ -3095,7 +3181,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location2" default="/" /> <data name="tw_filename2" /> @@ -3115,6 +3201,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3158,6 +3245,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3207,6 +3295,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3255,6 +3344,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3417,6 +3507,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3482,6 +3573,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3489,7 +3581,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3509,6 +3601,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3549,6 +3642,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index 9432466e3..4bb146baf 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -96,6 +96,7 @@ <variable name="text_color" value="#FFFFFF" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="home_button_x" value="50" /> <variable name="home_button_y" value="1226" /> <variable name="back_button_x" value="666" /> @@ -131,10 +132,12 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="2" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="36"/> <variable name="listbox_x" value="5" /> <variable name="listbox_width" value="710" /> - <variable name="listbox_tz_height" value="540" /> + <variable name="listbox_tz_height" value="580" /> <variable name="listbox_background" value="#303030" /> <variable name="listbox_spacing" value="16" /> <variable name="sd_plus_x" value="350" /> @@ -321,33 +324,33 @@ <object type="keyboard"> <placement x="0" y="740" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="115" width="80" /> <row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" /> - <row2 key01="108:a" key02="s" key03="d" key04="f" key05="g" key06="h" key07="j" key08="k" key09="108:l" /> - <row3 key01="108:layout2" key02="z" key03="x" key04="c" key05="v" key06="b" key07="n" key08="m" key09="108:c:8" /> + <row2 key01="117:a" key02="s" key03="d" key04="f" key05="g" key06="h" key07="j" key08="k" key09="123:l" /> + <row3 key01="117:layout2" key02="z" key03="x" key04="c" key05="v" key06="b" key07="n" key08="m" key09="123:c:8" /> <row4 key01="117:layout3" key02="80:" key03="400: " key04="80:." key05="123:a:action" /> </layout1> <layout2> <keysize height="116" width="80" /> <row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" /> - <row2 key01="108:A" key02="S" key03="D" key04="F" key05="G" key06="H" key07="J" key08="K" key09="108:L" /> - <row3 key01="108:layout1" key02="Z" key03="X" key04="C" key05="V" key06="B" key07="N" key08="M" key09="108:c:8" /> + <row2 key01="117:A" key02="S" key03="D" key04="F" key05="G" key06="H" key07="J" key08="K" key09="123:L" /> + <row3 key01="117:layout1" key02="Z" key03="X" key04="C" key05="V" key06="B" key07="N" key08="M" key09="123:c:8" /> <row4 key01="117:layout3" key02="80:," key03="400: " key04="80:." key05="123:action" /> </layout2> <layout3> <keysize height="115" width="80" /> <row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" /> <row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" /> - <row3 key01="108:layout4" key02="!" key03="72:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="108:c:8" /> + <row3 key01="117:layout4" key02="!" key03="80:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="123:c:8" /> <row4 key01="117:layout1" key02="80:," key03="400: " key04="80:." key05="123:action" /> </layout3> <layout4> <keysize height="116" width="80" /> <row1 key01="~" key02="`" key03="|" key04="80:" key05="80:" key06="80:" key07="80:" key08="80:" key09="{" key10="}" /> <row2 key01="80:" key02="80:" key03="80:" key04="80:" key05="80:" key06="^" key07="_" key08="=" key09="[" key10="]" /> - <row3 key01="115:layout3" key02="80:" key03="80:" key04="80:" key05="80:" key06="\" key07="<" key08=">" key09="108:c:8" /> + <row3 key01="117:layout3" key02="80:" key03="80:" key04="80:" key05="80:" key06="\" key07="<" key08=">" key09="123:c:8" /> <row4 key01="117:layout1" key02="80:" key03="400: " key04="80:" key05="123:action" /> </layout4> </object> @@ -368,6 +371,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -379,6 +383,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -387,6 +392,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -395,6 +401,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -403,6 +410,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -411,6 +419,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -420,6 +429,7 @@ <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -428,6 +438,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -496,6 +507,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -503,7 +515,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="1" files="1" /> <path name="tw_zip_location" default="/sdcard" /> <data name="tw_filename" /> @@ -622,6 +634,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col1_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> @@ -631,6 +644,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row_queue_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Zip Queue</text> @@ -702,6 +716,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe cache/dalvik</text> @@ -722,6 +737,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot System</text> @@ -744,6 +760,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -811,6 +828,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -894,6 +912,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col_center_medium_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -953,6 +972,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -965,6 +985,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1054,6 +1075,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1071,6 +1093,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1088,6 +1111,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1106,6 +1130,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1124,6 +1149,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1145,6 +1171,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1166,6 +1193,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1193,6 +1221,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1211,6 +1240,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1269,6 +1299,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1277,6 +1308,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%backup_name_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1503,6 +1535,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -1614,6 +1647,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> @@ -1621,7 +1655,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" nav="0" /> <path name="tw_backups_folder" /> <data name="tw_restore" default="" /> @@ -1661,6 +1695,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -1673,6 +1708,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -1851,6 +1887,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2052,7 +2089,6 @@ <condition var1="tw_boot_is_mountable" var2="1" /> <condition var1="mounted" op="=" var2="/boot" /> </conditions> - <placement x="%col1_x%" y="%row6_text_y%" /> <font resource="font" color="#A0A0A0" /> <text>Unmount Boot</text> @@ -2109,6 +2145,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_usb_storage" var2="1" /> <placement x="%col1_x%" y="row3_y" /> <font resource="font" color="%button_text_color%" /> @@ -2118,6 +2155,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2164,6 +2202,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -2198,6 +2237,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2218,6 +2258,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2238,6 +2279,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2258,6 +2300,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2278,6 +2321,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2385,6 +2429,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2393,6 +2438,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2416,17 +2462,15 @@ <page name="timezone"> <object type="template" name="header" /> - <object type="text" color="%text_color%"> - <font resource="font" /> - <placement x="%center_x%" y="%row1_header_y%" placement="5" /> - <text>Select Time Zone</text> - </object> - <object type="listbox"> - <placement x="%listbox_x%" y="%row1_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2469,6 +2513,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>None</text> @@ -2477,6 +2522,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2485,6 +2531,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2493,6 +2540,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offset_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2501,6 +2549,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%tz_set_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2537,6 +2586,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2553,6 +2603,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2570,6 +2621,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2579,6 +2631,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2587,6 +2640,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2595,6 +2649,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2603,6 +2658,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2611,6 +2667,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2620,6 +2677,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_injecttwrp" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2659,6 +2717,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2667,6 +2726,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2681,6 +2741,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2689,6 +2750,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sd_plus_x%" y="%sdswap_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2709,6 +2771,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2717,6 +2780,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col2_x%" y="%sdfilesystem_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2783,6 +2847,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2800,6 +2865,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2817,6 +2883,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2877,6 +2944,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2884,7 +2952,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <folders="1" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2918,6 +2986,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -2949,6 +3018,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2962,6 +3032,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2975,6 +3046,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -2987,6 +3059,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3003,6 +3076,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row3_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3018,6 +3092,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3034,6 +3109,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3048,6 +3124,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col2_x%" y="%row4_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3084,6 +3161,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> @@ -3091,7 +3169,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location2" default="/" /> <data name="tw_filename2" /> @@ -3111,6 +3189,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3154,6 +3233,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3203,6 +3283,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3251,6 +3332,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3413,6 +3495,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3478,6 +3561,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3485,7 +3569,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3505,6 +3589,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select</text> @@ -3545,6 +3630,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index 74c80921e..9d6abf9a8 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -104,6 +104,7 @@ <variable name="text_color" value="#A0A0A0" /> <variable name="text_success_color" value="#33B5E5" /> <variable name="text_fail_color" value="#FF0101" /> + <variable name="highlight_color" value="#90909080" /> <variable name="slider_x" value="225" /> <variable name="slider_y" value="390" /> <variable name="slider_text_y" value="425" /> @@ -149,6 +150,8 @@ <variable name="fileselector_separatorcolor" value="#505050" /> <variable name="fileselector_separatorheight" value="1" /> <variable name="fileselector_background" value="#303030" /> + <variable name="fileselector_highlight_color" value="#505050" /> + <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="12" /> <variable name="zipstorage_text_y" value="88" /> <variable name="listbox_x" value="156" /> @@ -235,6 +238,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%home_button_x%" y="%home_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -244,6 +248,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%back_button_x%" y="%back_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -281,6 +286,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col1_button_x%" y="%sort_asc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Name</text> @@ -289,6 +295,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Date</text> @@ -297,6 +304,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Size</text> @@ -311,6 +319,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col1_button_x%" y="%sort_desc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Name</text> @@ -319,6 +328,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Date</text> @@ -327,6 +337,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Size</text> @@ -364,7 +375,7 @@ <object type="keyboard"> <placement x="0" y="277" /> <layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" /> - <highlight color="#90909080" /> + <highlight color="%highlight_color%" /> <layout1> <keysize height="51" width="73" /> <row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" key11="70:c:8" /> @@ -411,6 +422,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Install</text> @@ -422,6 +434,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Backup</text> @@ -430,6 +443,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore</text> @@ -438,6 +452,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe</text> @@ -446,6 +461,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Mount</text> @@ -454,6 +470,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Settings</text> @@ -462,6 +479,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Advanced</text> @@ -470,6 +488,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reboot</text> @@ -538,6 +557,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -545,13 +565,14 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_zip_location" default="/sdcard" /> <data name="select" /> </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_zip_location%</text> @@ -559,7 +580,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter extn=".zip" folders="0" files="1" /> <path name="tw_zip_location" /> <data name="tw_filename" /> @@ -651,6 +672,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_zip_queue_count" op="!=" var2="10"></condition> <placement x="%col2_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -660,6 +682,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row5_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>Clear Queue</text> @@ -743,6 +766,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Wipe Cache/Dalvik</text> @@ -763,6 +787,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -786,6 +811,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Home</text> @@ -839,6 +865,7 @@ <object type="template" name="header" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_exclamation" var2="1" /> <placement x="%exclamation_x%" y="%exclamation_y%" /> <font resource="font" color="%button_text_color%" /> @@ -922,6 +949,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_cancel" var2="1" /> <placement x="%col4_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -981,6 +1009,7 @@ <object type="template" name="action_page_console" /> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="0" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -993,6 +1022,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_reboot" var2="1" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1082,6 +1112,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_system" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1102,6 +1133,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_poweroff" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1122,6 +1154,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_recovery" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1142,6 +1175,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_reboot_bootloader" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1162,6 +1196,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_download_mode" var2="1" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1267,6 +1302,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row10_text_y%" /> <font resource="font" color="%text_color%" /> <conditions> @@ -1438,6 +1474,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Unmount</text> @@ -1474,6 +1511,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cache</text> @@ -1491,6 +1529,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Dalvik Cache</text> @@ -1508,6 +1547,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Factory Reset</text> @@ -1526,6 +1566,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>System</text> @@ -1544,6 +1585,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_external" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1565,6 +1607,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_internal" var2="1" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1586,6 +1629,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_has_internal" var2="1" /> <condition var1="tw_has_data_media" var2="1" /> @@ -1613,6 +1657,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_data_media" var2="0" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1631,6 +1676,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_has_sdext_partition" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -1849,6 +1895,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Refresh Sizes</text> @@ -1857,6 +1904,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Backup Name</text> @@ -1924,6 +1972,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel / Clear</text> @@ -2037,12 +2086,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" nav="0" /> @@ -2062,6 +2112,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <conditions> <condition var1="tw_is_encrypted" var2="1" /> <condition var1="tw_is_decrypted" var2="0" /> @@ -2191,6 +2242,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Rename Backup</text> @@ -2203,6 +2255,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%backup_name_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> @@ -2286,6 +2339,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -2411,6 +2465,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Time Zone</text> @@ -2419,6 +2474,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%slider_y%" /> <font resource="font" color="%button_text_color%" /> <text>Restore Defaults</text> @@ -2449,10 +2505,14 @@ </object> <object type="listbox"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%listbox_x%" y="%listbox_y%" w="%listbox_width%" h="%listbox_tz_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <background color="%listbox_background%" /> - <font resource="font" spacing="%listbox_spacing%" color="%text_color%" /> + <font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <data name="tw_time_zone_guisel" /> <listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem> <listitem name="(UTC -10) Hawaii">HST10;HDT</listitem> @@ -2495,6 +2555,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>0</text> @@ -2503,6 +2564,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>15</text> @@ -2511,6 +2573,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>30</text> @@ -2519,6 +2582,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_medium_x%" y="%row_offsetmedium_y%" /> <font resource="font" color="%button_text_color%" /> <text>45</text> @@ -2527,6 +2591,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Set Time Zone</text> @@ -2563,6 +2628,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Copy Log to SD</text> @@ -2579,6 +2645,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Fix Permissions</text> @@ -2596,6 +2663,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Terminal Command</text> @@ -2604,6 +2672,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>ADB Sideload</text> @@ -2612,6 +2681,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_allow_partition_sdcard" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2621,6 +2691,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>File Manager</text> @@ -2629,6 +2700,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Reload Theme</text> @@ -2637,6 +2709,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2668,6 +2741,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2676,6 +2750,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row1_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2690,6 +2765,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2698,6 +2774,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_sdext_x%" y="%row2_sdext_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -2718,6 +2795,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> <text>EXT3</text> @@ -2726,6 +2804,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_sdext_disable_ext4" var2="0" /> <placement x="%col3_medium_x%" y="%row4_medium_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2792,6 +2871,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2809,6 +2889,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col2_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2826,6 +2907,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_show_dumlock" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2887,6 +2969,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>Folders:</text> @@ -2894,7 +2977,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_file_location1" default="/sdcard" /> <data name="select" /> @@ -2902,6 +2985,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location1%</text> @@ -2909,7 +2993,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="0" files="1" /> <path name="tw_file_location1" default="/" /> <data name="tw_filename1" /> @@ -2943,6 +3027,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -2974,6 +3059,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -2987,6 +3073,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col1_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3000,6 +3087,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col2_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>Move</text> @@ -3012,6 +3100,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col3_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod 755</text> @@ -3028,6 +3117,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col4_x%" y="%row2_y%" /> <font resource="font" color="%button_text_color%" /> <text>chmod</text> @@ -3043,6 +3133,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col1_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete</text> @@ -3059,6 +3150,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="0" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3073,6 +3165,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_fm_isfolder" var2="1" /> <placement x="%col4_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3109,12 +3202,13 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> - <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> <filter folders="1" files="0" /> @@ -3135,6 +3229,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3178,6 +3273,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3227,6 +3323,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3275,6 +3372,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3436,6 +3534,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%col_center_x%" y="%cancel_button_y%" /> <font resource="font" color="%button_text_color%" /> <text>Cancel</text> @@ -3501,6 +3600,7 @@ </object> <object type="fileselector"> + <highlight color="%fileselector_highlight_color%" /> <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> <text>%tw_terminal_location%</text> @@ -3508,7 +3608,7 @@ <sort name="tw_gui_sort_order" /> <icon folder="folder_icon" file="file_icon" /> <background color="%fileselector_background%" /> - <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> <filter folders="1" files="0" /> <path name="tw_terminal_location" default="/" /> <data name="tw_terminal" /> @@ -3528,6 +3628,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%filemanager_select_x%" y="%filemanager_select_y%" /> <font resource="font" color="%button_text_color%" /> <text>Select Folder</text> @@ -3568,6 +3669,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <condition var1="tw_terminal_state" var2="1" /> <placement x="%filemanager_select_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> @@ -3577,6 +3679,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%home_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> @@ -3586,6 +3689,7 @@ </object> <object type="button"> + <highlight color="%highlight_color%" /> <placement x="%back_button_x%" y="%terminal_button_y%" /> <font resource="font" color="%button_text_color%" /> <text></text> diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp index 38eaadd20..66bf80f78 100644 --- a/gui/fileselector.cpp +++ b/gui/fileselector.cpp @@ -62,6 +62,10 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) ConvertStrToColor("black", &mHeaderSeparatorColor); ConvertStrToColor("white", &mFontColor); ConvertStrToColor("white", &mHeaderFontColor); + hasHighlightColor = false; + hasFontHighlightColor = false; + isHighlighted = false; + startSelection = -1; // Load header text child = node->first_node("header"); @@ -102,6 +106,17 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) child = node->first_node("text"); if (child) mHeaderText = child->value(); + memset(&mHighlightColor, 0, sizeof(COLOR)); + child = node->first_node("highlight"); + if (child) { + attr = child->first_attribute("color"); + if (attr) { + hasHighlightColor = true; + std::string color = attr->value(); + ConvertStrToColor(color, &mHighlightColor); + } + } + // Simple way to check for static state mLastValue = gui_parse_text(mHeaderText); if (mLastValue != mHeaderText) @@ -161,6 +176,15 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) string parsevalue = gui_parse_text(attr->value()); mLineSpacing = atoi(parsevalue.c_str()); } + + attr = child->first_attribute("highlightcolor"); + memset(&mFontHighlightColor, 0, sizeof(COLOR)); + if (attr) + { + std::string color = attr->value(); + ConvertStrToColor(color, &mFontHighlightColor); + hasFontHighlightColor = true; + } } // Load the separator if it exists @@ -349,14 +373,39 @@ int GUIFileSelector::Render(void) int currentIconOffsetY = 0, currentIconOffsetX = 0; int folderIconOffsetY = (int)((actualLineHeight - mFolderIconHeight) / 2), fileIconOffsetY = (int)((actualLineHeight - mFileIconHeight) / 2); int folderIconOffsetX = (mIconWidth - mFolderIconWidth) / 2, fileIconOffsetX = (mIconWidth - mFileIconWidth) / 2; + int actualSelection = mStart; + + if (isHighlighted) { + int selectY = scrollingY; + + // Locate the correct line for highlighting + while (selectY + actualLineHeight < startSelection) { + selectY += actualLineHeight; + actualSelection++; + } + if (hasHighlightColor) { + // Highlight the area + gr_color(mHighlightColor.red, mHighlightColor.green, mHighlightColor.blue, 255); + int HighlightHeight = actualLineHeight; + if (mRenderY + mHeaderH + selectY + actualLineHeight > mRenderH + mRenderY) { + HighlightHeight = actualLineHeight - (mRenderY + mHeaderH + selectY + actualLineHeight - mRenderH - mRenderY); + } + gr_fill(mRenderX, mRenderY + mHeaderH + selectY, mRenderW, HighlightHeight); + } + } for (line = 0; line < lines; line++) { Resource* icon; std::string label; - // Set the color for the font - gr_color(mFontColor.red, mFontColor.green, mFontColor.blue, 255); + if (isHighlighted && hasFontHighlightColor && line + mStart == actualSelection) { + // Use the highlight color for the font + gr_color(mFontHighlightColor.red, mFontHighlightColor.green, mFontHighlightColor.blue, 255); + } else { + // Set the color for the font + gr_color(mFontColor.red, mFontColor.green, mFontColor.blue, 255); + } if (line + mStart < folderSize) { @@ -514,7 +563,6 @@ int GUIFileSelector::GetSelection(int x, int y) int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y) { - static int startSelection = -1; static int lastY = 0, last2Y = 0; int selection = 0; @@ -525,6 +573,9 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y) startSelection = -1; else startSelection = GetSelection(x,y); + isHighlighted = (startSelection > -1); + if (isHighlighted) + mUpdate = 1; startY = lastY = last2Y = y; scrollingSpeed = 0; break; @@ -533,14 +584,21 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y) // Check if we dragged out of the selection window if (GetSelection(x, y) == -1) { last2Y = lastY = 0; + if (isHighlighted) { + isHighlighted = false; + mUpdate = 1; + } break; } // Provide some debounce on initial touches if (startSelection != -1 && abs(y - startY) < touchDebounce) { + isHighlighted = true; + mUpdate = 1; break; } + isHighlighted = false; last2Y = lastY; lastY = y; startSelection = -1; @@ -581,6 +639,7 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y) break; case TOUCH_RELEASE: + isHighlighted = false; if (startSelection >= 0) { // We've selected an item! diff --git a/gui/gui.cpp b/gui/gui.cpp index 92eab2983..7fd474a35 100644 --- a/gui/gui.cpp +++ b/gui/gui.cpp @@ -33,8 +33,8 @@ #include <unistd.h> #include <stdlib.h> - -extern "C" { +extern "C" +{ #include "../common.h" #include "../roots.h" #include "../minuitwrp/minui.h" @@ -48,6 +48,8 @@ extern "C" { #include "../data.hpp" #include "../variables.h" #include "../partitions.hpp" +#include "../twrp-functions.hpp" +#include "blanktimer.hpp" const static int CURTAIN_FADE = 32; @@ -59,609 +61,687 @@ static int gGuiInitialized = 0; static int gGuiConsoleRunning = 0; static int gGuiConsoleTerminate = 0; static int gForceRender = 0; +pthread_mutex_t gForceRendermutex; static int gNoAnimation = 1; static int gGuiInputRunning = 0; +blanktimer blankTimer; // Needed by pages.cpp too int gGuiRunning = 0; static int gRecorder = -1; -extern "C" void gr_write_frame_to_file(int fd); +extern "C" void gr_write_frame_to_file (int fd); -void flip(void) +void +flip (void) { - if (gRecorder != -1) - { - timespec time; - clock_gettime(CLOCK_MONOTONIC, &time); - write(gRecorder, &time, sizeof(timespec)); - gr_write_frame_to_file(gRecorder); - } - gr_flip(); - return; + if (gRecorder != -1) + { + timespec time; + clock_gettime (CLOCK_MONOTONIC, &time); + write (gRecorder, &time, sizeof (timespec)); + gr_write_frame_to_file (gRecorder); + } + gr_flip (); + return; } -void rapidxml::parse_error_handler(const char *what, void *where) +void +rapidxml::parse_error_handler (const char *what, void *where) { - fprintf(stderr, "Parser error: %s\n", what); - fprintf(stderr, " Start of string: %s\n", (char*) where); - abort(); + fprintf (stderr, "Parser error: %s\n", what); + fprintf (stderr, " Start of string: %s\n", (char *) where); + abort (); } -static void curtainSet() +static void +curtainSet () { - gr_color(0, 0, 0, 255); - gr_fill(0, 0, gr_fb_width(), gr_fb_height()); - gr_blit(gCurtain, 0, 0, gr_get_width(gCurtain), gr_get_height(gCurtain), 0, 0); - gr_flip(); - return; + gr_color (0, 0, 0, 255); + gr_fill (0, 0, gr_fb_width (), gr_fb_height ()); + gr_blit (gCurtain, 0, 0, gr_get_width (gCurtain), gr_get_height (gCurtain), + 0, 0); + gr_flip (); + return; } -static void curtainRaise(gr_surface surface) +static void +curtainRaise (gr_surface surface) { - int sy = 0; - int h = gr_get_height(gCurtain) - 1; - int w = gr_get_width(gCurtain); - int fy = 1; - - int msw = gr_get_width(surface); - int msh = gr_get_height(surface); - int CURTAIN_RATE = msh / 30; - - if (gNoAnimation == 0) - { - for (; h > 0; h -= CURTAIN_RATE, sy += CURTAIN_RATE, fy += CURTAIN_RATE) - { - gr_blit(surface, 0, 0, msw, msh, 0, 0); - gr_blit(gCurtain, 0, sy, w, h, 0, 0); - gr_flip(); - } - } - gr_blit(surface, 0, 0, msw, msh, 0, 0); - flip(); - return; + int sy = 0; + int h = gr_get_height (gCurtain) - 1; + int w = gr_get_width (gCurtain); + int fy = 1; + + int msw = gr_get_width (surface); + int msh = gr_get_height (surface); + int CURTAIN_RATE = msh / 30; + + if (gNoAnimation == 0) + { + for (; h > 0; h -= CURTAIN_RATE, sy += CURTAIN_RATE, fy += CURTAIN_RATE) + { + gr_blit (surface, 0, 0, msw, msh, 0, 0); + gr_blit (gCurtain, 0, sy, w, h, 0, 0); + gr_flip (); + } + } + gr_blit (surface, 0, 0, msw, msh, 0, 0); + flip (); + return; } -void curtainClose() +void +curtainClose () { #if 0 - int w = gr_get_width(gCurtain); - int h = 1; - int sy = gr_get_height(gCurtain) - 1; - int fbh = gr_fb_height(); - int CURTAIN_RATE = fbh / 30; - - if (gNoAnimation == 0) - { - for (; h < fbh; h += CURTAIN_RATE, sy -= CURTAIN_RATE) - { - gr_blit(gCurtain, 0, sy, w, h, 0, 0); - gr_flip(); - } - gr_blit(gCurtain, 0, 0, gr_get_width(gCurtain), gr_get_height(gCurtain), 0, 0); - gr_flip(); - - if (gRecorder != -1) - close(gRecorder); - - int fade; - for (fade = 16; fade < 255; fade += CURTAIN_FADE) - { - gr_blit(gCurtain, 0, 0, gr_get_width(gCurtain), gr_get_height(gCurtain), 0, 0); - gr_color(0, 0, 0, fade); - gr_fill(0, 0, gr_fb_width(), gr_fb_height()); - gr_flip(); - } - gr_color(0, 0, 0, 255); - gr_fill(0, 0, gr_fb_width(), gr_fb_height()); - gr_flip(); - } + int w = gr_get_width (gCurtain); + int h = 1; + int sy = gr_get_height (gCurtain) - 1; + int fbh = gr_fb_height (); + int CURTAIN_RATE = fbh / 30; + + if (gNoAnimation == 0) + { + for (; h < fbh; h += CURTAIN_RATE, sy -= CURTAIN_RATE) + { + gr_blit (gCurtain, 0, sy, w, h, 0, 0); + gr_flip (); + } + gr_blit (gCurtain, 0, 0, gr_get_width (gCurtain), + gr_get_height (gCurtain), 0, 0); + gr_flip (); + + if (gRecorder != -1) + close (gRecorder); + + int fade; + for (fade = 16; fade < 255; fade += CURTAIN_FADE) + { + gr_blit (gCurtain, 0, 0, gr_get_width (gCurtain), + gr_get_height (gCurtain), 0, 0); + gr_color (0, 0, 0, fade); + gr_fill (0, 0, gr_fb_width (), gr_fb_height ()); + gr_flip (); + } + gr_color (0, 0, 0, 255); + gr_fill (0, 0, gr_fb_width (), gr_fb_height ()); + gr_flip (); + } #else - gr_blit(gCurtain, 0, 0, gr_get_width(gCurtain), gr_get_height(gCurtain), 0, 0); - gr_flip(); + gr_blit (gCurtain, 0, 0, gr_get_width (gCurtain), gr_get_height (gCurtain), + 0, 0); + gr_flip (); #endif - return; + return; } -timespec timespec_diff(timespec& start, timespec& end) +static void * +input_thread (void *cookie) { - timespec temp; - if ((end.tv_nsec-start.tv_nsec)<0) { - temp.tv_sec = end.tv_sec-start.tv_sec-1; - temp.tv_nsec = 1000000000+end.tv_nsec-start.tv_nsec; - } else { - temp.tv_sec = end.tv_sec-start.tv_sec; - temp.tv_nsec = end.tv_nsec-start.tv_nsec; - } - return temp; -} + int drag = 0; + static int touch_and_hold = 0, dontwait = 0, touch_repeat = 0, x = 0, y = + 0, lshift = 0, rshift = 0, key_repeat = 0; + static struct timeval touchStart; + HardwareKeyboard kb; -static void *input_thread(void *cookie) -{ - int drag = 0; - static int touch_and_hold = 0, dontwait = 0, touch_repeat = 0, x = 0, y = 0, lshift = 0, rshift = 0, key_repeat = 0; - static struct timeval touchStart; - HardwareKeyboard kb; + //start screen timeout threads + blankTimer.setTimerThread(); - for (;;) { + for (;;) + { - // wait for the next event - struct input_event ev; - int state = 0, ret = 0; + // wait for the next event + struct input_event ev; + int state = 0, ret = 0; - ret = ev_get(&ev, dontwait); + ret = ev_get (&ev, dontwait); - if (ret < 0) { - struct timeval curTime; - gettimeofday(&curTime, NULL); - long mtime, seconds, useconds; + if (ret < 0) + { + struct timeval curTime; + gettimeofday (&curTime, NULL); + long mtime, seconds, useconds; - seconds = curTime.tv_sec - touchStart.tv_sec; - useconds = curTime.tv_usec - touchStart.tv_usec; + seconds = curTime.tv_sec - touchStart.tv_sec; + useconds = curTime.tv_usec - touchStart.tv_usec; - mtime = ((seconds) * 1000 + useconds/1000.0) + 0.5; - if (touch_and_hold && mtime > 500) { - touch_and_hold = 0; - touch_repeat = 1; - gettimeofday(&touchStart, NULL); + mtime = ((seconds) * 1000 + useconds / 1000.0) + 0.5; + if (touch_and_hold && mtime > 500) + { + touch_and_hold = 0; + touch_repeat = 1; + gettimeofday (&touchStart, NULL); #ifdef _EVENT_LOGGING - LOGE("TOUCH_HOLD: %d,%d\n", x, y); + LOGE ("TOUCH_HOLD: %d,%d\n", x, y); #endif - PageManager::NotifyTouch(TOUCH_HOLD, x, y); - } else if (touch_repeat && mtime > 100) { + PageManager::NotifyTouch (TOUCH_HOLD, x, y); + blankTimer.resetTimerAndUnblank(); + } + else if (touch_repeat && mtime > 100) + { #ifdef _EVENT_LOGGING - LOGE("TOUCH_REPEAT: %d,%d\n", x, y); + LOGE ("TOUCH_REPEAT: %d,%d\n", x, y); #endif - gettimeofday(&touchStart, NULL); - PageManager::NotifyTouch(TOUCH_REPEAT, x, y); - } else if (key_repeat == 1 && mtime > 500) { + gettimeofday (&touchStart, NULL); + PageManager::NotifyTouch (TOUCH_REPEAT, x, y); + blankTimer.resetTimerAndUnblank(); + } + else if (key_repeat == 1 && mtime > 500) + { #ifdef _EVENT_LOGGING - LOGE("KEY_HOLD: %d,%d\n", x, y); + LOGE ("KEY_HOLD: %d,%d\n", x, y); #endif - gettimeofday(&touchStart, NULL); - key_repeat = 2; - kb.KeyRepeat(); - } else if (key_repeat == 2 && mtime > 100) { + gettimeofday (&touchStart, NULL); + key_repeat = 2; + kb.KeyRepeat (); + blankTimer.resetTimerAndUnblank(); + } + else if (key_repeat == 2 && mtime > 100) + { #ifdef _EVENT_LOGGING - LOGE("KEY_REPEAT: %d,%d\n", x, y); + LOGE ("KEY_REPEAT: %d,%d\n", x, y); #endif - gettimeofday(&touchStart, NULL); - kb.KeyRepeat(); + gettimeofday (&touchStart, NULL); + kb.KeyRepeat (); + blankTimer.resetTimerAndUnblank(); } - } else if (ev.type == EV_ABS) { + } + else if (ev.type == EV_ABS) + { - x = ev.value >> 16; - y = ev.value & 0xFFFF; + x = ev.value >> 16; + y = ev.value & 0xFFFF; - if (ev.code == 0) - { - if (state == 0) - { + if (ev.code == 0) + { + if (state == 0) + { #ifdef _EVENT_LOGGING - LOGE("TOUCH_RELEASE: %d,%d\n", x, y); + LOGE ("TOUCH_RELEASE: %d,%d\n", x, y); #endif - PageManager::NotifyTouch(TOUCH_RELEASE, x, y); - touch_and_hold = 0; - touch_repeat = 0; - if (!key_repeat) - dontwait = 0; - } - state = 0; - drag = 0; - } - else - { - if (!drag) - { + PageManager::NotifyTouch (TOUCH_RELEASE, x, y); + blankTimer.resetTimerAndUnblank(); + touch_and_hold = 0; + touch_repeat = 0; + if (!key_repeat) + dontwait = 0; + } + state = 0; + drag = 0; + } + else + { + if (!drag) + { #ifdef _EVENT_LOGGING - LOGE("TOUCH_START: %d,%d\n", x, y); + LOGE ("TOUCH_START: %d,%d\n", x, y); #endif - if (PageManager::NotifyTouch(TOUCH_START, x, y) > 0) - state = 1; - drag = 1; - touch_and_hold = 1; - dontwait = 1; - key_repeat = 0; - gettimeofday(&touchStart, NULL); - } - else - { - if (state == 0) - { + if (PageManager::NotifyTouch (TOUCH_START, x, y) > 0) + state = 1; + drag = 1; + touch_and_hold = 1; + dontwait = 1; + key_repeat = 0; + gettimeofday (&touchStart, NULL); + blankTimer.resetTimerAndUnblank(); + } + else + { + if (state == 0) + { #ifdef _EVENT_LOGGING - LOGE("TOUCH_DRAG: %d,%d\n", x, y); + LOGE ("TOUCH_DRAG: %d,%d\n", x, y); #endif - if (PageManager::NotifyTouch(TOUCH_DRAG, x, y) > 0) - state = 1; - key_repeat = 0; - } - } - } - } - else if (ev.type == EV_KEY) - { - // Handle key-press here + if (PageManager::NotifyTouch (TOUCH_DRAG, x, y) > 0) + state = 1; + key_repeat = 0; + blankTimer.resetTimerAndUnblank(); + } + } + } + } + else if (ev.type == EV_KEY) + { + // Handle key-press here #ifdef _EVENT_LOGGING - LOGE("TOUCH_KEY: %d\n", ev.code); + LOGE ("TOUCH_KEY: %d\n", ev.code); #endif - if (ev.value != 0) { - // This is a key press - if (kb.KeyDown(ev.code)) { - key_repeat = 1; - touch_and_hold = 0; - touch_repeat = 0; - dontwait = 1; - gettimeofday(&touchStart, NULL); - } else { - key_repeat = 0; - touch_and_hold = 0; - touch_repeat = 0; - dontwait = 0; + if (ev.value != 0) + { + // This is a key press + if (kb.KeyDown (ev.code)) + { + key_repeat = 1; + touch_and_hold = 0; + touch_repeat = 0; + dontwait = 1; + gettimeofday (&touchStart, NULL); + blankTimer.resetTimerAndUnblank(); + } + else + { + key_repeat = 0; + touch_and_hold = 0; + touch_repeat = 0; + dontwait = 0; + blankTimer.resetTimerAndUnblank(); } - } else { - // This is a key release - kb.KeyUp(ev.code); - key_repeat = 0; - touch_and_hold = 0; - touch_repeat = 0; - dontwait = 0; } - } - } - return NULL; + else + { + // This is a key release + kb.KeyUp (ev.code); + key_repeat = 0; + touch_and_hold = 0; + touch_repeat = 0; + dontwait = 0; + blankTimer.resetTimerAndUnblank(); + } + } + } + return NULL; } // This special function will return immediately the first time, but then // always returns 1/30th of a second (or immediately if called later) from // the last time it was called -static void loopTimer(void) +static void +loopTimer (void) { - static timespec lastCall; - static int initialized = 0; - - if (!initialized) - { - clock_gettime(CLOCK_MONOTONIC, &lastCall); - initialized = 1; - return; - } - - do - { - timespec curTime; - clock_gettime(CLOCK_MONOTONIC, &curTime); - - timespec diff = timespec_diff(lastCall, curTime); - - // This is really 30 times per second - if (diff.tv_sec || diff.tv_nsec > 33333333) - { - lastCall = curTime; - return; - } - - // We need to sleep some period time microseconds - unsigned int sleepTime = 33333 - (diff.tv_nsec / 1000); - usleep(sleepTime); - } while(1); - return; + static timespec lastCall; + static int initialized = 0; + + if (!initialized) + { + clock_gettime (CLOCK_MONOTONIC, &lastCall); + initialized = 1; + return; + } + + do + { + timespec curTime; + clock_gettime (CLOCK_MONOTONIC, &curTime); + + timespec diff = TWFunc::timespec_diff (lastCall, curTime); + + // This is really 30 times per second + if (diff.tv_sec || diff.tv_nsec > 33333333) + { + lastCall = curTime; + return; + } + + // We need to sleep some period time microseconds + unsigned int sleepTime = 33333 - (diff.tv_nsec / 1000); + usleep (sleepTime); + } + while (1); + return; } -static int runPages(void) +static int +runPages (void) { - // Raise the curtain - if (gCurtain != NULL) - { - gr_surface surface; - - PageManager::Render(); - gr_get_surface(&surface); - curtainRaise(surface); - gr_free_surface(surface); - } - - gGuiRunning = 1; - - DataManager::SetValue("tw_loaded", 1); - - for (;;) - { - loopTimer(); - - if (!gForceRender) - { - int ret; - - ret = PageManager::Update(); - if (ret > 1) - PageManager::Render(); - - if (ret > 0) - flip(); - } - else - { - gForceRender = 0; - PageManager::Render(); - flip(); - } - } - - gGuiRunning = 0; - return 0; + // Raise the curtain + if (gCurtain != NULL) + { + gr_surface surface; + + PageManager::Render (); + gr_get_surface (&surface); + curtainRaise (surface); + gr_free_surface (surface); + } + + gGuiRunning = 1; + + DataManager::SetValue ("tw_loaded", 1); + + for (;;) + { + loopTimer (); + + if (!gForceRender) + { + int ret; + + ret = PageManager::Update (); + if (ret > 1) + PageManager::Render (); + + if (ret > 0) + flip (); + } + else + { + pthread_mutex_lock(&gForceRendermutex); + gForceRender = 0; + pthread_mutex_unlock(&gForceRendermutex); + PageManager::Render (); + flip (); + } + } + + gGuiRunning = 0; + return 0; } -static int runPage(const char* page_name) +static int +runPage (const char *page_name) { - gui_changePage(page_name); - - // Raise the curtain - if (gCurtain != NULL) - { - gr_surface surface; - - PageManager::Render(); - gr_get_surface(&surface); - curtainRaise(surface); - gr_free_surface(surface); - } - - gGuiRunning = 1; - - DataManager::SetValue("tw_loaded", 1); - - for (;;) - { - loopTimer(); - - if (!gForceRender) - { - int ret; - - ret = PageManager::Update(); - if (ret > 1) - PageManager::Render(); - - if (ret > 0) - flip(); - } - else - { - gForceRender = 0; - PageManager::Render(); - flip(); - } - if (DataManager::GetIntValue("tw_page_done") != 0) { - gui_changePage("main"); - break; + gui_changePage (page_name); + + // Raise the curtain + if (gCurtain != NULL) + { + gr_surface surface; + + PageManager::Render (); + gr_get_surface (&surface); + curtainRaise (surface); + gr_free_surface (surface); + } + + gGuiRunning = 1; + + DataManager::SetValue ("tw_loaded", 1); + + for (;;) + { + loopTimer (); + + if (!gForceRender) + { + int ret; + + ret = PageManager::Update (); + if (ret > 1) + PageManager::Render (); + + if (ret > 0) + flip (); + } + else + { + pthread_mutex_lock(&gForceRendermutex); + gForceRender = 0; + pthread_mutex_unlock(&gForceRendermutex); + PageManager::Render (); + flip (); } - } + if (DataManager::GetIntValue ("tw_page_done") != 0) + { + gui_changePage ("main"); + break; + } + } - gGuiRunning = 0; - return 0; + gGuiRunning = 0; + return 0; } -int gui_forceRender(void) +int +gui_forceRender (void) { - gForceRender = 1; - return 0; + pthread_mutex_lock(&gForceRendermutex); + gForceRender = 1; + pthread_mutex_unlock(&gForceRendermutex); + return 0; } -int gui_changePage(std::string newPage) +int +gui_changePage (std::string newPage) { - LOGI("Set page: '%s'\n", newPage.c_str()); - PageManager::ChangePage(newPage); - gForceRender = 1; - return 0; + LOGI ("Set page: '%s'\n", newPage.c_str ()); + PageManager::ChangePage (newPage); + pthread_mutex_lock(&gForceRendermutex); + gForceRender = 1; + pthread_mutex_unlock(&gForceRendermutex); + return 0; } -int gui_changeOverlay(std::string overlay) +int +gui_changeOverlay (std::string overlay) { - PageManager::ChangeOverlay(overlay); - gForceRender = 1; - return 0; + PageManager::ChangeOverlay (overlay); + pthread_mutex_lock(&gForceRendermutex); + gForceRender = 1; + pthread_mutex_unlock(&gForceRendermutex); + return 0; } -int gui_changePackage(std::string newPackage) +int +gui_changePackage (std::string newPackage) { - PageManager::SelectPackage(newPackage); - gForceRender = 1; - return 0; + PageManager::SelectPackage (newPackage); + pthread_mutex_lock(&gForceRendermutex); + gForceRender = 1; + pthread_mutex_unlock(&gForceRendermutex); + return 0; } -std::string gui_parse_text(string inText) +std::string gui_parse_text (string inText) { - // Copied from std::string GUIText::parseText(void) - // This function parses text for DataManager values encompassed by %value% in the XML - static int counter = 0; - std::string str = inText; - size_t pos = 0; - size_t next = 0, end = 0; - - while (1) - { - next = str.find('%', pos); - if (next == std::string::npos) return str; - end = str.find('%', next + 1); - if (end == std::string::npos) return str; - - // We have a block of data - std::string var = str.substr(next + 1, (end - next) - 1); - str.erase(next, (end - next) + 1); - - if (next + 1 == end) - { - str.insert(next, 1, '%'); - } - else - { - std::string value; - if (DataManager::GetValue(var, value) == 0) - str.insert(next, value); - } - - pos = next + 1; - } + // Copied from std::string GUIText::parseText(void) + // This function parses text for DataManager values encompassed by %value% in the XML + static int counter = 0; + std::string str = inText; + size_t pos = 0; + size_t next = 0, end = 0; + + while (1) + { + next = str.find ('%', pos); + if (next == std::string::npos) + return str; + end = str.find ('%', next + 1); + if (end == std::string::npos) + return str; + + // We have a block of data + std::string var = str.substr (next + 1, (end - next) - 1); + str.erase (next, (end - next) + 1); + + if (next + 1 == end) + { + str.insert (next, 1, '%'); + } + else + { + std::string value; + if (DataManager::GetValue (var, value) == 0) + str.insert (next, value); + } + + pos = next + 1; + } } -extern "C" int gui_init() +extern "C" int +gui_init () { - int fd; + int fd; - gr_init(); + gr_init (); - if (res_create_surface("/res/images/curtain.jpg", &gCurtain)) + if (res_create_surface ("/res/images/curtain.jpg", &gCurtain)) { - printf("Unable to locate '/res/images/curtain.jpg'\nDid you set a DEVICE_RESOLUTION in your config files?\n"); - return -1; + printf + ("Unable to locate '/res/images/curtain.jpg'\nDid you set a DEVICE_RESOLUTION in your config files?\n"); + return -1; } - curtainSet(); + curtainSet (); - ev_init(); - return 0; + ev_init (); + return 0; } -extern "C" int gui_loadResources() +extern "C" int +gui_loadResources () { // unlink("/sdcard/video.last"); // rename("/sdcard/video.bin", "/sdcard/video.last"); // gRecorder = open("/sdcard/video.bin", O_CREAT | O_WRONLY); - int check = 0; - DataManager::GetValue(TW_IS_ENCRYPTED, check); - if (check) { - if (PageManager::LoadPackage("TWRP", "/res/ui.xml", "decrypt")) + int check = 0; + DataManager::GetValue (TW_IS_ENCRYPTED, check); + if (check) + { + if (PageManager::LoadPackage ("TWRP", "/res/ui.xml", "decrypt")) { - LOGE("Failed to load base packages.\n"); - goto error; - } else - check = 1; + LOGE ("Failed to load base packages.\n"); + goto error; + } + else + check = 1; } - if (check == 0 && PageManager::LoadPackage("TWRP", "/script/ui.xml", "main")) { - std::string theme_path; - - theme_path = DataManager::GetSettingsStoragePath(); - if (!PartitionManager.Mount_Settings_Storage(false)) { - int retry_count = 5; - while (retry_count > 0 && !PartitionManager.Mount_Settings_Storage(false)) { - usleep(500000); - retry_count--; + if (check == 0 + && PageManager::LoadPackage ("TWRP", "/script/ui.xml", "main")) + { + std::string theme_path; + + theme_path = DataManager::GetSettingsStoragePath (); + if (!PartitionManager.Mount_Settings_Storage (false)) + { + int retry_count = 5; + while (retry_count > 0 + && !PartitionManager.Mount_Settings_Storage (false)) + { + usleep (500000); + retry_count--; } - if (!PartitionManager.Mount_Settings_Storage(false)) { - LOGE("Unable to mount %s during GUI startup.\n", theme_path.c_str()); - check = 1; + if (!PartitionManager.Mount_Settings_Storage (false)) + { + LOGE ("Unable to mount %s during GUI startup.\n", + theme_path.c_str ()); + check = 1; } } - theme_path += "/TWRP/theme/ui.zip"; - if (check || PageManager::LoadPackage("TWRP", theme_path, "main")) + theme_path += "/TWRP/theme/ui.zip"; + if (check || PageManager::LoadPackage ("TWRP", theme_path, "main")) { - if (PageManager::LoadPackage("TWRP", "/res/ui.xml", "main")) + if (PageManager::LoadPackage ("TWRP", "/res/ui.xml", "main")) { - LOGE("Failed to load base packages.\n"); - goto error; + LOGE ("Failed to load base packages.\n"); + goto error; } } } - // Set the default package - PageManager::SelectPackage("TWRP"); + // Set the default package + PageManager::SelectPackage ("TWRP"); - gGuiInitialized = 1; - return 0; + gGuiInitialized = 1; + return 0; error: - LOGE("An internal error has occurred.\n"); - gGuiInitialized = 0; - return -1; + LOGE ("An internal error has occurred.\n"); + gGuiInitialized = 0; + return -1; } -extern "C" int gui_start() +extern "C" int +gui_start () { - if (!gGuiInitialized) return -1; + if (!gGuiInitialized) + return -1; - gGuiConsoleTerminate = 1; - while (gGuiConsoleRunning) loopTimer(); + gGuiConsoleTerminate = 1; + while (gGuiConsoleRunning) + loopTimer (); - // Set the default package - PageManager::SelectPackage("TWRP"); + // Set the default package + PageManager::SelectPackage ("TWRP"); - if (!gGuiInputRunning) { - // Start by spinning off an input handler. - pthread_t t; - pthread_create(&t, NULL, input_thread, NULL); - gGuiInputRunning = 1; + if (!gGuiInputRunning) + { + // Start by spinning off an input handler. + pthread_t t; + pthread_create (&t, NULL, input_thread, NULL); + gGuiInputRunning = 1; } - return runPages(); + return runPages (); } -extern "C" int gui_startPage(const char* page_name) +extern "C" int +gui_startPage (const char *page_name) { - if (!gGuiInitialized) return -1; + if (!gGuiInitialized) + return -1; - gGuiConsoleTerminate = 1; - while (gGuiConsoleRunning) loopTimer(); + gGuiConsoleTerminate = 1; + while (gGuiConsoleRunning) + loopTimer (); - // Set the default package - PageManager::SelectPackage("TWRP"); + // Set the default package + PageManager::SelectPackage ("TWRP"); - if (!gGuiInputRunning) { - // Start by spinning off an input handler. - pthread_t t; - pthread_create(&t, NULL, input_thread, NULL); - gGuiInputRunning = 1; + if (!gGuiInputRunning) + { + // Start by spinning off an input handler. + pthread_t t; + pthread_create (&t, NULL, input_thread, NULL); + gGuiInputRunning = 1; } - DataManager::SetValue("tw_page_done", 0); - return runPage(page_name); + DataManager::SetValue ("tw_page_done", 0); + return runPage (page_name); } -static void *console_thread(void *cookie) +static void * +console_thread (void *cookie) { - PageManager::SwitchToConsole(); - - while (!gGuiConsoleTerminate) - { - loopTimer(); - - if (!gForceRender) - { - int ret; - - ret = PageManager::Update(); - if (ret > 1) - PageManager::Render(); - - if (ret > 0) - flip(); - - if (ret < 0) - LOGE("An update request has failed.\n"); - } - else - { - gForceRender = 0; - PageManager::Render(); - flip(); - } - } - gGuiConsoleRunning = 0; - return NULL; + PageManager::SwitchToConsole (); + + while (!gGuiConsoleTerminate) + { + loopTimer (); + + if (!gForceRender) + { + int ret; + + ret = PageManager::Update (); + if (ret > 1) + PageManager::Render (); + + if (ret > 0) + flip (); + + if (ret < 0) + LOGE ("An update request has failed.\n"); + } + else + { + pthread_mutex_lock(&gForceRendermutex); + gForceRender = 0; + pthread_mutex_unlock(&gForceRendermutex); + PageManager::Render (); + flip (); + } + } + gGuiConsoleRunning = 0; + return NULL; } -extern "C" int gui_console_only() +extern "C" int +gui_console_only () { - if (!gGuiInitialized) return -1; + if (!gGuiInitialized) + return -1; - gGuiConsoleTerminate = 0; - gGuiConsoleRunning = 1; + gGuiConsoleTerminate = 0; + gGuiConsoleRunning = 1; - // Start by spinning off an input handler. - pthread_t t; - pthread_create(&t, NULL, console_thread, NULL); + // Start by spinning off an input handler. + pthread_t t; + pthread_create (&t, NULL, console_thread, NULL); - return 0; + return 0; } @@ -1,13 +1,13 @@ -#ifndef _GUI_HEADER -#define _GUI_HEADER - -int gui_console_only(); -int gui_init(); -int gui_loadResources(); -int gui_start(); -int gui_startPage(const char* page_name); -void gui_print(const char *fmt, ...); -void gui_print_overwrite(const char *fmt, ...); - -#endif // _GUI_HEADER - +#ifndef _GUI_HEADER
+#define _GUI_HEADER
+
+int gui_console_only();
+int gui_init();
+int gui_loadResources();
+int gui_start();
+int gui_startPage(const char* page_name);
+void gui_print(const char *fmt, ...);
+void gui_print_overwrite(const char *fmt, ...);
+
+#endif // _GUI_HEADER
+
diff --git a/gui/listbox.cpp b/gui/listbox.cpp index 888947b29..5dd2a2db6 100644 --- a/gui/listbox.cpp +++ b/gui/listbox.cpp @@ -1,4 +1,4 @@ -// ListBox.cpp - GUIListBox object +// FileSelector.cpp - GUIFileSelector object #include <linux/input.h> #include <pthread.h> @@ -31,105 +31,238 @@ extern "C" { #include "rapidxml.hpp" #include "objects.hpp" #include "../data.hpp" +#include "../twrp-functions.hpp" + +#define SCROLLING_SPEED_DECREMENT 6 +#define SCROLLING_FLOOR 10 +#define SCROLLING_MULTIPLIER 6 GUIListBox::GUIListBox(xml_node<>* node) { - xml_attribute<>* attr; - xml_node<>* child; - - mStart = mLineSpacing = mIconWidth = mIconHeight = 0; - mIconSelected = mIconUnselected = mBackground = mFont = NULL; - mBackgroundX = mBackgroundY = mBackgroundW = mBackgroundH = 0; - mUpdate = 0; - ConvertStrToColor("black", &mBackgroundColor); - ConvertStrToColor("white", &mFontColor); - - child = node->first_node("icon"); - if (child) - { - attr = child->first_attribute("selected"); - if (attr) - mIconSelected = PageManager::FindResource(attr->value()); - attr = child->first_attribute("unselected"); - if (attr) - mIconUnselected = PageManager::FindResource(attr->value()); - } - child = node->first_node("background"); - if (child) - { - attr = child->first_attribute("resource"); - if (attr) - mBackground = PageManager::FindResource(attr->value()); - attr = child->first_attribute("color"); - if (attr) - { - std::string color = attr->value(); - ConvertStrToColor(color, &mBackgroundColor); - } - } - - // Load the placement - LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH); - SetActionPos(mRenderX, mRenderY, mRenderW, mRenderH); + xml_attribute<>* attr; + xml_node<>* child; + int header_separator_color_specified = 0, header_separator_height_specified = 0, header_text_color_specified = 0, header_background_color_specified = 0; + + mStart = mLineSpacing = startY = mFontHeight = mSeparatorH = scrollingY = scrollingSpeed = 0; + mIconWidth = mIconHeight = mSelectedIconHeight = mSelectedIconHeight = mUnselectedIconWidth = mUnselectedIconWidth = mHeaderIconHeight = mHeaderIconWidth = 0; + mHeaderSeparatorH = mLineHeight = mHeaderIsStatic = mHeaderH = actualLineHeight = 0; + mIconSelected = mIconUnselected = mBackground = mFont = mHeaderIcon = NULL; + mBackgroundX = mBackgroundY = mBackgroundW = mBackgroundH = 0; + mUpdate = 0; + touchDebounce = 6; + ConvertStrToColor("black", &mBackgroundColor); + ConvertStrToColor("black", &mHeaderBackgroundColor); + ConvertStrToColor("black", &mSeparatorColor); + ConvertStrToColor("black", &mHeaderSeparatorColor); + ConvertStrToColor("white", &mFontColor); + ConvertStrToColor("white", &mHeaderFontColor); + hasHighlightColor = false; + hasFontHighlightColor = false; + isHighlighted = false; + startSelection = -1; + + // Load header text + child = node->first_node("header"); + if (child) + { + attr = child->first_attribute("icon"); + if (attr) + mHeaderIcon = PageManager::FindResource(attr->value()); + + attr = child->first_attribute("background"); + if (attr) + { + std::string color = attr->value(); + ConvertStrToColor(color, &mHeaderBackgroundColor); + header_background_color_specified = -1; + } + attr = child->first_attribute("textcolor"); + if (attr) + { + std::string color = attr->value(); + ConvertStrToColor(color, &mHeaderFontColor); + header_text_color_specified = -1; + } + attr = child->first_attribute("separatorcolor"); + if (attr) + { + std::string color = attr->value(); + ConvertStrToColor(color, &mHeaderSeparatorColor); + header_separator_color_specified = -1; + } + attr = child->first_attribute("separatorheight"); + if (attr) { + string parsevalue = gui_parse_text(attr->value()); + mHeaderSeparatorH = atoi(parsevalue.c_str()); + header_separator_height_specified = -1; + } + } + child = node->first_node("text"); + if (child) mHeaderText = child->value(); + + memset(&mHighlightColor, 0, sizeof(COLOR)); + child = node->first_node("highlight"); + if (child) { + attr = child->first_attribute("color"); + if (attr) { + hasHighlightColor = true; + std::string color = attr->value(); + ConvertStrToColor(color, &mHighlightColor); + } + } + + // Simple way to check for static state + mLastValue = gui_parse_text(mHeaderText); + if (mLastValue != mHeaderText) + mHeaderIsStatic = 0; + else + mHeaderIsStatic = -1; + + child = node->first_node("icon"); + if (child) + { + attr = child->first_attribute("selected"); + if (attr) + mIconSelected = PageManager::FindResource(attr->value()); + attr = child->first_attribute("unselected"); + if (attr) + mIconUnselected = PageManager::FindResource(attr->value()); + } + child = node->first_node("background"); + if (child) + { + attr = child->first_attribute("resource"); + if (attr) + mBackground = PageManager::FindResource(attr->value()); + attr = child->first_attribute("color"); + if (attr) + { + std::string color = attr->value(); + ConvertStrToColor(color, &mBackgroundColor); + if (!header_background_color_specified) + ConvertStrToColor(color, &mHeaderBackgroundColor); + } + } + + // Load the placement + LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH); + SetActionPos(mRenderX, mRenderY, mRenderW, mRenderH); + + // Load the font, and possibly override the color + child = node->first_node("font"); + if (child) + { + attr = child->first_attribute("resource"); + if (attr) + mFont = PageManager::FindResource(attr->value()); + + attr = child->first_attribute("color"); + if (attr) + { + std::string color = attr->value(); + ConvertStrToColor(color, &mFontColor); + if (!header_text_color_specified) + ConvertStrToColor(color, &mHeaderFontColor); + } - // Load the font, and possibly override the color - child = node->first_node("font"); - if (child) - { - attr = child->first_attribute("resource"); - if (attr) - mFont = PageManager::FindResource(attr->value()); + attr = child->first_attribute("spacing"); + if (attr) { + string parsevalue = gui_parse_text(attr->value()); + mLineSpacing = atoi(parsevalue.c_str()); + } - attr = child->first_attribute("color"); + attr = child->first_attribute("highlightcolor"); + memset(&mFontHighlightColor, 0, sizeof(COLOR)); if (attr) { std::string color = attr->value(); - ConvertStrToColor(color, &mFontColor); + ConvertStrToColor(color, &mFontHighlightColor); + hasFontHighlightColor = true; } + } + + // Load the separator if it exists + child = node->first_node("separator"); + if (child) + { + attr = child->first_attribute("color"); + if (attr) + { + std::string color = attr->value(); + ConvertStrToColor(color, &mSeparatorColor); + if (!header_separator_color_specified) + ConvertStrToColor(color, &mHeaderSeparatorColor); + } - attr = child->first_attribute("spacing"); - if (attr) { + attr = child->first_attribute("height"); + if (attr) { string parsevalue = gui_parse_text(attr->value()); - mLineSpacing = atoi(parsevalue.c_str()); + mSeparatorH = atoi(parsevalue.c_str()); + if (!header_separator_height_specified) + mHeaderSeparatorH = mSeparatorH; } - } + } - // Handle the result variable - child = node->first_node("data"); - if (child) - { - attr = child->first_attribute("name"); - if (attr) - mVariable = attr->value(); - attr = child->first_attribute("default"); - if (attr) - DataManager::SetValue(mVariable, attr->value()); - } + // Handle the result variable + child = node->first_node("data"); + if (child) + { + attr = child->first_attribute("name"); + if (attr) + mVariable = attr->value(); + attr = child->first_attribute("default"); + if (attr) + DataManager::SetValue(mVariable, attr->value()); + } + + // Retrieve the line height + gr_getFontDetails(mFont ? mFont->GetResource() : NULL, &mFontHeight, NULL); + mLineHeight = mFontHeight; + mHeaderH = mFontHeight; + + if (mIconSelected && mIconSelected->GetResource()) + { + mSelectedIconWidth = gr_get_width(mIconSelected->GetResource()); + mSelectedIconHeight = gr_get_height(mIconSelected->GetResource()); + if (mSelectedIconHeight > (int)mLineHeight) + mLineHeight = mSelectedIconHeight; + mIconWidth = mSelectedIconWidth; + } + + if (mIconUnselected && mIconUnselected->GetResource()) + { + mUnselectedIconWidth = gr_get_width(mIconUnselected->GetResource()); + mUnselectedIconHeight = gr_get_height(mIconUnselected->GetResource()); + if (mUnselectedIconHeight > (int)mLineHeight) + mLineHeight = mUnselectedIconHeight; + if (mUnselectedIconWidth > mIconWidth) + mIconWidth = mUnselectedIconWidth; + } + + if (mHeaderIcon && mHeaderIcon->GetResource()) + { + mHeaderIconWidth = gr_get_width(mHeaderIcon->GetResource()); + mHeaderIconHeight = gr_get_height(mHeaderIcon->GetResource()); + if (mHeaderIconHeight > mHeaderH) + mHeaderH = mHeaderIconHeight; + if (mHeaderIconWidth > mIconWidth) + mIconWidth = mHeaderIconWidth; + } + + mHeaderH += mLineSpacing + mHeaderSeparatorH; + actualLineHeight = mLineHeight + mLineSpacing + mSeparatorH; + if (mHeaderH < actualLineHeight) + mHeaderH = actualLineHeight; + + if (actualLineHeight / 3 > 6) + touchDebounce = actualLineHeight / 3; + + if (mBackground && mBackground->GetResource()) + { + mBackgroundW = gr_get_width(mBackground->GetResource()); + mBackgroundH = gr_get_height(mBackground->GetResource()); + } - // Retrieve the line height - gr_getFontDetails(mFont ? mFont->GetResource() : NULL, &mFontHeight, NULL); - mLineHeight = mFontHeight; - if (mIconSelected && mIconSelected->GetResource()) - { - if (gr_get_height(mIconSelected->GetResource()) > mLineHeight) - mLineHeight = gr_get_height(mIconSelected->GetResource()); - mIconWidth = gr_get_width(mIconSelected->GetResource()); - mIconHeight = gr_get_height(mIconSelected->GetResource()); - } - if (mIconUnselected && mIconUnselected->GetResource()) - { - if (gr_get_height(mIconUnselected->GetResource()) > mLineHeight) - mLineHeight = gr_get_height(mIconUnselected->GetResource()); - mIconWidth = gr_get_width(mIconUnselected->GetResource()); - mIconHeight = gr_get_height(mIconUnselected->GetResource()); - } - - if (mBackground && mBackground->GetResource()) - { - mBackgroundW = gr_get_width(mBackground->GetResource()); - mBackgroundH = gr_get_height(mBackground->GetResource()); - } - // Get the currently selected value for the list DataManager::GetValue(mVariable, currentValue); @@ -146,18 +279,16 @@ GUIListBox::GUIListBox(xml_node<>* node) data.displayName = attr->value(); data.variableValue = child->value(); - if (child->value() == currentValue) + if (child->value() == currentValue) { data.selected = 1; - else + } else { data.selected = 0; + } mList.push_back(data); child = child->next_sibling("listitem"); } - - // Call this to get the selected item to be shown in the list on first render - NotifyVarChange(mVariable, currentValue); } GUIListBox::~GUIListBox() @@ -165,168 +296,363 @@ GUIListBox::~GUIListBox() } int GUIListBox::Render(void) -{ +{ // First step, fill background - gr_color(mBackgroundColor.red, mBackgroundColor.green, mBackgroundColor.blue, 255); - gr_fill(mRenderX, mRenderY, mRenderW, mRenderH); - - // Next, render the background resource (if it exists) - if (mBackground && mBackground->GetResource()) - { - mBackgroundX = mRenderX + ((mRenderW - mBackgroundW) / 2); - mBackgroundY = mRenderY + ((mRenderH - mBackgroundH) / 2); - gr_blit(mBackground->GetResource(), 0, 0, mBackgroundW, mBackgroundH, mBackgroundX, mBackgroundY); - } - - // Now, we need the lines (icon + text) - gr_color(mFontColor.red, mFontColor.green, mFontColor.blue, mFontColor.alpha); - - // This tells us how many lines we can actually render - int lines = mRenderH / (mLineHeight + mLineSpacing); - int line; - - int listSize = mList.size(); - - if (listSize < lines) lines = listSize; - - void* fontResource = NULL; - if (mFont) fontResource = mFont->GetResource(); - - int yPos = mRenderY + (mLineSpacing / 2); - for (line = 0; line < lines; line++) - { - Resource* icon; - std::string label; + gr_color(mBackgroundColor.red, mBackgroundColor.green, mBackgroundColor.blue, 255); + gr_fill(mRenderX, mRenderY + mHeaderH, mRenderW, mRenderH - mHeaderH); + + // Next, render the background resource (if it exists) + if (mBackground && mBackground->GetResource()) + { + mBackgroundX = mRenderX + ((mRenderW - mBackgroundW) / 2); + mBackgroundY = mRenderY + ((mRenderH - mBackgroundH) / 2); + gr_blit(mBackground->GetResource(), 0, 0, mBackgroundW, mBackgroundH, mBackgroundX, mBackgroundY); + } + + // This tells us how many lines we can actually render + int lines = (mRenderH - mHeaderH) / (actualLineHeight); + int line; + + int listSize = mList.size(); + + if (listSize < lines) { + lines = listSize; + scrollingY = 0; + } else { + lines++; + if (lines < listSize) + lines++; + } + + void* fontResource = NULL; + if (mFont) fontResource = mFont->GetResource(); + + int yPos = mRenderY + mHeaderH + scrollingY; + int fontOffsetY = (int)((actualLineHeight - mFontHeight) / 2); + int currentIconHeight = 0, currentIconWidth = 0; + int currentIconOffsetY = 0, currentIconOffsetX = 0; + int UnselectedIconOffsetY = (int)((actualLineHeight - mUnselectedIconHeight) / 2), SelectedIconOffsetY = (int)((actualLineHeight - mSelectedIconHeight) / 2); + int UnselectedIconOffsetX = (mIconWidth - mUnselectedIconWidth) / 2, SelectedIconOffsetX = (mIconWidth - mSelectedIconWidth) / 2; + int actualSelection = mStart; + + if (isHighlighted) { + int selectY = scrollingY; + + // Locate the correct line for highlighting + while (selectY + actualLineHeight < startSelection) { + selectY += actualLineHeight; + actualSelection++; + } + if (hasHighlightColor) { + // Highlight the area + gr_color(mHighlightColor.red, mHighlightColor.green, mHighlightColor.blue, 255); + int HighlightHeight = actualLineHeight; + if (mRenderY + mHeaderH + selectY + actualLineHeight > mRenderH + mRenderY) { + HighlightHeight = actualLineHeight - (mRenderY + mHeaderH + selectY + actualLineHeight - mRenderH - mRenderY); + } + gr_fill(mRenderX, mRenderY + mHeaderH + selectY, mRenderW, HighlightHeight); + } + } + + for (line = 0; line < lines; line++) + { + Resource* icon; + std::string label; + + if (line + mStart >= listSize) + continue; + + label = mList.at(line + mStart).displayName; + if (isHighlighted && hasFontHighlightColor && line + mStart == actualSelection) { + // Use the highlight color for the font + gr_color(mFontHighlightColor.red, mFontHighlightColor.green, mFontHighlightColor.blue, 255); + } else { + // Set the color for the font + gr_color(mFontColor.red, mFontColor.green, mFontColor.blue, 255); + } - label = mList.at(line + mStart).displayName; if (mList.at(line + mStart).selected != 0) { icon = mIconSelected; + currentIconHeight = mSelectedIconHeight; + currentIconWidth = mSelectedIconWidth; + currentIconOffsetY = SelectedIconOffsetY; + currentIconOffsetX = SelectedIconOffsetX; } else { icon = mIconUnselected; + currentIconHeight = mSelectedIconHeight; + currentIconWidth = mSelectedIconWidth; + currentIconOffsetY = SelectedIconOffsetY; + currentIconOffsetX = SelectedIconOffsetX; } - if (icon && icon->GetResource()) - { - gr_blit(icon->GetResource(), 0, 0, mIconWidth, mIconHeight, mRenderX, (yPos + (int)((mLineHeight - mIconHeight) / 2))); - } - gr_textExW(mRenderX + mIconWidth + 5, yPos, label.c_str(), fontResource, mRenderX + mRenderW - mIconWidth - 5); + if (icon && icon->GetResource()) + { + int rect_y = 0, image_y = (yPos + currentIconOffsetY); + if (image_y + currentIconHeight > mRenderY + mRenderH) + rect_y = mRenderY + mRenderH - image_y; + else + rect_y = currentIconHeight; + gr_blit(icon->GetResource(), 0, 0, currentIconWidth, rect_y, mRenderX + currentIconOffsetX, image_y); + } + gr_textExWH(mRenderX + mIconWidth + 5, yPos + fontOffsetY, label.c_str(), fontResource, mRenderX + mRenderW, mRenderY + mRenderH); - // Move the yPos - yPos += mLineHeight + mLineSpacing; - } + // Add the separator + if (yPos + actualLineHeight < mRenderH + mRenderY) { + gr_color(mSeparatorColor.red, mSeparatorColor.green, mSeparatorColor.blue, 255); + gr_fill(mRenderX, yPos + actualLineHeight - mSeparatorH, mRenderW, mSeparatorH); + } - mUpdate = 0; - return 0; + // Move the yPos + yPos += actualLineHeight; + } + + // Render the Header (last so that it overwrites the top most row for per pixel scrolling) + // First step, fill background + gr_color(mHeaderBackgroundColor.red, mHeaderBackgroundColor.green, mHeaderBackgroundColor.blue, 255); + gr_fill(mRenderX, mRenderY, mRenderW, mHeaderH); + + // Now, we need the header (icon + text) + yPos = mRenderY; + { + Resource* headerIcon; + int mIconOffsetX = 0; + + // render the icon if it exists + headerIcon = mHeaderIcon; + if (headerIcon && headerIcon->GetResource()) + { + gr_blit(headerIcon->GetResource(), 0, 0, mHeaderIconWidth, mHeaderIconHeight, mRenderX + ((mHeaderIconWidth - mIconWidth) / 2), (yPos + (int)((mHeaderH - mHeaderIconHeight) / 2))); + mIconOffsetX = mIconWidth; + } + + // render the text + gr_color(mHeaderFontColor.red, mHeaderFontColor.green, mHeaderFontColor.blue, 255); + gr_textExWH(mRenderX + mIconOffsetX + 5, yPos + (int)((mHeaderH - mFontHeight) / 2), mLastValue.c_str(), fontResource, mRenderX + mRenderW, mRenderY + mRenderH); + + // Add the separator + gr_color(mHeaderSeparatorColor.red, mHeaderSeparatorColor.green, mHeaderSeparatorColor.blue, 255); + gr_fill(mRenderX, yPos + mHeaderH - mHeaderSeparatorH, mRenderW, mHeaderSeparatorH); + } + + mUpdate = 0; + return 0; } int GUIListBox::Update(void) { - if (mUpdate) - { - mUpdate = 0; - if (Render() == 0) + if (!mHeaderIsStatic) { + std::string newValue = gui_parse_text(mHeaderText); + if (mLastValue != newValue) { + mLastValue = newValue; + mUpdate = 1; + } + } + + if (mUpdate) + { + mUpdate = 0; + if (Render() == 0) return 2; - } - return 0; + } + + // Handle kinetic scrolling + if (scrollingSpeed == 0) { + // Do nothing + } else if (scrollingSpeed > 0) { + if (scrollingSpeed < ((int) (actualLineHeight * 2.5))) { + scrollingY += scrollingSpeed; + scrollingSpeed -= SCROLLING_SPEED_DECREMENT; + } else { + scrollingY += ((int) (actualLineHeight * 2.5)); + scrollingSpeed -= SCROLLING_SPEED_DECREMENT; + } + while (mStart && scrollingY > 0) { + mStart--; + scrollingY -= actualLineHeight; + } + if (mStart == 0 && scrollingY > 0) { + scrollingY = 0; + scrollingSpeed = 0; + } else if (scrollingSpeed < SCROLLING_FLOOR) + scrollingSpeed = 0; + mUpdate = 1; + } else if (scrollingSpeed < 0) { + int totalSize = mList.size(); + int lines = (mRenderH - mHeaderH) / (actualLineHeight); + + if (totalSize > lines) { + int bottom_offset = ((int)(mRenderH) - mHeaderH) - (lines * actualLineHeight); + + bottom_offset -= actualLineHeight; + + if (abs(scrollingSpeed) < ((int) (actualLineHeight * 2.5))) { + scrollingY += scrollingSpeed; + scrollingSpeed += SCROLLING_SPEED_DECREMENT; + } else { + scrollingY -= ((int) (actualLineHeight * 2.5)); + scrollingSpeed += SCROLLING_SPEED_DECREMENT; + } + while (mStart + lines + (bottom_offset ? 1 : 0) < totalSize && abs(scrollingY) > actualLineHeight) { + mStart++; + scrollingY += actualLineHeight; + } + if (bottom_offset != 0 && mStart + lines + 1 >= totalSize && scrollingY <= bottom_offset) { + mStart = totalSize - lines - 1; + scrollingY = bottom_offset; + } else if (mStart + lines >= totalSize && scrollingY < 0) { + mStart = totalSize - lines; + scrollingY = 0; + } else if (scrollingSpeed * -1 < SCROLLING_FLOOR) + scrollingSpeed = 0; + mUpdate = 1; + } + } + + return 0; } int GUIListBox::GetSelection(int x, int y) { - // We only care about y position - return (y - mRenderY) / (mLineHeight + mLineSpacing); + // We only care about y position + if (y < mRenderY || y - mRenderY <= mHeaderH || y - mRenderY > mRenderH) return -1; + return (y - mRenderY - mHeaderH); } int GUIListBox::NotifyTouch(TOUCH_STATE state, int x, int y) { - static int startSelection = -1; - static int startY = 0; - int selection = 0; + static int lastY = 0, last2Y = 0; + int selection = 0; + + switch (state) + { + case TOUCH_START: + if (scrollingSpeed != 0) + startSelection = -1; + else + startSelection = GetSelection(x,y); + isHighlighted = (startSelection > -1); + if (isHighlighted) + mUpdate = 1; + startY = lastY = last2Y = y; + scrollingSpeed = 0; + break; + + case TOUCH_DRAG: + // Check if we dragged out of the selection window + if (GetSelection(x, y) == -1) { + last2Y = lastY = 0; + if (isHighlighted) { + isHighlighted = false; + mUpdate = 1; + } + break; + } - switch (state) - { - case TOUCH_START: - startSelection = GetSelection(x,y); - startY = y; - break; - - case TOUCH_DRAG: - // Check if we dragged out of the selection window - selection = GetSelection(x,y); - if (startSelection != selection) - { - startSelection = -1; - - // Handle scrolling - if (y > (int) (startY + (mLineHeight + mLineSpacing))) - { - if (mStart) mStart--; - mUpdate = 1; - startY = y; - } - else if (y < (int) (startY - (mLineHeight + mLineSpacing))) - { - int listSize = mList.size(); - int lines = mRenderH / (mLineHeight + mLineSpacing); - - if (mStart + lines < listSize) mStart++; - mUpdate = 1; - startY = y; - } - } - break; + // Provide some debounce on initial touches + if (startSelection != -1 && abs(y - startY) < touchDebounce) { + isHighlighted = true; + mUpdate = 1; + break; + } - case TOUCH_RELEASE: - if (startSelection >= 0) - { - // We've selected an item! - std::string str; - - int listSize = mList.size(); - - // Move the selection to the proper place in the array - startSelection += mStart; - - if (startSelection < listSize) - { - if (!mVariable.empty()) - { - int i; - for (i=0; i<listSize; i++) - mList.at(i).selected = 0; - - str = mList.at(startSelection).variableValue; - mList.at(startSelection).selected = 1; - DataManager::SetValue(mVariable, str); - mUpdate = 1; - } - } - } - case TOUCH_HOLD: + isHighlighted = false; + last2Y = lastY; + lastY = y; + startSelection = -1; + + // Handle scrolling + scrollingY += y - startY; + startY = y; + while(mStart && scrollingY > 0) { + mStart--; + scrollingY -= actualLineHeight; + } + if (mStart == 0 && scrollingY > 0) + scrollingY = 0; + { + int totalSize = mList.size(); + int lines = (mRenderH - mHeaderH) / (actualLineHeight); + + if (totalSize > lines) { + int bottom_offset = ((int)(mRenderH) - mHeaderH) - (lines * actualLineHeight); + + bottom_offset -= actualLineHeight; + + while (mStart + lines + (bottom_offset ? 1 : 0) < totalSize && abs(scrollingY) > actualLineHeight) { + mStart++; + scrollingY += actualLineHeight; + } + if (bottom_offset != 0 && mStart + lines + 1 >= totalSize && scrollingY <= bottom_offset) { + mStart = totalSize - lines - 1; + scrollingY = bottom_offset; + } else if (mStart + lines >= totalSize && scrollingY < 0) { + mStart = totalSize - lines; + scrollingY = 0; + } + } else + scrollingY = 0; + } + mUpdate = 1; + break; + + case TOUCH_RELEASE: + isHighlighted = false; + if (startSelection >= 0) + { + // We've selected an item! + std::string str; + + int listSize = mList.size(); + int selectY = scrollingY, actualSelection = mStart; + + // Move the selection to the proper place in the array + while (selectY + actualLineHeight < startSelection) { + selectY += actualLineHeight; + actualSelection++; + } + + if (actualSelection < listSize && !mVariable.empty()) + { + int i; + for (i=0; i<listSize; i++) + mList.at(i).selected = 0; + + str = mList.at(actualSelection).variableValue; + mList.at(actualSelection).selected = 1; + DataManager::SetValue(mVariable, str); + mUpdate = 1; + } + } else { + // This is for kinetic scrolling + scrollingSpeed = lastY - last2Y; + if (abs(scrollingSpeed) > SCROLLING_FLOOR) + scrollingSpeed *= SCROLLING_MULTIPLIER; + else + scrollingSpeed = 0; + } case TOUCH_REPEAT: - break; - } - return 0; + case TOUCH_HOLD: + break; + } + return 0; } int GUIListBox::NotifyVarChange(std::string varName, std::string value) { - string checkValue; - int var_changed = 0; - - if (varName.empty()) - { - DataManager::GetValue(mVariable, checkValue); - if (checkValue != currentValue) { - varName = mVariable; - value = checkValue; - currentValue = checkValue; - var_changed = 1; + if (!mHeaderIsStatic) { + std::string newValue = gui_parse_text(mHeaderText); + if (mLastValue != newValue) { + mLastValue = newValue; + mStart = 0; + scrollingY = 0; + scrollingSpeed = 0; + mUpdate = 1; } - } - if (varName == mVariable || var_changed != 0) + } + if (varName == mVariable) { int i, listSize = mList.size(), selected_index = 0; @@ -354,28 +680,29 @@ int GUIListBox::NotifyVarChange(std::string varName, std::string value) mUpdate = 1; return 0; } - return 0; + return 0; } int GUIListBox::SetRenderPos(int x, int y, int w /* = 0 */, int h /* = 0 */) { - mRenderX = x; - mRenderY = y; - if (w || h) - { - mRenderW = w; - mRenderH = h; - } - SetActionPos(mRenderX, mRenderY, mRenderW, mRenderH); - mUpdate = 1; - return 0; + mRenderX = x; + mRenderY = y; + if (w || h) + { + mRenderW = w; + mRenderH = h; + } + SetActionPos(mRenderX, mRenderY, mRenderW, mRenderH); + mUpdate = 1; + return 0; } void GUIListBox::SetPageFocus(int inFocus) { - if (inFocus) - { - mUpdate = 1; - } + if (inFocus) + { + DataManager::GetValue(mVariable, currentValue); + NotifyVarChange(mVariable, currentValue); + mUpdate = 1; + } } - diff --git a/gui/objects.hpp b/gui/objects.hpp index c310b369a..2ddeb88c7 100644 --- a/gui/objects.hpp +++ b/gui/objects.hpp @@ -355,6 +355,9 @@ protected: int mTextX, mTextY, mTextW, mTextH; int mIconX, mIconY, mIconW, mIconH; bool mRendered; + bool hasHighlightColor; + bool renderHighlight; + COLOR mHighlightColor; }; class GUICheckbox: public RenderObject, public ActionObject, public Conditional @@ -478,6 +481,12 @@ protected: COLOR mHeaderFontColor; COLOR mSeparatorColor; COLOR mHeaderSeparatorColor; + bool hasHighlightColor; + bool hasFontHighlightColor; + bool isHighlighted; + COLOR mHighlightColor; + COLOR mFontHighlightColor; + int startSelection; }; class GUIListBox : public RenderObject, public ActionObject @@ -524,20 +533,40 @@ protected: std::string mVariable; std::string mSelection; std::string currentValue; + std::string mHeaderText; + std::string mLastValue; + int actualLineHeight; int mStart; + int startY; + int mSeparatorH, mHeaderSeparatorH; int mLineSpacing; int mUpdate; - int mBackgroundX, mBackgroundY, mBackgroundW, mBackgroundH; + int mBackgroundX, mBackgroundY, mBackgroundW, mBackgroundH, mHeaderH; + int mIconWidth, mIconHeight, mSelectedIconWidth, mSelectedIconHeight, mUnselectedIconWidth, mUnselectedIconHeight, mHeaderIconHeight, mHeaderIconWidth; + int scrollingSpeed; + int scrollingY; static int mSortOrder; unsigned mFontHeight; unsigned mLineHeight; - int mIconWidth, mIconHeight; + Resource* mHeaderIcon; Resource* mIconSelected; Resource* mIconUnselected; Resource* mBackground; Resource* mFont; COLOR mBackgroundColor; COLOR mFontColor; + COLOR mHeaderBackgroundColor; + COLOR mHeaderFontColor; + COLOR mSeparatorColor; + COLOR mHeaderSeparatorColor; + bool hasHighlightColor; + bool hasFontHighlightColor; + bool isHighlighted; + COLOR mHighlightColor; + COLOR mFontHighlightColor; + int mHeaderIsStatic; + int startSelection; + int touchDebounce; }; // GUIAnimation - Used for animations diff --git a/partition.cpp b/partition.cpp index 53e7ba636..73aa8af16 100644 --- a/partition.cpp +++ b/partition.cpp @@ -1313,7 +1313,7 @@ bool TWPartition::Backup_Tar(string backup_folder) { sprintf(back_name, "%s", Backup_Path.c_str()); tar.setdir(back_name); tar.setfn(Full_FileName); - backup_count = tar.splitArchiveThread(); + backup_count = tar.splitArchiveFork(); if (backup_count == -1) { LOGE("Error tarring split files!\n"); return false; @@ -1324,7 +1324,7 @@ bool TWPartition::Backup_Tar(string backup_folder) { if (use_compression) { tar.setdir(Backup_Path); tar.setfn(Full_FileName); - if (tar.createTarGZThread() != 0) + if (tar.createTarGZFork() != 0) return -1; string gzname = Full_FileName + ".gz"; rename(gzname.c_str(), Full_FileName.c_str()); @@ -1332,7 +1332,7 @@ bool TWPartition::Backup_Tar(string backup_folder) { else { tar.setdir(Backup_Path); tar.setfn(Full_FileName); - if (tar.createTarThread() != 0) + if (tar.createTarFork() != 0) return -1; } if (TWFunc::Get_File_Size(Full_FileName) == 0) { @@ -1424,7 +1424,7 @@ bool TWPartition::Restore_Tar(string restore_folder, string Restore_File_System) twrpTar tar; tar.setdir("/"); tar.setfn(Full_FileName); - if (tar.extractTarThread() != 0) + if (tar.extractTarFork() != 0) return false; sprintf(split_index, "%03i", index); Full_FileName = restore_folder + "/" + Backup_FileName + split_index; @@ -1438,7 +1438,7 @@ bool TWPartition::Restore_Tar(string restore_folder, string Restore_File_System) twrpTar tar; tar.setdir(Backup_Path); tar.setfn(Full_FileName); - if (tar.extractTarThread() != 0) + if (tar.extractTarFork() != 0) return false; } return true; diff --git a/twrp-functions.cpp b/twrp-functions.cpp index fa2110aa0..85ce7274a 100644 --- a/twrp-functions.cpp +++ b/twrp-functions.cpp @@ -12,6 +12,7 @@ #include <sys/sendfile.h> #include <sys/stat.h> #include <sys/vfs.h> +#include "cutils/android_reboot.h" #include <iostream> #include <fstream> #include "twrp-functions.hpp" @@ -374,6 +375,7 @@ int TWFunc::tw_reboot(RebootCommand command) return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_RESTART2, (void*) "bootloader"); case rb_poweroff: check_and_run_script("/sbin/poweroff.sh", "power off"); + android_reboot(ANDROID_RB_POWEROFF, 0, 0); return reboot(RB_POWER_OFF); case rb_download: check_and_run_script("/sbin/rebootdownload.sh", "reboot download"); @@ -449,6 +451,8 @@ int TWFunc::copy_file(string src, string dst, int mode) { dstfile << srcfile.rdbuf(); srcfile.close(); dstfile.close(); + if (chmod(dst.c_str(), mode) != 0) + return -1; return 0; } @@ -472,3 +476,48 @@ unsigned int TWFunc::Get_D_Type_From_Stat(string Path) { return DT_SOCK; return DT_UNKNOWN; } + +int TWFunc::read_file(string fn, string& results) { + ifstream file; + file.open(fn.c_str(), ios::in); + if (file.is_open()) { + file >> results; + file.close(); + return 0; + } + LOGI("Cannot find file %s\n", fn.c_str()); + return -1; +} + +int TWFunc::write_file(string fn, string& line) { + FILE *file; + file = fopen(fn.c_str(), "w"); + if (file != NULL) { + fwrite(line.c_str(), line.size(), 1, file); + fclose(file); + return 0; + } + LOGI("Cannot find file %s\n", fn.c_str()); + return -1; +} + +timespec TWFunc::timespec_diff(timespec& start, timespec& end) +{ + timespec temp; + if ((end.tv_nsec-start.tv_nsec)<0) { + temp.tv_sec = end.tv_sec-start.tv_sec-1; + temp.tv_nsec = 1000000000+end.tv_nsec-start.tv_nsec; + } else { + temp.tv_sec = end.tv_sec-start.tv_sec; + temp.tv_nsec = end.tv_nsec-start.tv_nsec; + } + return temp; +} + + int TWFunc::drop_caches(void) { + string file = "/proc/sys/vm/drop_caches"; + string value = "3"; + if (write_file(file, value) != 0) + return -1; + return 0; +} diff --git a/twrp-functions.hpp b/twrp-functions.hpp index fc2d64787..d7dea3f2a 100644 --- a/twrp-functions.hpp +++ b/twrp-functions.hpp @@ -1,50 +1,54 @@ -#ifndef _TWRPFUNCTIONS_HPP -#define _TWRPFUNCTIONS_HPP - -#include <string> - -using namespace std; - -typedef enum -{ - rb_current = 0, - rb_system, - rb_recovery, - rb_poweroff, - rb_bootloader, // May also be fastboot - rb_download, -} RebootCommand; - -// Partition class -class TWFunc -{ -public: - static int Check_MD5(string File); - static string Get_Root_Path(string Path); // Trims any trailing folders or filenames from the path, also adds a leading / if not present - static string Get_Path(string Path); // Trims everything after the last / in the string - static string Get_Filename(string Path); // Trims the path off of a filename - - static void install_htc_dumlock(void); // Installs HTC Dumlock - static void htc_dumlock_restore_original_boot(void); // Restores the backup of boot from HTC Dumlock - static void htc_dumlock_reflash_recovery_to_boot(void); // Reflashes the current recovery to boot - static int Recursive_Mkdir(string Path); // Recursively makes the entire path - static unsigned long long Get_Folder_Size(const string& Path, bool Display_Error); // Gets the size of a folder and all of its subfolders using dirent and stat - static bool Path_Exists(string Path); // Returns true if the path exists - static void GUI_Operation_Text(string Read_Value, string Default_Text); // Updates text for display in the GUI, e.g. Backing up %partition name% - static void GUI_Operation_Text(string Read_Value, string Partition_Name, string Default_Text); // Same as above but includes partition name - static unsigned long Get_File_Size(string Path); // Returns the size of a file - static void twfinish_recovery(const char *send_intent); // Writes the log to last_log - static int tw_reboot(RebootCommand command); // Prepares the device for rebooting - static void check_and_run_script(const char* script_file, const char* display_name); // checks for the existence of a script, chmods it to 755, then runs it - static int Exec_Cmd(string cmd, string &result); //execute a command and return the result as a string by reference - static int removeDir(const string path, bool removeParent); //recursively remove a directory - static int copy_file(string src, string dst, int mode); //copy file from src to dst with mode permissions - static unsigned int Get_D_Type_From_Stat(string Path); // Returns a dirent dt_type value using stat instead of dirent - -private: - static void check_and_fclose(FILE *fp, const char *name); - static void copy_log_file(const char* source, const char* destination, int append); - -}; - -#endif // _TWRPFUNCTIONS_HPP +#ifndef _TWRPFUNCTIONS_HPP
+#define _TWRPFUNCTIONS_HPP
+
+#include <string>
+
+using namespace std;
+
+typedef enum
+{
+ rb_current = 0,
+ rb_system,
+ rb_recovery,
+ rb_poweroff,
+ rb_bootloader, // May also be fastboot
+ rb_download,
+} RebootCommand;
+
+// Partition class
+class TWFunc
+{
+public:
+ static int Check_MD5(string File);
+ static string Get_Root_Path(string Path); // Trims any trailing folders or filenames from the path, also adds a leading / if not present
+ static string Get_Path(string Path); // Trims everything after the last / in the string
+ static string Get_Filename(string Path); // Trims the path off of a filename
+
+ static void install_htc_dumlock(void); // Installs HTC Dumlock
+ static void htc_dumlock_restore_original_boot(void); // Restores the backup of boot from HTC Dumlock
+ static void htc_dumlock_reflash_recovery_to_boot(void); // Reflashes the current recovery to boot
+ static int Recursive_Mkdir(string Path); // Recursively makes the entire path
+ static unsigned long long Get_Folder_Size(const string& Path, bool Display_Error); // Gets the size of a folder and all of its subfolders using dirent and stat
+ static bool Path_Exists(string Path); // Returns true if the path exists
+ static void GUI_Operation_Text(string Read_Value, string Default_Text); // Updates text for display in the GUI, e.g. Backing up %partition name%
+ static void GUI_Operation_Text(string Read_Value, string Partition_Name, string Default_Text); // Same as above but includes partition name
+ static unsigned long Get_File_Size(string Path); // Returns the size of a file
+ static void twfinish_recovery(const char *send_intent); // Writes the log to last_log
+ static int tw_reboot(RebootCommand command); // Prepares the device for rebooting
+ static void check_and_run_script(const char* script_file, const char* display_name); // checks for the existence of a script, chmods it to 755, then runs it
+ static int Exec_Cmd(string cmd, string &result); //execute a command and return the result as a string by reference
+ static int removeDir(const string path, bool removeParent); //recursively remove a directory
+ static int copy_file(string src, string dst, int mode); //copy file from src to dst with mode permissions
+ static unsigned int Get_D_Type_From_Stat(string Path); // Returns a dirent dt_type value using stat instead of dirent
+ static timespec timespec_diff(timespec& start, timespec& end); // Return a diff for 2 times
+ static int read_file(string fn, string& results); //read from file
+ static int write_file(string fn, string& line); //write from file
+ static int drop_caches(void); //drop linux cache memory
+
+private:
+ static void check_and_fclose(FILE *fp, const char *name);
+ static void copy_log_file(const char* source, const char* destination, int append);
+
+};
+
+#endif // _TWRPFUNCTIONS_HPP
diff --git a/twrpTar.cpp b/twrpTar.cpp index 263684995..5d1752131 100644 --- a/twrpTar.cpp +++ b/twrpTar.cpp @@ -24,6 +24,7 @@ extern "C" { } #include <sys/types.h> #include <sys/stat.h> +#include <sys/wait.h> #include <string.h> #include <errno.h> #include <fcntl.h> @@ -49,47 +50,139 @@ void twrpTar::setdir(string dir) { tardir = dir; } -int twrpTar::createTarGZThread() { - pthread_t thread; - ThreadPtr tarptr = &twrpTar::createTGZ; - PThreadPtr p = *(PThreadPtr*)&tarptr; - pthread_create(&thread, NULL, p, this); - if(pthread_join(thread, NULL)) { +int twrpTar::createTarGZFork() { + int status; + pid_t pid; + if ((pid = fork()) == -1) { + LOGI("create tar failed to fork.\n"); return -1; } + if (pid == 0) { + if (createTGZ() != 0) + exit(-1); + else + exit(0); + } + else { + if ((pid = wait(&status)) == -1) { + LOGI("Tar creation failed\n"); + return -1; + } + else { + if (WIFSIGNALED(status) != 0) { + LOGI("Child process ended with signal: %d\n", WTERMSIG(status)); + return -1; + } + else if (WIFEXITED(status) != 0) + LOGI("Tar creation successful\n"); + else { + LOGI("Tar creation failed\n"); + return -1; + } + } + } return 0; } -int twrpTar::createTarThread() { - pthread_t thread; - ThreadPtr tarptr = &twrpTar::create; - PThreadPtr p = *(PThreadPtr*)&tarptr; - pthread_create(&thread, NULL, p, this); - if(pthread_join(thread, NULL)) { +int twrpTar::createTarFork() { + int status; + pid_t pid; + if ((pid = fork()) == -1) { + LOGI("create tar failed to fork.\n"); return -1; } + if (pid == 0) { + if (create() != 0) + exit(-1); + else + exit(0); + } + else { + if ((pid = wait(&status)) == -1) { + LOGI("Tar creation failed\n"); + return -1; + } + else { + if (WIFSIGNALED(status) != 0) { + LOGI("Child process ended with signal: %d\n", WTERMSIG(status)); + return -1; + } + else if (WIFEXITED(status) != 0) + LOGI("Tar creation successful\n"); + else { + LOGI("Tar creation failed\n"); + return -1; + } + } + } return 0; } -int twrpTar::extractTarThread() { - pthread_t thread; - ThreadPtr tarptr = &twrpTar::extract; - PThreadPtr p = *(PThreadPtr*)&tarptr; - pthread_create(&thread, NULL, p, this); - if(pthread_join(thread, NULL)) { +int twrpTar::extractTarFork() { + int status; + pid_t pid; + if ((pid = fork()) == -1) { + LOGI("create tar failed to fork.\n"); return -1; } + if (pid == 0) { + if (extract() != 0) + exit(-1); + else + exit(0); + } + else { + if ((pid = wait(&status)) == -1) { + LOGI("Tar creation failed\n"); + return -1; + } + else { + if (WIFSIGNALED(status) != 0) { + LOGI("Child process ended with signal: %d\n", WTERMSIG(status)); + return -1; + } + else if (WIFEXITED(status) != 0) + LOGI("Tar creation successful\n"); + else { + LOGI("Tar creation failed\n"); + return -1; + } + } + } return 0; } -int twrpTar::splitArchiveThread() { - pthread_t thread; - ThreadPtr tarptr = &twrpTar::Split_Archive; - PThreadPtr p = *(PThreadPtr*)&tarptr; - pthread_create(&thread, NULL, p, this); - if(pthread_join(thread, NULL)) { +int twrpTar::splitArchiveFork() { + int status; + pid_t pid; + if ((pid = fork()) == -1) { + LOGI("create tar failed to fork.\n"); return -1; } + if (pid == 0) { + if (Split_Archive() != 0) + exit(-1); + else + exit(0); + } + else { + if ((pid = wait(&status)) == -1) { + LOGI("Tar creation failed\n"); + return -1; + } + else { + if (WIFSIGNALED(status) != 0) { + LOGI("Child process ended with signal: %d\n", WTERMSIG(status)); + return -1; + } + else if (WIFEXITED(status) != 0) + LOGI("Tar creation successful\n"); + else { + LOGI("Tar creation failed\n"); + return -1; + } + } + } return 0; } diff --git a/twrpTar.hpp b/twrpTar.hpp index db9cf9bb8..427e6d1c3 100644 --- a/twrpTar.hpp +++ b/twrpTar.hpp @@ -39,10 +39,10 @@ class twrpTar { int createTar(); int addFile(string fn, bool include_root); int closeTar(bool gzip); - int createTarGZThread(); - int createTarThread(); - int extractTarThread(); - int splitArchiveThread(); + int createTarGZFork(); + int createTarFork(); + int extractTarFork(); + int splitArchiveFork(); void setfn(string fn); void setdir(string dir); private: @@ -65,6 +65,4 @@ class twrpTar { string tardir; string tarfn; string basefn; - typedef int (twrpTar::*ThreadPtr)(void); - typedef void* (*PThreadPtr)(void*); }; diff --git a/variables.h b/variables.h index d43be8165..7f2ab0000 100644 --- a/variables.h +++ b/variables.h @@ -1,178 +1,182 @@ -/* - * Copyright (C) 2007 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _VARIABLES_HEADER_ -#define _VARIABLES_HEADER_ - -#define TW_VERSION_STR "2.4.1.0" - -#define TW_USE_COMPRESSION_VAR "tw_use_compression" -#define TW_IGNORE_IMAGE_SIZE "tw_ignore_image_size" -#define TW_FILENAME "tw_filename" -#define TW_ZIP_INDEX "tw_zip_index" -#define TW_ZIP_QUEUE_COUNT "tw_zip_queue_count" - -#define MAX_BACKUP_NAME_LEN 64 -#define TW_BACKUP_TEXT "tw_backup_text" -#define TW_BACKUP_NAME "tw_backup_name" -#define TW_BACKUP_SYSTEM_VAR "tw_backup_system" -#define TW_BACKUP_DATA_VAR "tw_backup_data" -#define TW_BACKUP_BOOT_VAR "tw_backup_boot" -#define TW_BACKUP_RECOVERY_VAR "tw_backup_recovery" -#define TW_BACKUP_CACHE_VAR "tw_backup_cache" -#define TW_BACKUP_ANDSEC_VAR "tw_backup_andsec" -#define TW_BACKUP_SDEXT_VAR "tw_backup_sdext" -#define TW_BACKUP_SP1_VAR "tw_backup_sp1" -#define TW_BACKUP_SP2_VAR "tw_backup_sp2" -#define TW_BACKUP_SP3_VAR "tw_backup_sp3" -#define TW_BACKUP_AVG_IMG_RATE "tw_backup_avg_img_rate" -#define TW_BACKUP_AVG_FILE_RATE "tw_backup_avg_file_rate" -#define TW_BACKUP_AVG_FILE_COMP_RATE "tw_backup_avg_file_comp_rate" -#define TW_BACKUP_SYSTEM_SIZE "tw_backup_system_size" -#define TW_BACKUP_DATA_SIZE "tw_backup_data_size" -#define TW_BACKUP_BOOT_SIZE "tw_backup_boot_size" -#define TW_BACKUP_RECOVERY_SIZE "tw_backup_recovery_size" -#define TW_BACKUP_CACHE_SIZE "tw_backup_cache_size" -#define TW_BACKUP_ANDSEC_SIZE "tw_backup_andsec_size" -#define TW_BACKUP_SDEXT_SIZE "tw_backup_sdext_size" -#define TW_BACKUP_SP1_SIZE "tw_backup_sp1_size" -#define TW_BACKUP_SP2_SIZE "tw_backup_sp2_size" -#define TW_BACKUP_SP3_SIZE "tw_backup_sp3_size" -#define TW_STORAGE_FREE_SIZE "tw_storage_free_size" -#define TW_GENERATE_MD5_TEXT "tw_generate_md5_text" - -#define TW_RESTORE_TEXT "tw_restore_text" -#define TW_RESTORE_SYSTEM_VAR "tw_restore_system" -#define TW_RESTORE_DATA_VAR "tw_restore_data" -#define TW_RESTORE_BOOT_VAR "tw_restore_boot" -#define TW_RESTORE_RECOVERY_VAR "tw_restore_recovery" -#define TW_RESTORE_CACHE_VAR "tw_restore_cache" -#define TW_RESTORE_ANDSEC_VAR "tw_restore_andsec" -#define TW_RESTORE_SDEXT_VAR "tw_restore_sdext" -#define TW_RESTORE_SP1_VAR "tw_restore_sp1" -#define TW_RESTORE_SP2_VAR "tw_restore_sp2" -#define TW_RESTORE_SP3_VAR "tw_restore_sp3" -#define TW_RESTORE_AVG_IMG_RATE "tw_restore_avg_img_rate" -#define TW_RESTORE_AVG_FILE_RATE "tw_restore_avg_file_rate" -#define TW_RESTORE_AVG_FILE_COMP_RATE "tw_restore_avg_file_comp_rate" -#define TW_RESTORE_FILE_DATE "tw_restore_file_date" -#define TW_VERIFY_MD5_TEXT "tw_verify_md5_text" -#define TW_UPDATE_SYSTEM_DETAILS_TEXT "tw_update_system_details_text" - -#define TW_SHOW_SPAM_VAR "tw_show_spam" -#define TW_COLOR_THEME_VAR "tw_color_theme" -#define TW_VERSION_VAR "tw_version" -#define TW_SORT_FILES_BY_DATE_VAR "tw_sort_files_by_date" -#define TW_GUI_SORT_ORDER "tw_gui_sort_order" -#define TW_ZIP_LOCATION_VAR "tw_zip_location" -#define TW_ZIP_INTERNAL_VAR "tw_zip_internal" -#define TW_ZIP_EXTERNAL_VAR "tw_zip_external" -#define TW_FORCE_MD5_CHECK_VAR "tw_force_md5_check" -#define TW_SKIP_MD5_CHECK_VAR "tw_skip_md5_check" -#define TW_SKIP_MD5_GENERATE_VAR "tw_skip_md5_generate" -#define TW_SIGNED_ZIP_VERIFY_VAR "tw_signed_zip_verify" -#define TW_REBOOT_AFTER_FLASH_VAR "tw_reboot_after_flash_option" -#define TW_TIME_ZONE_VAR "tw_time_zone" -#define TW_RM_RF_VAR "tw_rm_rf" - -#define TW_BACKUPS_FOLDER_VAR "tw_backups_folder" - -#define TW_SP1_PARTITION_NAME_VAR "tw_sp1_name" -#define TW_SP2_PARTITION_NAME_VAR "tw_sp2_name" -#define TW_SP3_PARTITION_NAME_VAR "tw_sp3_name" - -#define TW_SDEXT_SIZE "tw_sdext_size" -#define TW_SWAP_SIZE "tw_swap_size" -#define TW_SDPART_FILE_SYSTEM "tw_sdpart_file_system" -#define TW_TIME_ZONE_GUISEL "tw_time_zone_guisel" -#define TW_TIME_ZONE_GUIOFFSET "tw_time_zone_guioffset" -#define TW_TIME_ZONE_GUIDST "tw_time_zone_guidst" - -#define TW_ACTION_BUSY "tw_busy" - -#define TW_ALLOW_PARTITION_SDCARD "tw_allow_partition_sdcard" - -#define TW_SCREEN_OFF "tw_screen_off" - -#define TW_REBOOT_SYSTEM "tw_reboot_system" -#define TW_REBOOT_RECOVERY "tw_reboot_recovery" -#define TW_REBOOT_POWEROFF "tw_reboot_poweroff" -#define TW_REBOOT_BOOTLOADER "tw_reboot_bootloader" - -#define TW_HAS_DUAL_STORAGE "tw_has_dual_storage" -#define TW_USE_EXTERNAL_STORAGE "tw_use_external_storage" -#define TW_HAS_INTERNAL "tw_has_internal" -#define TW_INTERNAL_PATH "tw_internal_path" // /data/media or /internal -#define TW_INTERNAL_MOUNT "tw_internal_mount" // /data or /internal -#define TW_INTERNAL_LABEL "tw_internal_label" // data or internal -#define TW_HAS_EXTERNAL "tw_has_external" -#define TW_EXTERNAL_PATH "tw_external_path" // /sdcard or /external/sdcard2 -#define TW_EXTERNAL_MOUNT "tw_external_mount" // /sdcard or /external -#define TW_EXTERNAL_LABEL "tw_external_label" // sdcard or external - -#define TW_HAS_DATA_MEDIA "tw_has_data_media" - -#define TW_HAS_BOOT_PARTITION "tw_has_boot_partition" -#define TW_HAS_RECOVERY_PARTITION "tw_has_recovery_partition" -#define TW_HAS_ANDROID_SECURE "tw_has_android_secure" -#define TW_HAS_SDEXT_PARTITION "tw_has_sdext_partition" -#define TW_HAS_USB_STORAGE "tw_has_usb_storage" -#define TW_NO_BATTERY_PERCENT "tw_no_battery_percent" -#define TW_POWER_BUTTON "tw_power_button" -#define TW_SIMULATE_ACTIONS "tw_simulate_actions" -#define TW_SIMULATE_FAIL "tw_simulate_fail" -#define TW_DONT_UNMOUNT_SYSTEM "tw_dont_unmount_system" -// #define TW_ALWAYS_RMRF "tw_always_rmrf" - -#define TW_SHOW_DUMLOCK "tw_show_dumlock" -#define TW_HAS_INJECTTWRP "tw_has_injecttwrp" -#define TW_INJECT_AFTER_ZIP "tw_inject_after_zip" -#define TW_HAS_DATADATA "tw_has_datadata" -#define TW_FLASH_ZIP_IN_PLACE "tw_flash_zip_in_place" -#define TW_MIN_SYSTEM_SIZE "50" // minimum system size to allow a reboot -#define TW_MIN_SYSTEM_VAR "tw_min_system" -#define TW_DOWNLOAD_MODE "tw_download_mode" -#define TW_IS_ENCRYPTED "tw_is_encrypted" -#define TW_IS_DECRYPTED "tw_is_decrypted" -#define TW_HAS_CRYPTO "tw_has_crypto" -#define TW_CRYPTO_PASSWORD "tw_crypto_password" -#define TW_DATA_BLK_DEVICE "tw_data_blk_device" // Original block device - not decrypted -#define TW_SDEXT_DISABLE_EXT4 "tw_sdext_disable_ext4" - -// Also used: -// tw_boot_is_mountable -// tw_system_is_mountable -// tw_data_is_mountable -// tw_cache_is_mountable -// tw_sdcext_is_mountable -// tw_sdcint_is_mountable -// tw_sd-ext_is_mountable -// tw_sp1_is_mountable -// tw_sp2_is_mountable -// tw_sp3_is_mountable - -// Max archive size for tar backups before we split (1.5GB) -#define MAX_ARCHIVE_SIZE 1610612736LLU - -#ifndef CUSTOM_LUN_FILE -#define CUSTOM_LUN_FILE "/sys/devices/platform/usb_mass_storage/lun%d/file" -#endif - -// For OpenRecoveryScript -#define SCRIPT_FILE_CACHE "/cache/recovery/openrecoveryscript" -#define SCRIPT_FILE_TMP "/tmp/openrecoveryscript" - -#endif // _VARIABLES_HEADER_ +/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _VARIABLES_HEADER_
+#define _VARIABLES_HEADER_
+
+#define TW_VERSION_STR "2.4.1.0"
+
+#define TW_USE_COMPRESSION_VAR "tw_use_compression"
+#define TW_IGNORE_IMAGE_SIZE "tw_ignore_image_size"
+#define TW_FILENAME "tw_filename"
+#define TW_ZIP_INDEX "tw_zip_index"
+#define TW_ZIP_QUEUE_COUNT "tw_zip_queue_count"
+
+#define MAX_BACKUP_NAME_LEN 64
+#define TW_BACKUP_TEXT "tw_backup_text"
+#define TW_BACKUP_NAME "tw_backup_name"
+#define TW_BACKUP_SYSTEM_VAR "tw_backup_system"
+#define TW_BACKUP_DATA_VAR "tw_backup_data"
+#define TW_BACKUP_BOOT_VAR "tw_backup_boot"
+#define TW_BACKUP_RECOVERY_VAR "tw_backup_recovery"
+#define TW_BACKUP_CACHE_VAR "tw_backup_cache"
+#define TW_BACKUP_ANDSEC_VAR "tw_backup_andsec"
+#define TW_BACKUP_SDEXT_VAR "tw_backup_sdext"
+#define TW_BACKUP_SP1_VAR "tw_backup_sp1"
+#define TW_BACKUP_SP2_VAR "tw_backup_sp2"
+#define TW_BACKUP_SP3_VAR "tw_backup_sp3"
+#define TW_BACKUP_AVG_IMG_RATE "tw_backup_avg_img_rate"
+#define TW_BACKUP_AVG_FILE_RATE "tw_backup_avg_file_rate"
+#define TW_BACKUP_AVG_FILE_COMP_RATE "tw_backup_avg_file_comp_rate"
+#define TW_BACKUP_SYSTEM_SIZE "tw_backup_system_size"
+#define TW_BACKUP_DATA_SIZE "tw_backup_data_size"
+#define TW_BACKUP_BOOT_SIZE "tw_backup_boot_size"
+#define TW_BACKUP_RECOVERY_SIZE "tw_backup_recovery_size"
+#define TW_BACKUP_CACHE_SIZE "tw_backup_cache_size"
+#define TW_BACKUP_ANDSEC_SIZE "tw_backup_andsec_size"
+#define TW_BACKUP_SDEXT_SIZE "tw_backup_sdext_size"
+#define TW_BACKUP_SP1_SIZE "tw_backup_sp1_size"
+#define TW_BACKUP_SP2_SIZE "tw_backup_sp2_size"
+#define TW_BACKUP_SP3_SIZE "tw_backup_sp3_size"
+#define TW_STORAGE_FREE_SIZE "tw_storage_free_size"
+#define TW_GENERATE_MD5_TEXT "tw_generate_md5_text"
+
+#define TW_RESTORE_TEXT "tw_restore_text"
+#define TW_RESTORE_SYSTEM_VAR "tw_restore_system"
+#define TW_RESTORE_DATA_VAR "tw_restore_data"
+#define TW_RESTORE_BOOT_VAR "tw_restore_boot"
+#define TW_RESTORE_RECOVERY_VAR "tw_restore_recovery"
+#define TW_RESTORE_CACHE_VAR "tw_restore_cache"
+#define TW_RESTORE_ANDSEC_VAR "tw_restore_andsec"
+#define TW_RESTORE_SDEXT_VAR "tw_restore_sdext"
+#define TW_RESTORE_SP1_VAR "tw_restore_sp1"
+#define TW_RESTORE_SP2_VAR "tw_restore_sp2"
+#define TW_RESTORE_SP3_VAR "tw_restore_sp3"
+#define TW_RESTORE_AVG_IMG_RATE "tw_restore_avg_img_rate"
+#define TW_RESTORE_AVG_FILE_RATE "tw_restore_avg_file_rate"
+#define TW_RESTORE_AVG_FILE_COMP_RATE "tw_restore_avg_file_comp_rate"
+#define TW_RESTORE_FILE_DATE "tw_restore_file_date"
+#define TW_VERIFY_MD5_TEXT "tw_verify_md5_text"
+#define TW_UPDATE_SYSTEM_DETAILS_TEXT "tw_update_system_details_text"
+
+#define TW_SHOW_SPAM_VAR "tw_show_spam"
+#define TW_COLOR_THEME_VAR "tw_color_theme"
+#define TW_VERSION_VAR "tw_version"
+#define TW_SORT_FILES_BY_DATE_VAR "tw_sort_files_by_date"
+#define TW_GUI_SORT_ORDER "tw_gui_sort_order"
+#define TW_ZIP_LOCATION_VAR "tw_zip_location"
+#define TW_ZIP_INTERNAL_VAR "tw_zip_internal"
+#define TW_ZIP_EXTERNAL_VAR "tw_zip_external"
+#define TW_FORCE_MD5_CHECK_VAR "tw_force_md5_check"
+#define TW_SKIP_MD5_CHECK_VAR "tw_skip_md5_check"
+#define TW_SKIP_MD5_GENERATE_VAR "tw_skip_md5_generate"
+#define TW_SIGNED_ZIP_VERIFY_VAR "tw_signed_zip_verify"
+#define TW_REBOOT_AFTER_FLASH_VAR "tw_reboot_after_flash_option"
+#define TW_TIME_ZONE_VAR "tw_time_zone"
+#define TW_RM_RF_VAR "tw_rm_rf"
+
+#define TW_BACKUPS_FOLDER_VAR "tw_backups_folder"
+
+#define TW_SP1_PARTITION_NAME_VAR "tw_sp1_name"
+#define TW_SP2_PARTITION_NAME_VAR "tw_sp2_name"
+#define TW_SP3_PARTITION_NAME_VAR "tw_sp3_name"
+
+#define TW_SDEXT_SIZE "tw_sdext_size"
+#define TW_SWAP_SIZE "tw_swap_size"
+#define TW_SDPART_FILE_SYSTEM "tw_sdpart_file_system"
+#define TW_TIME_ZONE_GUISEL "tw_time_zone_guisel"
+#define TW_TIME_ZONE_GUIOFFSET "tw_time_zone_guioffset"
+#define TW_TIME_ZONE_GUIDST "tw_time_zone_guidst"
+
+#define TW_ACTION_BUSY "tw_busy"
+
+#define TW_ALLOW_PARTITION_SDCARD "tw_allow_partition_sdcard"
+
+#define TW_SCREEN_OFF "tw_screen_off"
+
+#define TW_REBOOT_SYSTEM "tw_reboot_system"
+#define TW_REBOOT_RECOVERY "tw_reboot_recovery"
+#define TW_REBOOT_POWEROFF "tw_reboot_poweroff"
+#define TW_REBOOT_BOOTLOADER "tw_reboot_bootloader"
+
+#define TW_HAS_DUAL_STORAGE "tw_has_dual_storage"
+#define TW_USE_EXTERNAL_STORAGE "tw_use_external_storage"
+#define TW_HAS_INTERNAL "tw_has_internal"
+#define TW_INTERNAL_PATH "tw_internal_path" // /data/media or /internal
+#define TW_INTERNAL_MOUNT "tw_internal_mount" // /data or /internal
+#define TW_INTERNAL_LABEL "tw_internal_label" // data or internal
+#define TW_HAS_EXTERNAL "tw_has_external"
+#define TW_EXTERNAL_PATH "tw_external_path" // /sdcard or /external/sdcard2
+#define TW_EXTERNAL_MOUNT "tw_external_mount" // /sdcard or /external
+#define TW_EXTERNAL_LABEL "tw_external_label" // sdcard or external
+
+#define TW_HAS_DATA_MEDIA "tw_has_data_media"
+
+#define TW_HAS_BOOT_PARTITION "tw_has_boot_partition"
+#define TW_HAS_RECOVERY_PARTITION "tw_has_recovery_partition"
+#define TW_HAS_ANDROID_SECURE "tw_has_android_secure"
+#define TW_HAS_SDEXT_PARTITION "tw_has_sdext_partition"
+#define TW_HAS_USB_STORAGE "tw_has_usb_storage"
+#define TW_NO_BATTERY_PERCENT "tw_no_battery_percent"
+#define TW_POWER_BUTTON "tw_power_button"
+#define TW_SIMULATE_ACTIONS "tw_simulate_actions"
+#define TW_SIMULATE_FAIL "tw_simulate_fail"
+#define TW_DONT_UNMOUNT_SYSTEM "tw_dont_unmount_system"
+// #define TW_ALWAYS_RMRF "tw_always_rmrf"
+
+#define TW_SHOW_DUMLOCK "tw_show_dumlock"
+#define TW_HAS_INJECTTWRP "tw_has_injecttwrp"
+#define TW_INJECT_AFTER_ZIP "tw_inject_after_zip"
+#define TW_HAS_DATADATA "tw_has_datadata"
+#define TW_FLASH_ZIP_IN_PLACE "tw_flash_zip_in_place"
+#define TW_MIN_SYSTEM_SIZE "50" // minimum system size to allow a reboot
+#define TW_MIN_SYSTEM_VAR "tw_min_system"
+#define TW_DOWNLOAD_MODE "tw_download_mode"
+#define TW_IS_ENCRYPTED "tw_is_encrypted"
+#define TW_IS_DECRYPTED "tw_is_decrypted"
+#define TW_HAS_CRYPTO "tw_has_crypto"
+#define TW_CRYPTO_PASSWORD "tw_crypto_password"
+#define TW_DATA_BLK_DEVICE "tw_data_blk_device" // Original block device - not decrypted
+#define TW_SDEXT_DISABLE_EXT4 "tw_sdext_disable_ext4"
+
+// Also used:
+// tw_boot_is_mountable
+// tw_system_is_mountable
+// tw_data_is_mountable
+// tw_cache_is_mountable
+// tw_sdcext_is_mountable
+// tw_sdcint_is_mountable
+// tw_sd-ext_is_mountable
+// tw_sp1_is_mountable
+// tw_sp2_is_mountable
+// tw_sp3_is_mountable
+
+// Max archive size for tar backups before we split (1.5GB)
+#define MAX_ARCHIVE_SIZE 1610612736LLU
+
+#ifndef CUSTOM_LUN_FILE
+#define CUSTOM_LUN_FILE "/sys/devices/platform/usb_mass_storage/lun%d/file"
+#endif
+
+#ifndef TW_BRIGHTNESS_PATH
+#define TW_BRIGHTNESS_PATH /nobrightness
+#endif
+
+// For OpenRecoveryScript
+#define SCRIPT_FILE_CACHE "/cache/recovery/openrecoveryscript"
+#define SCRIPT_FILE_TMP "/tmp/openrecoveryscript"
+
+#endif // _VARIABLES_HEADER_
|