diff options
| -rw-r--r-- | wps/WPSLIST | 22 | ||||
| -rwxr-xr-x | wps/wpsbuild.pl | 25 |
2 files changed, 25 insertions, 22 deletions
diff --git a/wps/WPSLIST b/wps/WPSLIST index 08171aa..f39212b 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST @@ -233,17 +233,17 @@ line selector end color: b58c00 line selector text color: 000000 filetype colours: - -#backdrop -backdrop.320x240x16: /.rockbox/backdrops/cabbiev2.320x240x16.bmp -backdrop.128x128x16: /.rockbox/backdrops/cabbiev2.128x128x16.bmp -backdrop.132x80x16: /.rockbox/backdrops/cabbiev2.132x80x16.bmp -backdrop.138x110x2: /.rockbox/backdrops/cabbiev2.138x110x2.bmp -backdrop.160x128x16: /.rockbox/backdrops/cabbiev2.160x128x16.bmp -backdrop.160x128x2: /.rockbox/backdrops/cabbiev2.160x128x2.bmp -backdrop.176x132x16: /.rockbox/backdrops/cabbiev2.176x132x16.bmp -backdrop.176x220x16: /.rockbox/backdrops/cabbiev2.176x220x16.bmp -backdrop.220x176x16: /.rockbox/backdrops/cabbiev2.220x176x16.bmp -backdrop.240x320x16: /.rockbox/backdrops/cabbiev2.240x320x16.bmp +#backdrop - remember this is the source file name in your SVN folder, not dest name! +backdrop.320x240x16: backdrops/cabbiev2.320x240x16.bmp +backdrop.128x128x16: backdrops/cabbiev2.128x128x16.bmp +backdrop.132x80x16: backdrops/cabbiev2.132x80x16.bmp +backdrop.138x110x2: backdrops/cabbiev2.138x110x2.bmp +backdrop.160x128x16: backdrops/cabbiev2.160x128x16.bmp +backdrop.160x128x2: backdrops/cabbiev2.160x128x2.bmp +backdrop.176x132x16: backdrops/cabbiev2.176x132x16.bmp +backdrop.176x220x16: backdrops/cabbiev2.176x220x16.bmp +backdrop.220x176x16: backdrops/cabbiev2.220x176x16.bmp +backdrop.240x320x16: backdrops/cabbiev2.240x320x16.bmp #selection bar settings for color targets selector type.320x240x16: bar (gradient) diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index 2cab537..7218250 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl @@ -27,7 +27,7 @@ my $firmdir="$ROOT/firmware"; my $wpslist=$ARGV[0]; my $target = $ARGV[1]; -my $cppdef = $target; +my $cppdef = $target; my @depthlist = ( 16, 8, 4, 2, 1 ); if(!$wpslist) { @@ -108,9 +108,10 @@ sub mkdirs { sub copybackdrop { #copy the backdrop file into the build dir - - $backdrop =~ /\/(.*backdrops\/(.*))/i; - `cp $ROOT/backdrops/$2 $1`; + $dst = $backdrop; + $dst =~ s/(\.[0-9]*x[0-9]*x[0-9]*)//; + $cmd = "cp $ROOT/$backdrop .rockbox/$dst"; + `$cmd`; } sub copythemefont { @@ -203,22 +204,24 @@ MOO if($font) { push @out, "font: /.rockbox/fonts/$font\n"; } - if($fgcolor) { + if($fgcolor && $main_depth > 2) { push @out, "foreground color: $fgcolor\n"; } - if($bgcolor) { + if($bgcolor && $main_depth > 2) { push @out, "background color: $bgcolor\n"; } if($statusbar) { push @out, "statusbar: $statusbar\n"; } if($backdrop) { - push @out, "backdrop: $backdrop\n"; + #clip resolution from filename + $backdrop =~ s/(\.[0-9]*x[0-9]*x[0-9]*)//; + push @out, "backdrop: /.rockbox/$backdrop\n"; } - if($lineselectstart) { + if($lineselectstart && $main_depth > 2) { push @out, "line selector start color: $lineselectstart\n"; } - if($lineselectend) { + if($lineselectend && $main_depth > 2) { push @out, "line selector end color: $lineselectend\n"; } if($selecttype) { @@ -230,10 +233,10 @@ MOO if($viewericon) { push @out, "viewers iconset: $viewericon\n"; } - if($lineselecttextcolor) { + if($lineselecttextcolor && $main_depth > 2 ) { push @out, "line selector text color: $lineselecttextcolor\n"; } - if($filetylecolor) { + if($filetylecolor && $main_depth > 2) { push @out, "filetype colours: $filetylecolor\n"; } if($rwps && $has_remote ) { |