From 5a169bb71707dae31a886e1b932341b70eacf2df Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 23 Jun 2008 06:04:17 +0000 Subject: commit FS#9027 - conditional viewports ** BREAKS CURRENT WPS's ** * %P has been removed, merged with the new %pb * %pb is now %pb or %pb|bitmap|x|y|width|height| (any of those params can be - to use sane defaults... check wiki/task for more explaination) * New %Vl and %Vd tags which are used to setup and display conditionaly displayed viewports (%Vl||| to set up, then %Vd to enable the viewport * bumps the max allowed viewport count to 24 * you can setup 3 different progressbars in a WPS... max of one per viewport though http://www.rockbox.org/tracker/task/9027?getfile=16785 is a simple perl script to convert old %P/%pb to the new %pb syntax I'll commit changes to the cabbie wps soon which shows how to use %Vl/%Vd properly... Reminder: %m will be removed soonish also so when fixing your WPS's remember to use conditional viewports to replace %m git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17759 a1c6a512-1295-4272-9138-f99709370657 --- wps/Rockboxed.112x64x1.wps | 2 +- wps/Rockboxed.128x128x16.wps | 3 +-- wps/Rockboxed.132x80x16.wps | 3 +-- wps/Rockboxed.138x110x2.wps | 3 +-- wps/Rockboxed.160x128x16.wps | 3 +-- wps/Rockboxed.160x128x2.wps | 3 +-- wps/Rockboxed.176x132x16.wps | 3 +-- wps/Rockboxed.176x220x16.wps | 3 +-- wps/Rockboxed.220x176x16.wps | 3 +-- wps/Rockboxed.240x320x16.wps | 3 +-- wps/Rockboxed.320x240x16.wps | 3 +-- wps/UniCatcher.128x96x1.wps | 2 +- wps/UniCatcher.160x128x16.wps | 2 +- wps/UniCatcher.160x128x2.wps | 2 +- wps/UniCatcher.176x132x16.wps | 2 +- wps/UniCatcher.176x220x16.wps | 2 +- wps/UniCatcher.220x176x16.wps | 2 +- wps/UniCatcher.240x320x16.wps | 2 +- wps/UniCatcher.320x240x16.wps | 2 +- wps/boxes.220x176x16.wps | 3 +-- wps/cabbiev2.112x64x1.wps | 3 +-- wps/cabbiev2.128x128x16.wps | 3 +-- wps/cabbiev2.128x64x1.wps | 3 +-- wps/cabbiev2.128x96x2.wps | 3 +-- wps/cabbiev2.132x80x16.wps | 3 +-- wps/cabbiev2.138x110x2.wps | 3 +-- wps/cabbiev2.160x128x1.wps | 3 +-- wps/cabbiev2.160x128x16.wps | 3 +-- wps/cabbiev2.160x128x2.wps | 3 +-- wps/cabbiev2.176x132x16.wps | 3 +-- wps/cabbiev2.176x220x16.wps | 3 +-- wps/cabbiev2.220x176x16.wps | 3 +-- wps/cabbiev2.240x320x16.wps | 3 +-- wps/cabbiev2.320x240x16.wps | 3 +-- wps/iCatcher.112x64x1.wps | 2 +- wps/iCatcher.128x128x16.wps | 2 +- wps/iCatcher.128x64x1.160x128x2.wps | 2 +- wps/iCatcher.128x96x1.wps | 2 +- wps/iCatcher.132x80x16.wps | 2 +- wps/iCatcher.138x110x2.wps | 2 +- wps/iCatcher.160x128x16.wps | 2 +- wps/iCatcher.160x128x2.wps | 2 +- wps/iCatcher.176x132x16.wps | 2 +- wps/iCatcher.176x220x16.wps | 2 +- wps/iCatcher.220x176x16.wps | 2 +- wps/iCatcher.240x320x16.wps | 2 +- wps/iCatcher.320x240x16.wps | 2 +- 47 files changed, 47 insertions(+), 72 deletions(-) (limited to 'wps') diff --git a/wps/Rockboxed.112x64x1.wps b/wps/Rockboxed.112x64x1.wps index fee3a5c081..17a1223680 100644 --- a/wps/Rockboxed.112x64x1.wps +++ b/wps/Rockboxed.112x64x1.wps @@ -12,7 +12,7 @@ %al%s%ac%?id<%id|%d1>%ar %al%s%ac%?it<%it|%fn>%ar %ac%t3%ig;%ac%iy -%pb|5|10|102| +%pb|-|10|-|92|5| %al %pc%ac%?fc%ar%pt %?ps<%xdBa|%xdBb> %?mp<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe> diff --git a/wps/Rockboxed.128x128x16.wps b/wps/Rockboxed.128x128x16.wps index ffd749148f..66b47459ab 100644 --- a/wps/Rockboxed.128x128x16.wps +++ b/wps/Rockboxed.128x128x16.wps @@ -2,7 +2,6 @@ # License: GNU GPL v2 or later. %wd %X|bg-128x128x16.bmp| -%P|pg-108.bmp| %xl|A|mode-color-small.bmp|62|109|4| %xl|B|shuffle-color-small.bmp|34|109| %xl|C|volume-color-small.bmp|15|111|9| @@ -15,7 +14,7 @@ %al %s%ac%?it<%it|%fn>%ar %ac%t3%ig;%ac%iy -%pb|5|10|118|76| +%pb|pg-108.bmp|10|76|108|5| %al %pc%ac%?fc%ar%pt %?ps<%xdB> %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> diff --git a/wps/Rockboxed.132x80x16.wps b/wps/Rockboxed.132x80x16.wps index 437a6ed9a9..c4ec5a1cea 100644 --- a/wps/Rockboxed.132x80x16.wps +++ b/wps/Rockboxed.132x80x16.wps @@ -2,7 +2,6 @@ # License: GNU GPL v2 or later. %wd %X|bg-132x80x16.bmp| -%P|pg-108.bmp| %xl|A|mode-color-small.bmp|62|65|4| %xl|B|shuffle-color-small.bmp|34|65| %xl|C|volume-color-small.bmp|15|67|9| @@ -13,7 +12,7 @@ %al %s%ac%?ia<%ia|%d2>%ar %al %s%ac%?id<%id|%d1>%ar %al %s%ac%?it<%it|%fn>%ar -%pb|5|12|118|43| +%pb|pg-108.bmp|12|43|106|5| %al %pc%ac%?fc%ar%pt %?ps<%xdB> %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> diff --git a/wps/Rockboxed.138x110x2.wps b/wps/Rockboxed.138x110x2.wps index 419141292c..e871b07feb 100644 --- a/wps/Rockboxed.138x110x2.wps +++ b/wps/Rockboxed.138x110x2.wps @@ -2,7 +2,6 @@ # License: GNU GPL v2 or later. %wd %X|bg-138x110x2.bmp| -%P|pg-grey-118.bmp| %xl|A|mode-grey.bmp|68|91|4| %xl|B|shuffle-grey-medium.bmp|35|91| %xl|C|volume-grey.bmp|15|93|9| @@ -14,7 +13,7 @@ %al %s%ac%?id<%id|%d1>%ar %al %s%ac%?it<%it|%fn>%ar %ac%t3%ig;%ac%iy -%pb|5|10|128| +%pb|pg-grey-118.bmp|10|-|118|5| %al %pc%ac%?fc%ar%pt %?ps<%xdB> %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> diff --git a/wps/Rockboxed.160x128x16.wps b/wps/Rockboxed.160x128x16.wps index 41cd72f41d..37e8256521 100644 --- a/wps/Rockboxed.160x128x16.wps +++ b/wps/Rockboxed.160x128x16.wps @@ -2,7 +2,6 @@ # License: GNU GPL v2 or later. %wd %X|bg-160x128x16.bmp| -%P|pg-140.bmp| %xl|A|mode-color-big.bmp|72|109|4| %xl|B|shuffle-color-big.bmp|36|109| %xl|C|volume-color-medium.bmp|15|111|9| @@ -15,7 +14,7 @@ %al %s%ac%?it<%it|%fn>%ar %ac%t3%ig;%ac%iy -%pb|5|10|150|76| +%pb|pg-140.bmp|10|76|140|5| %al %pc%ac%?fc%ar%pt %?ps<%xdB> %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> diff --git a/wps/Rockboxed.160x128x2.wps b/wps/Rockboxed.160x128x2.wps index 328d86d650..2ee7c08502 100644 --- a/wps/Rockboxed.160x128x2.wps +++ b/wps/Rockboxed.160x128x2.wps @@ -2,7 +2,6 @@ # License: GNU GPL v2 or later. %wd %X|bg-160x128x2.bmp| -%P|pg-grey-140.bmp| %xl|A|mode-grey.bmp|72|109|4| %xl|B|shuffle-grey-big.bmp|36|109| %xl|C|volume-grey.bmp|15|111|9| @@ -15,7 +14,7 @@ %al %s%ac%?it<%it|%fn>%ar %ac%t3%ig;%ac%iy -%pb|5|10|150| +%pb|pg-grey-140.bmp|10|-|140|5| %al %pc%ac%?fc%ar%pt %?ps<%xdB> %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> diff --git a/wps/Rockboxed.176x132x16.wps b/wps/Rockboxed.176x132x16.wps index c710e96fee..92cae29fe1 100644 --- a/wps/Rockboxed.176x132x16.wps +++ b/wps/Rockboxed.176x132x16.wps @@ -2,7 +2,6 @@ # License: GNU GPL v2 or later. %wd %X|bg-176x132x16.bmp| -%P|pg-156.bmp| %xl|A|mode-color-big.bmp|81|113|4| %xl|B|shuffle-color-big.bmp|40|113| %xl|C|volume-color-big.bmp|15|115|11| @@ -15,7 +14,7 @@ %al %s%ac%?it<%it|%fn>%ar %ac%t3%ig;%ac%iy -%pb|5|10|166|75| +%pb|pg-156.bmp|10|75|156|5| %al %pc%ac%?fc%ar%pt %?ps<%xdB> %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> diff --git a/wps/Rockboxed.176x220x16.wps b/wps/Rockboxed.176x220x16.wps index c483127764..ddbd790094 100644 --- a/wps/Rockboxed.176x220x16.wps +++ b/wps/Rockboxed.176x220x16.wps @@ -2,7 +2,6 @@ # License: GNU GPL v2 or later. %wd %X|bg-176x220x16.bmp| -%P|pg-156.bmp| %xl|A|mode-color-big.bmp|81|201|4| %xl|B|shuffle-color-big.bmp|40|201| %xl|C|volume-color-big.bmp|15|203|11| @@ -23,7 +22,7 @@ -%pb|5|10|166|171| +%pb|pg-156.bmp|10|171|156|5| %al %pc%ac%?fc%ar%pt %?ps<%xdB> %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> diff --git a/wps/Rockboxed.220x176x16.wps b/wps/Rockboxed.220x176x16.wps index 97781a2274..9814b1372b 100644 --- a/wps/Rockboxed.220x176x16.wps +++ b/wps/Rockboxed.220x176x16.wps @@ -2,7 +2,6 @@ # License: GNU GPL v2 or later. %wd %X|bg-220x176x16.bmp| -%P|pg-200.bmp| %xl|A|mode-color-big.bmp|102|156|4| %xl|B|shuffle-color-big.bmp|57|156| %xl|C|volume-color-big.bmp|15|158|11| @@ -17,7 +16,7 @@ %al %s%ac%?it<%it|%fn>%ar %ac%t3%ig;%ac%iy -%pb|5|10|210|116| +%pb|pg-200.bmp|10|116|200|5| %al %pc%ac%?fc%ar%pt %?ps<%xdB> %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> diff --git a/wps/Rockboxed.240x320x16.wps b/wps/Rockboxed.240x320x16.wps index 37f1c3512b..291f1894fb 100644 --- a/wps/Rockboxed.240x320x16.wps +++ b/wps/Rockboxed.240x320x16.wps @@ -2,7 +2,6 @@ # License: GNU GPL v2 or later. %wd %X|bg-240x320x16.bmp| -%P|pg-220.bmp| %xl|A|mode-color-big.bmp|112|300|4| %xl|B|shuffle-color-big.bmp|57|300| %xl|C|volume-color-big.bmp|15|302|11| @@ -22,7 +21,7 @@ %ac%t3%ig;%ac%iy -%pb|5|10|230|256| +%pb|pg-220.bmp|10|256|220|5| %al %pc%ac%?fc%ar%pt %?ps<%xdB> %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> diff --git a/wps/Rockboxed.320x240x16.wps b/wps/Rockboxed.320x240x16.wps index 23ffa83ec3..05d1077feb 100644 --- a/wps/Rockboxed.320x240x16.wps +++ b/wps/Rockboxed.320x240x16.wps @@ -2,7 +2,6 @@ # License: GNU GPL v2 or later. %wd %X|bg-320x240x16.bmp| -%P|pg-300.bmp| %xl|A|mode-color-big.bmp|153|220|4| %xl|B|shuffle-color-big.bmp|113|220| %xl|C|volume-color-big.bmp|15|222|11| @@ -18,7 +17,7 @@ %ac%t3%ig;%ac%iy -%pb|5|10|310|178| +%pb|pg-300.bmp|10|178|300|5| %al %pc%ac%?fc%ar%pt %?ps<%xdB> %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> diff --git a/wps/UniCatcher.128x96x1.wps b/wps/UniCatcher.128x96x1.wps index e6ef042edf..b96ff5b9e4 100644 --- a/wps/UniCatcher.128x96x1.wps +++ b/wps/UniCatcher.128x96x1.wps @@ -3,7 +3,7 @@ %t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>;%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt> %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> %s%ac%?id<%id|%?d1<%d1|Unknown Album>> -%pb|4|11|117| +%pb|-|11|-|106|4| %s%ac%?in<%in|%pp> - %?it<%it|%fn> %xl|A|battery-s.bmp|109|3|5| diff --git a/wps/UniCatcher.160x128x16.wps b/wps/UniCatcher.160x128x16.wps index d3aa176c4d..4fe806f090 100644 --- a/wps/UniCatcher.160x128x16.wps +++ b/wps/UniCatcher.160x128x16.wps @@ -6,7 +6,7 @@ %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> %s%ac%?id<%id|%?d1<%d1|Unknown Album>> %al %fbKbps -%pb|4|10|150| +%pb|-|10|-|140|4| %s%ac%?in<%in|%pp> - %?it<%it|%fn> %xl|A|battery.bmp|135|8|5| diff --git a/wps/UniCatcher.160x128x2.wps b/wps/UniCatcher.160x128x2.wps index 2ba0d6dc7a..85f964ac24 100644 --- a/wps/UniCatcher.160x128x2.wps +++ b/wps/UniCatcher.160x128x2.wps @@ -6,7 +6,7 @@ %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> %s%ac%?id<%id|%?d1<%d1|Unknown Album>> %al %fbKbps -%pb|4|10|150| +%pb|-|10|-|140|4| %s%ac%?in<%in|%pp> - %?it<%it|%fn> %xl|A|battery-g.bmp|135|8|5| diff --git a/wps/UniCatcher.176x132x16.wps b/wps/UniCatcher.176x132x16.wps index 41cd648c63..df850d99b4 100644 --- a/wps/UniCatcher.176x132x16.wps +++ b/wps/UniCatcher.176x132x16.wps @@ -6,7 +6,7 @@ %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> %s%ac%?id<%id|%?d1<%d1|Unknown Album>> %al %fbKbps -%pb|4|10|166| +%pb|-|10|-|156|4| %s%ac%?in<%in|%pp> - %?it<%it|%fn> %xl|A|battery.bmp|151|8|5| diff --git a/wps/UniCatcher.176x220x16.wps b/wps/UniCatcher.176x220x16.wps index 2100b1d72a..9d60ff5ae7 100644 --- a/wps/UniCatcher.176x220x16.wps +++ b/wps/UniCatcher.176x220x16.wps @@ -11,7 +11,7 @@ %al %fbKbps -%pb|4|10|166| +%pb|-|10|-|156|4| %s%acNext: %?It<%It|%?Fn<%Fn|?>> %xl|A|battery.bmp|151|8|5| diff --git a/wps/UniCatcher.220x176x16.wps b/wps/UniCatcher.220x176x16.wps index 0ed45ce35d..44ceda9fb5 100644 --- a/wps/UniCatcher.220x176x16.wps +++ b/wps/UniCatcher.220x176x16.wps @@ -8,7 +8,7 @@ %s%ac%?id<%id|%?d1<%d1|Unknown Album>> %s%ac%?in<%in|%pp> - %?it<%it|%fn> %al %fbKbps -%pb|6|11|209| +%pb|-|11|-|198|6| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/UniCatcher.240x320x16.wps b/wps/UniCatcher.240x320x16.wps index cd0532bf80..17e3bcc256 100644 --- a/wps/UniCatcher.240x320x16.wps +++ b/wps/UniCatcher.240x320x16.wps @@ -16,7 +16,7 @@ %al %fbKbps -%pb|7|11|229| +%pb|-|11|-|218|7| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/UniCatcher.320x240x16.wps b/wps/UniCatcher.320x240x16.wps index b6410c3b7a..f36d11ea07 100644 --- a/wps/UniCatcher.320x240x16.wps +++ b/wps/UniCatcher.320x240x16.wps @@ -11,7 +11,7 @@ %al %fbKbps -%pb|7|11|309| +%pb|-|11|-|298|7| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/boxes.220x176x16.wps b/wps/boxes.220x176x16.wps index f008223ffb..4b6fdd6f3c 100644 --- a/wps/boxes.220x176x16.wps +++ b/wps/boxes.220x176x16.wps @@ -1,5 +1,4 @@ %X|backdrop-220x176.bmp| -%P|pb-220.bmp| %xl|A|codec.bmp|40|102|22| %xl|B|encoding.bmp|40|108|2| %xl|C|repeat.bmp|124|10|4| @@ -27,7 +26,7 @@ %fbk -%pb|8|0|208| +%pb|pb-220.bmp|0|-|208|8| %ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2> diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps index 2982c1cedd..bf981b1197 100644 --- a/wps/cabbiev2.112x64x1.wps +++ b/wps/cabbiev2.112x64x1.wps @@ -2,7 +2,6 @@ # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) %wd %x|z|wpsbackdrop-112x64x1.bmp|0|0| -%P|pb-112x64x1.bmp| %xl|A|lock-112x64x1.bmp|4|56|2| %xl|B|battery-112x64x1.bmp|22|56|9| %xl|C|volume-112x64x1.bmp|41|56|9| @@ -15,7 +14,7 @@ %s%ac%?ia<%ia|%?d2<%d2|(root)>> %s%ac%?id<%id|%?d1<%d1|(root)>> %t5%ac%s%?Fn|%ac%pp of %pe>;%t5%ac%s%?Fn|%ac%pp of %pe> -%pb|4|1|111|42| +%pb|pb-112x64x1.bmp|1|42|110|4| %pc%ar%pr #Bottom status bar %?mh<%xdAa|%xdAb> diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps index 0d4567e49d..99cda7b93a 100644 --- a/wps/cabbiev2.128x128x16.wps +++ b/wps/cabbiev2.128x128x16.wps @@ -3,7 +3,6 @@ #derived from "cabbie" (C) Yohann Misquitta %wd %X|wpsbackdrop-128x128x16.bmp| -%P|pb-128x128x16.bmp| %xl|A|lock-128x128x16.bmp|3|110|2| %xl|B|battery-128x128x16.bmp|23|110|10| %xl|C|volume-128x128x16.bmp|51|110|10| @@ -11,7 +10,7 @@ %xl|E|repeat-128x128x16.bmp|97|110|4| %xl|F|playmode-128x128x16.bmp|111|110|5| %Cl|4|12|s60|s60| -%pb|6|3|125|87| +%pb|pb-128x128x16.bmp|3|87|122|6| #NowPlaying %?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)>>> diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps index 8b360291a6..7ea6889b75 100644 --- a/wps/cabbiev2.128x64x1.wps +++ b/wps/cabbiev2.128x64x1.wps @@ -1,9 +1,8 @@ # 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|pb-128x64x1.bmp| %x|A|wpsbackdrop-128x64x1.bmp|0|0| -%pb|8|1|126|38| +%pb|pb-128x64x1.bmp|1|38|125|8| %s%ac%?it<%it|%fn> %s%ac%?ia<%ia|%?d2<%d2|(root)>> diff --git a/wps/cabbiev2.128x96x2.wps b/wps/cabbiev2.128x96x2.wps index 637e74e5b9..c3e4337ff0 100644 --- a/wps/cabbiev2.128x96x2.wps +++ b/wps/cabbiev2.128x96x2.wps @@ -2,14 +2,13 @@ # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) %wd %X|wpsbackdrop-128x96x2.bmp| -%P|pb-128x96x2.bmp| %xl|A|lock-160x128x2.bmp|3|1|2| %xl|B|battery-160x128x2.bmp|26|2|10| %xl|C|volume-160x128x2.bmp|49|1|10| %xl|D|shuffle-160x128x2.bmp|72|2| %xl|E|repeat-160x128x2.bmp|93|0|4| %xl|F|playmode-160x128x2.bmp|112|1|5| -%pb|7|1|126|61| +%pb|pb-128x96x2.bmp|1|61|125|7| %V|0|83|128|13|1|0|3| %?mh<%xdAa|%xdAb> %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps index 2b0caed4fb..cfc8a38900 100644 --- a/wps/cabbiev2.132x80x16.wps +++ b/wps/cabbiev2.132x80x16.wps @@ -2,7 +2,6 @@ # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) %wd %X|wpsbackdrop-132x80x16.bmp| -%P|pb-132x80x16.bmp| %xl|A|lock-132x80x16.bmp|36|69|2| %xl|B|battery-132x80x16.bmp|51|69|10| %xl|C|volume-132x80x16.bmp|69|69|10| @@ -10,7 +9,7 @@ %xl|E|repeat-132x80x16.bmp|105|67|4| %xl|F|playmode-132x80x16.bmp|118|67|5| %Cl|3|14|c40|c40| -%pb|6|2|129|58| +%pb|pb-132x80x16.bmp|2|58|127|6| #NowPlaying %?C<%s%m|48|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> %?C<%s%m|48|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps index 0112b479c7..c9d4c5a900 100644 --- a/wps/cabbiev2.138x110x2.wps +++ b/wps/cabbiev2.138x110x2.wps @@ -4,7 +4,6 @@ # derived from "cabbie" (C) Yohann Misquitta %wd %X|wpsbackdrop-138x110x2.bmp| -%P|pb-138x110x2.bmp| %xl|A|lock-160x128x2.bmp|4|98|2| %xl|B|battery-160x128x2.bmp|28|99|10| %xl|C|volume-160x128x2.bmp|53|98|10| @@ -12,7 +11,7 @@ %xl|E|repeat-160x128x2.bmp|102|97|4| %xl|F|playmode-160x128x2.bmp|123|98|5| %Cl|5|15|s55|s55| -%pb|6|2|136|75| +%pb|pb-138x110x2.bmp|2|75|134|6| %?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)>>> diff --git a/wps/cabbiev2.160x128x1.wps b/wps/cabbiev2.160x128x1.wps index 8727a446a6..643ddd136c 100644 --- a/wps/cabbiev2.160x128x1.wps +++ b/wps/cabbiev2.160x128x1.wps @@ -5,14 +5,13 @@ # derived from "cabbie" (C) Yohann Misquitta %wd %x|z|wpsbackdrop-160x128x1.bmp|0|0| -%P|pb-160x128x1.bmp| %xl|A|lock-160x128x1.bmp|48|114|2| %xl|B|battery-160x128x1.bmp|66|115|10| %xl|C|volume-160x128x1.bmp|87|114|10| %xl|D|shuffle-160x128x1.bmp|107|115| %xl|E|repeat-160x128x1.bmp|127|113|4| %xl|F|playmode-160x128x1.bmp|145|114|5| -%pb|8|1|159|86| +%pb|pb-160x128x1.bmp|1|86|158|8| %s%ac%?it<%it|%fn> %s%ac%?ia<%ia|%?d2<%d2|(root)>> %s%ac%?id<%id|%?d1<%d1|(root)>> diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps index f35eb2dda3..ed5135c41b 100644 --- a/wps/cabbiev2.160x128x16.wps +++ b/wps/cabbiev2.160x128x16.wps @@ -2,7 +2,6 @@ # (C) 2007, Johannes Voggenthaler (Zinc Alloy) #derived from "cabbie" (C) Yohann Misquitta %wd -%P|pb-160x128x16.bmp| %X|wpsbackdrop-160x128x16.bmp| %xl|A|lock-160x128x16.bmp|48|114|2| %xl|B|battery-160x128x16.bmp|66|115|10| @@ -11,7 +10,7 @@ %xl|E|repeat-160x128x16.bmp|125|112|4| %xl|F|playmode-160x128x16.bmp|142|114|5| %Cl|7|16|c65|c65| -%pb|8|6|155|86| +%pb|pb-160x128x16.bmp|6|86|149|8| #NowPlaying %?C<%s%m|77|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> %?C<%s%m|77|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps index 6307129407..20025525aa 100644 --- a/wps/cabbiev2.160x128x2.wps +++ b/wps/cabbiev2.160x128x2.wps @@ -5,7 +5,6 @@ # derived from "cabbie" (C) Yohann Misquitta %wd %X|wpsbackdrop-160x128x2.bmp| -%P|pb-160x128x2.bmp| %xl|A|lock-160x128x2.bmp|48|114|2| %xl|B|battery-160x128x2.bmp|66|115|10| %xl|C|volume-160x128x2.bmp|87|114|10| @@ -13,7 +12,7 @@ %xl|E|repeat-160x128x2.bmp|127|113|4| %xl|F|playmode-160x128x2.bmp|145|114|5| %Cl|2|16|s64|s64| -%pb|8|1|159|86| +%pb|pb-160x128x2.bmp|1|86|158|8| %?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)>>> diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps index 93a207bc10..85d40fc4b9 100644 --- a/wps/cabbiev2.176x132x16.wps +++ b/wps/cabbiev2.176x132x16.wps @@ -3,7 +3,6 @@ #derived from "cabbie" (C) Yohann Misquitta #Ported to nano by crzyboyster %wd -%P|pb-176x132x16.bmp| %X|wpsbackdrop-176x132x16.bmp| %xl|A|lock-176x132x16.bmp|65|116|2| %xl|B|battery-176x132x16.bmp|83|117|10| @@ -12,7 +11,7 @@ %xl|E|repeat-176x132x16.bmp|139|113|4| %xl|F|playmode-176x132x16.bmp|156|115|5| %Cl|9|16|s65|s65| -%pb|8|8|168|86| +%pb|pb-176x132x16.bmp|8|86|160|8| #NowPlaying %?C<%s%m|81|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> %?C<%s%m|81|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps index 042ffcdf01..3c8cd035ee 100644 --- a/wps/cabbiev2.176x220x16.wps +++ b/wps/cabbiev2.176x220x16.wps @@ -2,7 +2,6 @@ # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) %wd %X|wpsbackdrop-176x220x16.bmp| -%P|pb-176x220x16.bmp| %xl|A|lock-176x220x16.bmp|51|204|2| %xl|B|battery-176x220x16.bmp|73|206|10| %xl|C|volume-176x220x16.bmp|97|206|10| @@ -10,7 +9,7 @@ %xl|E|repeat-176x220x16.bmp|144|204|4| %xl|F|playmode-176x220x16.bmp|159|204|5| %Cl|29|20|c120|c120| -%pb|8|5|171|182| +%pb|pb-176x220x16.bmp|5|182|166|8| #NowPlaying diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps index 94cf128d43..ce8dc2b091 100644 --- a/wps/cabbiev2.220x176x16.wps +++ b/wps/cabbiev2.220x176x16.wps @@ -3,7 +3,6 @@ #derived from "cabbie" (C) Yohann Misquitta %wd %X|wpsbackdrop-220x176x16.bmp| -%P|pb-220x176x16.bmp| %xl|A|lock-220x176x16.bmp|88|152|2| %xl|B|battery-220x176x16.bmp|110|153|10| %xl|C|volume-220x176x16.bmp|134|153|10| @@ -11,7 +10,7 @@ %xl|E|repeat-220x176x16.bmp|182|151|4| %xl|F|playmode-220x176x16.bmp|200|152|5| %Cl|15|32|s75|s75| -%pb|8|11|210|121| +%pb|pb-220x176x16.bmp|11|121|199|8| #NowPlaying diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps index 2ed0b4a842..207052b1d6 100644 --- a/wps/cabbiev2.240x320x16.wps +++ b/wps/cabbiev2.240x320x16.wps @@ -5,7 +5,6 @@ %wd %X|wpsbackdrop-240x320x16.bmp| -%P|pb-240x320x16.bmp| %xl|A|lock-240x320x16.bmp|11|292|2| %xl|B|battery-240x320x16.bmp|46|292|10| %xl|C|volume-240x320x16.bmp|98|292|10| @@ -13,7 +12,7 @@ %xl|E|repeat-240x320x16.bmp|182|292|4| %xl|F|playmode-240x320x16.bmp|206|292|5| %Cl|55|30|c130|c130| -%pb|13|22|221|254| +%pb|pb-240x320x16.bmp|22|254|199|13| %?C<|> %?C<|%s%ac%?it<%it|%fn>> %?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps index f6495948e9..cbe967d9a9 100644 --- a/wps/cabbiev2.320x240x16.wps +++ b/wps/cabbiev2.320x240x16.wps @@ -3,7 +3,6 @@ #derived from "cabbie" (C) Yohann Misquitta %wd %X|wpsbackdrop-320x240x16.bmp| -%P|pb-320x240x16.bmp| %xl|A|lock-320x240x16.bmp|91|207|2| %xl|B|battery-320x240x16.bmp|126|207|10| %xl|C|volume-320x240x16.bmp|177|207|10| @@ -11,7 +10,7 @@ %xl|E|repeat-320x240x16.bmp|261|207|4| %xl|F|playmode-320x240x16.bmp|286|207|5| %Cl|16|32|s120|s120| -%pb|15|10|310|162| +%pb|pb-320x240x16.bmp|10|162|300|15| #NowPlaying %?C<%s%m|153|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> diff --git a/wps/iCatcher.112x64x1.wps b/wps/iCatcher.112x64x1.wps index 68cfd79a2a..1f54a1193b 100644 --- a/wps/iCatcher.112x64x1.wps +++ b/wps/iCatcher.112x64x1.wps @@ -5,7 +5,7 @@ %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> %s%ac%?id<%id|%?d1<%d1|Unknown Album>> %s%ac%?in<%in|%pp> - %?it<%it|%fn> -%pb|3|11|101| +%pb|-|11|-|90|3| %t6%s%ac%?Fm|%fbKbps %fc>;%t6%s%ac%?Fm|%fbKbps %fc> %xl|A|battery-s.bmp|93|3|5| diff --git a/wps/iCatcher.128x128x16.wps b/wps/iCatcher.128x128x16.wps index 691ed8d9c4..9f24f09cce 100644 --- a/wps/iCatcher.128x128x16.wps +++ b/wps/iCatcher.128x128x16.wps @@ -11,7 +11,7 @@ %al %fbKbps -%pb|4|11|117| +%pb|-|11|-|106|4| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/iCatcher.128x64x1.160x128x2.wps b/wps/iCatcher.128x64x1.160x128x2.wps index e137a08be6..3d0702644c 100644 --- a/wps/iCatcher.128x64x1.160x128x2.wps +++ b/wps/iCatcher.128x64x1.160x128x2.wps @@ -4,7 +4,7 @@ %t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >;%t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe|%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt > %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> %s%ac%?id<%id|%?d1<%d1|Unknown Album>> -%pb|4|11|117| +%pb|-|11|-|106|4| %s%ac%?in<%in|%pp> - %?it<%it|%fn> %xl|A|battery-s.bmp|109|3|5| diff --git a/wps/iCatcher.128x96x1.wps b/wps/iCatcher.128x96x1.wps index 0ebea5f7d5..1222642adf 100644 --- a/wps/iCatcher.128x96x1.wps +++ b/wps/iCatcher.128x96x1.wps @@ -6,7 +6,7 @@ %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> %s%ac%?id<%id|%?d1<%d1|Unknown Album>> %s%ac%?in<%in|%pp> - %?it<%it|%fn> -%pb|4|11|117| +%pb|-|11|-|106|4| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/iCatcher.132x80x16.wps b/wps/iCatcher.132x80x16.wps index 428d28b7c2..bc730a2c2f 100644 --- a/wps/iCatcher.132x80x16.wps +++ b/wps/iCatcher.132x80x16.wps @@ -6,7 +6,7 @@ %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> %s%ac%?id<%id|%?d1<%d1|Unknown Album>> %s%ac%?in<%in|%pp> - %?it<%it|%fn> -%pb|4|11|117| +%pb|-|11|-|106|4| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/iCatcher.138x110x2.wps b/wps/iCatcher.138x110x2.wps index 5e1c651b4a..c4a64acc92 100644 --- a/wps/iCatcher.138x110x2.wps +++ b/wps/iCatcher.138x110x2.wps @@ -10,7 +10,7 @@ %s%ac%?in<%in|%pp> - %?it<%it|%fn> %al %fbKbps -%pb|4|10|128| +%pb|-|10|-|118|4| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/iCatcher.160x128x16.wps b/wps/iCatcher.160x128x16.wps index 8147214b70..8604ba39b0 100644 --- a/wps/iCatcher.160x128x16.wps +++ b/wps/iCatcher.160x128x16.wps @@ -11,7 +11,7 @@ %s%ac%?in<%in|%pp> - %?it<%it|%fn> %al %fbKbps -%pb|4|10|150| +%pb|-|10|-|140|4| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/iCatcher.160x128x2.wps b/wps/iCatcher.160x128x2.wps index e2d786de3b..1405dc3ad6 100644 --- a/wps/iCatcher.160x128x2.wps +++ b/wps/iCatcher.160x128x2.wps @@ -11,7 +11,7 @@ %s%ac%?in<%in|%pp> - %?it<%it|%fn> %al %fbKbps -%pb|4|10|150| +%pb|-|10|-|140|4| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/iCatcher.176x132x16.wps b/wps/iCatcher.176x132x16.wps index 2064246e7d..b6bd62a699 100644 --- a/wps/iCatcher.176x132x16.wps +++ b/wps/iCatcher.176x132x16.wps @@ -11,7 +11,7 @@ %s%ac%?in<%in|%pp> - %?it<%it|%fn> %al %fbKbps -%pb|4|10|166| +%pb|-|10|-|156|4| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/iCatcher.176x220x16.wps b/wps/iCatcher.176x220x16.wps index 4c74d53bdf..18a634a867 100644 --- a/wps/iCatcher.176x220x16.wps +++ b/wps/iCatcher.176x220x16.wps @@ -15,7 +15,7 @@ %al %fbKbps -%pb|4|10|166| +%pb|-|10|-|156|4| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/iCatcher.220x176x16.wps b/wps/iCatcher.220x176x16.wps index 45ead21d42..dea2c1a3d9 100644 --- a/wps/iCatcher.220x176x16.wps +++ b/wps/iCatcher.220x176x16.wps @@ -9,7 +9,7 @@ %s%ac%?in<%in|%pp> - %?it<%it|%fn> %al %fbKbps -%pb|6|11|209| +%pb|-|11|-|198|6| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/iCatcher.240x320x16.wps b/wps/iCatcher.240x320x16.wps index dff593068b..b2774d46dd 100644 --- a/wps/iCatcher.240x320x16.wps +++ b/wps/iCatcher.240x320x16.wps @@ -13,7 +13,7 @@ %al %fbKbps -%pb|7|11|229| +%pb|-|11|-|218|7| %s%acNext: %?It<%It|%?Fn<%Fn|?>> diff --git a/wps/iCatcher.320x240x16.wps b/wps/iCatcher.320x240x16.wps index ec7cef15dd..59d9d49925 100644 --- a/wps/iCatcher.320x240x16.wps +++ b/wps/iCatcher.320x240x16.wps @@ -9,7 +9,7 @@ %s%ac%?in<%in|%pp> - %?it<%it|%fn> %al %fbKbps -%pb|7|11|309| +%pb|-|11|-|298|7| %s%acNext: %?It<%It|%?Fn<%Fn|?>> -- cgit v1.2.3