From d08af61394bb9d6c3cbb614f790091de44cbfd1b Mon Sep 17 00:00:00 2001
From: Marianne Arnold <pixelma@rockbox.org>
Date: Sat, 2 Feb 2008 01:10:43 +0000
Subject: [PATCH] Several fixes for the cabbiev2 theme. (1) Rename the files
 used for the rwps and change the WPSLIST so that it is done the same way as
 for iCatcher and .rwps files are actually included in the zip. (2) Replace
 the Iaudio rwps background which was taken fron the unicode version before
 with the correct one. (3) Fix the e200 wps to look like the author intended
 and with the progressbar at the right spot. (4) Make the 160x128 greyscale
 version use the helvR10 font as the colour version does. This also fixes a
 potential issue with the Iaudio rwps. (5) Clean up the WPSLIST a bit and drop
 (hopefully) unnecessary definitions. I guess it could be even simplified some
 more, someone with a bit perl foo should look into this. -- (3) and (4) taken
 from the last entries in FS#8443 by Apoo Maha.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16196 a1c6a512-1295-4272-9138-f99709370657
---
 wps/WPSLIST                                   |  54 ++++--------------
 ...ps-128x64x1.rwps => cabbiev2.128x64x1.wps} |   0
 ...ps-128x96x2.rwps => cabbiev2.128x96x2.wps} |   0
 wps/cabbiev2.160x128x2.wps                    |   8 +--
 wps/cabbiev2.176x220x16.wps                   |   6 +-
 wps/cabbiev2/background-128x96x2.bmp          | Bin 36918 -> 12358 bytes
 wps/cabbiev2/lockclosed-160x128x2.bmp         | Bin 274 -> 214 bytes
 wps/cabbiev2/lockopen-160x128x2.bmp           | Bin 274 -> 214 bytes
 wps/cabbiev2/pb-176x220x16.bmp                | Bin 3926 -> 4088 bytes
 wps/cabbiev2/wpsbackdrop-160x128x2.bmp        | Bin 10358 -> 10358 bytes
 wps/cabbiev2/wpsbackdrop-176x220x16.bmp       | Bin 116216 -> 116216 bytes
 11 files changed, 17 insertions(+), 51 deletions(-)
 rename wps/{cabbiev2.rwps-128x64x1.rwps => cabbiev2.128x64x1.wps} (100%)
 rename wps/{cabbiev2.rwps-128x96x2.rwps => cabbiev2.128x96x2.wps} (100%)

diff --git a/wps/WPSLIST b/wps/WPSLIST
index 79a3b56063..08171aad16 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -208,13 +208,10 @@ Author: Jens Arnold
 
 <wps>
 Name: cabbiev2.wps
+RWPS: cabbiev2.rwps
 # Real name of the creator of the WPS
 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.
 
-#remote WPS settings
-rwps: cabbiev2.rwps-128x96x2.rwps
-rwps: cabbiev2.rwps-128x64x2.rwps
-
 # Preferred font (including .fnt extension - leave blank for player):
 Font.320x240x16: helvR12.fnt
 Font.240x320x16: helvR14.fnt
@@ -222,7 +219,7 @@ Font.220x176x16: helvR10.fnt
 Font.176x220x16: helvR10.fnt
 Font.176x132x16: helvR10.fnt
 Font.160x128x16: helvR10.fnt
-Font.160x128x2: mix12.fnt
+Font.160x128x2: helvR10.fnt
 Font.138x110x2: helvR10.fnt
 Font.128x128x16: helvR10.fnt
 Font.132x80x16: Sazanami-Mincho-Regular-11.fnt
@@ -283,43 +280,12 @@ viewers iconset.220x176x16: /.rockbox/icons/tango_small_viewers.bmp
 viewers iconset.240x320x16: /.rockbox/icons/tango_small_viewers.bmp 
 
 # Whether the WPS is designed to have the statusbar on or off
