From cba886d9b75c21ee1e81b70dbd7fc234d2288f66 Mon Sep 17 00:00:00 2001 From: Michael Giacomelli Date: Mon, 21 Jan 2008 06:19:22 +0000 Subject: [PATCH] Set different icons for each resolution in the build script. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16131 a1c6a512-1295-4272-9138-f99709370657 --- wps/WPSLIST | 43 +++++++++++++++++++++++++++++++++++++------ wps/wpsbuild.pl | 8 ++++++++ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/wps/WPSLIST b/wps/WPSLIST index 43725d68b8..79a3b56063 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST @@ -210,8 +210,11 @@ Author: Jens Arnold 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 Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta. + +#remote WPS settings 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 @@ -224,8 +227,16 @@ Font.138x110x2: helvR10.fnt Font.128x128x16: helvR10.fnt Font.132x80x16: Sazanami-Mincho-Regular-11.fnt Font.112x64x1: rockfont-8.fnt + +#misc settings that should be ignored on grayscale targets foreground color: CCCCCC background color: 000000 +line selector start color: fde89e +line selector end color: b58c00 +line selector text color: 000000 +filetype colours: - + +#backdrop backdrop.320x240x16: /.rockbox/backdrops/cabbiev2.320x240x16.bmp backdrop.128x128x16: /.rockbox/backdrops/cabbiev2.128x128x16.bmp backdrop.132x80x16: /.rockbox/backdrops/cabbiev2.132x80x16.bmp @@ -236,8 +247,6 @@ backdrop.176x132x16: /.rockbox/backdrops/cabbiev2.176x132x16.bmp backdrop.176x220x16: /.rockbox/backdrops/cabbiev2.176x220x16.bmp backdrop.220x176x16: /.rockbox/backdrops/cabbiev2.220x176x16.bmp backdrop.240x320x16: /.rockbox/backdrops/cabbiev2.240x320x16.bmp -line selector start color: fde89e -line selector end color: b58c00 #selection bar settings for color targets selector type.320x240x16: bar (gradient) @@ -249,10 +258,30 @@ 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: - +#icons +iconset.320x240x16: /.rockbox/icons/tango_small.bmp +iconset.128x128x16: /.rockbox/icons/tango_small.bmp +iconset.132x80x16: /.rockbox/icons/tango_small.bmp +iconset.138x110x2: /.rockbox/icons/tango_small_mono.bmp +iconset.160x128x16: /.rockbox/icons/tango_small.bmp +iconset.160x128x2: /.rockbox/icons/tango_small_mono.bmp +iconset.176x132x16: /.rockbox/icons/tango_small.bmp +iconset.176x220x16: /.rockbox/icons/tango_small.bmp +iconset.220x176x16: /.rockbox/icons/tango_small.bmp +iconset.240x320x16: /.rockbox/icons/tango_small.bmp + +#viewer icons +viewers iconset.320x240x16: /.rockbox/icons/tango_small_viewers.bmp +viewers iconset.128x128x16: /.rockbox/icons/tango_small_viewers.bmp +viewers iconset.132x80x16: /.rockbox/icons/tango_small_viewers.bmp +viewers iconset.138x110x2: /.rockbox/icons/tango_small_viewers_mono.bmp +viewers iconset.160x128x16: /.rockbox/icons/tango_small_viewers.bmp +viewers iconset.160x128x2: /.rockbox/icons/tango_small_viewers_mono.bmp +viewers iconset.176x132x16: /.rockbox/icons/tango_small_viewers.bmp +viewers iconset.176x220x16: /.rockbox/icons/tango_small_viewers.bmp +viewers iconset.220x176x16: /.rockbox/icons/tango_small_viewers.bmp +viewers iconset.240x320x16: /.rockbox/icons/tango_small_viewers.bmp + # Whether the WPS is designed to have the statusbar on or off Statusbar.320x240x16: on Statusbar.240x320x16: on @@ -265,6 +294,7 @@ Statusbar.138x110x2: on Statusbar.128x128x16: on Statusbar.132x80x16: on Statusbar.112x64x1: on + # The minimum required pixel height for the WPS # 176 for H3xx, 128 for H1xx, 64 for Recorder/Ondio, 14 for player Height.320x240x16: 240 @@ -278,6 +308,7 @@ Height.138x110x2: 110 Height.128x128x16: 128 Height.132x80x16: 80 Height.112x64x1: 64 + # The minimum required pixel width for the WPS (160 for iRiver, # 220 for H3xx, 160 for H1xx, 112 for Recorder/Ondio, 55 for player Width.320x240x16: 320 diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index e6cf6cc479..2cab5374f8 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl @@ -424,10 +424,18 @@ while() { $iconset = $1; copythemeicon(); } + elsif($l =~ /^iconset\.${main_width}x${main_height}x$main_depth: (.*)/i) { + $iconset = $1; + copythemeicon(); + } elsif($l =~ /^viewers iconset: (.*)/i) { $viewericon = $1; copythemeviewericon(); } + elsif($l =~ /^viewers iconset\.${main_width}x${main_height}x$main_depth: (.*)/i) { + $viewericon = $1; + copythemeviewericon(); + } elsif($l =~ /^line selector text color: (.*)/i) { $lineselecttextcolor = $1; }