summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDees Troy <dees_troy@teamw.in>2013-02-19 15:41:07 +0100
committerGerrit Code Review <gerrit@5.9.244.119>2013-02-19 15:41:07 +0100
commit94a599f5758ee4e246175e923b74d845d5398aea (patch)
treef03053c9778c701ec2e3c6976aa43edf8ddcd0cd
parentMerge "Add button highlight" into twrp2.4 (diff)
parentAdd highlight to file selector (diff)
downloadandroid_bootable_recovery-94a599f5758ee4e246175e923b74d845d5398aea.tar
android_bootable_recovery-94a599f5758ee4e246175e923b74d845d5398aea.tar.gz
android_bootable_recovery-94a599f5758ee4e246175e923b74d845d5398aea.tar.bz2
android_bootable_recovery-94a599f5758ee4e246175e923b74d845d5398aea.tar.lz
android_bootable_recovery-94a599f5758ee4e246175e923b74d845d5398aea.tar.xz
android_bootable_recovery-94a599f5758ee4e246175e923b74d845d5398aea.tar.zst
android_bootable_recovery-94a599f5758ee4e246175e923b74d845d5398aea.zip
-rwxr-xr-xgui/devices/1024x600/res/ui.xml23
-rw-r--r--gui/devices/1024x768/res/ui.xml23
-rw-r--r--gui/devices/1280x800/res/ui.xml23
-rw-r--r--gui/devices/1920x1200/res/ui.xml23
-rw-r--r--gui/devices/2560x1600/res/ui.xml23
-rw-r--r--gui/devices/320x480/res/ui.xml18
-rw-r--r--gui/devices/480x800/res/ui.xml18
-rw-r--r--gui/devices/480x854/res/ui.xml18
-rw-r--r--gui/devices/540x960/res/ui.xml18
-rw-r--r--gui/devices/720x1280/res/ui.xml17
-rwxr-xr-xgui/devices/800x1280/res/ui.xml18
-rwxr-xr-xgui/devices/800x480/res/ui.xml23
-rw-r--r--gui/fileselector.cpp65
-rw-r--r--gui/objects.hpp6
14 files changed, 236 insertions, 80 deletions
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index bedefc9d8..76d7d7339 100755
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -150,6 +150,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="2" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="18" />
<variable name="zipstorage_text_y" value="88" />
<variable name="listbox_x" value="269" />
@@ -547,6 +549,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -554,13 +557,14 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_zip_location" default="/sdcard" />
<data name="select" />
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -568,7 +572,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="0" files="1" />
<path name="tw_zip_location" />
<data name="tw_filename" />
@@ -2074,12 +2078,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" nav="0" />
@@ -2952,6 +2957,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -2959,7 +2965,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location1" default="/sdcard" />
<data name="select" />
@@ -2967,6 +2973,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2974,7 +2981,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="0" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3183,12 +3190,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" />
@@ -3580,6 +3588,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3587,7 +3596,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index f494db97a..7f856de37 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -150,6 +150,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="2" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="18" />
<variable name="zipstorage_text_y" value="88" />
<variable name="listbox_x" value="269" />
@@ -547,6 +549,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -554,13 +557,14 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_zip_location" default="/sdcard" />
<data name="select" />
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -568,7 +572,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="0" files="1" />
<path name="tw_zip_location" />
<data name="tw_filename" />
@@ -2074,12 +2078,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" nav="0" />
@@ -2952,6 +2957,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -2959,7 +2965,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location1" default="/sdcard" />
<data name="select" />
@@ -2967,6 +2973,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2974,7 +2981,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="0" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3183,12 +3190,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" />
@@ -3580,6 +3588,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3587,7 +3596,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index abe3c62b6..3d0821499 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -150,6 +150,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="2" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="18" />
<variable name="zipstorage_text_y" value="88" />
<variable name="listbox_x" value="397" />
@@ -547,6 +549,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -554,13 +557,14 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_zip_location" default="/sdcard" />
<data name="select" />
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -568,7 +572,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="0" files="1" />
<path name="tw_zip_location" />
<data name="tw_filename" />
@@ -2074,12 +2078,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" nav="0" />
@@ -2952,6 +2957,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -2959,7 +2965,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location1" default="/sdcard" />
<data name="select" />
@@ -2967,6 +2973,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2974,7 +2981,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="0" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3183,12 +3190,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" />
@@ -3580,6 +3588,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3587,7 +3596,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 21a3db423..95237faec 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -150,6 +150,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="2" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="18" />
<variable name="zipstorage_text_y" value="130" />
<variable name="listbox_x" value="560" />
@@ -547,6 +549,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -554,13 +557,14 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_zip_location" default="/sdcard" />
<data name="select" />
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -568,7 +572,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="0" files="1" />
<path name="tw_zip_location" />
<data name="tw_filename" />
@@ -2074,12 +2078,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" nav="0" />
@@ -2952,6 +2957,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -2959,7 +2965,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location1" default="/sdcard" />
<data name="select" />
@@ -2967,6 +2973,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2974,7 +2981,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="0" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3183,12 +3190,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" />
@@ -3580,6 +3588,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3587,7 +3596,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
index 2c54d2ff8..45209bb7d 100644
--- a/gui/devices/2560x1600/res/ui.xml
+++ b/gui/devices/2560x1600/res/ui.xml
@@ -150,6 +150,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="2" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="18" />
<variable name="zipstorage_text_y" value="190" />
<variable name="listbox_x" value="680" />
@@ -547,6 +549,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -554,13 +557,14 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_zip_location" default="/sdcard" />
<data name="select" />
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -568,7 +572,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="0" files="1" />
<path name="tw_zip_location" />
<data name="tw_filename" />
@@ -2074,12 +2078,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" nav="0" />
@@ -2952,6 +2957,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -2959,7 +2965,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location1" default="/sdcard" />
<data name="select" />
@@ -2967,6 +2973,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2974,7 +2981,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="0" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3183,12 +3190,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" />
@@ -3580,6 +3588,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3587,7 +3596,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index fdc9c3e92..406187e4d 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -132,6 +132,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="1" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="12" />
<variable name="listbox_x" value="3" />
<variable name="listbox_width" value="313" />
@@ -505,6 +507,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -512,7 +515,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="1" files="1" />
<path name="tw_zip_location" default="/sdcard" />
<data name="tw_filename" />
@@ -1644,6 +1647,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
@@ -1651,7 +1655,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" nav="0" />
<path name="tw_backups_folder" />
<data name="tw_restore" default="" />
@@ -2085,7 +2089,6 @@
<condition var1="tw_boot_is_mountable" var2="1" />
<condition var1="mounted" op="=" var2="/boot" />
</conditions>
-
<placement x="%col1_x%" y="%row6_text_y%" />
<font resource="font" color="#A0A0A0" />
<text>Unmount Boot</text>
@@ -2943,6 +2946,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2950,7 +2954,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<folders="1" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3159,6 +3163,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
@@ -3166,7 +3171,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location2" default="/" />
<data name="tw_filename2" />
@@ -3558,6 +3563,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3565,7 +3571,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index d305a12e9..b2acb237f 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -131,6 +131,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="2" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="18" />
<variable name="listbox_x" value="5" />
<variable name="listbox_width" value="470" />
@@ -504,6 +506,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -511,7 +514,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="1" files="1" />
<path name="tw_zip_location" default="/sdcard" />
<data name="tw_filename" />
@@ -1643,6 +1646,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
@@ -1650,7 +1654,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" nav="0" />
<path name="tw_backups_folder" />
<data name="tw_restore" default="" />
@@ -2084,7 +2088,6 @@
<condition var1="tw_boot_is_mountable" var2="1" />
<condition var1="mounted" op="=" var2="/boot" />
</conditions>
-
<placement x="%col1_x%" y="%row6_text_y%" />
<font resource="font" color="#A0A0A0" />
<text>Unmount Boot</text>
@@ -2942,6 +2945,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2949,7 +2953,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<folders="1" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3158,6 +3162,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
@@ -3165,7 +3170,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location2" default="/" />
<data name="tw_filename2" />
@@ -3557,6 +3562,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3564,7 +3570,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index 65412e767..20895f82d 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -130,6 +130,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="2" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="18" />
<variable name="listbox_x" value="5" />
<variable name="listbox_width" value="470" />
@@ -503,6 +505,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -510,7 +513,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="1" files="1" />
<path name="tw_zip_location" default="/sdcard" />
<data name="tw_filename" />
@@ -1642,6 +1645,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
@@ -1649,7 +1653,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" nav="0" />
<path name="tw_backups_folder" />
<data name="tw_restore" default="" />
@@ -2083,7 +2087,6 @@
<condition var1="tw_boot_is_mountable" var2="1" />
<condition var1="mounted" op="=" var2="/boot" />
</conditions>
-
<placement x="%col1_x%" y="%row6_text_y%" />
<font resource="font" color="#A0A0A0" />
<text>Unmount Boot</text>
@@ -2941,6 +2944,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2948,7 +2952,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<folders="1" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3157,6 +3161,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
@@ -3164,7 +3169,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location2" default="/" />
<data name="tw_filename2" />
@@ -3556,6 +3561,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3563,7 +3569,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index ad8c91efc..d3cb57418 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -131,6 +131,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="2" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="18" />
<variable name="listbox_x" value="5" />
<variable name="listbox_width" value="530" />
@@ -504,6 +506,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -511,7 +514,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="1" files="1" />
<path name="tw_zip_location" default="/sdcard" />
<data name="tw_filename" />
@@ -1643,6 +1646,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
@@ -1650,7 +1654,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" nav="0" />
<path name="tw_backups_folder" />
<data name="tw_restore" default="" />
@@ -2084,7 +2088,6 @@
<condition var1="tw_boot_is_mountable" var2="1" />
<condition var1="mounted" op="=" var2="/boot" />
</conditions>
-
<placement x="%col1_x%" y="%row6_text_y%" />
<font resource="font" color="#A0A0A0" />
<text>Unmount Boot</text>
@@ -2942,6 +2945,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2949,7 +2953,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<folders="1" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3158,6 +3162,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
@@ -3165,7 +3170,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location2" default="/" />
<data name="tw_filename2" />
@@ -3557,6 +3562,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3564,7 +3570,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index bc8209270..217564fdb 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -136,6 +136,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="2" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="36" />
<variable name="listbox_x" value="5" />
<variable name="listbox_width" value="710" />
@@ -517,6 +519,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -524,7 +527,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="1" files="1" />
<path name="tw_zip_location" default="/sdcard" />
<data name="tw_filename" />
@@ -1656,6 +1659,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
@@ -1663,7 +1667,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" nav="0" />
<path name="tw_backups_folder" />
<data name="tw_restore" default="" />
@@ -2954,6 +2958,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2961,7 +2966,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<folders="1" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3170,6 +3175,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
@@ -3177,7 +3183,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location2" default="/" />
<data name="tw_filename2" />
@@ -3569,6 +3575,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3576,7 +3583,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index fcb527a61..1b9560478 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -132,6 +132,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="2" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="36"/>
<variable name="listbox_x" value="5" />
<variable name="listbox_width" value="710" />
@@ -505,6 +507,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -512,7 +515,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="1" files="1" />
<path name="tw_zip_location" default="/sdcard" />
<data name="tw_filename" />
@@ -1644,6 +1647,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
@@ -1651,7 +1655,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" nav="0" />
<path name="tw_backups_folder" />
<data name="tw_restore" default="" />
@@ -2085,7 +2089,6 @@
<condition var1="tw_boot_is_mountable" var2="1" />
<condition var1="mounted" op="=" var2="/boot" />
</conditions>
-
<placement x="%col1_x%" y="%row6_text_y%" />
<font resource="font" color="#A0A0A0" />
<text>Unmount Boot</text>
@@ -2943,6 +2946,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2950,7 +2954,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<folders="1" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3159,6 +3163,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
@@ -3166,7 +3171,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location2" default="/" />
<data name="tw_filename2" />
@@ -3558,6 +3563,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3565,7 +3571,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 66a2b85fe..342b14e8e 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -150,6 +150,8 @@
<variable name="fileselector_separatorcolor" value="#505050" />
<variable name="fileselector_separatorheight" value="1" />
<variable name="fileselector_background" value="#303030" />
+ <variable name="fileselector_highlight_color" value="#505050" />
+ <variable name="fileselector_highlight_font_color" value="#33B5E5" />
<variable name="fileselector_spacing" value="12" />
<variable name="zipstorage_text_y" value="88" />
<variable name="listbox_x" value="156" />
@@ -555,6 +557,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -562,13 +565,14 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_zip_location" default="/sdcard" />
<data name="select" />
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_zip_location%</text>
@@ -576,7 +580,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter extn=".zip" folders="0" files="1" />
<path name="tw_zip_location" />
<data name="tw_filename" />
@@ -2082,12 +2086,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Select Package to Restore:</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" nav="0" />
@@ -2960,6 +2965,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>Folders:</text>
@@ -2967,7 +2973,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_file_location1" default="/sdcard" />
<data name="select" />
@@ -2975,6 +2981,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location1%</text>
@@ -2982,7 +2989,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="0" files="1" />
<path name="tw_file_location1" default="/" />
<data name="tw_filename1" />
@@ -3191,12 +3198,13 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_file_location2%</text>
<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
<sort name="tw_gui_sort_order" />
- <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
<filter folders="1" files="0" />
@@ -3588,6 +3596,7 @@
</object>
<object type="fileselector">
+ <highlight color="%fileselector_highlight_color%" />
<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
<text>%tw_terminal_location%</text>
@@ -3595,7 +3604,7 @@
<sort name="tw_gui_sort_order" />
<icon folder="folder_icon" file="file_icon" />
<background color="%fileselector_background%" />
- <font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+ <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
<filter folders="1" files="0" />
<path name="tw_terminal_location" default="/" />
<data name="tw_terminal" />
diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp
index 38eaadd20..66bf80f78 100644
--- a/gui/fileselector.cpp
+++ b/gui/fileselector.cpp
@@ -62,6 +62,10 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node)
ConvertStrToColor("black", &mHeaderSeparatorColor);
ConvertStrToColor("white", &mFontColor);
ConvertStrToColor("white", &mHeaderFontColor);
+ hasHighlightColor = false;
+ hasFontHighlightColor = false;
+ isHighlighted = false;
+ startSelection = -1;
// Load header text
child = node->first_node("header");
@@ -102,6 +106,17 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node)
child = node->first_node("text");
if (child) mHeaderText = child->value();
+ memset(&mHighlightColor, 0, sizeof(COLOR));
+ child = node->first_node("highlight");
+ if (child) {
+ attr = child->first_attribute("color");
+ if (attr) {
+ hasHighlightColor = true;
+ std::string color = attr->value();
+ ConvertStrToColor(color, &mHighlightColor);
+ }
+ }
+
// Simple way to check for static state
mLastValue = gui_parse_text(mHeaderText);
if (mLastValue != mHeaderText)
@@ -161,6 +176,15 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node)
string parsevalue = gui_parse_text(attr->value());
mLineSpacing = atoi(parsevalue.c_str());
}
+
+ attr = child->first_attribute("highlightcolor");
+ memset(&mFontHighlightColor, 0, sizeof(COLOR));
+ if (attr)
+ {
+ std::string color = attr->value();
+ ConvertStrToColor(color, &mFontHighlightColor);
+ hasFontHighlightColor = true;
+ }
}
// Load the separator if it exists
@@ -349,14 +373,39 @@ int GUIFileSelector::Render(void)
int currentIconOffsetY = 0, currentIconOffsetX = 0;
int folderIconOffsetY = (int)((actualLineHeight - mFolderIconHeight) / 2), fileIconOffsetY = (int)((actualLineHeight - mFileIconHeight) / 2);
int folderIconOffsetX = (mIconWidth - mFolderIconWidth) / 2, fileIconOffsetX = (mIconWidth - mFileIconWidth) / 2;
+ int actualSelection = mStart;
+
+ if (isHighlighted) {
+ int selectY = scrollingY;
+
+ // Locate the correct line for highlighting
+ while (selectY + actualLineHeight < startSelection) {
+ selectY += actualLineHeight;
+ actualSelection++;
+ }
+ if (hasHighlightColor) {
+ // Highlight the area
+ gr_color(mHighlightColor.red, mHighlightColor.green, mHighlightColor.blue, 255);
+ int HighlightHeight = actualLineHeight;
+ if (mRenderY + mHeaderH + selectY + actualLineHeight > mRenderH + mRenderY) {
+ HighlightHeight = actualLineHeight - (mRenderY + mHeaderH + selectY + actualLineHeight - mRenderH - mRenderY);
+ }
+ gr_fill(mRenderX, mRenderY + mHeaderH + selectY, mRenderW, HighlightHeight);
+ }
+ }
for (line = 0; line < lines; line++)
{
Resource* icon;
std::string label;
- // Set the color for the font
- gr_color(mFontColor.red, mFontColor.green, mFontColor.blue, 255);
+ if (isHighlighted && hasFontHighlightColor && line + mStart == actualSelection) {
+ // Use the highlight color for the font
+ gr_color(mFontHighlightColor.red, mFontHighlightColor.green, mFontHighlightColor.blue, 255);
+ } else {
+ // Set the color for the font
+ gr_color(mFontColor.red, mFontColor.green, mFontColor.blue, 255);
+ }
if (line + mStart < folderSize)
{
@@ -514,7 +563,6 @@ int GUIFileSelector::GetSelection(int x, int y)
int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y)
{
- static int startSelection = -1;
static int lastY = 0, last2Y = 0;
int selection = 0;
@@ -525,6 +573,9 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y)
startSelection = -1;
else
startSelection = GetSelection(x,y);
+ isHighlighted = (startSelection > -1);
+ if (isHighlighted)
+ mUpdate = 1;
startY = lastY = last2Y = y;
scrollingSpeed = 0;
break;
@@ -533,14 +584,21 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y)
// Check if we dragged out of the selection window
if (GetSelection(x, y) == -1) {
last2Y = lastY = 0;
+ if (isHighlighted) {
+ isHighlighted = false;
+ mUpdate = 1;
+ }
break;
}
// Provide some debounce on initial touches
if (startSelection != -1 && abs(y - startY) < touchDebounce) {
+ isHighlighted = true;
+ mUpdate = 1;
break;
}
+ isHighlighted = false;
last2Y = lastY;
lastY = y;
startSelection = -1;
@@ -581,6 +639,7 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y)
break;
case TOUCH_RELEASE:
+ isHighlighted = false;
if (startSelection >= 0)
{
// We've selected an item!
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 78844e77b..3925a2757 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -481,6 +481,12 @@ protected:
COLOR mHeaderFontColor;
COLOR mSeparatorColor;
COLOR mHeaderSeparatorColor;
+ bool hasHighlightColor;
+ bool hasFontHighlightColor;
+ bool isHighlighted;
+ COLOR mHighlightColor;
+ COLOR mFontHighlightColor;
+ int startSelection;
};
class GUIListBox : public RenderObject, public ActionObject