-Statusbar.320x240x16: on
-Statusbar.240x320x16: on
-Statusbar.220x176x16: on
-Statusbar.176x220x16: on
-Statusbar.176x132x16: on
-Statusbar.160x128x16: on
-Statusbar.160x128x2: on
-Statusbar.138x110x2: on
-Statusbar.128x128x16: on
-Statusbar.132x80x16: on
-Statusbar.112x64x1: on
-
-# The minimum required pixel height for the WPS
-# 176 for H3xx, 128 for H1xx, 64 for Recorder/Ondio, 14 for player
-Height.320x240x16: 240
-Height.240x320x16: 320
-Height.220x176x16: 176
-Height.176x220x16: 220
-Height.176x132x16: 132
-Height.160x128x16: 128
-Height.160x128x2: 128
-Height.138x110x2: 110
-Height.128x128x16: 128
-Height.132x80x16: 80
-Height.112x64x1: 64
-
-# The minimum required pixel width for the WPS (160 for iRiver,
-# 220 for H3xx, 160 for H1xx, 112 for Recorder/Ondio, 55 for player
-Width.320x240x16: 320
-Width.240x320x16: 240
-Width.220x176x16: 220
-Width.176x220x16: 176
-Width.176x132x16: 176
-Width.160x128x16: 160
-Width.160x128x2: 160
-Width.138x110x2: 138
-Width.128x128x16: 128
-Width.132x80x16: 132
-Width.112x64x1: 112
+Statusbar: on
 </wps>
+
+<rwps>
+Name: cabbiev2.rwps
+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.
+Font: helvR10.fnt
+Statusbar: on
+</rwps>
diff --git a/wps/cabbiev2.rwps-128x64x1.rwps b/wps/cabbiev2.128x64x1.wps
similarity index 100%
rename from wps/cabbiev2.rwps-128x64x1.rwps
rename to wps/cabbiev2.128x64x1.wps
diff --git a/wps/cabbiev2.rwps-128x96x2.rwps b/wps/cabbiev2.128x96x2.wps
similarity index 100%
rename from wps/cabbiev2.rwps-128x96x2.rwps
rename to wps/cabbiev2.128x96x2.wps
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index 95c32f74dc..5d271b3b94 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -38,15 +38,15 @@
 %xl|Y|ff-160x128x2.bmp|145|114|
 %xl|Z|rew-160x128x2.bmp|145|114|
 %Cl|2|16|s64|s64|
-%pb|8|1|159|88|
+%pb|8|1|159|86|
 %?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
 %?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
 %?C<%s%m|70|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>>
 
-%?C<%s%m|70|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
+%?C<%s%m|70|%alNext Track:|%s%acNext Track:>
+%?C<%s%m|70|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
 
-%al %pc%ac%pp of %pe%ar%pr 
-
+%al %pc%ac%pp of %pe%ar%pr 
 %?mh<%xdA|%xdB>
 %?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>
 %?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt>
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index d343db8b11..9303dc3e7c 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -23,8 +23,7 @@
 %xl|a|vol5-176x220x16.bmp|97|206|
 %xl|b|vol6-176x220x16.bmp|97|206|
 %xl|c|vol7-176x220x16.bmp|97|206|
-%xl|d|vol8-176x220x16.bmp|97|206|
-
+%xl|d|vol8-176x220x16.bmp|97|206|
 %xl|e|vol9-176x220x16.bmp|97|206|
 %xl|Q|shuffle-176x220x16.bmp|119|207|
 %xl|R|repeatall-176x220x16.bmp|144|204|
@@ -37,8 +36,9 @@
 %xl|Y|ff-176x220x16.bmp|159|204|
 %xl|Z|rew-176x220x16.bmp|159|204|
 %Cl|29|20|c120|c120|
-%pb|8|9|171|182|
+%pb|8|5|171|182|
 #NowPlaying
+
 
 %?C<|%s%ac%?it<%it|%fn>>
 %?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
