From 2f9117af3099ff40c7baef4d5f533b35acb08617 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Sun, 17 Feb 2013 19:52:09 -0600 Subject: Configurable timeout and brightness settings Change-Id: I924297ab0dcf920cd4b4b617949c3b16cbc68e43 --- Android.mk | 6 ++ data.cpp | 40 +++++++++- gui/blanktimer.cpp | 10 ++- gui/blanktimer.hpp | 111 +++++++++++++-------------- gui/devices/1024x600/res/ui.xml | 146 +++++++++++++++++++++++++++++++---- gui/devices/1024x768/res/ui.xml | 158 ++++++++++++++++++++++++++++++++------ gui/devices/1280x800/res/ui.xml | 158 ++++++++++++++++++++++++++++++++------ gui/devices/1920x1200/res/ui.xml | 160 +++++++++++++++++++++++++++++++++------ gui/devices/2560x1600/res/ui.xml | 160 +++++++++++++++++++++++++++++++++------ gui/devices/320x480/res/ui.xml | 153 ++++++++++++++++++++++++++++++++----- gui/devices/480x800/res/ui.xml | 153 ++++++++++++++++++++++++++++++++----- gui/devices/480x854/res/ui.xml | 153 ++++++++++++++++++++++++++++++++----- gui/devices/540x960/res/ui.xml | 153 ++++++++++++++++++++++++++++++++----- gui/devices/720x1280/res/ui.xml | 153 ++++++++++++++++++++++++++++++++----- gui/devices/800x1280/res/ui.xml | 153 ++++++++++++++++++++++++++++++++----- gui/devices/800x480/res/ui.xml | 156 ++++++++++++++++++++++++++++++++------ 16 files changed, 1708 insertions(+), 315 deletions(-) diff --git a/Android.mk b/Android.mk index 58b060728..9c16b1f59 100644 --- a/Android.mk +++ b/Android.mk @@ -228,6 +228,12 @@ endif ifeq ($(TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID), true) LOCAL_CFLAGS += -DTW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID endif +ifneq ($(TW_BRIGHTNESS_PATH),) + LOCAL_CFLAGS += -DTW_BRIGHTNESS_PATH=$(TW_BRIGHTNESS_PATH) +endif +ifneq ($(TW_MAX_BRIGHTNESS),) + LOCAL_CFLAGS += -DTW_MAX_BRIGHTNESS=$(TW_MAX_BRIGHTNESS) +endif ifeq ($(TARGET_BOARD_PLATFORM),rk30xx) LOCAL_CFLAGS += -DRK3066 endif diff --git a/data.cpp b/data.cpp index 6566bcd22..a4cb464c2 100644 --- a/data.cpp +++ b/data.cpp @@ -40,6 +40,7 @@ #include "data.hpp" #include "partitions.hpp" #include "twrp-functions.hpp" +#include "gui/blanktimer.hpp" #ifdef TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID #include "cutils/properties.h" @@ -62,6 +63,7 @@ map DataManager::mValues; map DataManager::mConstValues; string DataManager::mBackingFile; int DataManager::mInitialized = 0; +extern blanktimer blankTimer; // Device ID functions void DataManager::sanitize_device_id(char* device_id) { @@ -429,7 +431,10 @@ int DataManager::SetValue(const string varName, string value, int persist /* = 0 if (pos->second.second != 0) SaveValues(); - gui_notifyVarChange(varName.c_str(), value.c_str()); + if (varName == "tw_screen_timeout_secs") + blankTimer.setTime(atoi(value.c_str())); + else + gui_notifyVarChange(varName.c_str(), value.c_str()); return 0; } @@ -849,6 +854,31 @@ void DataManager::SetDefaultValues() mValues.insert(make_pair("tw_terminal_state", make_pair("0", 0))); mValues.insert(make_pair("tw_background_thread_running", make_pair("0", 0))); mValues.insert(make_pair(TW_RESTORE_FILE_DATE, make_pair("0", 0))); + mValues.insert(make_pair("tw_screen_timeout_secs", make_pair("60", 1))); +#ifdef TW_MAX_BRIGHTNESS + if (strcmp(EXPAND(TW_BRIGHTNESS_PATH), "/nobrightness") != 0) { + LOGI("TW_BRIGHTNESS_PATH := %s\n", EXPAND(TW_BRIGHTNESS_PATH)); + mConstValues.insert(make_pair("tw_has_brightnesss_file", "1")); + mConstValues.insert(make_pair("tw_brightness_file", EXPAND(TW_BRIGHTNESS_PATH))); + ostringstream val100, val25, val50, val75; + int value = TW_MAX_BRIGHTNESS; + val100 << value; + mConstValues.insert(make_pair("tw_brightness_100", val100.str())); + value = TW_MAX_BRIGHTNESS * 0.25; + val25 << value; + mConstValues.insert(make_pair("tw_brightness_25", val25.str())); + value = TW_MAX_BRIGHTNESS * 0.5; + val50 << value; + mConstValues.insert(make_pair("tw_brightness_50", val50.str())); + value = TW_MAX_BRIGHTNESS * 0.75; + val75 << value; + mConstValues.insert(make_pair("tw_brightness_75", val75.str())); + mValues.insert(make_pair("tw_brightness", make_pair(val100.str(), 1))); + mValues.insert(make_pair("tw_brightness_display", make_pair("100", 1))); + } else { + mConstValues.insert(make_pair("tw_has_brightnesss_file", "0")); + } +#endif } // Magic Values @@ -998,6 +1028,14 @@ void DataManager::ReadSettingsFile(void) PartitionManager.Mount_By_Path(ext_path, 0); } update_tz_environment_variables(); +#ifdef TW_MAX_BRIGHTNESS + if (strcmp(EXPAND(TW_BRIGHTNESS_PATH), "/nobrightness") != 0) { + string brightness_path = EXPAND(TW_BRIGHTNESS_PATH); + string brightness_value = GetStrValue("tw_brightness"); + LOGI("writing %s to brightness\n", brightness_value.c_str()); + TWFunc::write_file(brightness_path, brightness_value); + } +#endif } string DataManager::GetCurrentStoragePath(void) diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp index f64bb5f45..d991d40b3 100644 --- a/gui/blanktimer.cpp +++ b/gui/blanktimer.cpp @@ -50,6 +50,10 @@ blanktimer::blanktimer(void) { orig_brightness = getBrightness(); } +void blanktimer::setTime(int newtime) { + sleepTimer = newtime; +} + int blanktimer::setTimerThread(void) { pthread_t thread; ThreadPtr blankptr = &blanktimer::setClockTimer; @@ -84,13 +88,15 @@ int blanktimer::setClockTimer(void) { usleep(1000); clock_gettime(CLOCK_MONOTONIC, &curTime); diff = TWFunc::timespec_diff(btimer, curTime); - if (diff.tv_sec > sleepTimer && conblank != 1) + if (sleepTimer && diff.tv_sec > sleepTimer && conblank != 1) { + orig_brightness = getBrightness(); setBlank(1); + PageManager::ChangeOverlay("lock"); + } if (conblank == 1 && blanked != 1) { blanked = 1; gr_fb_blank(conblank); setBrightness(0); - PageManager::ChangeOverlay("lock"); } } return -1; diff --git a/gui/blanktimer.hpp b/gui/blanktimer.hpp index 74712bd75..4135635f8 100644 --- a/gui/blanktimer.hpp +++ b/gui/blanktimer.hpp @@ -1,55 +1,56 @@ -/* - 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 . -*/ - -#ifndef __BLANKTIMER_HEADER_HPP -#define __BLANKTIMER_HEADER_HPP - -#include -#include - -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 +/* + 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 . +*/ + +#ifndef __BLANKTIMER_HEADER_HPP +#define __BLANKTIMER_HEADER_HPP + +#include +#include + +using namespace std; + +class blanktimer { + public: + blanktimer(void); + int setTimerThread(void); + void resetTimerAndUnblank(void); + void setTime(int newtime); + + 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/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index 9d66a9021..393e40d2a 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -62,9 +62,9 @@ - + - + @@ -2402,21 +2402,13 @@ - Force MD5 check on all zips? - - - - - - - Use rm -rf instead of formatting? - + Skip MD5 generation on backups @@ -2424,7 +2416,7 @@ - + Enable MD5 checking of backup files @@ -2432,7 +2424,7 @@ - + Ignore image size errors during backup @@ -2440,7 +2432,7 @@ - + Simulate most actions for theme testing @@ -2449,7 +2441,7 @@ - + Simulate failure for actions @@ -2465,6 +2457,15 @@ timezone + + + + + Screen + + screen + + @@ -2610,6 +2611,121 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index cf74e0a35..5748e435b 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -62,9 +62,9 @@ - + - + @@ -649,14 +649,6 @@ - - - - Force MD5 check on all zips? - - - - @@ -2402,21 +2394,13 @@ - Force MD5 check on all zips? - - - - - - - Use rm -rf instead of formatting? - + Skip MD5 generation on backups @@ -2424,7 +2408,7 @@ - + Enable MD5 checking of backup files @@ -2432,7 +2416,7 @@ - + Ignore image size errors during backup @@ -2440,7 +2424,7 @@ - + Simulate most actions for theme testing @@ -2449,7 +2433,7 @@ - + Simulate failure for actions @@ -2465,6 +2449,15 @@ timezone + + + + + Screen + + screen + + @@ -2610,6 +2603,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index 8e96c7bf6..953318933 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -62,9 +62,9 @@ - + - + @@ -649,14 +649,6 @@ - - - - Force MD5 check on all zips? - - - - @@ -2402,21 +2394,13 @@ - Force MD5 check on all zips? - - - - - - - Use rm -rf instead of formatting? - + Skip MD5 generation on backups @@ -2424,7 +2408,7 @@ - + Enable MD5 checking of backup files @@ -2432,7 +2416,7 @@ - + Ignore image size errors during backup @@ -2440,7 +2424,7 @@ - + Simulate most actions for theme testing @@ -2449,7 +2433,7 @@ - + Simulate failure for actions @@ -2465,6 +2449,15 @@ timezone + + + + + Screen + + screen + + @@ -2610,6 +2603,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index cbe6353a8..874dcaa16 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -50,7 +50,7 @@ - + @@ -62,9 +62,9 @@ - + - + @@ -649,14 +649,6 @@ - - - - Force MD5 check on all zips? - - - - @@ -2402,21 +2394,13 @@ - Force MD5 check on all zips? - - - - - - - Use rm -rf instead of formatting? - + Skip MD5 generation on backups @@ -2424,7 +2408,7 @@ - + Enable MD5 checking of backup files @@ -2432,7 +2416,7 @@ - + Ignore image size errors during backup @@ -2440,7 +2424,7 @@ - + Simulate most actions for theme testing @@ -2449,7 +2433,7 @@ - + Simulate failure for actions @@ -2465,6 +2449,15 @@ timezone + + + + + Screen + + screen + + @@ -2610,6 +2603,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml index 834aa2a45..bd058c16f 100644 --- a/gui/devices/2560x1600/res/ui.xml +++ b/gui/devices/2560x1600/res/ui.xml @@ -62,9 +62,9 @@ - + - + @@ -161,7 +161,7 @@ - + @@ -649,14 +649,6 @@ - - - - Force MD5 check on all zips? - - - - @@ -2402,21 +2394,13 @@ - Force MD5 check on all zips? - - - - - - - Use rm -rf instead of formatting? - + Skip MD5 generation on backups @@ -2424,7 +2408,7 @@ - + Enable MD5 checking of backup files @@ -2432,7 +2416,7 @@ - + Ignore image size errors during backup @@ -2440,7 +2424,7 @@ - + Simulate most actions for theme testing @@ -2449,7 +2433,7 @@ - + Simulate failure for actions @@ -2465,6 +2449,15 @@ timezone + + + + + Screen + + screen + + @@ -2610,6 +2603,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index c8ff2fbba..5de1e7e33 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -598,14 +598,6 @@ - - - - Force MD5 check on all zips. - - - - @@ -2374,21 +2366,13 @@ - Force MD5 check on all zips. - - - - - - - Use rm -rf instead of formatting. - + Skip MD5 generation during backup. @@ -2396,7 +2380,7 @@ - + Enable MD5 verification of backup files. @@ -2404,7 +2388,7 @@ - + Ignore image size errors during backup. @@ -2412,7 +2396,7 @@ - + Simulate actions for theme testing. @@ -2421,7 +2405,7 @@ - + Simulate failure for actions. @@ -2439,6 +2423,14 @@ + + + Screen + + screen + + + Restore Defaults @@ -2576,6 +2568,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index 718921d76..b44c23d40 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -597,14 +597,6 @@ - - - - Force MD5 check on all zips. - - - - @@ -2373,21 +2365,13 @@ - Force MD5 check on all zips. - - - - - - - Use rm -rf instead of formatting. - + Skip MD5 generation during backup. @@ -2395,7 +2379,7 @@ - + Enable MD5 verification of backup files. @@ -2403,7 +2387,7 @@ - + Ignore image size errors during backup. @@ -2411,7 +2395,7 @@ - + Simulate actions for theme testing. @@ -2420,7 +2404,7 @@ - + Simulate failure for actions. @@ -2438,6 +2422,14 @@ + + + Screen + + screen + + + Restore Defaults @@ -2575,6 +2567,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index b8bd53f9c..8959e9916 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -596,14 +596,6 @@ - - - - Force MD5 check on all zips. - - - - @@ -2372,21 +2364,13 @@ - Force MD5 check on all zips. - - - - - - - Use rm -rf instead of formatting. - + Skip MD5 generation during backup. @@ -2394,7 +2378,7 @@ - + Enable MD5 verification of backup files. @@ -2402,7 +2386,7 @@ - + Ignore image size errors during backup. @@ -2410,7 +2394,7 @@ - + Simulate actions for theme testing. @@ -2419,7 +2403,7 @@ - + Simulate failure for actions. @@ -2437,6 +2421,14 @@ + + + Screen + + screen + + + Restore Defaults @@ -2574,6 +2566,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index 01e7f7ae8..184ffba63 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -597,14 +597,6 @@ - - - - Force MD5 check on all zips. - - - - @@ -2373,21 +2365,13 @@ - Force MD5 check on all zips. - - - - - - - Use rm -rf instead of formatting. - + Skip MD5 generation during backup. @@ -2395,7 +2379,7 @@ - + Enable MD5 verification of backup files. @@ -2403,7 +2387,7 @@ - + Ignore image size errors during backup. @@ -2411,7 +2395,7 @@ - + Simulate actions for theme testing. @@ -2420,7 +2404,7 @@ - + Simulate failure for actions. @@ -2438,6 +2422,14 @@ + + + Screen + + screen + + + Restore Defaults @@ -2575,6 +2567,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index fa51706ff..031364ba0 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -610,14 +610,6 @@ - - - - Force MD5 check on all zips. - - - - @@ -2386,21 +2378,13 @@ - Force MD5 check on all zips. - - - - - - - Use rm -rf instead of formatting. - + Skip MD5 generation during backup. @@ -2408,7 +2392,7 @@ - + Enable MD5 verification of backup files. @@ -2416,7 +2400,7 @@ - + Ignore image size errors during backup. @@ -2424,7 +2408,7 @@ - + Simulate actions for theme testing. @@ -2433,7 +2417,7 @@ - + Simulate failure for actions. @@ -2451,6 +2435,14 @@ + + + Screen + + screen + + + Restore Defaults @@ -2588,6 +2580,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index 4bb146baf..6703376c1 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -598,14 +598,6 @@ - - - - Force MD5 check on all zips. - - - - @@ -2374,21 +2366,13 @@ - Force MD5 check on all zips. - - - - - - - Use rm -rf instead of formatting. - + Skip MD5 generation during backup. @@ -2396,7 +2380,7 @@ - + Enable MD5 verification of backup files. @@ -2404,7 +2388,7 @@ - + Ignore image size errors during backup. @@ -2412,7 +2396,7 @@ - + Simulate actions for theme testing. @@ -2421,7 +2405,7 @@ - + Simulate failure for actions. @@ -2439,6 +2423,14 @@ + + + Screen + + screen + + + Restore Defaults @@ -2576,6 +2568,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index 9d6abf9a8..7c815cfac 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -64,7 +64,7 @@ - + @@ -657,14 +657,6 @@ - - - - Force MD5 check on all zips? - - - - @@ -2410,21 +2402,13 @@ - Force MD5 check on all zips? - - - - - - - Use rm -rf instead of formatting? - + Skip MD5 generation on backups @@ -2432,7 +2416,7 @@ - + Enable MD5 checking of backup files @@ -2440,7 +2424,7 @@ - + Ignore image size errors during backup @@ -2448,7 +2432,7 @@ - + Simulate most actions for theme testing @@ -2457,7 +2441,7 @@ - + Simulate failure for actions @@ -2473,6 +2457,15 @@ timezone + + + + + Screen + + screen + + @@ -2618,6 +2611,125 @@ + + + + + + + Screen Settings + + + + + + Screen Timeout: %tw_screen_timeout_secs% seconds + + + + + + None + + tw_screen_timeout_secs=0 + + + + + + 60 + + tw_screen_timeout_secs=60 + + + + + + 120 + + tw_screen_timeout_secs=120 + + + + + + 180 + + tw_screen_timeout_secs=180 + + + + + + + Brightness: %tw_brightness_display% + + + + + + + 25% + + + echo %tw_brightness_25% > "%tw_brightness_file%" + tw_brightness_display=25% + tw_brightness=%tw_brightness_25% + + + + + + + + 50% + + + echo %tw_brightness_50% > "%tw_brightness_file%" + tw_brightness_display=50% + tw_brightness=%tw_brightness_50% + + + + + + + + 75% + + + echo %tw_brightness_75% > "%tw_brightness_file%" + tw_brightness_display=75% + tw_brightness=%tw_brightness_75% + + + + + + + + 100% + + + echo %tw_brightness_100% > "%tw_brightness_file%" + tw_brightness_display=100% + tw_brightness=%tw_brightness_100% + + + + + + main + + + + + settings + + + + + -- cgit v1.2.3