7 files changed, 83 insertions, 1 deletions

diff --git a/apps/settings_list.c b/apps/settings_list.c
index 648cb420cf..af83866356 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -215,7 +215,8 @@ static const char graphic_numeric[] = "graphic,numeric";
 #elif LCD_HEIGHT <= 80
   #define DEFAULT_FONT_HEIGHT 11
   #define DEFAULT_FONTNAME "11-Sazanami-Mincho"
-#elif (LCD_HEIGHT == 96) && (LCD_WIDTH == 96)   /* sandisk sansa clip zip */
+/* sandisk sansa clip zip and samsung yh-820 */
+#elif (LCD_HEIGHT == 96) && ((LCD_WIDTH == 96) || (LCD_WIDTH == 128))
   #define DEFAULT_FONT_HEIGHT 8
   #define DEFAULT_FONTNAME "08-Rockfont"
 #elif LCD_HEIGHT <= 220
diff --git a/backdrops/cabbiev2.128x96x16.bmp b/backdrops/cabbiev2.128x96x16.bmp
new file mode 100644
index 0000000000..11f66603ab
--- /dev/null
+++ b/backdrops/cabbiev2.128x96x16.bmp
diff --git a/wps/AUTHORS b/wps/AUTHORS
index c755a20be8..4f0d852286 100644
--- a/wps/AUTHORS
+++ b/wps/AUTHORS
@@ -25,6 +25,7 @@ Cabbie v2.0:
     Nicolas Pennequin
     Rob Purchase
     Robert Menes
+    Szymon Dziok
     Thomas Martitz
     Tomer Shalev
     Yohann Misquitta
diff --git a/wps/WPSLIST b/wps/WPSLIST
index 3286b1eb8b..93a173a18a 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -97,6 +97,7 @@ wps.128x128x16:  cabbiev2.128x128x16.wps
 wps.128x128x2:   cabbiev2.128x128x2.wps
 wps.128x160x16:  cabbiev2.128x160x16.wps
 wps.132x80x16:   cabbiev2.132x80x16.wps
+wps.128x96x16:   cabbiev2.128x96x16.wps
 wps.128x96x2:    cabbiev2.128x96x2.wps
 wps.128x64x1:    cabbiev2.128x64x1.wps
 wps.112x64x1:    cabbiev2.112x64x1.wps
@@ -125,6 +126,7 @@ Font.128x128x16: 12-Adobe-Helvetica.fnt
 Font.128x128x2:  12-Adobe-Helvetica.fnt
 Font.128x160x16: 12-Adobe-Helvetica.fnt
 Font.132x80x16:  11-Sazanami-Mincho.fnt
+Font.128x96x16:  08-Rockfont.fnt
 Font.128x96x2:   12-Adobe-Helvetica.fnt
 Font.128x64x1:   08-Rockfont.fnt
 Font.112x64x1:   08-Rockfont.fnt
@@ -157,6 +159,7 @@ backdrop.220x176x16:  backdrops/cabbiev2.220x176x16.bmp
 backdrop.240x320x16:  backdrops/cabbiev2.240x320x16.bmp
 backdrop.240x400x16:  backdrops/cabbiev2.240x400x16.bmp
 backdrop.96x96x16:    backdrops/cabbiev2.96x96x16.bmp
+backdrop.128x96x16:   backdrops/cabbiev2.128x96x16.bmp
 backdrop.128x96x2:    backdrops/cabbiev2.128x96x2.bmp
 
 #selection bar settings for color targets
@@ -178,6 +181,7 @@ iconset.176x220x16:  icons/tango_icons.12x12.bmp
 iconset.220x176x16:  icons/tango_icons.12x12.bmp
 iconset.240x320x16:  icons/tango_icons.16x16.bmp
 iconset.240x400x16:  icons/tango_icons.16x16.bmp
+iconset.128x96x16:   icons/tango_icons.8x8.bmp
 iconset.96x96x16:    icons/tango_icons.8x8.bmp
 iconset..+x2:        icons/tango_small_mono.bmp
 
@@ -196,6 +200,7 @@ viewers iconset.176x220x16:  icons/tango_icons_viewers.12x12.bmp
 viewers iconset.220x176x16:  icons/tango_icons_viewers.12x12.bmp
 viewers iconset.240x320x16:  icons/tango_icons_viewers.16x16.bmp
 viewers iconset.240x400x16:  icons/tango_icons_viewers.16x16.bmp
+viewers iconset.128x96x16:   icons/tango_icons_viewers.8x8.bmp
 viewers iconset.96x96x16:    icons/tango_icons_viewers.8x8.bmp
 viewers iconset..+x2:        icons/tango_small_viewers_mono.bmp
 
diff --git a/wps/cabbiev2.128x96x16.wps b/wps/cabbiev2.128x96x16.wps
new file mode 100644
index 0000000000..d245d91293
--- /dev/null
+++ b/wps/cabbiev2.128x96x16.wps
@@ -0,0 +1,75 @@
+# Cabbie v2.0
+# (C) 2007-2014 The Authors (see /rockbox/wps/AUTHORS)
+# Derived from "cabbie" (C) Yohann Misquitta
+#
+# Disable Status Bar
+%wd
+#
+# Load Backdrop
+%X(wpsbackdrop-128x96x16.bmp)
+#
+# Preload Images
+%xl(A,lock-96x96x16.bmp,0,0,2)
+%xl(B,battery-96x96x16.bmp,0,0,10)
+%xl(C,volume-96x96x16.bmp,0,0,10)
+%xl(D,shuffle-96x96x16.bmp,0,0)
+%xl(E,repeat-96x96x16.bmp,0,0,4)
+%xl(F,playmode-96x96x16.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(3,65,122,5,-)
+%pb(0,0,122,5,pb-128x96x16.bmp)
+#
+# Hold
+%V(3,85,13,10,-)
+%?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(23,85,19,10,-)
+%?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(51,85,14,10,-)
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(74,85,20,10,-)
+%?ps<%xd(D)>
+#
+# Repeat
+%V(97,85,8,10,-)
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(111,85,11,10,-)
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+#
+# Next Track Info
+%V(3,56,122,12,-)
+%s%ac%Sx(Next:) %?It<%It|%Fn>
+#
+# Time Elapsed/Remaining
+%V(3,73,122,12,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,4,10,45,45,-)
+%Cl(0,0,45,45,c,c)
+%Cd
+#
+# Track Info - Album Art
+%ax%Vl(a,51,12,-,34,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<%iy>
+#
+# Track Info - No Album Art
+%Vl(b,0,12,-,34,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<%iy>
diff --git a/wps/cabbiev2/pb-128x96x16.bmp b/wps/cabbiev2/pb-128x96x16.bmp
new file mode 100644
index 0000000000..63ab49e646
--- /dev/null
+++ b/wps/cabbiev2/pb-128x96x16.bmp
diff --git a/wps/cabbiev2/wpsbackdrop-128x96x16.bmp b/wps/cabbiev2/wpsbackdrop-128x96x16.bmp
new file mode 100644
index 0000000000..cabd7f28cf
--- /dev/null
+++ b/wps/cabbiev2/wpsbackdrop-128x96x16.bmp