5 files changed, 266 insertions, 114 deletions

diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps
index c1923ecfe3..3c56df1be1 100644
--- a/wps/cabbiev2.112x64x1.wps
+++ b/wps/cabbiev2.112x64x1.wps
@@ -1,25 +1,53 @@
 # cabbie 2.0 default for the Archos Series by Marianne Arnold
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+#
+# Disable Status Bar
 %wd
+#
+# Load Backdrop
 %x(z,wpsbackdrop-112x64x1.bmp,0,0)
-%xl(A,lock-112x64x1.bmp,4,56,2)
-%xl(B,battery-112x64x1.bmp,22,56,9)
-%xl(C,volume-112x64x1.bmp,41,56,9)
-%xl(D,shuffle-112x64x1.bmp,59,56)
-%xl(E,repeat-112x64x1.bmp,81,56,4)
-%xl(F,playmode-112x64x1.bmp,98,56,5)
-#NowPlaying
-
-%s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
-%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
-%t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>
-%pb(1,42,110,4,pb-112x64x1.bmp)
-%pc%ar%pr
-#Bottom status bar
+#
+# Preload Images
+%xl(A,lock-112x64x1.bmp,0,0,2)
+%xl(B,battery-112x64x1.bmp,0,0,9)
+%xl(C,volume-112x64x1.bmp,0,0,9)
+%xl(D,shuffle-112x64x1.bmp,0,0)
+%xl(E,repeat-112x64x1.bmp,0,0,4)
+%xl(F,playmode-112x64x1.bmp,0,0,5)
+#
+# Progress Bar
+%V(1,42,110,4,-)
+%pb(0,0,-,4,pb-112x64x1.bmp)
+#
+# Hold
+%V(4,56,28,8,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(22,56,19,8,-)
 %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)>>
+#
+# Volume
+%V(41,56,18,8,-)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+#
+# Shuffle
+%V(59,56,22,8,-)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(81,56,17,8,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(98,56,14,8,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+#
+# Track Info
+%V(0,8,-,35,-)
+%s%ac%?it<%it|%fn>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+%t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>
+%V(0,48,-,8,-)
+%pc%ar%pr
diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps
index 2461e48dd6..71c80aa728 100644
--- a/wps/cabbiev2.128x64x1.wps
+++ b/wps/cabbiev2.128x64x1.wps
@@ -1,41 +1,62 @@
 # cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy)
 # derived from cabbie 2.0 default rwps (C) 2007, Marc Guay
-
+#
+# Disable Status Bar
 %wd
-
-# progressbar viewport
-%V(0,0,128,6,1)
+#
+# Preload Images
+%xl(A,lock-128x64x1.bmp,0,0,2)
+%xl(B,battery-128x64x1.bmp,0,0,9)
+%xl(C,volume-128x64x1.bmp,0,0,9)
+%xl(D,shuffle-128x64x1.bmp,0,1)
+%xl(E,repeat-128x64x1.bmp,0,0,4)
+%xl(F,playmode-128x64x1.bmp,0,0,5)
 %x(a,pbbackground-128x64x1.bmp,1,0)
-%pb(2,1,124,4,pb-128x64x1.bmp)
-
+%xl(b,bar-128x64x1.bmp,2,0)
+#
+# Progress Bar
+%V(0,0,128,6,1)
+#%xd(a)
+%pb(2,1,123,4,pb-128x64x1.bmp)
+#
+# Separator Bar
+%V(2,52,124,1,1)
+%xd(b)
+#
+# Hold
+%V(3,56,20,8,1)
+%?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(25,56,23,8,1)
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)>>
+#
+# Volume
+%V(48,56,21,8,1)
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+#
+# Shuffle
+%V(69,56,26,8,1)
+%?ps<%xd(D)>
+#
+# Repeat
+%V(95,56,20,8,1)
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(115,56,13,8,1)
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+#
+# Time Elapsed/Remaining
 %V(0,8,128,8,1)
 %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pc
-
-# tag info viewport
+#
+# Current Track Info
 %V(0,16,128,24,1)
 %ac%s%?it<%it|%fn>
 %ac%s%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
 %ac%s%?id<%id|%?d(1)<%d(1)|%(root%)>>
-
-# next file viewport
+#
+# Next Track Info
 %V(0,42,128,8,1)
 %ac%s%Sx(Next:) %?It<%It|%Fn>
-
-# playtime info and status bar
-
-%V(2,52,124,12,1)
-%x(b,bar-128x64x1.bmp,2,0)
-%xl(A,lock-128x64x1.bmp,1,4,2)
-%xl(B,battery-128x64x1.bmp,23,4,9)
-%xl(C,volume-128x64x1.bmp,46,4,9)
-%xl(D,shuffle-128x64x1.bmp,67,5)
-%xl(E,repeat-128x64x1.bmp,93,4,4)
-%xl(F,playmode-128x64x1.bmp,113,4,5)
-
-# status bar
-%?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)>>
-%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
-%?ps<%xd(D)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
diff --git a/wps/cabbiev2.128x96x2.wps b/wps/cabbiev2.128x96x2.wps
index 135931d978..d06b7a100a 100644
--- a/wps/cabbiev2.128x96x2.wps
+++ b/wps/cabbiev2.128x96x2.wps
@@ -1,30 +1,55 @@
 # cabbie 2.0 default for the iAudio X5 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+#
