12 files changed, 108 insertions, 0 deletions

diff --git a/backdrops/cabbiev2.480x800x16.bmp b/backdrops/cabbiev2.480x800x16.bmp
new file mode 100644
index 0000000000..fae9f77665
--- /dev/null
+++ b/backdrops/cabbiev2.480x800x16.bmp
diff --git a/wps/WPSLIST b/wps/WPSLIST
index b334ed4222..e382368fa1 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -292,6 +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.480x800x16: 35-Adobe-Helvetica.fnt
 Font.320x480x16: 27-Adobe-Helvetica.fnt
 Font.320x240x16: 15-Adobe-Helvetica.fnt
 Font.240x400x16: 16-Adobe-Helvetica.fnt
@@ -321,6 +322,7 @@ line selector text color: 000000
 filetype colours:
 
 #backdrop - remember this is the source file name in your SVN folder, not dest name!
+backdrop.480x800x16: backdrops/cabbiev2.480x800x16.bmp
 backdrop.320x480x16: backdrops/cabbiev2.320x480x16.bmp
 backdrop.320x240x16: backdrops/cabbiev2.320x240x16.bmp
 backdrop.128x128x16: backdrops/cabbiev2.128x128x16.bmp
@@ -335,6 +337,7 @@ backdrop.240x320x16: backdrops/cabbiev2.240x320x16.bmp
 backdrop.240x400x16: backdrops/cabbiev2.240x400x16.bmp
 
 #selection bar settings for color targets
+selector type.480x800x16: bar (gradient)
 selector type.320x480x16: bar (gradient)
 selector type.320x240x16: bar (gradient)
 selector type.128x128x16: bar (gradient)
@@ -349,6 +352,7 @@ selector type.160x128x2: bar (inverse)
 selector type.138x110x2: bar (inverse)
 
 #icons
+iconset.480x800x16: icons/tango_small.bmp 
 iconset.320x480x16: icons/tango_small.bmp 
 iconset.320x240x16: icons/tango_small.bmp 
 iconset.128x128x16: icons/tango_small.bmp 
@@ -363,6 +367,7 @@ iconset.240x320x16: icons/tango_small.bmp
 iconset.240x400x16: icons/tango_small.bmp 
 
 #viewer icons
+viewers iconset.480x800x16: icons/tango_small_viewers.bmp
 viewers iconset.320x480x16: icons/tango_small_viewers.bmp
 viewers iconset.320x240x16: icons/tango_small_viewers.bmp
 viewers iconset.128x128x16: icons/tango_small_viewers.bmp
