From 166d0ef16da8280c7e868cb1a73345a3ee35b70b Mon Sep 17 00:00:00 2001 From: pixelma Date: Sat, 22 Mar 2008 14:17:28 +0000 Subject: [PATCH] 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 +- wps/cabbiev2.128x64x1.wps | 23 +++--- wps/cabbiev2.128x96x2.wps | 3 +- wps/cabbiev2.132x80x16.wps | 2 +- wps/cabbiev2.138x110x2.wps | 87 ++++++++++---------- wps/cabbiev2.160x128x1.wps | 2 +- wps/cabbiev2.160x128x16.wps | 2 +- wps/cabbiev2.160x128x2.wps | 91 +++++++++++---------- wps/cabbiev2.176x132x16.wps | 2 +- wps/cabbiev2.176x220x16.wps | 2 +- wps/cabbiev2.220x176x16.wps | 2 +- wps/cabbiev2.240x320x16.wps | 2 +- wps/cabbiev2.320x240x16.wps | 2 +- wps/cabbiev2/ebar-128x64x1.bmp | Bin 192 -> 0 bytes wps/cabbiev2/npbar-128x64x1.bmp | Bin 192 -> 0 bytes .../{vol00-160x128x2.bmp => vol0-160x128x2.bmp} | Bin wps/cabbiev2/vol01.bmp | Bin 250 -> 0 bytes .../{vol01-160x128x2.bmp => vol1-160x128x2.bmp} | Bin .../{vol02-160x128x2.bmp => vol2-160x128x2.bmp} | Bin .../{vol03-160x128x2.bmp => vol3-160x128x2.bmp} | Bin .../{vol04-160x128x2.bmp => vol4-160x128x2.bmp} | Bin .../{vol05-160x128x2.bmp => vol5-160x128x2.bmp} | Bin .../{vol06-160x128x2.bmp => vol6-160x128x2.bmp} | Bin .../{vol07-160x128x2.bmp => vol7-160x128x2.bmp} | Bin wps/cabbiev2/vol8-160x128x2.bmp | Bin 0 -> 250 bytes .../{vol08-160x128x2.bmp => vol9-160x128x2.bmp} | Bin wps/cabbiev2/wpsbackdrop-128x64x1.bmp | Bin 0 -> 1088 bytes ...round-128x96x2.bmp => wpsbackdrop-128x96x2.bmp} | Bin wps/cabbiev2/wpsbackdrop-176x132x16U.bmp | Bin 69752 -> 0 bytes 29 files changed, 111 insertions(+), 111 deletions(-) delete mode 100644 wps/cabbiev2/ebar-128x64x1.bmp delete mode 100644 wps/cabbiev2/npbar-128x64x1.bmp rename wps/cabbiev2/{vol00-160x128x2.bmp => vol0-160x128x2.bmp} (100%) delete mode 100644 wps/cabbiev2/vol01.bmp rename wps/cabbiev2/{vol01-160x128x2.bmp => vol1-160x128x2.bmp} (100%) rename wps/cabbiev2/{vol02-160x128x2.bmp => vol2-160x128x2.bmp} (100%) rename wps/cabbiev2/{vol03-160x128x2.bmp => vol3-160x128x2.bmp} (100%) rename wps/cabbiev2/{vol04-160x128x2.bmp => vol4-160x128x2.bmp} (100%) rename wps/cabbiev2/{vol05-160x128x2.bmp => vol5-160x128x2.bmp} (100%) rename wps/cabbiev2/{vol06-160x128x2.bmp => vol6-160x128x2.bmp} (100%) rename wps/cabbiev2/{vol07-160x128x2.bmp => vol7-160x128x2.bmp} (100%) create mode 100644 wps/cabbiev2/vol8-160x128x2.bmp rename wps/cabbiev2/{vol08-160x128x2.bmp => vol9-160x128x2.bmp} (100%) create mode 100644 wps/cabbiev2/wpsbackdrop-128x64x1.bmp rename wps/cabbiev2/{background-128x96x2.bmp => wpsbackdrop-128x96x2.bmp} (100%) delete mode 100644 wps/cabbiev2/wpsbackdrop-176x132x16U.bmp diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps index 3a50ba6e5..1bddf1f90 100644 --- a/wps/cabbiev2.128x128x16.wps +++ b/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| diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps index 744011fb5..a8287330d 100644 --- a/wps/cabbiev2.128x64x1.wps +++ b/wps/cabbiev2.128x64x1.wps @@ -1,14 +1,13 @@ -# cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy) -# derived from cabbie 2.0 default rwps (C) 2007, Marc Guay -%wd -%P|pbar-128x64x1.bmp| -%x|A|ebar-128x64x1.bmp|4|38| -%xl|B|npbar-128x64x1.bmp|4|2| -%pb|8|4|123|38| -%s%ac%?it<%it|%fn> -%s%ac%?ia<%ia|%?d2<%d2|(root)>> - -%al %pc%ar%pr - +# cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy) +# derived from cabbie 2.0 default rwps (C) 2007, Marc Guay +%wd +%P|pbar-128x64x1.bmp| +%x|A|wpsbackdrop-128x64x1.bmp|0|0| +%pb|8|4|123|38| +%s%ac%?it<%it|%fn> +%s%ac%?ia<%ia|%?d2<%d2|(root)>> + +%al %pc%ar%pr + %xdB diff --git a/wps/cabbiev2.128x96x2.wps b/wps/cabbiev2.128x96x2.wps index 6b1ac40b8..2e8a794f6 100644 --- a/wps/cabbiev2.128x96x2.wps +++ b/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 - diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps index 57736bf04..0cc33dc35 100644 --- a/wps/cabbiev2.132x80x16.wps +++ b/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| diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps index 22595c6d3..22b4f6f33 100644 --- a/wps/cabbiev2.138x110x2.wps +++ b/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) -# derived from "cabbie" (C) Yohann Misquitta -%wd -%X|wpsbackdrop-138x110x2.bmp|0|0| -%P|pb-138x110x2.bmp| -%xl|A|lockclosed-160x128x2.bmp|2|96| -%xl|B|lockopen-160x128x2.bmp|2|96| -%xl|C|battpl-160x128x2.bmp|26|98| -%xl|D|battch-160x128x2.bmp|26|98| -%xl|E|batt00-160x128x2.bmp|26|98| -%xl|F|batt01-160x128x2.bmp|26|98| -%xl|G|batt02-160x128x2.bmp|26|98| -%xl|H|batt03-160x128x2.bmp|26|98| -%xl|I|batt04-160x128x2.bmp|26|98| -%xl|J|batt05-160x128x2.bmp|26|98| -%xl|K|batt06-160x128x2.bmp|26|98| -%xl|L|batt07-160x128x2.bmp|26|98| -%xl|M|vol00-160x128x2.bmp|54|98| -%xl|N|vol01-160x128x2.bmp|54|98| -%xl|O|vol02-160x128x2.bmp|54|98| -%xl|P|vol03-160x128x2.bmp|54|98| -%xl|p|vol04-160x128x2.bmp|54|98| -%xl|q|vol05-160x128x2.bmp|54|98| -%xl|r|vol06-160x128x2.bmp|54|98| -%xl|s|vol07-160x128x2.bmp|54|98| -%xl|t|vol08-160x128x2.bmp|54|98| -%xl|Q|shuffle-160x128x2.bmp|86|97| -%xl|R|repeatall-160x128x2.bmp|107|95| +# (C) 2007, Johannes Voggenthaler (Zinc Alloy) +# derived from "cabbie" (C) Yohann Misquitta +%wd +%X|wpsbackdrop-138x110x2.bmp| +%P|pb-138x110x2.bmp| +%xl|A|lockclosed-160x128x2.bmp|2|96| +%xl|B|lockopen-160x128x2.bmp|2|96| +%xl|C|battpl-160x128x2.bmp|26|98| +%xl|D|battch-160x128x2.bmp|26|98| +%xl|E|batt00-160x128x2.bmp|26|98| +%xl|F|batt01-160x128x2.bmp|26|98| +%xl|G|batt02-160x128x2.bmp|26|98| +%xl|H|batt03-160x128x2.bmp|26|98| +%xl|I|batt04-160x128x2.bmp|26|98| +%xl|J|batt05-160x128x2.bmp|26|98| +%xl|K|batt06-160x128x2.bmp|26|98| +%xl|L|batt07-160x128x2.bmp|26|98| +%xl|M|vol0-160x128x2.bmp|54|98| +%xl|N|vol1-160x128x2.bmp|54|98| +%xl|O|vol2-160x128x2.bmp|54|98| +%xl|P|vol3-160x128x2.bmp|54|98| +%xl|p|vol4-160x128x2.bmp|54|98| +%xl|q|vol5-160x128x2.bmp|54|98| +%xl|r|vol6-160x128x2.bmp|54|98| +%xl|s|vol7-160x128x2.bmp|54|98| +%xl|t|vol8-160x128x2.bmp|54|98| +%xl|u|vol9-160x128x2.bmp|54|98| +%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|U|repeatab-160x128x2.bmp|107|95| -%xl|V|stop-160x128x2.bmp|124|97| -%xl|W|play-160x128x2.bmp|124|97| -%xl|X|pause-160x128x2.bmp|124|97| -%xl|Y|ff-160x128x2.bmp|124|97| -%xl|Z|rew-160x128x2.bmp|124|97| -%Cl|5|15|s55|s55| -%pb|6|2|136|75| -%?C<%s%m|65|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> +%xl|T|repeatshuffle-160x128x2.bmp|107|95| +%xl|U|repeatab-160x128x2.bmp|107|95| +%xl|V|stop-160x128x2.bmp|124|97| +%xl|W|play-160x128x2.bmp|124|97| +%xl|X|pause-160x128x2.bmp|124|97| +%xl|Y|ff-160x128x2.bmp|124|97| +%xl|Z|rew-160x128x2.bmp|124|97| +%Cl|5|15|s55|s55| +%pb|6|2|136|75| +%?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>> - -%al %pc%ac%pp of %pe%ar%pr -%?mh<%xdA|%xdB> +%?C<%s%m|65|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>> + +%al %pc%ac%pp of %pe%ar%pr +%?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> diff --git a/wps/cabbiev2.160x128x1.wps b/wps/cabbiev2.160x128x1.wps index bab8182ee..7d08f8717 100755 --- a/wps/cabbiev2.160x128x1.wps +++ b/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| diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps index b4dc983dc..0b71436f2 100644 --- a/wps/cabbiev2.160x128x16.wps +++ b/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| diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps index 5d271b3b9..e57675c5d 100644 --- a/wps/cabbiev2.160x128x2.wps +++ b/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) -# derived from "cabbie" (C) Yohann Misquitta -%wd -%X|wpsbackdrop-160x128x2.bmp|0|0| -%P|pb-160x128x2.bmp| -%xl|A|lockclosed-160x128x2.bmp|56|114| -%xl|B|lockopen-160x128x2.bmp|56|114| -%xl|C|battpl-160x128x2.bmp|74|115| -%xl|D|battch-160x128x2.bmp|74|115| -%xl|E|batt00-160x128x2.bmp|74|115| -%xl|F|batt01-160x128x2.bmp|74|115| -%xl|G|batt02-160x128x2.bmp|74|115| -%xl|H|batt03-160x128x2.bmp|74|115| -%xl|I|batt04-160x128x2.bmp|74|115| -%xl|J|batt05-160x128x2.bmp|74|115| -%xl|K|batt06-160x128x2.bmp|74|115| -%xl|L|batt07-160x128x2.bmp|74|115| -%xl|M|vol00-160x128x2.bmp|95|115| -%xl|N|vol01-160x128x2.bmp|95|115| -%xl|O|vol02-160x128x2.bmp|95|115| -%xl|P|vol03-160x128x2.bmp|95|115| -%xl|p|vol04-160x128x2.bmp|95|115| -%xl|q|vol05-160x128x2.bmp|95|115| -%xl|r|vol06-160x128x2.bmp|95|115| -%xl|s|vol07-160x128x2.bmp|95|115| -%xl|t|vol08-160x128x2.bmp|95|115| -%xl|Q|shuffle-160x128x2.bmp|117|115| -%xl|R|repeatall-160x128x2.bmp|131|113| -%xl|S|repeatone-160x128x2.bmp|131|113| -%xl|T|repeatshuffle-160x128x2.bmp|131|113| -%xl|U|repeatab-160x128x2.bmp|131|114| -%xl|V|stop-160x128x2.bmp|145|114| -%xl|W|play-160x128x2.bmp|145|114| -%xl|X|pause-160x128x2.bmp|145|114| -%xl|Y|ff-160x128x2.bmp|145|114| -%xl|Z|rew-160x128x2.bmp|145|114| -%Cl|2|16|s64|s64| +# (C) 2007, Johannes Voggenthaler (Zinc Alloy) +# derived from "cabbie" (C) Yohann Misquitta +%wd +%X|wpsbackdrop-160x128x2.bmp| +%P|pb-160x128x2.bmp| +%xl|A|lockclosed-160x128x2.bmp|56|114| +%xl|B|lockopen-160x128x2.bmp|56|114| +%xl|C|battpl-160x128x2.bmp|74|115| +%xl|D|battch-160x128x2.bmp|74|115| +%xl|E|batt00-160x128x2.bmp|74|115| +%xl|F|batt01-160x128x2.bmp|74|115| +%xl|G|batt02-160x128x2.bmp|74|115| +%xl|H|batt03-160x128x2.bmp|74|115| +%xl|I|batt04-160x128x2.bmp|74|115| +%xl|J|batt05-160x128x2.bmp|74|115| +%xl|K|batt06-160x128x2.bmp|74|115| +%xl|L|batt07-160x128x2.bmp|74|115| +%xl|M|vol0-160x128x2.bmp|95|115| +%xl|N|vol1-160x128x2.bmp|95|115| +%xl|O|vol2-160x128x2.bmp|95|115| +%xl|P|vol3-160x128x2.bmp|95|115| +%xl|p|vol4-160x128x2.bmp|95|115| +%xl|q|vol5-160x128x2.bmp|95|115| +%xl|r|vol6-160x128x2.bmp|95|115| +%xl|s|vol7-160x128x2.bmp|95|115| +%xl|t|vol8-160x128x2.bmp|95|115| +%xl|u|vol9-160x128x2.bmp|95|115| +%xl|Q|shuffle-160x128x2.bmp|117|115| +%xl|R|repeatall-160x128x2.bmp|131|113| +%xl|S|repeatone-160x128x2.bmp|131|113| +%xl|T|repeatshuffle-160x128x2.bmp|131|113| +%xl|U|repeatab-160x128x2.bmp|131|114| +%xl|V|stop-160x128x2.bmp|145|114| +%xl|W|play-160x128x2.bmp|145|114| +%xl|X|pause-160x128x2.bmp|145|114| +%xl|Y|ff-160x128x2.bmp|145|114| +%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> -%?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>> -%?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt> -%?ps<%xdQ> -%?mm<|%xdR|%xdS|%xdT|%xdU> -%?mp<%xdV|%xdW|%xdX|%xdY|%xdZ> -%?C<%C> +%?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|%xdu> +%?ps<%xdQ> +%?mm<|%xdR|%xdS|%xdT|%xdU> +%?mp<%xdV|%xdW|%xdX|%xdY|%xdZ> +%?C<%C> diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps index f2ec25749..30729b29a 100644 --- a/wps/cabbiev2.176x132x16.wps +++ b/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| diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps index 9303dc3e7..fa0df0af2 100644 --- a/wps/cabbiev2.176x220x16.wps +++ b/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| diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps index 5ea187449..cab8e11ed 100644 --- a/wps/cabbiev2.220x176x16.wps +++ b/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| diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps index 0e520c5be..87a73e5b3 100644 --- a/wps/cabbiev2.240x320x16.wps +++ b/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| diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps index 8794349c3..48d751cf4 100644 --- a/wps/cabbiev2.320x240x16.wps +++ b/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| diff --git a/wps/cabbiev2/ebar-128x64x1.bmp b/wps/cabbiev2/ebar-128x64x1.bmp deleted file mode 100644 index df6209767cbe7c59c9ce40d77c0df50392ecf6b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 192 zcwTezJ-`3~c0jBF#N|ND0mO_z2m(z&e3%b{Vc`G&|6tnwKQj0kkidWpc=HaR@Y$Uj aQ20!xX#D&GD15g31Qb3`CYpW83=9B=wkkIO diff --git a/wps/cabbiev2/npbar-128x64x1.bmp b/wps/cabbiev2/npbar-128x64x1.bmp deleted file mode 100644 index 648a509851d26a477729010b807a8a41e01b5eab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 192 zcwTezJ-`3~c0jBF#N|ND0mO_z2m(z&e3%b{Vc`G&|6tnwKQj0kQ2+n`Z-XRbK;1_nt3 jp{o3zZ9X#?82Iu*=2=Xt$e%gw9MGyinP~PUGcW)E6lh-? diff --git a/wps/cabbiev2/vol00-160x128x2.bmp b/wps/cabbiev2/vol0-160x128x2.bmp similarity index 100% rename from wps/cabbiev2/vol00-160x128x2.bmp rename to wps/cabbiev2/vol0-160x128x2.bmp diff --git a/wps/cabbiev2/vol01.bmp b/wps/cabbiev2/vol01.bmp deleted file mode 100644 index 5ae018cf1b1590b37a8fd5ef5fb464aff15388f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 250 zcwTez{lx$QWk9R}#3De<4aAHLEMV~#1_Tg*;{X5uGpt&*iXk*K6fA!2+BJrA=gu)4 zI&_F(>(;FdD_5>$m@#7pLq|skLv?jELve92Lw0sHLwtNZP;&!=F&r>3FdHjC3}*&m i0|Xn!VP-&Zm>CcpC>zXyu|XU-8^}Shf%YKSATFy$9#KcFq|oCBzsJLV$A))>;^2ptXil3Q|f4 mA?Wc3%P|03Zf)+gh&_kzQN2g=7Ts&?{*S{chSNX8!GIsl7bh10 literal 0 HcwPel00001 diff --git a/wps/cabbiev2/vol08-160x128x2.bmp b/wps/cabbiev2/vol9-160x128x2.bmp similarity index 100% rename from wps/cabbiev2/vol08-160x128x2.bmp rename to wps/cabbiev2/vol9-160x128x2.bmp diff --git a/wps/cabbiev2/wpsbackdrop-128x64x1.bmp b/wps/cabbiev2/wpsbackdrop-128x64x1.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b65163a1b681f77be5a0f38ccc9e1dfcc8cae29c GIT binary patch literal 1088 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 JSy)o3{|{7f;vxV5 -- 2.11.4.GIT