Adds support for reverting to the Rockbox default WPS. Note that the rockbox_default.wps is a placeholder file and is never actually loaded - selecting it just causes Rockbox to clear its memory of any installed custom WPS. This means that it works cross platform. Also, small fix to boxes.wps (curse vi) and wpsbuild.pl - support for pure text WPS files.

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

5 files changed, 17 insertions, 21 deletions

diff --git a/wps/WPSLIST b/wps/WPSLIST
index 2752719b35..91d38c1ae3 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -1,4 +1,4 @@
-<wps>ZZ
+<wps>
 # Name of the WPS _including_ extension
 Name: ipodVOL.wps
 # Name of the creator of the WPS
@@ -14,6 +14,15 @@ Width: 160
 </wps>
 
 <wps>
+Name: rockbox_default.wps
+Author: Rockbox team
+Font: rockbox_default.fnt
+Statusbar: on
+Height: 2
+Width: 8
+</wps>
+
+<wps>
 Name: boxes.wps
 Author: Christi Scarborough (after the_engineer)
 Font: rockbox_default.fnt
@@ -21,12 +30,3 @@ Statusbar: off
 Height: 128
 Width: 160
 </wps>
-
-<wps>
-Name: default.wps
-Author: Rockbox team
-Font: rockbox_default.fnt
-Statusbar: on
-Height: 64
-Width: 112
-</wps>
diff --git a/wps/boxes.wps b/wps/boxes.wps
index 14734dced5..158d028e81 100755
--- a/wps/boxes.wps
+++ b/wps/boxes.wps
@@ -1,4 +1,4 @@
-x%x|a|bg.bmp|0|0|
+%x|a|bg.bmp|0|0|
 %xl|b|cdc-mp1.bmp|40|70|
 %xl|c|cdc-mp2.bmp|40|70|
 %xl|d|cdc-mp3.bmp|40|70|
@@ -74,4 +74,4 @@ x%x|a|bg.bmp|0|0|
 %?ps<%xdu|>
 %?mh<%xdv|>
 %?mr<%xdx|>
-%?rr<%xdA|%xdM|%xdN|%xdU|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdw|%xdy>
\ No newline at end of file
+%?rr<%xdA|%xdM|%xdN|%xdU|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdw|%xdy>
diff --git a/wps/default.wps b/wps/default.wps
deleted file mode 100644
index 07018eea9d..0000000000
--- a/wps/default.wps
+++ /dev/null
@@ -1,8 +0,0 @@
-%s%?it<%?in<%in. |>%it|%fn>
-%s%?ia<%ia|%?d2<%d2|(root)>>
-%s%?id<%id|%?d1<%d1|(root)>> %?iy<(%iy)|>
-
-%al%pc/%pt%ar[%pp:%pe]
-%fbkBit %?fv<avg|> %?iv<(id3v%iv)|(no id3)>
-%pb
-%pm
diff --git a/wps/rockbox_default.wps b/wps/rockbox_default.wps
new file mode 100644
index 0000000000..b1427cab84
--- /dev/null
+++ b/wps/rockbox_default.wps
@@ -0,0 +1,2 @@
+# Dummy file to allow Rockbox to reset to the default WPS config.
+# Do not edit this file.  It's never actually loaded by Rockbox.
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index 11856436cc..a8e325fde7 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -88,7 +88,9 @@ sub copywps {
         my $wpsdir = $wps;
         $wpsdir =~ s/\.wps//;
         system("cp $dir/$wps .rockbox/wps/");
-        system("cp $dir/$wpsdir/*.bmp .rockbox/wps/$wpsdir/");
+        if (-e "$dir/$wpsdir") {
+           system("cp $dir/$wpsdir/*.bmp .rockbox/wps/$wpsdir/");
+        }
     }
     else {
         print STDERR "beep, no dir to copy WPS from!\n";