+# Disable Status Bar
 %wd
+#
+# Load Backdrop
 %X(wpsbackdrop-128x96x2.bmp)
-%xl(A,lock-160x128x2.bmp,3,1,2)
-%xl(B,battery-160x128x2.bmp,26,2,10)
-%xl(C,volume-160x128x2.bmp,49,1,10)
-%xl(D,shuffle-160x128x2.bmp,72,2)
-%xl(E,repeat-160x128x2.bmp,93,0,4)
-%xl(F,playmode-160x128x2.bmp,112,1,5)
-
-%V(0,10,128,48,1)%Vf(0)%Vb(3)
-%s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
-%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
-%s%Sx(Next:) %ac%It
-
+#
+# Preload Images
+%xl(A,lock-160x128x2.bmp,0,1,2)
+%xl(B,battery-160x128x2.bmp,0,2,10)
+%xl(C,volume-160x128x2.bmp,0,1,10)
+%xl(D,shuffle-160x128x2.bmp,0,2)
+%xl(E,repeat-160x128x2.bmp,0,0,4)
+%xl(F,playmode-160x128x2.bmp,0,1,5)
+#
+# Progress Bar
 %V(0,58,128,12,1)%Vf(0)%Vb(3)
 %pb(1,3,125,7,pb-128x96x2.bmp)
-
-%V(0,70,128,12,1)%Vf(0)%Vb(3)
-%al %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr 
-
-%V(0,83,128,13,1)%Vf(0)%Vb(3)
+#
+# Hold
+%V(3,83,23,13,1)%Vf(0)%Vb(3)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(26,83,23,13,1)%Vf(0)%Vb(3)
 %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+#
+# Volume
+%V(49,83,23,13,1)%Vf(0)%Vb(3)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(72,83,21,13,1)%Vf(0)%Vb(3)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(93,83,19,13,1)%Vf(0)%Vb(3)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(112,83,16,13,1)%Vf(0)%Vb(3)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+#
+# Time Elapsed/Remaining
+%V(3,70,122,12,1)%Vf(0)%Vb(3)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Track Info
+%V(0,10,128,48,1)%Vf(0)%Vb(3)
+%s%ac%?it<%it|%fn>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+%s%Sx(Next:) %ac%It
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index 7b20adf7cf..5386d79328 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -1,18 +1,68 @@
 # cabbie 2.0 default for the Sansa e200 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+#
+# Disable Status Bar
 %wd
