1 files changed, 32 insertions, 32 deletions

diff --git a/wps/cabbiev2.320x480x16.wps b/wps/cabbiev2.320x480x16.wps
index ee73a02af2..9d7348dc56 100644
--- a/wps/cabbiev2.320x480x16.wps
+++ b/wps/cabbiev2.320x480x16.wps
@@ -3,30 +3,44 @@
 # (C) 2010  Thomas Martitz, port to 320x480x16
 # derived from "cabbie" (C) Yohann Misquitta
 
-# LOTS OF FIXMEs HERE
-
+# TODO:
+#  * Touch regions
+#  * images for battery, hold button
 %wd
 %X(wpsbackdrop-320x480x16.bmp)
 
+#%xl(A,lock-240x320x16.bmp,11,0,2)
+#%xl(B,battery-240x320x16.bmp,46,0,10)
+%xl(C,volume-320x480x16.bmp,91,60,10)
+%xl(D,shuffle-320x480x16.bmp,156,65)
+%xl(E,repeat-320x480x16.bmp,231,55,4)
+%xl(F,playmode-320x480x16.bmp,273,55,5)
+
 %Cl(0,0,180,180,c,c)
 
 %C?<%Vd(a)|%Vd(b)>
 #%T(22,284,199,13,progressbar)
 #%T(90,238,60,20,playlist)
 %?Tl(2.5)<%Vd(t)|%Vd(u)>
-%Vl(b,0,0,-,-,-)
-%?C<|%s%ac%?it<%it|%fn>>
-%?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>
-%?C<|%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>>
-%?C<|%ac%?iy<%iy|>>
-%?C<|>
-%?C<|%ac%?ig<%ig|>>
-%?C<|%ac%?fv<%(vbr%) |>%fb kbit/s %fc>
-%?C<|%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>>
-%?C<|>
+
+
+# track & next track info - no AA
+%Vl(b,0,50,-,-,-)
+%s%ac%?it<%it|%fn>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+%ac%?iy<%iy|>
+
+%ac%?ig<%ig|>
+%ac%?fv<%(vbr%) |>%fb kbit/s %fc
+%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>
 %ac%Sx(Next Track:)
 %ac%s%?It<%It|%Fn>
 
+# album art viewport
+%Vl(a,70,50,180,180,-)
+%?C<%Cd>
+
 # current track info - AA
 %Vl(a,0,240,-,-,-)
 %s%ac%?it<%it|%fn>
@@ -41,21 +55,16 @@
 %V(15,398,290,30,-)
 %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
 
+# progressbar and bottom icons
+%V(0,371,-,-,-)
+%pb(20,0,280,-,pb-320x480x16.bmp)
 
-#%xl(A,lock-240x320x16.bmp,11,0,2)
-#%xl(B,battery-240x320x16.bmp,46,0,10)
-%xl(C,volume-320x480x16.bmp,91,60,10)
-#%xl(D,shuffle-240x320x16.bmp,139,0)
-#%xl(E,repeat-320x480x16.bmp,182,0,4)
-#%xl(F,playmode-240x320x16.bmp,206,0,5)
-
-%V(0,372,240,-,1)
 #%?mh<%xd(Aa)|%xd(Ab)>
 #%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
-#%?ps<%xd(D)>
-#%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-#%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+%?ps<%xd(D)>
+%xd(E, %mm, -1)
+%xd(F, %mp)
 
 #%T(206,0,24,24,play)
 #%T(206,0,24,24,&stop)
@@ -81,12 +90,3 @@
 #%T(144,0,24,23,&ffwd)
 #%T(115,0,24,23,prev)
 #%T(144,0,24,23,next)
-
-#%Vl(u,70,335,-,30,1)
-#purposely left blank
-
-%Vl(a,70,50,180,180,-)
-%?C<%Cd>
-
-%V(0,371,-,-,-)
-%pb(20,0,280,-,pb-320x480x16.bmp)