Turned out that setting the viewer iconset to empty properly chooses the default iconset, and the problem with the default viewer iconset on greyscale targets was that there was a file too much in icons/. The defaults are copied from elsewhere, and differ between grey/mono and colour targets. The extraneous file overwrote the default when building the .zip.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16399 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 15 insertions, 13 deletions

diff --git a/icons/viewers.bmp b/icons/viewers.bmp
deleted file mode 100644
index 9b039b1217..0000000000
--- a/icons/viewers.bmp
+++ /dev/null
diff --git a/wps/WPSLIST b/wps/WPSLIST
index c7fab9e6cf..52d81a6ab7 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -51,7 +51,7 @@ Foreground Color: 000000
 Background Color: B6C6E5
 backdrop:
 iconset:
-viewers iconset: /.rockbox/icons/viewers.bmp
+viewers iconset:
 selector type: bar (inverse)
 </wps>
 
@@ -66,7 +66,7 @@ Foreground Color: 000000
 Background Color: B6C6E5
 backdrop:
 iconset:
-viewers iconset: /.rockbox/icons/viewers.bmp
+viewers iconset:
 selector type: bar (inverse)
 </wps>
 
@@ -78,7 +78,7 @@ Font: nedore-8.fnt
 Statusbar: on
 backdrop:
 iconset:
-viewers iconset: /.rockbox/icons/viewers.bmp
+viewers iconset:
 selector type: bar (inverse)
 </wps>
 
@@ -89,7 +89,7 @@ Author: Raymond Hoh
 Font: nimbus-12.fnt
 backdrop:
 iconset:
-viewers iconset: /.rockbox/icons/viewers.bmp
+viewers iconset:
 selector type: bar (inverse)
 Statusbar: on
 </wps>
@@ -102,7 +102,7 @@ Font: nedore-8.fnt
 Statusbar: on
 backdrop:
 iconset:
-viewers iconset: /.rockbox/icons/viewers.bmp
+viewers iconset:
 selector type: bar (inverse)
 </wps>
 
@@ -149,7 +149,7 @@ Font: nimbus-13.fnt
 Statusbar: on
 backdrop:
 iconset:
-viewers iconset: /.rockbox/icons/viewers.bmp
+viewers iconset:
 selector type: bar (inverse)
 </wps>
 
@@ -170,7 +170,7 @@ Foreground Color: 000000
 Background Color: B6C6E5
 backdrop:
 iconset:
-viewers iconset: /.rockbox/icons/viewers.bmp
+viewers iconset:
 selector type: bar (inverse)
 </wps>
 
@@ -201,7 +201,7 @@ Background Color: FFFFFF
 Statusbar: on
 backdrop:
 iconset:
-viewers iconset: /.rockbox/icons/viewers.bmp
+viewers iconset:
 selector type: bar (inverse)
 </wps>
 
@@ -223,7 +223,7 @@ Background Color: FFFFFF
 Statusbar: on
 backdrop:
 iconset:
-viewers iconset: /.rockbox/icons/viewers.bmp
+viewers iconset:
 selector type: bar (inverse)
 </wps>
 
@@ -254,7 +254,7 @@ Background Color: FFC000
 Statusbar: on
 backdrop:
 iconset:
-viewers iconset: /.rockbox/icons/viewers.bmp
+viewers iconset:
 selector type: bar (inverse)
 </wps>
 
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index a07909ca77..cb9ccbfc80 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -144,8 +144,10 @@ sub copythemeviewericon
 {
     #copy the viewer icon specified by the theme
 
-    $viewericon =~ /\/(.*icons\/(.*))/i;
-    `cp $ROOT/icons/$2 $1`;
+    if ($viewericon ne '') {
+        $viewericon =~ /\/(.*icons\/(.*))/i;
+        `cp $ROOT/icons/$2 $1`;
+    }
 }
 
 sub copywps
@@ -244,7 +246,7 @@ MOO
     if(defined($iconset)) {
         push @out, "iconset: $iconset\n";
     }
-    if($viewericon) {
+    if(defined($viewericon)) {
         push @out, "viewers iconset: $viewericon\n";
     }
     if($lineselecttextcolor && $main_depth > 2 ) {