From bd77d021f0a7dfa8dc9ee9ac3bdc84a54ac87537 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Mon, 26 Jul 2010 12:07:48 +0000
Subject: FS#11490 - Viewportify most of the shipped cabbiev2 wps' By Hayden
 Pearce. Spot a mistake? mention in the tracker page

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27574 a1c6a512-1295-4272-9138-f99709370657
---
 wps/cabbiev2.320x240x16.wps | 79 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 56 insertions(+), 23 deletions(-)

(limited to 'wps/cabbiev2.320x240x16.wps')

diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index f84c52eece..dd216c91ae 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -1,46 +1,79 @@
-# cabbie 2.0 default
+# Cabbie 2.0 default
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-#derived from "cabbie" (C) Yohann Misquitta
+# Derived from "cabbie" (C) Yohann Misquitta
+#
+# Disable Status Bar
 %wd
+#
+# Load Backdrop
 %X(wpsbackdrop-320x240x16.bmp)
-%xl(A,lock-320x240x16.bmp,91,207,2)
-%xl(B,battery-320x240x16.bmp,126,207,10)
-%xl(C,volume-320x240x16.bmp,177,207,10)
-%xl(D,shuffle-320x240x16.bmp,218,211)
-%xl(E,repeat-320x240x16.bmp,261,207,4)
-%xl(F,playmode-320x240x16.bmp,286,207,5)
-%ax%Cl(16,32,120,120)
-%pb(10,162,300,15,pb-320x240x16.bmp)
+#
+# Preload Images
+%xl(A,lock-320x240x16.bmp,0,0,2)
+%xl(B,battery-320x240x16.bmp,0,0,10)
+%xl(C,volume-320x240x16.bmp,0,0,10)
+%xl(D,shuffle-320x240x16.bmp,0,0)
+%xl(E,repeat-320x240x16.bmp,0,0,4)
+%xl(F,playmode-320x240x16.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(10,162,300,15,-)
+%pb(0,0,300,15,pb-320x240x16.bmp)
+#
+# Hold
+%V(91,207,30,13,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(126,207,44,23,-)
 %?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(177,207,34,23,-)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(218,211,37,16,-)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(261,207,18,23,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(286,207,24,23,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-
-%?C<%Vd(a)%Cd|%Vd(b)>
-#NowPlaying
-
+#
+# Time Elapsed/Remaining
+%V(10,180,300,20,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,16,32,120,120,-)
+%Cl(0,0,120,120,c,c)
+%Cd
+#
+# Track Info - Album Art
 %ax%Vl(a,153,30,-,130,1)
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
-%s%al%iy
+%s%al%?iy<%iy>
 
 %s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
-%s%al%Ia
-
+%s%al%?Ia<%Ia>
+#
+# Track Info - No Album Art
 %ax%Vl(b,0,30,-,130,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%iy
+%s%ac%?iy<%iy>
 
 %ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
-%s%ac%Ia
-
-%V(10,180,300,20,1)
-%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
-
+%s%ac%?Ia<%Ia>
-- 
cgit v1.2.3