From 93023002d6c0f2a5445c1566d74a631ccadeffce Mon Sep 17 00:00:00 2001
From: Alex Mayer <magictrick4906@aim.com>
Date: Fri, 5 Oct 2012 12:17:52 -0400
Subject: [PATCH] Make Cabbiev2 enable icons when selected

adds 'show icons: on' to cabbiev2.cfg file.
when you switch theme away from cabbiev2 to a theme
with 'show icons: off' then switch back to cabbiev2
the icons are still off which doesnt mimic the default
settings presented by rockbox.

Change-Id: Iee051c687a9a6843fece96a2a16280916b1d2599
Reviewed-on: http://gerrit.rockbox.org/325
Reviewed-by: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Reviewed-by: Thomas Martitz <kugel@rockbox.org>
---
 wps/WPSLIST     | 1 +
 wps/wpsbuild.pl | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/wps/WPSLIST b/wps/WPSLIST
index 0d194585be..3b10c3002b 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -199,6 +199,7 @@ viewers iconset.240x400x16:  icons/tango_icons_viewers.16x16.bmp
 viewers iconset.96x96x16:    icons/tango_icons_viewers.8x8.bmp
 viewers iconset..+x2:        icons/tango_small_viewers_mono.bmp
 
+show icons: on
 statusbar: top
 ui viewport: -
 </main>
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index 6df35df585..52a2f4c01f 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -64,6 +64,7 @@ my $selecttype;
 my $iconset;
 my $remoteiconset;
 my $viewericon;
+my $showicons;
 my $remoteviewericon;
 my $lineselecttextcolor;
 my $filetylecolor;
@@ -295,6 +296,7 @@ MOO
     push @out, "statusbar: $statusbar\n"        if (defined($statusbar));
     push @out, "iconset: $iconset\n"            if (defined($iconset));
     push @out, "viewers iconset: $viewericon\n" if (defined($viewericon));
+    push @out, "show icons: $showicons\n"       if (defined($viewericon) && defined($showicons));
     push @out, "ui viewport: $listviewport\n"   if (defined($listviewport));
 
     if ($has_remote) {
@@ -411,6 +413,7 @@ while(<WPS>) {
         undef $iconset;
         undef $remoteiconset;
         undef $viewericon;
+        undef $showicons;
         undef $remoteviewericon;
         undef $lineselecttextcolor;
         undef $filetylecolor;
@@ -487,6 +490,9 @@ while(<WPS>) {
             elsif($_ = check_res($l, "viewers iconset")) {
                 $viewericon = $_;
             }
+            elsif($l =~ /^show icons: *(.*)/i) {
+                $showicons = $1;
+            }
             elsif($l =~ /^line selector text color: *(.*)/i) {
                 $lineselecttextcolor = $1;
             }