diff options
author | Alex Mayer <magictrick4906@aim.com> | 2012-10-05 12:17:52 -0400 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-10-06 22:59:20 +0200 |
commit | 93023002d6c0f2a5445c1566d74a631ccadeffce (patch) | |
tree | 3d71db27f8414fcd624b128b2b5335d13203e2d5 | |
parent | a0293c7e94acc6b13ee19d8f5dab75218bdb91b4 (diff) | |
download | rockbox-93023002d6c0f2a5445c1566d74a631ccadeffce.tar.gz rockbox-93023002d6c0f2a5445c1566d74a631ccadeffce.zip |
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>
-rw-r--r-- | wps/WPSLIST | 1 | ||||
-rwxr-xr-x | wps/wpsbuild.pl | 6 |
2 files changed, 7 insertions, 0 deletions
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 | |||
199 | viewers iconset.96x96x16: icons/tango_icons_viewers.8x8.bmp | 199 | viewers iconset.96x96x16: icons/tango_icons_viewers.8x8.bmp |
200 | viewers iconset..+x2: icons/tango_small_viewers_mono.bmp | 200 | viewers iconset..+x2: icons/tango_small_viewers_mono.bmp |
201 | 201 | ||
202 | show icons: on | ||
202 | statusbar: top | 203 | statusbar: top |
203 | ui viewport: - | 204 | ui viewport: - |
204 | </main> | 205 | </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; | |||
64 | my $iconset; | 64 | my $iconset; |
65 | my $remoteiconset; | 65 | my $remoteiconset; |
66 | my $viewericon; | 66 | my $viewericon; |
67 | my $showicons; | ||
67 | my $remoteviewericon; | 68 | my $remoteviewericon; |
68 | my $lineselecttextcolor; | 69 | my $lineselecttextcolor; |
69 | my $filetylecolor; | 70 | my $filetylecolor; |
@@ -295,6 +296,7 @@ MOO | |||
295 | push @out, "statusbar: $statusbar\n" if (defined($statusbar)); | 296 | push @out, "statusbar: $statusbar\n" if (defined($statusbar)); |
296 | push @out, "iconset: $iconset\n" if (defined($iconset)); | 297 | push @out, "iconset: $iconset\n" if (defined($iconset)); |
297 | push @out, "viewers iconset: $viewericon\n" if (defined($viewericon)); | 298 | push @out, "viewers iconset: $viewericon\n" if (defined($viewericon)); |
299 | push @out, "show icons: $showicons\n" if (defined($viewericon) && defined($showicons)); | ||
298 | push @out, "ui viewport: $listviewport\n" if (defined($listviewport)); | 300 | push @out, "ui viewport: $listviewport\n" if (defined($listviewport)); |
299 | 301 | ||
300 | if ($has_remote) { | 302 | if ($has_remote) { |
@@ -411,6 +413,7 @@ while(<WPS>) { | |||
411 | undef $iconset; | 413 | undef $iconset; |
412 | undef $remoteiconset; | 414 | undef $remoteiconset; |
413 | undef $viewericon; | 415 | undef $viewericon; |
416 | undef $showicons; | ||
414 | undef $remoteviewericon; | 417 | undef $remoteviewericon; |
415 | undef $lineselecttextcolor; | 418 | undef $lineselecttextcolor; |
416 | undef $filetylecolor; | 419 | undef $filetylecolor; |
@@ -487,6 +490,9 @@ while(<WPS>) { | |||
487 | elsif($_ = check_res($l, "viewers iconset")) { | 490 | elsif($_ = check_res($l, "viewers iconset")) { |
488 | $viewericon = $_; | 491 | $viewericon = $_; |
489 | } | 492 | } |
493 | elsif($l =~ /^show icons: *(.*)/i) { | ||
494 | $showicons = $1; | ||
495 | } | ||
490 | elsif($l =~ /^line selector text color: *(.*)/i) { | 496 | elsif($l =~ /^line selector text color: *(.*)/i) { |
491 | $lineselecttextcolor = $1; | 497 | $lineselecttextcolor = $1; |
492 | } | 498 | } |