diff options
author | Dave Chapman <dave@dchapman.com> | 2008-02-23 10:48:30 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2008-02-23 10:48:30 +0000 |
commit | e7e3172b5286deedc744946862baa655b3e03d35 (patch) | |
tree | d36506595de82bf85617d523b2d867f071d2a893 | |
parent | 3716179a249513a5cbf3f0e50cb69d3668971f4a (diff) | |
download | rockbox-e7e3172b5286deedc744946862baa655b3e03d35.tar.gz rockbox-e7e3172b5286deedc744946862baa655b3e03d35.zip |
"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/WPSLIST | 2 | ||||
-rwxr-xr-x | wps/wpsbuild.pl | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/wps/WPSLIST b/wps/WPSLIST index e290287017..79649f4579 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST | |||
@@ -157,7 +157,7 @@ Background Color: FFFFFF | |||
157 | Statusbar: on | 157 | Statusbar: on |
158 | backdrop: | 158 | backdrop: |
159 | iconset: | 159 | iconset: |
160 | viewers iconset: | 160 | viewers iconset: /.rockbox/icons/viewers.bmp |
161 | </wps> | 161 | </wps> |
162 | 162 | ||
163 | <rwps> | 163 | <rwps> |
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index cb9ccbfc80..a07909ca77 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl | |||
@@ -144,10 +144,8 @@ sub copythemeviewericon | |||
144 | { | 144 | { |
145 | #copy the viewer icon specified by the theme | 145 | #copy the viewer icon specified by the theme |
146 | 146 | ||
147 | if ($viewericon ne '') { | 147 | $viewericon =~ /\/(.*icons\/(.*))/i; |
148 | $viewericon =~ /\/(.*icons\/(.*))/i; | 148 | `cp $ROOT/icons/$2 $1`; |
149 | `cp $ROOT/icons/$2 $1`; | ||
150 | } | ||
151 | } | 149 | } |
152 | 150 | ||
153 | sub copywps | 151 | sub copywps |
@@ -246,7 +244,7 @@ MOO | |||
246 | if(defined($iconset)) { | 244 | if(defined($iconset)) { |
247 | push @out, "iconset: $iconset\n"; | 245 | push @out, "iconset: $iconset\n"; |
248 | } | 246 | } |
249 | if(defined($viewericon)) { | 247 | if($viewericon) { |
250 | push @out, "viewers iconset: $viewericon\n"; | 248 | push @out, "viewers iconset: $viewericon\n"; |
251 | } | 249 | } |
252 | if($lineselecttextcolor && $main_depth > 2 ) { | 250 | if($lineselecttextcolor && $main_depth > 2 ) { |