From ef9c9d6354bbe1ca28f22c913666800ccf4b3d41 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 23 Jun 2008 07:32:27 +0000 Subject: replace %m from all svn WPS with use conditional viewports. One thing I forgot to mention in the cond vp commit... if any viewports are defined in a WPS, it wont let you display text in the default viewport (the one which has everything up untill the first %V..) You should only use that viewport for image placement git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17761 a1c6a512-1295-4272-9138-f99709370657 --- wps/boxes.176x132x16.wps | 77 ++++++++++++++++++++++++--------------------- wps/cabbiev2.128x128x16.wps | 36 ++++++++++++++------- wps/cabbiev2.132x80x16.wps | 23 ++++++++++---- wps/cabbiev2.138x110x2.wps | 27 +++++++++++----- wps/cabbiev2.160x128x16.wps | 33 +++++++++++++------ wps/cabbiev2.160x128x2.wps | 29 +++++++++++------ wps/cabbiev2.220x176x16.wps | 35 +++++++++++++-------- 7 files changed, 167 insertions(+), 93 deletions(-) diff --git a/wps/boxes.176x132x16.wps b/wps/boxes.176x132x16.wps index a159aa3bab..00324f15f9 100644 --- a/wps/boxes.176x132x16.wps +++ b/wps/boxes.176x132x16.wps @@ -1,37 +1,42 @@ -%X|backdrop-176x132.bmp| -%xl|A|codec.bmp|40|70|22| -%xl|B|encoding.bmp|40|76|2| -%xl|C|repeat.bmp|99|0|4| -%xl|D|navi-colour.bmp|68|3|5| -%xl|E|shf.bmp|99|17| -%xl|F|lock-m.bmp|87|0| -%xl|G|lock-r.bmp|87|12| -%xl|H|volume-colour.bmp|12|1|11| -%xl|I|battery-colour.bmp|149|1|6| -%xl|J|rating-colour.bmp|91|68|11| +# cabbie 2.0 default +# (C) 2007, Johannes Voggenthaler (Zinc Alloy) +#derived from "cabbie" (C) Yohann Misquitta +#Ported to nano by crzyboyster %wd - - - - -%ac%s%?it<%it|%fn> -%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>;%ac%t5%s%?id<%id|%?d1<%d1|(Unknown Album)>> - -%ac%t5%pc / %pt;%ac%t5Track %pp of %pe - - %fbk - -%pb - - -%ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2> -%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk> -%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>> -%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu|%xdAv> -%?fv<%xdBa|%xdBb> -%?mm<|%xdCa|%xdCb|%xdCc|%xdCd> -%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe> -%?ps<%xdE|> -%?mh<%xdF|> -%?mr<%xdG|> -%?rr<%xdJa|%xdJb|%xdJc|%xdJd|%xdJe|%xdJf|%xdJg|%xdJh|%xdJi|%xdJj|%xdJk> +%X|wpsbackdrop-176x132x16.bmp| +%xl|A|lock-176x132x16.bmp|65|116|2| +%xl|B|battery-176x132x16.bmp|83|117|10| +%xl|C|volume-176x132x16.bmp|102|117|10| +%xl|D|shuffle-176x132x16.bmp|120|117| +%xl|E|repeat-176x132x16.bmp|139|113|4| +%xl|F|playmode-176x132x16.bmp|156|115|5| +%Cl|9|16|s65|s65| +%pb|pb-176x132x16.bmp|8|86|160|8| +%?mh<%xdAa|%xdAb> +%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> +%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj> +%?ps<%xdD> +%?mm<|%xdEa|%xdEb|%xdEc|%xdEd> +%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe> + +%?C<%Vda%C|%Vdb> + +#NowPlaying +%Vl|a|81|12|-|-|1|-|-| +%s%al%?it<%it|%fn> +%s%al%?ia<%ia|%?d2<%d2|(root)>> +%s%al%?id<%id|%?d1<%d1|(root)>> + +%s%alNext Track: +%s%al%?It<%It|%Fn> + +%Vl|b|0|12|-|-|1|-|-| +%s%ac%?it<%it|%fn> +%s%ac%?ia<%ia|%?d2<%d2|(root)>> +%s%ac%?id<%id|%?d1<%d1|(root)>> + +%acNext Track: +%s%ac%?It<%It|%Fn> + +%V|0|96|-|-|1|-|-| +%al %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps index 99cda7b93a..ae99889032 100644 --- a/wps/cabbiev2.128x128x16.wps +++ b/wps/cabbiev2.128x128x16.wps @@ -11,20 +11,34 @@ %xl|F|playmode-128x128x16.bmp|111|110|5| %Cl|4|12|s60|s60| %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)>>> -%?C<%s%m|70|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>> -%?C<%s%m|70|%al%iy|%s%ac%iy> - -%s%acNext:%?It<%It|%Fn> - -%al %pc%ac%pp of %pe%ar%pr - +# images all in the default viewport %?mh<%xdAa|%xdAb> %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj> %?ps<%xdD> %?mm<|%xdEa|%xdEb|%xdEc|%xdEd> %?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe> -%?C<%C> + +%?C<%C%Vda|%Vdb> + + +#NowPlaying - with AA +%Vl|a|70|12|-|50|1|-|-| +%s%al%?it<%it|%fn> +%s%al%?ia<%ia|%?d2<%d2|(root)>> +%s%al%?id<%id|%?d1<%d1|(root)>> +%s%al%iy + +#NowPlaying - without AA +%Vl|b|0|12|-|50|1|-|-| +%s%ac%?it<%it|%fn> +%s%ac%?ia<%ia|%?d2<%d2|(root)>> +%s%ac%?id<%id|%?d1<%d1|(root)>> +%s%ac%iy + +#next and playlist +%V|0|70|-|-|1|-|-| +%s%acNext:%?It<%It|%Fn> + +%al %pc%ac%pp of %pe%ar%pr + diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps index cfc8a38900..f9bf447595 100644 --- a/wps/cabbiev2.132x80x16.wps +++ b/wps/cabbiev2.132x80x16.wps @@ -10,15 +10,26 @@ %xl|F|playmode-132x80x16.bmp|118|67|5| %Cl|3|14|c40|c40| %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)>>> -%?C<%s%m|48|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>> -%?C<%s%m|48|%alNext: %?It<%It|%Fn>|%s%acNext: %?It<%It|%Fn>> +%?C<%C%Vda|%Vdb> + +#Images %?mh<%xdAa|%xdAb> %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj> %?ps<%xdD> %?mm<|%xdEa|%xdEb|%xdEc|%xdEd> %?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe> -%?C<%C> + +#NowPlaying - aa +%Vl|a|48|10|-|48|1|-|-| +%s%al%?it<%it|%fn> +%s%al%?ia<%ia|%?d2<%d2|(root)>> +%s%al%?id<%id|%?d1<%d1|(root)>> +%s%alNext: %?It<%It|%Fn> + +#NowPlaying - no aa +%Vl|b|0|10|-|48|1|-|-| +%s%ac%?it<%it|%fn> +%s%ac%?ia<%ia|%?d2<%d2|(root)>> +%s%ac%?id<%id|%?d1<%d1|(root)>> +%s%acNext: %?It<%It|%Fn> diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps index c9d4c5a900..0a2f71abd9 100644 --- a/wps/cabbiev2.138x110x2.wps +++ b/wps/cabbiev2.138x110x2.wps @@ -12,17 +12,28 @@ %xl|F|playmode-160x128x2.bmp|123|98|5| %Cl|5|15|s55|s55| %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)>>> -%?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 +#images %?mh<%xdAa|%xdAb> %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj> %?ps<%xdD> %?mm<|%xdEa|%xdEb|%xdEc|%xdEd> %?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe> -%?C<%C> +%?C<%C%Vda|%Vdb> + +%Vl|a|65|10|-|60|1|-|-| +%s%al%?it<%it|%fn> +%s%al%?ia<%ia|%?d2<%d2|(root)>> +%s%al%?id<%id|%?d1<%d1|(root)>> +%s%alNext Track: +%s%al%?It<%It|%Fn> + +%Vl|b|0|10|-|60|1|-|-| +%s%ac%?it<%it|%fn> +%s%ac%?ia<%ia|%?d2<%d2|(root)>> +%s%ac%?id<%id|%?d1<%d1|(root)>> +%s%acNext Track: +%s%ac%?It<%It|%Fn> + +%V|0|82|-|-|1|-|-| +%al %pc%ac%pp of %pe%ar%pr diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps index ed5135c41b..413bdac8e0 100644 --- a/wps/cabbiev2.160x128x16.wps +++ b/wps/cabbiev2.160x128x16.wps @@ -11,19 +11,32 @@ %xl|F|playmode-160x128x16.bmp|142|114|5| %Cl|7|16|c65|c65| %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)>>> -%?C<%s%m|77|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>> - -%?C<%m|77||%ac>%t4Next Track: -%?C<%m|77||%ac>%s%t4%It - -%al %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr %?mh<%xdAa|%xdAb> %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj> %?ps<%xdD> %?mm<|%xdEa|%xdEb|%xdEc|%xdEd> %?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe> -%?C<%C> +%?C<%C%Vda|%Vdb> + +# NowPlaying - AA +%Vl|a|77|10|-|-|1|-|-| +%s%al%?it<%it|%fn> +%s%al%?ia<%ia|%?d2<%d2|(root)>> +%s%al%?id<%id|%?d1<%d1|(root)>> + +Next Track: +%s%?It<%It|%Fn> + +# NowPlaying - no AA +%Vl|b|0|10|-|-|1|-|-| +%s%ac%?it<%it|%fn> +%s%ac%?ia<%ia|%?d2<%d2|(root)>> +%s%ac%?id<%id|%?d1<%d1|(root)>> + +Next Track: +%s%?It<%It|%Fn> + +%V|0|66|-|-|1|-|-| +%al %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr + diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps index 20025525aa..3c3a885401 100644 --- a/wps/cabbiev2.160x128x2.wps +++ b/wps/cabbiev2.160x128x2.wps @@ -13,19 +13,30 @@ %xl|F|playmode-160x128x2.bmp|145|114|5| %Cl|2|16|s64|s64| %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)>>> - -%?C<%s%m|70|%alNext Track:|%s%acNext Track:> -%?C<%s%m|70|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>> - -%al %pc%ac%pp of %pe%ar%pr %?mh<%xdAa|%xdAb> %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj> %?ps<%xdD> %?mm<|%xdEa|%xdEb|%xdEc|%xdEd> %?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe> -%?C<%C> +%?C<%C%Vda|%Vdb> + +%Vl|a|70|10|-|-|1|-|-| +%s%al%?it<%it|%fn> +%s%al%?ia<%ia|%?d2<%d2|(root)>> +%s%al%?id<%id|%?d1<%d1|(root)>> + +%s%alNext Track: +%s%al%?It<%It|%Fn> + +%Vl|b|0|10|-|-|1|-|-| +%s%ac%?it<%it|%fn> +%s%ac%?ia<%ia|%?d2<%d2|(root)>> +%s%ac%?id<%id|%?d1<%d1|(root)>> + +%s%acNext Track: +%s%ac%?It<%It|%Fn> + +%Vl|a|0|96|-|-|1|-|-| +%al %pc%ac%pp of %pe%ar%pr diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps index ce8dc2b091..d2874bf167 100644 --- a/wps/cabbiev2.220x176x16.wps +++ b/wps/cabbiev2.220x176x16.wps @@ -11,23 +11,32 @@ %xl|F|playmode-220x176x16.bmp|200|152|5| %Cl|15|32|s75|s75| %pb|pb-220x176x16.bmp|11|121|199|8| +%?mh<%xdAa|%xdAb> +%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> +%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj> +%?ps<%xdD> +%?mm<|%xdEa|%xdEb|%xdEc|%xdEd> +%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe> + #NowPlaying +%?C<%Vda%C|%Vdb> +%Vl|a|105|30|-|-|1|-|-| +%s%al%?it<%it|%fn> +%s%al%?ia<%ia|%?d2<%d2|(root)>> +%s%al%?id<%id|%?d1<%d1|(root)>> -%?C<%s%m|105|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> -%?C<%s%m|105|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> -%?C<%s%m|105|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>> +%s%alNext Track: +%s%al%?It<%It|%Fn> -%?C<%s%m|105|%alNext Track:|%acNext Track:> -%?C<%s%m|105|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>> +%Vl|b|0|30|-|-|1|-|-| +%s%ac%?it<%it|%fn> +%s%ac%?ia<%ia|%?d2<%d2|(root)>> +%s%ac%?id<%id|%?d1<%d1|(root)>> +%acNext Track: +%s%ac%?It<%It|%Fn> -%al %pc%ac%pp of %pe%ar%pr -%?mh<%xdAa|%xdAb> -%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> -%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj> -%?ps<%xdD> -%?mm<|%xdEa|%xdEb|%xdEc|%xdEd> -%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe> -%?C<%C> +%V|0|130|-|-|1|-|-| +%al %pc%ac%pp of %pe%ar%pr -- cgit v1.2.3