Cabbiev2 320x480 touchscreen support.

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

5 files changed, 49 insertions, 39 deletions

diff --git a/wps/cabbiev2.320x480x16.wps b/wps/cabbiev2.320x480x16.wps
index 9d7348dc56..12415e07e4 100644
--- a/wps/cabbiev2.320x480x16.wps
+++ b/wps/cabbiev2.320x480x16.wps
@@ -1,31 +1,32 @@
 # cabbie 2.0
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-# (C) 2010  Thomas Martitz, port to 320x480x16
+# (C) 2010, Thomas Martitz ported to 320x480 touchscreens
 # derived from "cabbie" (C) Yohann Misquitta
 
 # 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)
+%xl(C,volume-320x480x16.bmp,91,71,10)
+%xl(D,shuffle-320x480x16.bmp,156,76)
+%xl(E,repeat-320x480x16.bmp,231,66,4)
+%xl(F,playmode-320x480x16.bmp,273,66,5)
+%xl(G,popup-320x480x16.bmp,0,0)
+%xl(H,rew-320x480x16.bmp,0,6)
+%xl(I,ff-320x480x16.bmp,45,6)
 
 %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)>
+%?C<%Vd(c)%?Tl(1.5)<%Vd(t)%Vd(ffrwd)|%Vd(a)>|%Vd(b)>
 
 
 # track & next track info - no AA
 %Vl(b,0,50,-,-,-)
+# tap on current title info for playlist (ie. where albumart would normally be)
+%T(70,0,180,180,playlist)
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
@@ -38,8 +39,10 @@
 %ac%s%?It<%It|%Fn>
 
 # album art viewport
-%Vl(a,70,50,180,180,-)
-%?C<%Cd>
+%Vl(c,70,50,180,180,-)
+# tap on the cover art for playlist
+%T(0,0,180,180,playlist)
+%Cd
 
 # current track info - AA
 %Vl(a,0,240,-,-,-)
@@ -56,37 +59,44 @@
 %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)
+%V(0,360,-,-,-)
+%pb(20,11,280,-,pb-320x480x16.bmp)
+%T(20,0,280,40,progressbar)
 
 #%?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)>>
+# volume
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%T(91,71,55,50,volume)
+#
+# shuffle
 %?ps<%xd(D)>
+%T(156,76,65,50,shuffle)
+#
+# repeat
 %xd(E, %mm, -1)
+%T(231,66,36,50,repmode)
+#
+# playmode
 %xd(F, %mp)
-
-#%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)
+%T(273,66,45,50,play)
+%T(273,66,45,50,&stop)
+
+#
+# popup osd menu
+#
+%Vl(t,22,242,277,110,-)
+%xd(G)
+%T(10,10,115,90,browse)
+%T(120,10,73,90,quickscreen)
+%T(195,10,70,90,contextmenu)
+
+#
+# ff/rewind button
+#
+%Vl(ffrwd,0,422,90,58,-)
+%xd(H)%xd(I)
+%T(0,0,40,58,&rwd)
+%T(0,0,40,58,prev)
+%T(50,0,40,58,&ffwd)
+%T(50,0,40,58,next)
diff --git a/wps/cabbiev2/ff-320x480x16.bmp b/wps/cabbiev2/ff-320x480x16.bmp
new file mode 100644
index 0000000000..8578532602
--- /dev/null
+++ b/wps/cabbiev2/ff-320x480x16.bmp
diff --git a/wps/cabbiev2/popup-320x480x16.bmp b/wps/cabbiev2/popup-320x480x16.bmp
new file mode 100644
index 0000000000..53c1bfdec6
--- /dev/null
+++ b/wps/cabbiev2/popup-320x480x16.bmp
diff --git a/wps/cabbiev2/rew-320x480x16.bmp b/wps/cabbiev2/rew-320x480x16.bmp
new file mode 100644
index 0000000000..06c56b51cf
--- /dev/null
+++ b/wps/cabbiev2/rew-320x480x16.bmp
diff --git a/wps/cabbiev2/wpsbackdrop-320x480x16.bmp b/wps/cabbiev2/wpsbackdrop-320x480x16.bmp
index 3711f89238..0ca8bed966 100644
--- a/wps/cabbiev2/wpsbackdrop-320x480x16.bmp
+++ b/wps/cabbiev2/wpsbackdrop-320x480x16.bmp