forgot 2 lcd sizes, and fix the progress viewport in 160x128x2

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17762 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 21 insertions, 10 deletions

diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index 85d40fc4b9..ef01e0e420 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -12,19 +12,30 @@
 %xl|F|playmode-176x132x16.bmp|156|115|5|
 %Cl|9|16|s65|s65|
 %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)>>>
-%?C<%s%m|81|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>>
-
-%?C<%s%m|81|%alNext Track:|%acNext Track:>
-%?C<%s%m|81|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
-
-%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
+%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