Cabbiev2 cleanup and a few corrections: (1) Get rid of two completely unused bitmaps. (2) Combine the two bitmaps used as background on the Iriver remote into one, name it consistently and change the .wps file accordingly. (3) Add the missing '0dB' volume image to the greyscale versions, including .wps file changes. Rename those greyscale volume images while at it, so that they are consistent with the rest - the 'vol08' one is now 'vol-9', because it is used for above line level. (4) Use the %X tag correctly, currently there were coordinates specified with it in most .wps files. (5) Set the bitmap's mime-type correctly for conformity.

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

wps/cabbiev2.128x128x16.wps

@@ -2,7 +2,7 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-128x128x16.bmp|0|0|
+%X|wpsbackdrop-128x128x16.bmp|
 %P|pb-128x128x16.bmp|
 %xl|A|lockclosed-128x128x16.bmp|3|110|
 %xl|B|lockopen-128x128x16.bmp|3|110|

wps/cabbiev2.128x64x1.wps

@@ -1,14 +1,13 @@
-# cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy)
+# cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy)
-# derived from cabbie 2.0 default rwps (C) 2007, Marc Guay
+# derived from cabbie 2.0 default rwps (C) 2007, Marc Guay
-%wd
+%wd
-%P|pbar-128x64x1.bmp|
+%P|pbar-128x64x1.bmp|
-%x|A|ebar-128x64x1.bmp|4|38|
+%x|A|wpsbackdrop-128x64x1.bmp|0|0|
-%xl|B|npbar-128x64x1.bmp|4|2|
+%pb|8|4|123|38|
-%pb|8|4|123|38|
+%s%ac%?it<%it|%fn>
-%s%ac%?it<%it|%fn>
+%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
+
-
+%al   %pc%ar%pr   
-%al   %pc%ar%pr   
+
-
 %xdB  
 

wps/cabbiev2.128x96x2.wps

@@ -1,7 +1,7 @@
 # cabbie 2.0 default for the iAudio X5 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%X|background-128x96x2.bmp|0|0|
+%X|wpsbackdrop-128x96x2.bmp|
 %P|pb-128x96x2.bmp|
 %pb|8|4|122|76|
 %s%ac%?it<%it|%fn>
@@ -11,4 +11,3 @@
 %sNext: %ac%It
 
 %al   %pc%ar%pr   
-

wps/cabbiev2.132x80x16.wps

@@ -1,7 +1,7 @@
 # cabbie 2.0 default for the Sansa c200 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%X|wpsbackdrop-132x80x16.bmp|0|0|
+%X|wpsbackdrop-132x80x16.bmp|
 %P|pb-132x80x16.bmp|
 %xl|A|lockclosed-132x80x16.bmp|36|69|
 %xl|B|lockopen-132x80x16.bmp|36|69|

wps/cabbiev2.138x110x2.wps

@@ -1,53 +1,54 @@
 # cabbie 2.0 default
 # ported from 160*128 greyscale port by Mark Fawcus (yapper)
-# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-# derived from "cabbie" (C) Yohann Misquitta
+# derived from "cabbie" (C) Yohann Misquitta
-%wd
+%wd
-%X|wpsbackdrop-138x110x2.bmp|0|0|
+%X|wpsbackdrop-138x110x2.bmp|
-%P|pb-138x110x2.bmp|
+%P|pb-138x110x2.bmp|
-%xl|A|lockclosed-160x128x2.bmp|2|96|
+%xl|A|lockclosed-160x128x2.bmp|2|96|
-%xl|B|lockopen-160x128x2.bmp|2|96|
+%xl|B|lockopen-160x128x2.bmp|2|96|
-%xl|C|battpl-160x128x2.bmp|26|98|
+%xl|C|battpl-160x128x2.bmp|26|98|
-%xl|D|battch-160x128x2.bmp|26|98|
+%xl|D|battch-160x128x2.bmp|26|98|
-%xl|E|batt00-160x128x2.bmp|26|98|
+%xl|E|batt00-160x128x2.bmp|26|98|
-%xl|F|batt01-160x128x2.bmp|26|98|
+%xl|F|batt01-160x128x2.bmp|26|98|
-%xl|G|batt02-160x128x2.bmp|26|98|
+%xl|G|batt02-160x128x2.bmp|26|98|
-%xl|H|batt03-160x128x2.bmp|26|98|
+%xl|H|batt03-160x128x2.bmp|26|98|
-%xl|I|batt04-160x128x2.bmp|26|98|
+%xl|I|batt04-160x128x2.bmp|26|98|
-%xl|J|batt05-160x128x2.bmp|26|98|
+%xl|J|batt05-160x128x2.bmp|26|98|
-%xl|K|batt06-160x128x2.bmp|26|98|
+%xl|K|batt06-160x128x2.bmp|26|98|
-%xl|L|batt07-160x128x2.bmp|26|98|
+%xl|L|batt07-160x128x2.bmp|26|98|
-%xl|M|vol00-160x128x2.bmp|54|98|
+%xl|M|vol0-160x128x2.bmp|54|98|
-%xl|N|vol01-160x128x2.bmp|54|98|
+%xl|N|vol1-160x128x2.bmp|54|98|
-%xl|O|vol02-160x128x2.bmp|54|98|
+%xl|O|vol2-160x128x2.bmp|54|98|
-%xl|P|vol03-160x128x2.bmp|54|98|
+%xl|P|vol3-160x128x2.bmp|54|98|
-%xl|p|vol04-160x128x2.bmp|54|98|
+%xl|p|vol4-160x128x2.bmp|54|98|
-%xl|q|vol05-160x128x2.bmp|54|98|
+%xl|q|vol5-160x128x2.bmp|54|98|
-%xl|r|vol06-160x128x2.bmp|54|98|
+%xl|r|vol6-160x128x2.bmp|54|98|
-%xl|s|vol07-160x128x2.bmp|54|98|
+%xl|s|vol7-160x128x2.bmp|54|98|
-%xl|t|vol08-160x128x2.bmp|54|98|
+%xl|t|vol8-160x128x2.bmp|54|98|
-%xl|Q|shuffle-160x128x2.bmp|86|97|
+%xl|u|vol9-160x128x2.bmp|54|98|
-%xl|R|repeatall-160x128x2.bmp|107|95|
+%xl|Q|shuffle-160x128x2.bmp|86|97|
+%xl|R|repeatall-160x128x2.bmp|107|95|
 %xl|S|repeatone-160x128x2.bmp|107|95|
-%xl|T|repeatshuffle-160x128x2.bmp|107|95|
+%xl|T|repeatshuffle-160x128x2.bmp|107|95|
-%xl|U|repeatab-160x128x2.bmp|107|95|
+%xl|U|repeatab-160x128x2.bmp|107|95|
-%xl|V|stop-160x128x2.bmp|124|97|
+%xl|V|stop-160x128x2.bmp|124|97|
-%xl|W|play-160x128x2.bmp|124|97|
+%xl|W|play-160x128x2.bmp|124|97|
-%xl|X|pause-160x128x2.bmp|124|97|
+%xl|X|pause-160x128x2.bmp|124|97|
-%xl|Y|ff-160x128x2.bmp|124|97|
+%xl|Y|ff-160x128x2.bmp|124|97|
-%xl|Z|rew-160x128x2.bmp|124|97|
+%xl|Z|rew-160x128x2.bmp|124|97|
-%Cl|5|15|s55|s55|
+%Cl|5|15|s55|s55|
-%pb|6|2|136|75|
+%pb|6|2|136|75|
-%?C<%s%m|65|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
+%?C<%s%m|65|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
 %?C<%s%m|65|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
 %?C<%s%m|65|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>>
 %?C<%s%m|65|%alNext Track:|%acNext Track:>
-%?C<%s%m|65|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
+%?C<%s%m|65|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
-
+
-%al %pc%ac%pp of %pe%ar%pr 
+%al %pc%ac%pp of %pe%ar%pr 
-%?mh<%xdA|%xdB>
+%?mh<%xdA|%xdB>
 %?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>
-%?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt>
+%?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt|%xdu>
 %?ps<%xdQ>
 %?mm<|%xdR|%xdS|%xdT|%xdU>
 %?mp<%xdV|%xdW|%xdX|%xdY|%xdZ>

wps/cabbiev2.160x128x1.wps

@@ -4,7 +4,7 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 # derived from "cabbie" (C) Yohann Misquitta
 %wd
