summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Giacomelli <giac2000@hotmail.com>2008-01-21 02:37:25 +0000
committerMichael Giacomelli <giac2000@hotmail.com>2008-01-21 02:37:25 +0000
commitb58071a1d2d8fde76a6b2bce0695c7904e62fb16 (patch)
tree9e9d20a192a06c39ed5d3d1dfb39c2d0395008c8
parentc5f640644db95843d7cef4f8b0f2156b8eba7f4a (diff)
downloadrockbox-b58071a1d2d8fde76a6b2bce0695c7904e62fb16.zip
rockbox-b58071a1d2d8fde76a6b2bce0695c7904e62fb16.tar.gz
rockbox-b58071a1d2d8fde76a6b2bce0695c7904e62fb16.tar.bz2
rockbox-b58071a1d2d8fde76a6b2bce0695c7904e62fb16.tar.xz
Fix Cabbie on non-color targets by not including the gradient selection bar. Also, update the build script so that different targets can have different selection bars.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16130 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--wps/WPSLIST20
-rwxr-xr-xwps/wpsbuild.pl3
2 files changed, 18 insertions, 5 deletions
diff --git a/wps/WPSLIST b/wps/WPSLIST
index 9afa678..43725d6 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -209,9 +209,9 @@ Author: Jens Arnold
<wps>
Name: cabbiev2.wps
# Real name of the creator of the WPS
-Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawkus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta.
-rwps: /.rockbox/wps/cabbiev2.rwps-128x96x2.rwps
-rwps: /.rockbox/wps/cabbiev2.rwps-128x64x2.rwps
+Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta.
+rwps: cabbiev2.rwps-128x96x2.rwps
+rwps: cabbiev2.rwps-128x64x2.rwps
# Preferred font (including .fnt extension - leave blank for player):
Font.320x240x16: helvR12.fnt
Font.240x320x16: helvR14.fnt
@@ -238,8 +238,18 @@ backdrop.220x176x16: /.rockbox/backdrops/cabbiev2.220x176x16.bmp
backdrop.240x320x16: /.rockbox/backdrops/cabbiev2.240x320x16.bmp
line selector start color: fde89e
line selector end color: b58c00
-selector type: bar (gradient)
-iconset: /.rockbox/icons/tango_small.bmp
+
+#selection bar settings for color targets
+selector type.320x240x16: bar (gradient)
+selector type.128x128x16: bar (gradient)
+selector type.132x80x16: bar (gradient)
+selector type.220x176x16: bar (gradient)
+selector type.160x128x16: bar (gradient)
+selector type.240x320x16: bar (gradient)
+selector type.176x132x16: bar (gradient)
+selector type.176x220x16: bar (gradient)
+
+iconset: /.rockbox/icons/tango_small.bmp
viewers iconset: /.rockbox/icons/tango_small_viewers.bmp
line selector text color: 000000
filetype colours: -
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index 5dbe100..e6cf6cc 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -417,6 +417,9 @@ while(<WPS>) {
elsif($l =~ /^selector type: (.*)/i) {
$selecttype = $1;
}
+ elsif($l =~ /^selector type\.${main_width}x${main_height}x$main_depth: (.*)/i) {
+ $selecttype = $1;
+ }
elsif($l =~ /^iconset: (.*)/i) {
$iconset = $1;
copythemeicon();