diff --git a/wps/cabbiev2/background-128x96x2.bmp b/wps/cabbiev2/background-128x96x2.bmp
index e1bfa875de70b542afb198e51d99cd7e4ba46d2a..61b0b9490e65c0830bbfca5af068b1d34684d8c9 100644
GIT binary patch
literal 12358
zcmeI2F;c`Z3`J#|f;60ik~2_jN12|ZaGqR)g9UxrB<>t$AQ@(##<FF}<FCBk(ywo~
z7Yn=j{OtbW{_dXa(PuZWe?C=zs2Q84$>w>sWm#-pS1T9<AOHaf+%bWCzV)=vS9is|
zflK7O2GGBRz{P)nUA~kHzQ30zh5!U0009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=
z5P$##AOHafKmY>&o<MsXd*;$JJEEJ-G^%T9an`C43C*=KymN10cvJ_9WsQ>k$*_iJ
zT*)tS&&s;2$F&;u(Y0Fxqk~a*5ncbSApOv8fm)D$J>}8ZeyCqk)AyHK!C%`D(pFXJ
zD|tk`wq0AWbii^-8nI-B9{U<WQ7tx6j>_oD;MWk0&i+MRKi_7D2>fOj{nu|@++*+s
D1NDw4

literal 36918
zcmeI)F_IH85Cu?k0b-883HAWwgyee^oH*tjWX_y(7azk**M8inY}b?%jVbe{YP3C4
ztEG9GP5tHT%a6_b^-}HUy1&=`TK9*|r)uk}@n0Wvr(?5ua}gjwfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5O`{VpRPFq_k1;TR#x?o!157bT0vmp2v%6#68s<g4e<YG{p)BR
zySJxbec|Kpp{GZ9)C-pI>2zvm0RaL82oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7e?IszNl9D#d|Z_diMtJd$3XJ8Dj<NRECmlz)tXG-^vLD%n`
z?&%;yU4Lq@d<0XMzAj#ysm^-+F{n5o*=i+pkP4m9L)Fvqe!uU8^w&@?k)Gr6I8LcJ
zkEuVq&2l%}*-Ky4uRTO2ub;MZ`tc&j^y<u&%!<40dF1c0<|s%1!{IPauem+ib*2Wr
z$?IV1y4S_Cf$er%L5-&EpjaZ4pr?<?Nf?JZxzcvKU6MPk9@8_nJ$;?veG9jn+Q7FJ
zuVTq+V=%@wn#b-;Pd%omgRWCA*6}#K^T*L7Tog&dj5g<coBrH8V_h{PQ2uA;rN1lx
T7yJ*WbI+H*bR@<IJgLBM(c);e

diff --git a/wps/cabbiev2/lockclosed-160x128x2.bmp b/wps/cabbiev2/lockclosed-160x128x2.bmp
index 47c2985ede20eb896d9eaa8de72da68771eb4f2c..6af64f246cfefca81e839fde742933610b56945d 100644
GIT binary patch
literal 214
zcmZ?ry~Y3mWk5;;hy{R{2Z$LNSb!u0Ljn*BaYHaj4g~)G{mU?I+B61BOG}29mKFvk
zCME_cDJh1nTemVCKYpAcEG&%S#fujVK0ZDS%a$!;(9zLhC@(K(NKH*;xOeX!*bF{b
ze=z;T#pwf(G0!E&MIT6ugd`ks0@DIVe1Y`VkOUPsAYJOB=i&{db2Pe|F9PYwVGLY5
Wfi#<IK?~SfBB9PeF3{ad1`GhvqAY>{

literal 274
zcmZXOu?@o@5JkUD+DIW2Bu<mk&TT+xDJ7LhaEX-KgTxEavw}yUWEFD8K$DaHzlZK0
zpx)O8sXpvamSmk-4NmO9H~C=~Zo6WPu+~CrodzKUc<-@o8=P}k*A>gMz!-yho-s`m
z#&LvFikFYOK$HOxM7MGvqE}`?y(oh}-v7bX?wQKGT)2}`W(L1B9C6^$i^^?{^R&CC
F$Pb(pBESFu

diff --git a/wps/cabbiev2/lockopen-160x128x2.bmp b/wps/cabbiev2/lockopen-160x128x2.bmp
index f7f62f97c41cccff0dac75b95571fc9646fb8c4a..b458a25c68a87a213367815a4415c2daa27c9d4d 100644
GIT binary patch
literal 214
zcmZ?ry~Y3mWk5;;hy{R{2Z$LNSb!u0Ljn*BaYHaj4g~)G{mXFk=1m4yS62peb9091
z=x7EeCME_=O-+W+pFcB5NJucGrlvA%-MW>byu6&@>C>kS%a<=_IDPsw!;Bd-z-DlU
z#(?Rmp}_}$jFX{hp*BGJYwLp4U=SVpJvACg-w1tR8pTk+@FLVQG#1ETX5=(;F1sds
bwGIP24}0r`73x4i2H~(^u-h1w9YI_GLvJ!D

literal 274
zcmZXOu?@o@5JkUD+DIW2Bu<mk&TT-6l+qO=xU`hogM<a>y#gapdKGejag&q&zlZK0
zpx)O8xjyVqmSmk-4NmO9H+!)Qx1<;&oO2k*F%PzFLkI!hd#vjUYb};#!935HrU}Lv
zXsw}?;^lG|h;{%3(XAec=(V$;Uev)Kr+;v@DRVF{SMH>gnfaNaWPwL74sMSuPrG}K
F`~aZ_BESFu

diff --git a/wps/cabbiev2/pb-176x220x16.bmp b/wps/cabbiev2/pb-176x220x16.bmp
index 75362128d8037320729567271600d3108c1f18d4..614759a2a4f0db681ecda50e8db906597ddad697 100644
GIT binary patch
literal 4088
zcmZ?r{lU)w24+A~1BjOcF$WMcGDrYP28KgGd8Tg=3>E+pEUb)v$qZfV7^d!Kn6jH;
zG6tHqk74FPhFOP+LYUe|MFvR-Ox?pUaT{Y{KZBH_f`S60b11`t6ATk}F!XF?=p9AF
zIt2Q*GR!^9SUd?7@13g{7My07c9db}@liC)Ltw@+hM7kh<{tybJHw)rY^!dlZoaF(
z{hsc&Q8a8rKyTYU{cZOIR^0#=@4$Fxo`2Nz=$p8+@1sW1a1VjlbMFIAz7yDd6BzF-
zDRoJ=fAl{5S%3FOBNA#rVk3)F&PFyF$c7+djK!rA*+5+85Tgc{UaaEC2Ey5J239Q)
zL7*C}%CHKenL~^kG%d*7=DR;S9{-VBbQo053yNv<ESvH2&)nDlX21FiN3&pT2m{WA
zC;)PiMKIN1m4)bnD~5BC6$8!3%7rUNa{yMw_zl5o0>pf{Ml|c-S|AE=DaPd(Ozp@P
z!OesygG(VZAW{(X;kH8*z%7M{!_}b40=Wy{{EInqkJ;1(6z{-p9v2U*W1v9kM1iX5
z0u@tGQ27-8>KXi%(?EhiSs()+nhKIdGhviF7($?Os$lgDj_4v*NqJz5gX0|l6VvME

literal 3926
zcmZ?r4dZ7312Z700mKV|m;;Cz86<!t1A_ukUWgll!2%$Hg@H*(PONDb$K)*>leTfs
z+#%Dso_oSJhKU<T(GUxP2^$zEZDQzO4@4YOw*e!Rp>-Lfhzux>H9F@quQ|imvzNDb
zA4A6mhKV~FChTD7-#LngQV2}i#n8Wlv400MknG*YGGQm%wEbMO4hwcK2E{SM$`cHW
zuP}6<VxM}3Vg6}`#b+31A7hwxViXOf5SVeCb><0<87FvWoaCNyl4;sehN*`crXOM4
zcnciI>o4&vzGJ-ljo6kairelfY`m_v?uNmJ2cu{Rg@EGr2ddj2s%^ZZy8f2d)(2`k
z9*J(c#kuA(<NCXxI2OP1*74xSg#91A&wdCy^D^ba`~0&XgHOL3MMEhB&b)~@^EUF#
z+t|}@qtCnzJNwr6)Jyl1&sh$<1jVu1wu2e({`cMZ)pGSi!^5vNH$Qb<`&Du0>nIvR
zA<%OBYyHhnE%&~6-2d5l<5T0c4_)_u^gsS9yXOG|J0qJ|Xl&NCM+@HlpY!^E>zDt{
z&;Cz(^?%{>Q8bi7VCLul{cryFy!+qr=70P1|FhozU-<g}giG&vgVGonm>AfB(9*-W
ze?jnx>!t@T#2$R&x%G+Tq1&Tq2!(*(-s_(GZ@3@5>v-^n>;CIu2k#j7u4XU~12(A{
E06{<V&j0`b

diff --git a/wps/cabbiev2/wpsbackdrop-160x128x2.bmp b/wps/cabbiev2/wpsbackdrop-160x128x2.bmp
index b6ade7dd32298970e17323d56a935ae13942c929..f82b45cd2399fec93c14be3a8418267f7af5373f 100644
GIT binary patch
delta 495
zcmY*WF-`+95L~ahA`#Ku2?@wm&RS{V<du??MB)K?3LQ0kfLQ)OsAv(_QshY#D57NS
z2&9}etJBPSJi9(@4x8;wMfr<*pHlVOIbz2`#Nvc_*0v1+xuz$x=mL51>d0$Q@{n7T
z(U>Anl~hy%0r;JPHaLlv7#G*9tUlz*9%WXXsikylR-GsZ??`P=&_h1f62zl%$7+Mc
zwE%jg$Y?<moTpAzvg&)NzQ?U463*^<32Sx#syd`Wt`a&u@N$Z*rz)<6aYI?1Ag}*(
z*7&lD@1uqV6aKTlkK5%5Z3AYoM|xayZtgjN%|oVGt!tR71z537*331GAQ{Kyc?a??
zlY(UnSuB<cxvoX<N}&L6<OVbOIvXCxVf1nNRu8-C%A}u*^Yl4irTu&~e9xab?W)}`
D3Jg$f

delta 574
zcmZ8eOHRWu5FL*}2->vq3fh&ih1el8BQ@P3%9>t*Yp}}=8s!As04W#X27GS9rYjaa
zhc;44;!*V8c;1_t?RvZ3+#HugR5rSrGf|-65d(V)&N(v98N~L}EN0QO1QlY{m{>rU
z{h{{5RI`|@L{)DyYsC>*GRSCeahGC>q8>2?#cy93w87ow1>hiLlTyy}nJht4`^HNY
zRu9o6gbeA)T-fBo)y%47R&doKKoqjsSo>sQ3U>D_esf1V%cZU6+3o=gQHR3l*V)A+
z`X~dP+GMI`b2bgp+W{8+55p{a*ukS|PF9LuJ?GAv`fiFjB*lpsCdSc2Ffz=J<qs0i
z=#5nJurtIVU_SlH>*-#K@1yQ~B&Y53_2U?GAD*UO6)GH<nAt<7sqYKLQW+S4tl9(2
j*f-uCa7oS>e5LDwvEA3e&YSuHIzQcO@ipmAuHN|<$+=oW

diff --git a/wps/cabbiev2/wpsbackdrop-176x220x16.bmp b/wps/cabbiev2/wpsbackdrop-176x220x16.bmp
index b526140391718200de284dbc55be1b78dda44f1a..a367e77950dfbf1b267882d6c2283537aa8457f1 100644
GIT binary patch
delta 12547
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
b4ic^plVlNG8>R8`<wzW4RIc2lJ<{m^@DQt`

delta 11615
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
L#<kmBU4#D*>|Er-