-%x|z|wpsbackdrop-160x128x1.bmp|0|0|
+%X|wpsbackdrop-160x128x2.bmp|
 %P|pb-160x128x1.bmp|
 %xl|A|lockclosed-160x128x1.bmp|48|114|
 %xl|B|lockopen-160x128x1.bmp|48|114|

wps/cabbiev2.160x128x16.wps

@@ -3,7 +3,7 @@
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
 %P|pb-160x128x16.bmp|
-%X|wpsbackdrop-160x128x16.bmp|0|0|
+%X|wpsbackdrop-160x128x16.bmp|
 %xl|A|lockclosed-160x128x16.bmp|48|114|
 %xl|B|lockopen-160x128x16.bmp|47|114|
 %xl|C|battpl-160x128x16.bmp|66|115|

wps/cabbiev2.160x128x2.wps

@@ -1,45 +1,46 @@
 # cabbie 2.0 default
 # 160*128 greyscale port by Mark Fawcus (yapper)
 # works with 64*64 album art if present
-# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-# derived from "cabbie" (C) Yohann Misquitta
+# derived from "cabbie" (C) Yohann Misquitta
-%wd
+%wd
-%X|wpsbackdrop-160x128x2.bmp|0|0|
+%X|wpsbackdrop-160x128x2.bmp|
-%P|pb-160x128x2.bmp|
+%P|pb-160x128x2.bmp|
-%xl|A|lockclosed-160x128x2.bmp|56|114|
+%xl|A|lockclosed-160x128x2.bmp|56|114|
-%xl|B|lockopen-160x128x2.bmp|56|114|
+%xl|B|lockopen-160x128x2.bmp|56|114|
-%xl|C|battpl-160x128x2.bmp|74|115|
+%xl|C|battpl-160x128x2.bmp|74|115|
-%xl|D|battch-160x128x2.bmp|74|115|
+%xl|D|battch-160x128x2.bmp|74|115|
-%xl|E|batt00-160x128x2.bmp|74|115|
+%xl|E|batt00-160x128x2.bmp|74|115|
-%xl|F|batt01-160x128x2.bmp|74|115|
+%xl|F|batt01-160x128x2.bmp|74|115|
-%xl|G|batt02-160x128x2.bmp|74|115|
+%xl|G|batt02-160x128x2.bmp|74|115|
-%xl|H|batt03-160x128x2.bmp|74|115|
+%xl|H|batt03-160x128x2.bmp|74|115|
-%xl|I|batt04-160x128x2.bmp|74|115|
+%xl|I|batt04-160x128x2.bmp|74|115|
-%xl|J|batt05-160x128x2.bmp|74|115|
+%xl|J|batt05-160x128x2.bmp|74|115|
-%xl|K|batt06-160x128x2.bmp|74|115|
+%xl|K|batt06-160x128x2.bmp|74|115|
-%xl|L|batt07-160x128x2.bmp|74|115|
+%xl|L|batt07-160x128x2.bmp|74|115|
-%xl|M|vol00-160x128x2.bmp|95|115|
+%xl|M|vol0-160x128x2.bmp|95|115|
-%xl|N|vol01-160x128x2.bmp|95|115|
+%xl|N|vol1-160x128x2.bmp|95|115|
-%xl|O|vol02-160x128x2.bmp|95|115|
+%xl|O|vol2-160x128x2.bmp|95|115|
-%xl|P|vol03-160x128x2.bmp|95|115|
+%xl|P|vol3-160x128x2.bmp|95|115|
-%xl|p|vol04-160x128x2.bmp|95|115|
+%xl|p|vol4-160x128x2.bmp|95|115|
-%xl|q|vol05-160x128x2.bmp|95|115|
+%xl|q|vol5-160x128x2.bmp|95|115|
-%xl|r|vol06-160x128x2.bmp|95|115|
+%xl|r|vol6-160x128x2.bmp|95|115|
-%xl|s|vol07-160x128x2.bmp|95|115|
+%xl|s|vol7-160x128x2.bmp|95|115|
-%xl|t|vol08-160x128x2.bmp|95|115|
+%xl|t|vol8-160x128x2.bmp|95|115|
-%xl|Q|shuffle-160x128x2.bmp|117|115|
+%xl|u|vol9-160x128x2.bmp|95|115|
-%xl|R|repeatall-160x128x2.bmp|131|113|
+%xl|Q|shuffle-160x128x2.bmp|117|115|
-%xl|S|repeatone-160x128x2.bmp|131|113|
+%xl|R|repeatall-160x128x2.bmp|131|113|
-%xl|T|repeatshuffle-160x128x2.bmp|131|113|
+%xl|S|repeatone-160x128x2.bmp|131|113|
-%xl|U|repeatab-160x128x2.bmp|131|114|
+%xl|T|repeatshuffle-160x128x2.bmp|131|113|
-%xl|V|stop-160x128x2.bmp|145|114|
+%xl|U|repeatab-160x128x2.bmp|131|114|
-%xl|W|play-160x128x2.bmp|145|114|
+%xl|V|stop-160x128x2.bmp|145|114|
-%xl|X|pause-160x128x2.bmp|145|114|
+%xl|W|play-160x128x2.bmp|145|114|
-%xl|Y|ff-160x128x2.bmp|145|114|
+%xl|X|pause-160x128x2.bmp|145|114|
-%xl|Z|rew-160x128x2.bmp|145|114|
+%xl|Y|ff-160x128x2.bmp|145|114|
-%Cl|2|16|s64|s64|
+%xl|Z|rew-160x128x2.bmp|145|114|
+%Cl|2|16|s64|s64|
 %pb|8|1|159|86|
