diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-02-21 19:10:57 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-02-21 19:10:57 +0000 |
commit | d401d7bc5528360130746e4511e03068821cc3af (patch) | |
tree | 4cde2edaeb8f72d72a84ad7121f4febcd2417963 | |
parent | f85103e8f2fe19b8e4495bc0317dd853f6aca23a (diff) | |
download | rockbox-d401d7bc5528360130746e4511e03068821cc3af.tar.gz rockbox-d401d7bc5528360130746e4511e03068821cc3af.zip |
Fix wpsbuild to properly generate "-" for theme related settings (to get the default values/no file for filename settings).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24813 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | wps/WPSLIST | 34 | ||||
-rwxr-xr-x | wps/wpsbuild.pl | 44 |
2 files changed, 53 insertions, 25 deletions
diff --git a/wps/WPSLIST b/wps/WPSLIST index 9b52416ec2..e6dc238466 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST @@ -73,8 +73,8 @@ backdrop: iconset: viewers iconset: selector type: bar (inverse) -ui viewport: - -remote ui viewport: - +ui viewport: +remote ui viewport: </wps> <wps> @@ -89,8 +89,8 @@ backdrop: iconset: viewers iconset: selector type: bar (inverse) -ui viewport: - -remote ui viewport: - +ui viewport: +remote ui viewport: </wps> <wps> @@ -105,8 +105,8 @@ iconset: viewers iconset: selector type: bar (inverse) Statusbar: top -ui viewport: - -remote ui viewport: - +ui viewport: +remote ui viewport: </wps> <wps> @@ -174,8 +174,8 @@ backdrop: iconset: viewers iconset: selector type: bar (inverse) -ui viewport: - -remote ui viewport: - +ui viewport: +remote ui viewport: </wps> <rwps> @@ -211,8 +211,8 @@ backdrop: iconset: viewers iconset: selector type: bar (inverse) -ui viewport: - -remote ui viewport: - +ui viewport: +remote ui viewport: </wps> <rwps> @@ -237,8 +237,8 @@ backdrop: iconset: viewers iconset: selector type: bar (inverse) -ui viewport: - -remote ui viewport: - +ui viewport: +remote ui viewport: </wps> <rwps> @@ -274,8 +274,8 @@ backdrop: iconset: viewers iconset: selector type: bar (inverse) -ui viewport: - -remote ui viewport: - +ui viewport: +remote ui viewport: </wps> <wps> @@ -313,7 +313,7 @@ background color: 000000 line selector start color: fde89e line selector end color: b58c00 line selector text color: 000000 -filetype colours: - +filetype colours: #backdrop - remember this is the source file name in your SVN folder, not dest name! backdrop.320x240x16: backdrops/cabbiev2.320x240x16.bmp @@ -372,8 +372,8 @@ Statusbar: top remote statusbar: top # list & remote ui viewports -ui viewport: - -remote ui viewport: - +ui viewport: +remote ui viewport: </wps> <rwps> diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index 7cc5367381..81a90f3c04 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl @@ -274,7 +274,7 @@ MOO push @out, "sbs: /$rbdir/wps/$sbs\n"; } } - if(defined($sbs) && $has_remote) { + if(defined($rsbs) && $has_remote) { if ($rsbs eq '') { push @out, "rsbs: -\n"; } else { @@ -282,7 +282,11 @@ MOO } } if($font) { - push @out, "font: /$rbdir/fonts/$font\n"; + if ($font eq '') { + push @out, "font: -\n"; + } else { + push @out, "font: /$rbdir/fonts/$font\n"; + } } if($fgcolor && $main_depth > 2) { push @out, "foreground color: $fgcolor\n"; @@ -315,25 +319,49 @@ MOO push @out, "selector type: $selecttype\n"; } if(defined($iconset)) { - push @out, "iconset: $iconset\n"; + if ($iconset eq '') { + push @out, "iconset: -\n"; + } else { + push @out, "iconset: $iconset\n"; + } } if(defined($viewericon)) { - push @out, "viewers iconset: $viewericon\n"; + if ($viewericon eq '') { + push @out, "viewers iconset: -\n"; + } else { + push @out, "viewers iconset: $viewericon\n"; + } } if($lineselecttextcolor && $main_depth > 2 ) { push @out, "line selector text color: $lineselecttextcolor\n"; } if($filetylecolor && $main_depth > 2) { - push @out, "filetype colours: $filetylecolor\n"; + if ($filetylecolor eq '') { + push @out, "filetype colours: -\n"; + } else { + push @out, "filetype colours: $filetylecolor\n"; + } } if($rwps && $has_remote ) { - push @out, "rwps: /$rbdir/wps/$rwps\n"; + if ($rwps eq '') { + push @out, "rwps: -\n"; + } else { + push @out, "rwps: /$rbdir/wps/$rwps\n"; + } } if(defined($listviewport)) { - push @out, "ui viewport: $listviewport\n"; + if ($listviewport eq '') { + push @out, "ui viewport: -\n"; + } else { + push @out, "ui viewport: $listviewport\n"; + } } if(defined($remotelistviewport) && $has_remote) { - push @out, "remote ui viewport: $listviewport\n"; + if ($remotelistviewport eq '') { + push @out, "remote ui viewport: -\n"; + } else { + push @out, "remote ui viewport: $listviewport\n"; + } } if(-f "$rbdir/wps/$cfg") { print STDERR "wpsbuild warning: wps/$cfg already exists!\n"; |