9 files changed, 151 insertions, 82 deletions

diff --git a/wps/WPSLIST b/wps/WPSLIST
index 938caa13fa..b334ed4222 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -292,7 +292,7 @@ RSBS:
 Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta.
 
 # Preferred font (including .fnt extension - leave blank for player):
-Font.320x480x16: 16-Adobe-Helvetica.fnt
+Font.320x480x16: 27-Adobe-Helvetica.fnt
 Font.320x240x16: 15-Adobe-Helvetica.fnt
 Font.240x400x16: 16-Adobe-Helvetica.fnt
 Font.240x320x16: 15-Adobe-Helvetica.fnt
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index 7b20adf7cf..04f3343d95 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -1,36 +1,92 @@
-# cabbie 2.0 default for the Sansa e200 Series by Marc Guay
-# derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# cabbie 2.0
+# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# (C) 2009, Maurus Cuelenaere (mcuelenaere) ported to Onda VX747
+# derived from "cabbie" (C) Yohann Misquitta
+
+# TODO:
+#  * Touch regions
+#  * images for battery, hold button
 %wd
-%X(wpsbackdrop-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)
-%xl(D,shuffle-176x220x16.bmp,119,207)
-%xl(E,repeat-176x220x16.bmp,144,204,4)
-%xl(F,playmode-176x220x16.bmp,159,204,5)
-%Cl(29,20,120,120,c,c)
-%pb(5,182,166,8,pb-176x220x16.bmp)
-#NowPlaying
-
-
-%?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<|%s%ac%?iy<%iy|>>
-
-%?C<|%s%ac%Sx(Next Track:)>
-%?C<|%s%ac%?It<%It|%Fn>>
-%?C<|%s%ac%?Ia<%Ia|>>
-
-%?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%)>>|>
-
-%al    %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr   
-%xd(A, %mh)
-%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%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)>
+
+
+# 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>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+
+# next track info - AA
+%Vl(a,0,338,-,-,-)
+%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
+
+# playtime
+%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)
+
+#%?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)>
 %xd(E, %mm, -1)
 %xd(F, %mp)
-%?C<%Cd>
+
+#%T(206,0,24,24,play)
+#%T(206,0,24,24,&stop)
+#%T(182,0,18,92,repmode)
+#%T(139,0,37,23,shuffle)
+#%T(98,0,33,23,volume)
+
+#viewport for the touch icons
+#%xl(G,browser-320x240x16.bmp,0,0)
+#%xl(I,pitch-320x240x16.bmp,39,0)
+#%xl(H,context-320x240x16.bmp,58,0)
+#%xl(J,quick-320x240x16.bmp,86,0)
+#%xl(K,rew-320x240x16.bmp,115,0)
+#%xl(L,ff-320x240x16.bmp,144,0)
+
+%Vl(t,70,335,-,30,1)
+#%xd(G) %xd(H) %xd(I) %xd(J) %xd(K) %xd(L)
+#%T(0,0,37,24,browse)
+#%T(39,5,24,24,pitch)
+#%T(58,0,24,24,contextmenu)
+#%T(86,0,24,24,quickscreen)
+#%T(115,0,24,23,&rwd)
+#%T(144,0,24,23,&ffwd)
+#%T(115,0,24,23,prev)
+#%T(144,0,24,23,next)
diff --git a/wps/cabbiev2.320x480x16.wps b/wps/cabbiev2.320x480x16.wps
index a64fa6fcf7..ee73a02af2 100644
--- a/wps/cabbiev2.320x480x16.wps
+++ b/wps/cabbiev2.320x480x16.wps
@@ -1,20 +1,20 @@
 # cabbie 2.0
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-# (C) 2009, Maurus Cuelenaere (mcuelenaere) ported to Onda VX747
+# (C) 2010  Thomas Martitz, port to 320x480x16
 # derived from "cabbie" (C) Yohann Misquitta
 
+# LOTS OF FIXMEs HERE
+
 %wd
-%X(wpsbackdrop-240x400x16.bmp)
-%Cl(55,50,130,130,c,c)
-%pb(22,284,199,13,pb-240x320x16.bmp)
-%T(22,284,199,13,progressbar)
-%T(90,238,60,20,playlist)
-%?Tl(2.5)<%Vd(t)|%Vd(u)>
-%V(0,0,240,330,1)
+%X(wpsbackdrop-320x480x16.bmp)
 
+%Cl(0,0,180,180,c,c)
 
-%?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%)>>>
@@ -22,58 +22,71 @@
 %?C<|>
 %?C<|%ac%?ig<%ig|>>
 %?C<|%ac%?fv<%(vbr%) |>%fb kbit/s %fc>
-%?C<|>
-%?C<%s%ac%?it<%it|%fn>|>
-%?C<%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>
-%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
 %?C<|%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>>
