diff options
author | Vojtech Bocek <vbocek@gmail.com> | 2013-02-24 01:40:19 +0100 |
---|---|---|
committer | Dees_Troy <dees_troy@teamw.in> | 2013-02-27 22:59:21 +0100 |
commit | 7cc278bb99ad9c9ea540a3e096592d5586e4c986 (patch) | |
tree | e4d8665c0aa4703c1fddfa69bdd119efd7da3d83 | |
parent | fixes for fakeflash zips (diff) | |
download | android_bootable_recovery-7cc278bb99ad9c9ea540a3e096592d5586e4c986.tar android_bootable_recovery-7cc278bb99ad9c9ea540a3e096592d5586e4c986.tar.gz android_bootable_recovery-7cc278bb99ad9c9ea540a3e096592d5586e4c986.tar.bz2 android_bootable_recovery-7cc278bb99ad9c9ea540a3e096592d5586e4c986.tar.lz android_bootable_recovery-7cc278bb99ad9c9ea540a3e096592d5586e4c986.tar.xz android_bootable_recovery-7cc278bb99ad9c9ea540a3e096592d5586e4c986.tar.zst android_bootable_recovery-7cc278bb99ad9c9ea540a3e096592d5586e4c986.zip |
Diffstat (limited to '')
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | exfat/libexfat/Android.mk | 1 | ||||
-rwxr-xr-x | gui/devices/1024x600/res/ui.xml | 12 | ||||
-rw-r--r-- | gui/devices/1024x768/res/ui.xml | 14 | ||||
-rw-r--r-- | gui/devices/1280x800/res/ui.xml | 14 | ||||
-rw-r--r-- | gui/devices/1920x1200/res/ui.xml | 14 | ||||
-rw-r--r-- | gui/devices/2560x1600/res/ui.xml | 14 | ||||
-rw-r--r-- | gui/devices/320x480/res/ui.xml | 12 | ||||
-rw-r--r-- | gui/devices/480x800/res/ui.xml | 12 | ||||
-rw-r--r-- | gui/devices/480x854/res/ui.xml | 12 | ||||
-rw-r--r-- | gui/devices/540x960/res/ui.xml | 12 | ||||
-rw-r--r-- | gui/devices/720x1280/res/ui.xml | 12 | ||||
-rwxr-xr-x | gui/devices/800x1280/res/ui.xml | 12 | ||||
-rwxr-xr-x | gui/devices/800x480/res/ui.xml | 14 | ||||
-rw-r--r-- | gui/fileselector.cpp | 96 | ||||
-rw-r--r-- | gui/objects.hpp | 8 | ||||
-rw-r--r-- | libblkid/Android.mk | 4 | ||||
-rw-r--r-- | libblkid/bitops.h | 6 | ||||
-rw-r--r-- | prebuilt/Android.mk | 6 |
19 files changed, 269 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk index 79d77480e..57bab353d 100644 --- a/Android.mk +++ b/Android.mk @@ -307,7 +307,9 @@ endif ifeq ($(TW_INCLUDE_JB_CRYPTO), true) include $(commands_recovery_local_path)/crypto/fs_mgr/Android.mk endif - +ifeq ($(BUILD_ID), GINGERBREAD) + TW_NO_EXFAT := true +endif ifneq ($(TW_NO_EXFAT), true) include $(commands_recovery_local_path)/exfat/exfat-fuse/Android.mk \ $(commands_recovery_local_path)/exfat/mkfs/Android.mk \ diff --git a/exfat/libexfat/Android.mk b/exfat/libexfat/Android.mk index 0b7f963a7..39a7faae7 100644 --- a/exfat/libexfat/Android.mk +++ b/exfat/libexfat/Android.mk @@ -4,7 +4,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libexfat LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 LOCAL_SRC_FILES = cluster.c io.c log.c lookup.c mount.c node.c time.c utf.c utils.c LOCAL_C_INCLUDES += $(LOCAL_PATH) \ diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index a651b5bf3..16969d9bd 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -153,6 +153,10 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> + <variable name="fastscroll_w" value="32" /> + <variable name="fastscroll_linew" value="2" /> + <variable name="fastscroll_rectw" value="24" /> + <variable name="fastscroll_recth" value="40" /> <variable name="zipstorage_text_y" value="88" /> <variable name="listbox_x" value="269" /> <variable name="listbox_y" value="90" /> @@ -552,6 +556,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -567,6 +572,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2115,6 +2121,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2535,6 +2542,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3118,6 +3126,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3134,6 +3143,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3351,6 +3361,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3749,6 +3760,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index f4cfa44bf..88365e62e 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -153,6 +153,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="32" /> + <variable name="fastscroll_linew" value="2" /> + <variable name="fastscroll_rectw" value="24" /> + <variable name="fastscroll_recth" value="40" /> <variable name="zipstorage_text_y" value="88" /> <variable name="listbox_x" value="269" /> <variable name="listbox_y" value="90" /> @@ -552,6 +558,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -567,6 +574,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2115,6 +2123,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2535,6 +2544,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3118,6 +3128,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3134,6 +3145,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3351,6 +3363,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3749,6 +3762,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index e6ef8f961..ef0b432ce 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -153,6 +153,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="40" /> + <variable name="fastscroll_linew" value="2" /> + <variable name="fastscroll_rectw" value="30" /> + <variable name="fastscroll_recth" value="50" /> <variable name="zipstorage_text_y" value="88" /> <variable name="listbox_x" value="397" /> <variable name="listbox_y" value="90" /> @@ -552,6 +558,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -567,6 +574,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2115,6 +2123,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2535,6 +2544,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3118,6 +3128,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3134,6 +3145,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3351,6 +3363,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3749,6 +3762,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index e22494bea..af438d7d9 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -153,6 +153,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="60" /> + <variable name="fastscroll_linew" value="3" /> + <variable name="fastscroll_rectw" value="45" /> + <variable name="fastscroll_recth" value="75" /> <variable name="zipstorage_text_y" value="130" /> <variable name="listbox_x" value="560" /> <variable name="listbox_y" value="150" /> @@ -552,6 +558,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -567,6 +574,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2115,6 +2123,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2535,6 +2544,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3118,6 +3128,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3134,6 +3145,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3351,6 +3363,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3749,6 +3762,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml index d3b20abd7..96170b59f 100644 --- a/gui/devices/2560x1600/res/ui.xml +++ b/gui/devices/2560x1600/res/ui.xml @@ -153,6 +153,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="80" /> + <variable name="fastscroll_linew" value="4" /> + <variable name="fastscroll_rectw" value="60" /> + <variable name="fastscroll_recth" value="100" /> <variable name="zipstorage_text_y" value="190" /> <variable name="listbox_x" value="680" /> <variable name="listbox_y" value="195" /> @@ -552,6 +558,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -567,6 +574,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2115,6 +2123,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2535,6 +2544,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3118,6 +3128,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3134,6 +3145,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3351,6 +3363,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3749,6 +3762,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index 9f2051d2b..887505c6b 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -135,6 +135,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="12" /> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="27" /> + <variable name="fastscroll_linew" value="1" /> + <variable name="fastscroll_rectw" value="18" /> + <variable name="fastscroll_recth" value="31" /> <variable name="listbox_x" value="3" /> <variable name="listbox_width" value="313" /> <variable name="listbox_tz_height" value="189" /> @@ -510,6 +516,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -1684,6 +1691,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2500,6 +2508,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3100,6 +3109,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3317,6 +3327,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3717,6 +3728,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index 2707b24ca..ab4be70ff 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -134,6 +134,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="40" /> + <variable name="fastscroll_linew" value="2" /> + <variable name="fastscroll_rectw" value="27" /> + <variable name="fastscroll_recth" value="47" /> <variable name="listbox_x" value="5" /> <variable name="listbox_width" value="470" /> <variable name="listbox_tz_height" value="310" /> @@ -509,6 +515,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -1683,6 +1690,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2499,6 +2507,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3099,6 +3108,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3316,6 +3326,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3716,6 +3727,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index 44cd78232..1147b77f3 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -133,6 +133,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="40" /> + <variable name="fastscroll_linew" value="2" /> + <variable name="fastscroll_rectw" value="27" /> + <variable name="fastscroll_recth" value="47" /> <variable name="listbox_x" value="5" /> <variable name="listbox_width" value="470" /> <variable name="listbox_tz_height" value="310" /> @@ -508,6 +514,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -1682,6 +1689,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2498,6 +2506,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3098,6 +3107,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3315,6 +3325,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3715,6 +3726,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index ae0b24e33..7c4967ed1 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -134,6 +134,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="18" /> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="45" /> + <variable name="fastscroll_linew" value="2" /> + <variable name="fastscroll_rectw" value="30" /> + <variable name="fastscroll_recth" value="52" /> <variable name="listbox_x" value="5" /> <variable name="listbox_width" value="530" /> <variable name="listbox_tz_height" value="420" /> @@ -509,6 +515,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -1683,6 +1690,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2499,6 +2507,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3099,6 +3108,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3316,6 +3326,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3716,6 +3727,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index bdd779939..5d94483c9 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -139,6 +139,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="36" /> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="60" /> + <variable name="fastscroll_linew" value="2" /> + <variable name="fastscroll_rectw" value="40" /> + <variable name="fastscroll_recth" value="70" /> <variable name="listbox_x" value="5" /> <variable name="listbox_width" value="710" /> <variable name="listbox_tz_height" value="590" /> @@ -522,6 +528,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -1696,6 +1703,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2512,6 +2520,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3112,6 +3121,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3329,6 +3339,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3729,6 +3740,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index eb602cd7c..9e2e2b8e7 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -135,6 +135,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="36"/> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="60" /> + <variable name="fastscroll_linew" value="2" /> + <variable name="fastscroll_rectw" value="40" /> + <variable name="fastscroll_recth" value="70" /> <variable name="listbox_x" value="5" /> <variable name="listbox_width" value="710" /> <variable name="listbox_tz_height" value="580" /> @@ -510,6 +516,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -1684,6 +1691,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2500,6 +2508,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3100,6 +3109,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3317,6 +3327,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3717,6 +3728,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index 7813aa686..82423709f 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -153,6 +153,12 @@ <variable name="fileselector_highlight_color" value="#505050" /> <variable name="fileselector_highlight_font_color" value="#33B5E5" /> <variable name="fileselector_spacing" value="12" /> + <variable name="fastscroll_linecolor" value="#808080" /> + <variable name="fastscroll_rectcolor" value="#808080" /> + <variable name="fastscroll_w" value="25" /> + <variable name="fastscroll_linew" value="2" /> + <variable name="fastscroll_rectw" value="19" /> + <variable name="fastscroll_recth" value="31" /> <variable name="zipstorage_text_y" value="88" /> <variable name="listbox_x" value="156" /> <variable name="listbox_y" value="90" /> @@ -560,6 +566,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -575,6 +582,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_zip_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2123,6 +2131,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Package to Restore:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -2543,6 +2552,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Select Time Zone:</text> <icon selected="radio_true" unselected="radio_false" /> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> @@ -3126,6 +3136,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>Folders:</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3142,6 +3153,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location1%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3359,6 +3371,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_file_location2%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> @@ -3757,6 +3770,7 @@ <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%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> <text>%tw_terminal_location%</text> <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> <sort name="tw_gui_sort_order" /> diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp index bc10f917d..edf3279f4 100644 --- a/gui/fileselector.cpp +++ b/gui/fileselector.cpp @@ -53,6 +53,8 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) mFolderIcon = mFileIcon = mBackground = mFont = mHeaderIcon = NULL; mBackgroundX = mBackgroundY = mBackgroundW = mBackgroundH = 0; mShowFolders = mShowFiles = mShowNavFolders = 1; + mFastScrollW = mFastScrollLineW = mFastScrollRectW = mFastScrollRectH = 0; + mFastScrollRectX = mFastScrollRectY = -1; mUpdate = 0; touchDebounce = 6; mPathVar = "cwd"; @@ -62,6 +64,8 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) ConvertStrToColor("black", &mHeaderSeparatorColor); ConvertStrToColor("white", &mFontColor); ConvertStrToColor("white", &mHeaderFontColor); + ConvertStrToColor("white", &mFastScrollLineColor); + ConvertStrToColor("white", &mFastScrollRectColor); hasHighlightColor = false; hasFontHighlightColor = false; isHighlighted = false; @@ -276,6 +280,43 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) } else mSelection = "0"; + // Fast scroll colors + child = node->first_node("fastscroll"); + if (child) + { + attr = child->first_attribute("linecolor"); + if(attr) + ConvertStrToColor(attr->value(), &mFastScrollLineColor); + + attr = child->first_attribute("rectcolor"); + if(attr) + ConvertStrToColor(attr->value(), &mFastScrollRectColor); + + attr = child->first_attribute("w"); + if (attr) { + string parsevalue = gui_parse_text(attr->value()); + mFastScrollW = atoi(parsevalue.c_str()); + } + + attr = child->first_attribute("linew"); + if (attr) { + string parsevalue = gui_parse_text(attr->value()); + mFastScrollLineW = atoi(parsevalue.c_str()); + } + + attr = child->first_attribute("rectw"); + if (attr) { + string parsevalue = gui_parse_text(attr->value()); + mFastScrollRectW = atoi(parsevalue.c_str()); + } + + attr = child->first_attribute("recth"); + if (attr) { + string parsevalue = gui_parse_text(attr->value()); + mFastScrollRectH = atoi(parsevalue.c_str()); + } + } + // Retrieve the line height gr_getFontDetails(mFont ? mFont->GetResource() : NULL, &mFontHeight, NULL); mLineHeight = mFontHeight; @@ -355,10 +396,14 @@ int GUIFileSelector::Render(void) int folderSize = mShowFolders ? mFolderList.size() : 0; int fileSize = mShowFiles ? mFileList.size() : 0; + int listW = mRenderW; + if (folderSize + fileSize < lines) { lines = folderSize + fileSize; scrollingY = 0; + mFastScrollRectX = mFastScrollRectY = -1; } else { + listW -= mFastScrollW; // space for fast scroll lines++; if (lines < folderSize + fileSize) lines++; @@ -437,12 +482,12 @@ int GUIFileSelector::Render(void) 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); + gr_textExWH(mRenderX + mIconWidth + 5, yPos + fontOffsetY, label.c_str(), fontResource, mRenderX + listW, mRenderY + mRenderH); // 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); + gr_fill(mRenderX, yPos + actualLineHeight - mSeparatorH, listW, mSeparatorH); } // Move the yPos @@ -477,6 +522,27 @@ int GUIFileSelector::Render(void) gr_fill(mRenderX, yPos + mHeaderH - mHeaderSeparatorH, mRenderW, mHeaderSeparatorH); } + // render fast scroll + lines = (mRenderH - mHeaderH) / (actualLineHeight); + if(mFastScrollW > 0 && folderSize + fileSize > lines) + { + int startX = listW + mRenderX; + int fWidth = mRenderW - listW; + int fHeight = mRenderH - mHeaderH; + + // line + gr_color(mFastScrollLineColor.red, mFastScrollLineColor.green, mFastScrollLineColor.blue, 255); + gr_fill(startX + fWidth/2, mRenderY + mHeaderH, mFastScrollLineW, mRenderH - mHeaderH); + + // rect + int pct = ((mStart*actualLineHeight - scrollingY)*100)/((folderSize + fileSize)*actualLineHeight-lines*actualLineHeight); + mFastScrollRectX = startX + (fWidth - mFastScrollRectW)/2; + mFastScrollRectY = mRenderY+mHeaderH + ((fHeight - mFastScrollRectH)*pct)/100; + + gr_color(mFastScrollRectColor.red, mFastScrollRectColor.green, mFastScrollRectColor.blue, 255); + gr_fill(mFastScrollRectX, mFastScrollRectY, mFastScrollRectW, mFastScrollRectH); + } + mUpdate = 0; return 0; } @@ -591,6 +657,32 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y) break; } + // Fast scroll + if(mFastScrollRectX != -1 && x >= mRenderX + mRenderW - mFastScrollW) + { + int pct = ((y-mRenderY-mHeaderH)*100)/(mRenderH-mHeaderH); + int totalSize = (mShowFolders ? mFolderList.size() : 0) + (mShowFiles ? mFileList.size() : 0); + int lines = (mRenderH - mHeaderH) / (actualLineHeight); + + float l = float((totalSize-lines)*pct)/100; + if(l + lines >= totalSize) + { + mStart = totalSize - lines; + scrollingY = 0; + } + else + { + mStart = l; + scrollingY = -(l - int(l))*actualLineHeight; + } + + startSelection = -1; + mUpdate = 1; + scrollingSpeed = 0; + isHighlighted = false; + break; + } + // Provide some debounce on initial touches if (startSelection != -1 && abs(y - startY) < touchDebounce) { isHighlighted = true; diff --git a/gui/objects.hpp b/gui/objects.hpp index 2ddeb88c7..86353685a 100644 --- a/gui/objects.hpp +++ b/gui/objects.hpp @@ -461,6 +461,12 @@ protected: int mUpdate; int mBackgroundX, mBackgroundY, mBackgroundW, mBackgroundH; int mHeaderH; + int mFastScrollW; + int mFastScrollLineW; + int mFastScrollRectW; + int mFastScrollRectH; + int mFastScrollRectX; + int mFastScrollRectY; static int mSortOrder; int startY; int scrollingSpeed; @@ -481,6 +487,8 @@ protected: COLOR mHeaderFontColor; COLOR mSeparatorColor; COLOR mHeaderSeparatorColor; + COLOR mFastScrollLineColor; + COLOR mFastScrollRectColor; bool hasHighlightColor; bool hasFontHighlightColor; bool isHighlighted; diff --git a/libblkid/Android.mk b/libblkid/Android.mk index 18c49e7e5..d6c203f90 100644 --- a/libblkid/Android.mk +++ b/libblkid/Android.mk @@ -4,8 +4,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := libblkid LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin -LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 +#LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin +LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -DHAVE_LOFF_T LOCAL_SRC_FILES = aix.c at.c befs.c bfs.c blkdev.c bsd.c btrfs.c cache.c canonicalize.c colors.c config.c cramfs.c crc32.c ddf_raid.c dev.c devname.c devno.c dm.c dos.c drbd.c drbdproxy_datalog.c encode.c env.c evaluate.c evms.c exec_shell.c exfat.c ext.c f2fs.c fileutils.c getsize.c gfs.c gpt.c hfs.c highpoint_raid.c hpfs.c ioctl.c ismounted.c iso9660.c isw_raid.c jfs.c jmicron_raid.c langinfo.c linux_raid.c linux_version.c llseek.c loopdev.c lsi_raid.c luks.c lvm1.c lvm2.c mac.c mangle.c match.c mbsalign.c md5.c md.c minix1.c minix2.c netware.c nilfs.c ntfs.c nvidia_raid.c ocfs.c pager.c partitions.c path.c probe.c procutils.c promise_raid.c randutils.c read.c reiserfs.c resolve.c romfs.c save.c setproctitle.c sgi.c silicon_raid.c solaris_x86.c squashfs.c sun.c superblocks.c swap.c sysfs1.c sysfs2.c sysv.c tag.c topology.c ubifs.c udf.c ufs.c ultrix.c unixware.c verify.c version.c vfat.c via_raid.c vmfs.c vxfs.c wholedisk.c xfs.c zfs.c adaptec_raid.c LOCAL_C_INCLUDES += $(LOCAL_PATH) \ LOCAL_SHARED_LIBRARIES += libc diff --git a/libblkid/bitops.h b/libblkid/bitops.h index 288fe715c..7439ece91 100644 --- a/libblkid/bitops.h +++ b/libblkid/bitops.h @@ -56,15 +56,15 @@ //#ifndef htobe16 //# if !defined(WORDS_BIGENDIAN) -# define htobe16(x) bswap_16 (x) +//# define htobe16(x) bswap_16 (x) # define htole16(x) (x) # define be16toh(x) bswap_16 (x) # define le16toh(x) (x) -# define htobe32(x) bswap_32 (x) +//# define htobe32(x) bswap_32 (x) # define htole32(x) (x) # define be32toh(x) bswap_32 (x) # define le32toh(x) (x) -# define htobe64(x) bswap_64 (x) +//# define htobe64(x) bswap_64 (x) # define htole64(x) (x) # define be64toh(x) bswap_64 (x) # define le64toh(x) (x) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index d5005e3ec..dec000f32 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -38,16 +38,20 @@ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libz.so #RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libjpeg.so #RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmtdutils.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libtar.so +RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libblkid.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmmcutils.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbmlutils.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libflashutils.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libstlport.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmincrypt.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext4_utils.so - +ifeq ($(BUILD_ID), GINGERBREAD) + TW_NO_EXFAT := true +endif ifneq ($(TW_NO_EXFAT), true) RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/exfat-fuse RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/mkexfatfs + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libexfat.so endif ifeq ($(TW_INCLUDE_BLOBPACK), true) RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/blobpack |