From 48f7d7d057ac2dd5b0237aa3afe9b23819f9b65e Mon Sep 17 00:00:00 2001 From: Marianne Arnold 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 ...-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 3a50ba6e53..1bddf1f905 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 744011fb56..a8287330dc 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 6b1ac40b82..2e8a794f6a 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 57736bf043..0cc33dc356 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 22595c6d3b..22b4f6f339 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 bab8182ee3..7d08f87171 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 b4dc983dc7..0b71436f2e 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 5d271b3b94..e57675c5d7 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 f2ec257490..30729b29ac 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 9303dc3e7c..fa0df0af2a 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 5ea1874494..cab8e11edd 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 0e520c5beb..87a73e5b33 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 8794349c36..48d751cf40 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 HcmV?d00001 literal 192 zcmZ?rJ-`3~c0fu4h|7VP1Be-c5Cocl_%I&?g9U)Z|NsBNOnV>$0e%J~z!ZRK-n;`S ie0HY>6h2ca8bAL4iac9>0t%le(;i_Nko7Z}fdK%AwkkIO 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 HcmV?d00001 literal 192 zcmZ?rJ-`3~c0fu4h|7VP1Be-c5Cocl_%I&?g9U)Z|NsBNOnV>$0e%M5|NsBn;LPs_ zX=P{R|NsA+2bB9|6-b8o8m2f7Uu+RoRWAnNYb+pzHV}z7)1hrO_Qjl{-N(mtZc<pp;3Z=(Z(NIVWbO@E&WYfk=pn5nzjHJL-xKU~dizz-pCB1ZrK diff --git a/wps/cabbiev2/vol01-160x128x2.bmp b/wps/cabbiev2/vol1-160x128x2.bmp similarity index 100% rename from wps/cabbiev2/vol01-160x128x2.bmp rename to wps/cabbiev2/vol1-160x128x2.bmp diff --git a/wps/cabbiev2/vol02-160x128x2.bmp b/wps/cabbiev2/vol2-160x128x2.bmp similarity index 100% rename from wps/cabbiev2/vol02-160x128x2.bmp rename to wps/cabbiev2/vol2-160x128x2.bmp diff --git a/wps/cabbiev2/vol03-160x128x2.bmp b/wps/cabbiev2/vol3-160x128x2.bmp similarity index 100% rename from wps/cabbiev2/vol03-160x128x2.bmp rename to wps/cabbiev2/vol3-160x128x2.bmp diff --git a/wps/cabbiev2/vol04-160x128x2.bmp b/wps/cabbiev2/vol4-160x128x2.bmp similarity index 100% rename from wps/cabbiev2/vol04-160x128x2.bmp rename to wps/cabbiev2/vol4-160x128x2.bmp diff --git a/wps/cabbiev2/vol05-160x128x2.bmp b/wps/cabbiev2/vol5-160x128x2.bmp similarity index 100% rename from wps/cabbiev2/vol05-160x128x2.bmp rename to wps/cabbiev2/vol5-160x128x2.bmp diff --git a/wps/cabbiev2/vol06-160x128x2.bmp b/wps/cabbiev2/vol6-160x128x2.bmp similarity index 100% rename from wps/cabbiev2/vol06-160x128x2.bmp rename to wps/cabbiev2/vol6-160x128x2.bmp diff --git a/wps/cabbiev2/vol07-160x128x2.bmp b/wps/cabbiev2/vol7-160x128x2.bmp similarity index 100% rename from wps/cabbiev2/vol07-160x128x2.bmp rename to wps/cabbiev2/vol7-160x128x2.bmp diff --git a/wps/cabbiev2/vol8-160x128x2.bmp b/wps/cabbiev2/vol8-160x128x2.bmp new file mode 100644 index 0000000000000000000000000000000000000000..70812b4d4598d28e745cd99cd95f92810450237e GIT binary patch literal 250 zcmYL?F%Ci@5JbmdXJd>f(8k(-1A9wq4nRp_Lt|mV5x4^MTz~^mau^$2SowdGS>DWM zm&fx9t`|Kw(wTH1?Xaf~d`Kq>x{f0OT5E_gLP|N3S}RH^$T=gWgb)I}_i)a^S_@+g swAN5c(efM1T7XzCTvs|J?i)|j^EqMW$)AUr+|9~lHl}~Z9c}{n0nHaD7XSbN literal 0 HcmV?d00001 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 zcmZ?rbzort13Mt80mKbJ>;S}!KnMd0dJGI83U~NGw)4zwbkO##tcq z0f@gSg}?37^NfigJ};1HN>tzW;c>!zATxmvn5`!>sxSL-I^|>o1H%Kbd7bKQKWFAV N2Ff2mw~ugm0RUrafF}R| literal 0 HcmV?d00001 diff --git a/wps/cabbiev2/background-128x96x2.bmp b/wps/cabbiev2/wpsbackdrop-128x96x2.bmp similarity index 100% rename from wps/cabbiev2/background-128x96x2.bmp rename to wps/cabbiev2/wpsbackdrop-128x96x2.bmp diff --git a/wps/cabbiev2/wpsbackdrop-176x132x16U.bmp b/wps/cabbiev2/wpsbackdrop-176x132x16U.bmp deleted file mode 100644 index 63095d1879569585dbdb3c24347c29dd03a40a2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69752 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