+#
+# Load Backdrop
 %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
-
-
+#
+# Preload Images
+%xl(A,lock-176x220x16.bmp,0,0,2)
+%xl(B,battery-176x220x16.bmp,0,2,10)
+%xl(C,volume-176x220x16.bmp,0,2,10)
+%xl(D,shuffle-176x220x16.bmp,0,3)
+%xl(E,repeat-176x220x16.bmp,0,0,4)
+%xl(F,playmode-176x220x16.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(5,182,166,8,-)
+%pb(0,0,-,8,pb-176x220x16.bmp)
+#
+# Hold
+%V(51,204,17,16,-)
+%xd(A, %mh)
+#
+# Battery
+%V(73,204,20,16,-)
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+#
+# Volume
+%V(97,204,16,16,-)
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(119,204,20,16,-)
+%?ps<%xd(D)>
+#
+# Repeat
+%V(144,204,11,16,-)
+%xd(E, %mm, -1)
+#
+# Playmode
+%V(159,204,12,16,-)
+%xd(F, %mp)
+#
+# Time Elapsed/Remaining
+%V(5,191,166,12,-)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,29,21,120,120,-)
+%Cl(0,0,120,120,c,c)
+%Cd
+#
+# Track Info - Album Art
+%ax%Vl(a,0,142,-,36,1)
+%s%ac%?it<%it|%fn>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+#
+# Track Info - No Album Art
+%Vl(b,0,50,-,96,1)
 %?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%)>>>
@@ -21,16 +71,3 @@
 %?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)>>
-%?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>
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index 435e713e6c..5edca40f62 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -2,40 +2,81 @@
 # (C) 20077, Johannes Voggenthaler (Zinc Alloy)
 # (C) Keith Perri (kperri) ported to (Gigabeat)
 #derived from "cabbie" (C) Yohann Misquitta
+#
+# Disable Status Bar
 %wd
-
+#
+# Load Backdrop
 %X(wpsbackdrop-240x320x16.bmp)
-%xl(A,lock-240x320x16.bmp,11,292,2)
-%xl(B,battery-240x320x16.bmp,46,292,10)
-%xl(C,volume-240x320x16.bmp,98,292,10)
-%xl(D,shuffle-240x320x16.bmp,139,292)
-%xl(E,repeat-240x320x16.bmp,182,292,4)
-%xl(F,playmode-240x320x16.bmp,206,292,5)
-%Cl(55,30,130,130,c,c)
-%pb(22,254,199,13,pb-240x320x16.bmp)
-%?C<|>
-%?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<|>
-%?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%)>>>
-
-
-     %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr     
-
+#
+# Preload Images
+%xl(A,lock-240x320x16.bmp,0,0,2)
+%xl(B,battery-240x320x16.bmp,0,0,10)
+%xl(C,volume-240x320x16.bmp,0,0,10)
+%xl(D,shuffle-240x320x16.bmp,139,0)
+%xl(E,repeat-240x320x16.bmp,0,0,4)
+%xl(F,playmode-240x320x16.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(22,254,199,13,-)
+%pb(0,0,-,13,pb-240x320x16.bmp)
+#
+# Hold
+%V(11,292,31,28,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(46,292,45,28,-)
 %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+#
+# Volume
+%V(98,292,34,28,-)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(139,292,38,28,-)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(182,292,19,28,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(206,292,24,28,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%Cd>
+#
+# Time Elapsed/Remaining
+%V(21,270,199,14,-)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,55,30,130,130,-)
+%Cl(0,0,130,130,c,c)
+%Cd
+#
+# Track Info - Album Art
+%ax%Vl(a,0,165,-,78,1)
+%s%ac%?it<%it|%fn>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+
+%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>
+#
+# Track Info - No Album Art
+%Vl(b,0,45,-,198,1)
+%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
+
 
+%ac%Sx(Next Track:)
+%ac%s%?It<%It|%Fn>
+%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>
+%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>