-%?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
+%?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
 %?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
 %?C<%s%m|70|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>>
 
@@ -47,10 +48,10 @@
 %?C<%s%m|70|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
 
 %al %pc%ac%pp of %pe%ar%pr 
-%?mh<%xdA|%xdB>
+%?mh<%xdA|%xdB>
-%?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>
+%?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>
-%?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt>
+%?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt|%xdu>
-%?ps<%xdQ>
+%?ps<%xdQ>
-%?mm<|%xdR|%xdS|%xdT|%xdU>
+%?mm<|%xdR|%xdS|%xdT|%xdU>
-%?mp<%xdV|%xdW|%xdX|%xdY|%xdZ>
+%?mp<%xdV|%xdW|%xdX|%xdY|%xdZ>
-%?C<%C>
+%?C<%C>

wps/cabbiev2.176x132x16.wps

@@ -4,7 +4,7 @@
 #Ported to nano by crzyboyster
 %wd
 %P|pb-176x132x16.bmp|
-%X|wpsbackdrop-176x132x16.bmp|0|0|
+%X|wpsbackdrop-176x132x16.bmp|
 %xl|A|lockclosed-176x132x16.bmp|65|116|
 %xl|B|lockopen-176x132x16.bmp|65|116|
 %xl|C|battpl-176x132x16.bmp|83|117|

wps/cabbiev2.176x220x16.wps

@@ -1,7 +1,7 @@
 # cabbie 2.0 default for the Sansa e200 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%X|wpsbackdrop-176x220x16.bmp|0|0|
+%X|wpsbackdrop-176x220x16.bmp|
 %P|pb-176x220x16.bmp|
 %xl|A|lockclosed-176x220x16.bmp|51|204|
 %xl|B|lockopen-176x220x16.bmp|51|204|

wps/cabbiev2.220x176x16.wps

@@ -2,7 +2,7 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-220x176x16.bmp|0|0|
+%X|wpsbackdrop-220x176x16.bmp|
 %P|pb-220x176x16.bmp|
 %xl|A|lockclosed-220x176x16.bmp|88|152|
 %xl|B|lockopen-220x176x16.bmp|88|152|

wps/cabbiev2.240x320x16.wps

@@ -4,7 +4,7 @@
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
 
-%X|wpsbackdrop-240x320x16.bmp|0|0|
+%X|wpsbackdrop-240x320x16.bmp|
 %P|pb-240x320x16.bmp|
 %xl|A|lockclosed-240x320x16.bmp|11|292|
 %xl|B|lockopen-240x320x16.bmp|11|292|

wps/cabbiev2.320x240x16.wps

@@ -2,7 +2,7 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-320x240x16.bmp|0|0|
+%X|wpsbackdrop-320x240x16.bmp|
 %P|pb-320x240x16.bmp|
 %xl|A|lockclosed-320x240x16.bmp|91|207|
 %xl|B|lockopen-320x240x16.bmp|91|207|