-%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
+%?C<|>
+%ac%Sx(Next Track:)
+%ac%s%?It<%It|%Fn>
+
+# current track info - AA
+%Vl(a,0,240,-,-,-)
+%s%ac%?it<%it|%fn>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
+# next track info - AA
+%Vl(a,0,338,-,-,-)
+%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
 
-     %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr     
+# playtime
+%V(15,398,290,30,-)
+%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
 
-%?C<%Cd>
 
-%xl(A,lock-240x320x16.bmp,11,0,2)
-%xl(B,battery-240x320x16.bmp,46,0,10)
-%xl(C,volume-240x320x16.bmp,98,0,10)
-%xl(D,shuffle-240x320x16.bmp,139,0)
-%xl(E,repeat-240x320x16.bmp,182,0,4)
-%xl(F,playmode-240x320x16.bmp,206,0,5)
+#%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)>>
+#%?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)>
+#%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
-%T(206,0,24,24,play)
-%T(206,0,24,24,&stop)
-%T(182,0,18,92,repmode)
-%T(139,0,37,23,shuffle)
-%T(98,0,33,23,volume)
+#%T(206,0,24,24,play)
+#%T(206,0,24,24,&stop)
+#%T(182,0,18,92,repmode)
+#%T(139,0,37,23,shuffle)
+#%T(98,0,33,23,volume)
 
 #viewport for the touch icons
-%xl(G,browser-320x240x16.bmp,0,0)
-%xl(I,pitch-320x240x16.bmp,39,0)
-%xl(H,context-320x240x16.bmp,58,0)
-%xl(J,quick-320x240x16.bmp,86,0)
-%xl(K,rew-320x240x16.bmp,115,0)
-%xl(L,ff-320x240x16.bmp,144,0)
+#%xl(G,browser-320x240x16.bmp,0,0)
+#%xl(I,pitch-320x240x16.bmp,39,0)
+#%xl(H,context-320x240x16.bmp,58,0)
+#%xl(J,quick-320x240x16.bmp,86,0)
+#%xl(K,rew-320x240x16.bmp,115,0)
+#%xl(L,ff-320x240x16.bmp,144,0)
 
 %Vl(t,70,335,-,30,1)
-%xd(G) %xd(H) %xd(I) %xd(J) %xd(K) %xd(L)
-%T(0,0,37,24,browse)
-%T(39,5,24,24,pitch)
-%T(58,0,24,24,contextmenu)
-%T(86,0,24,24,quickscreen)
-%T(115,0,24,23,&rwd)
-%T(144,0,24,23,&ffwd)
-%T(115,0,24,23,prev)
-%T(144,0,24,23,next)
-
-%Vl(u,70,335,-,30,1)
+#%xd(G) %xd(H) %xd(I) %xd(J) %xd(K) %xd(L)
+#%T(0,0,37,24,browse)
+#%T(39,5,24,24,pitch)
+#%T(58,0,24,24,contextmenu)
+#%T(86,0,24,24,quickscreen)
+#%T(115,0,24,23,&rwd)
+#%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)
diff --git a/wps/cabbiev2/pb-320x480x16.bmp b/wps/cabbiev2/pb-320x480x16.bmp
new file mode 100644
index 0000000000..dae7f74c2f
--- /dev/null
+++ b/wps/cabbiev2/pb-320x480x16.bmp
diff --git a/wps/cabbiev2/playmode-320x480x16.bmp b/wps/cabbiev2/playmode-320x480x16.bmp
new file mode 100644
index 0000000000..d32398d4e9
--- /dev/null
+++ b/wps/cabbiev2/playmode-320x480x16.bmp
diff --git a/wps/cabbiev2/repeat-320x480x16.bmp b/wps/cabbiev2/repeat-320x480x16.bmp
new file mode 100644
index 0000000000..61c0feedfe
--- /dev/null
+++ b/wps/cabbiev2/repeat-320x480x16.bmp
diff --git a/wps/cabbiev2/shuffle-320x480x16.bmp b/wps/cabbiev2/shuffle-320x480x16.bmp
new file mode 100644
index 0000000000..f77da93620
--- /dev/null
+++ b/wps/cabbiev2/shuffle-320x480x16.bmp
diff --git a/wps/cabbiev2/volume-320x480x16.bmp b/wps/cabbiev2/volume-320x480x16.bmp
new file mode 100644
index 0000000000..9eeacb722e
--- /dev/null
+++ b/wps/cabbiev2/volume-320x480x16.bmp
diff --git a/wps/cabbiev2/wpsbackdrop-320x480x16.bmp b/wps/cabbiev2/wpsbackdrop-320x480x16.bmp
index 3278c0d965..3711f89238 100644
--- a/wps/cabbiev2/wpsbackdrop-320x480x16.bmp
+++ b/wps/cabbiev2/wpsbackdrop-320x480x16.bmp