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

1 files changed, 20 insertions, 9 deletions

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