summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2008-02-23 10:48:30 +0000
committerDave Chapman <dave@dchapman.com>2008-02-23 10:48:30 +0000
commite7e3172b5286deedc744946862baa655b3e03d35 (patch)
treed36506595de82bf85617d523b2d867f071d2a893
parent3716179a249513a5cbf3f0e50cb69d3668971f4a (diff)
downloadrockbox-e7e3172b5286deedc744946862baa655b3e03d35.zip
rockbox-e7e3172b5286deedc744946862baa655b3e03d35.tar.gz
rockbox-e7e3172b5286deedc744946862baa655b3e03d35.tar.bz2
rockbox-e7e3172b5286deedc744946862baa655b3e03d35.tar.xz
"viewers iconset:" must not be empty, so revert that change to wpsbuild.pl and make iCatcher specify /.rockbox/icons/viewers.bmp. Thanks to Jens for pointing this out.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16386 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--wps/WPSLIST2
-rwxr-xr-xwps/wpsbuild.pl8
2 files changed, 4 insertions, 6 deletions
diff --git a/wps/WPSLIST b/wps/WPSLIST
index e290287..79649f4 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -157,7 +157,7 @@ Background Color: FFFFFF
Statusbar: on
backdrop:
iconset:
-viewers iconset:
+viewers iconset: /.rockbox/icons/viewers.bmp
</wps>
<rwps>
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index cb9ccbf..a07909c 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -144,10 +144,8 @@ sub copythemeviewericon
{
#copy the viewer icon specified by the theme
- if ($viewericon ne '') {
- $viewericon =~ /\/(.*icons\/(.*))/i;
- `cp $ROOT/icons/$2 $1`;
- }
+ $viewericon =~ /\/(.*icons\/(.*))/i;
+ `cp $ROOT/icons/$2 $1`;
}
sub copywps
@@ -246,7 +244,7 @@ MOO
if(defined($iconset)) {
push @out, "iconset: $iconset\n";
}
- if(defined($viewericon)) {
+ if($viewericon) {
push @out, "viewers iconset: $viewericon\n";
}
if($lineselecttextcolor && $main_depth > 2 ) {