diff --git a/wps/cabbiev2.480x800x16.wps b/wps/cabbiev2.480x800x16.wps
new file mode 100644
index 0000000000..82c403e7fa
--- /dev/null
+++ b/wps/cabbiev2.480x800x16.wps
@@ -0,0 +1,103 @@
+# cabbie 2.0
+# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# (C) 2010, Thomas Martitz ported to 480x800 touchscreens
+# derived from "cabbie" (C) Yohann Misquitta
+
+# TODO:
+#  * images for battery, hold button
+%wd
+%X(wpsbackdrop-480x800x16.bmp)
+
+#%xl(A,lock-240x320x16.bmp,11,0,2)
+#%xl(B,battery-240x320x16.bmp,46,0,10)
+%xl(C,volume-480x800x16.bmp,145,125,10)
+%xl(D,shuffle-480x800x16.bmp,240,133)
+%xl(E,repeat-480x800x16.bmp,343,121,4)
+%xl(F,playmode-480x800x16.bmp,403,119,5)
+%xl(G,popup-480x800x16.bmp,0,0)
+%xl(H,rew-480x800x16.bmp,0,5)
+%xl(I,ff-480x800x16.bmp,70,5)
+
+%Cl(0,0,275,275,c,c)
+
+%?C<%Vd(c)%?Tl(2.0)<%Vd(t)|%Vd(d)>|%Vd(a)%?Tl(2.0)<%Vd(t)|%Vd(b)>>
+
+# track & next track info - no AA
+%Vl(a,0,102,-,180,-)
+# tap on current title info for playlist (ie. where albumart would normally be)
+%T(0,0,275,275,playlist)
+
+%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|>
+%Vl(b,0,400,-,180,-)
+%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(c,102,75,275,275,-)
+# tap on the cover art for playlist
+%T(0,0,275,275,playlist)
+%Cd
+
+# current track info - AA
+%Vl(d,0,370,-,-,-)
+%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(d,0,550,-,-,-)
+%?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(20,660,440,36,-)
+%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+
+# progressbar and bottom icons
+%V(0,600,-,-,-)
+%pb(25,11,430,-,pb-480x800x16.bmp)
+%T(25,0,430,50,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(145,125,88,60,volume)
+#
+# shuffle
+%?ps<%xd(D)>
+%T(237,130,100,50,shuffle)
+#
+# repeat
+%xd(E, %mm, -1)
+%T(340,121,50,70,repmode)
+#
+# playmode
+%xd(F, %mp)
+%T(400,119,70,75,play)
+%T(400,119,70,75,&stop)
+
+#
+# popup osd menu
+#
+%Vl(t,30,400,420,165,-)
+%xd(G)
+%T(10,10,160,140,browse)
+%T(170,10,144,119,quickscreen)
+%T(288,10,123,146,contextmenu)
+
+#
+# ff/rewind button
+#
+%Vl(t,0,720,150,75,-)
+%xd(H)%xd(I)
+%T(0,0,70,75,&rwd)
+%T(0,0,70,75,prev)
+%T(70,0,70,75,&ffwd)
+%T(70,0,70,75,next)
diff --git a/wps/cabbiev2/ff-480x800x16.bmp b/wps/cabbiev2/ff-480x800x16.bmp
new file mode 100644
index 0000000000..fe287274b5
--- /dev/null
+++ b/wps/cabbiev2/ff-480x800x16.bmp
diff --git a/wps/cabbiev2/pb-480x800x16.bmp b/wps/cabbiev2/pb-480x800x16.bmp
new file mode 100644
index 0000000000..6d6072f160
--- /dev/null
+++ b/wps/cabbiev2/pb-480x800x16.bmp
diff --git a/wps/cabbiev2/playmode-480x800x16.bmp b/wps/cabbiev2/playmode-480x800x16.bmp
new file mode 100644
index 0000000000..6a25caa174
--- /dev/null
+++ b/wps/cabbiev2/playmode-480x800x16.bmp
diff --git a/wps/cabbiev2/popup-480x800x16.bmp b/wps/cabbiev2/popup-480x800x16.bmp
new file mode 100644
index 0000000000..9cfdb08b85
--- /dev/null
+++ b/wps/cabbiev2/popup-480x800x16.bmp
diff --git a/wps/cabbiev2/repeat-480x800x16.bmp b/wps/cabbiev2/repeat-480x800x16.bmp
new file mode 100644
index 0000000000..be4c1a01e3
--- /dev/null
+++ b/wps/cabbiev2/repeat-480x800x16.bmp
diff --git a/wps/cabbiev2/rew-480x800x16.bmp b/wps/cabbiev2/rew-480x800x16.bmp
new file mode 100644
index 0000000000..978712d00d
--- /dev/null
+++ b/wps/cabbiev2/rew-480x800x16.bmp
diff --git a/wps/cabbiev2/shuffle-480x800x16.bmp b/wps/cabbiev2/shuffle-480x800x16.bmp
new file mode 100644
index 0000000000..3eb893a3e3
--- /dev/null
+++ b/wps/cabbiev2/shuffle-480x800x16.bmp
diff --git a/wps/cabbiev2/volume-480x800x16.bmp b/wps/cabbiev2/volume-480x800x16.bmp
new file mode 100644
index 0000000000..e6d641bbac
--- /dev/null
+++ b/wps/cabbiev2/volume-480x800x16.bmp
diff --git a/wps/cabbiev2/wpsbackdrop-480x800x16.bmp b/wps/cabbiev2/wpsbackdrop-480x800x16.bmp
new file mode 100644
index 0000000000..9475e18b3a
--- /dev/null
+++ b/wps/cabbiev2/wpsbackdrop-480x800x16.bmp