From 1e24620c2b61dd1128f9be6cbe66430b5151fbac Mon Sep 17 00:00:00 2001
From: mauricewoelk <mauricewoelk@gmail.com>
Date: Sun, 24 May 2009 13:59:09 +0000
Subject: [PATCH] - Added widescreen fix to the arrow buttons one game window -
 Added exit menu to the settings (no more going back to main menu needed to
 exit the loader) - Changed the buttons for gamelist (favorites, sort by name
 etc.)

---
 source/filelist.h                        |  21 +++
 source/images/abcIcon.png                | Bin 1699 -> 1213 bytes
 source/images/abcIcon_gray.png           | Bin 0 -> 813 bytes
 source/images/arrangeCarosselle.png      | Bin 0 -> 1674 bytes
 source/images/arrangeCarosselle_gray.png | Bin 0 -> 1016 bytes
 source/images/arrangeGrid.png            | Bin 0 -> 910 bytes
 source/images/arrangeGrid_gray.png       | Bin 0 -> 760 bytes
 source/images/favIcon.png                | Bin 1650 -> 1553 bytes
 source/images/favIcon_gray.png           | Bin 0 -> 983 bytes
 source/images/playCountIcon.png          | Bin 1372 -> 778 bytes
 source/menu.cpp                          | 169 +++++++++++++++++++----
 11 files changed, 161 insertions(+), 29 deletions(-)
 create mode 100644 source/images/abcIcon_gray.png
 create mode 100644 source/images/arrangeCarosselle.png
 create mode 100644 source/images/arrangeCarosselle_gray.png
 create mode 100644 source/images/arrangeGrid.png
 create mode 100644 source/images/arrangeGrid_gray.png
 create mode 100644 source/images/favIcon_gray.png

diff --git a/source/filelist.h b/source/filelist.h
index a932964d..4f2c6b71 100644
--- a/source/filelist.h
+++ b/source/filelist.h
@@ -263,4 +263,25 @@ extern const u32	abcIcon_png_size;
 extern const u8		playCountIcon_png[];
 extern const u32	playCountIcon_png_size;
 
+extern const u8		arrangeGrid_png[];
+extern const u32	arrangeGrid_png_size;
+
+extern const u8		arrangeCarosselle_png[];
+extern const u32	arrangeCarosselle_png_size;
+
+extern const u8		favIcon_gray_png[];
+extern const u32	favIcon_gray_png_size;
+
+extern const u8		abcIcon_gray_png[];
+extern const u32	abcIcon_gray_png_size;
+
+extern const u8		playCountIcon_gray_png[];
+extern const u32	playCountIcon_gray_png_size;
+
+extern const u8		arrangeGrid_gray_png[];
+extern const u32	arrangeGrid_gray_png_size;
+
+extern const u8		arrangeCarosselle_gray_png[];
+extern const u32	arrangeCarosselle_gray_png_size;
+
 #endif
diff --git a/source/images/abcIcon.png b/source/images/abcIcon.png
index 70466c777a1701d18735fda5b8dfe0ab6cafef1c..b2b6cedb8c787a029a6d0726f12d4fbeca79c1d0 100644
GIT binary patch
literal 1213
zcmV;u1Va0XP)<h;3K|Lk000e1NJLTq001Ze001Be1^@s6V68d;000DpNkl<Zc-rk(
zOK%%h6#iyB_V^JevE#fSO;7@9R1kzBr7ei6ivkj`;AdsWh6O@mg~SHY4W*T!YC$Tc
zstQC&+ayg&o=)t<apJ`GygZz9?Q!Eao;o3<UU1}Vk7w?^=R4nb&bc;F=O&GhkAG0t
z0PioZ+b<i$K>$qMKt7j+5>S1|zxy$mR<K~w=1ShQPR!|HT;vTCIm3Wr7LK-+{T~Nq
zS_SAt9sw*Ii+uJ`7<5^r6LUJTs92VLG$*!wbYL}@VOd3ht_&WRiuPgF+F~wCtZ@$N
z1^dwG?0=K1E)Q%WOz}aM+Ds;wheEBeHg2RB6^2xHV3#t0uWW}s=l;HD4zv5O9oyA(
z0;oZe9PbB3Q*w~mOo&f^V-sY>R|c_{PQlRir$FdU4K+XwHaxdqdUX-mtxW_YEeN-E
zz~lAp3r#}lRW@0Y#83?T>E`UT;CwGR-Aiv`;@TA`UIhbZFCcbmu)N9Rd%s~Xm4GBw
z1~~BcdBpmM#I<GUn7r`=flI;b^}^%v03I15mp&1}R257Tupw*IYjmm@gNlU<MgT04
z&3+T})8g8%`jJhpiF?klsoVRAiAY-qTDp40C(nyd-Y?I2c<VZLQyT~bgNSzZKn(;)
zHW`W8sfxXx8zujWEK9Dbmt2^KLJ=1zh^>`H^o<&2c{mu0?suJe3*lJ1xHob2JDB-A
zv`kt&OU0Mb)EvQ?%b&s*3}J_Yoc-k|A$ji`qZLwDFi5y~D9_5X-!hvU$Zn_6*4u|b
zs1aMVDR1n^#|&DQfh?s#f!acrKqcd=Xo^G;Y>r}S>Mt=b(%n~<v#G5U!<RlnLp0`I
zlO<e=>;iCQdQynpNJ-5OSD(yaV`%|x1Fset<g}m^nZI`jd1B2Xz#dsf|LB-Va6O+B
z^Ss2|em{*ZtuJgE<sxwd7@wa7rvO)_LJ6)@=_eNEFl@XJ#it5@EF-fKjuoZaT3^NE
zyT2mT6e+eAJ_u;I`KbyJE)s7i*Re~|g-Du5cWyz`G*Rh_=|OUF9$iBt!ntLc7<%Ud
zqMhAh-GkdVvHWlX>BI`Ws!At<iS5nGO26^VSBUkT!s)U1XpX;n6_Xk=Gj!1SoAQSX
z-A@3U+dI+T*N<37mnfFy=_xUXi=;rZN|Ie(m)=M~Be_iqsC)1=Sf+_}QetJMxMuE;
zyGX6au{QTeRCG1}Jb2%#3@*<+5K){ye-WLp6pJFevyJOte}N?BVJ@>nj1q&CgSWr`
z7P(wbNY1AERdfstlFZF$>l;97bqRm|{3Cw9dWCY<6#cMw_;t7ys9=y~=A?dhY*Q=9
z&?&(Y_7Drs{V=r)f4Et&w)SLJ<QRkE?<)N=4+Q*Zp<ejr#mk~6@|trWe}+~9$#cBa
z?D_fd*>e~fdlv`!c81J@`lWPpF?AyUNw}i-NC5_3i>0Z>CE_d8gQ*Fhgatw&F={o&
z#Y`&vR*&Y$T(<y44x)y$_~ijCoyB!4vBdIv>YG9SRjM5Jj65mhX5Y{dhH~x8&p*Wf
bc69p(Q%xP_qmIET00000NkvXXu0mjfMC(7k

literal 1699
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

diff --git a/source/images/abcIcon_gray.png b/source/images/abcIcon_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..573d9792a39c2a5d41bb85876839015cc387313c
GIT binary patch
literal 813
zcmV+|1JeA7P)<h;3K|Lk000e1NJLTq001Ze001Be1ONa4%B1p(0008?Nkl<Zc-pPj
z%WfP+6b9h0s(a$g*eEuMO{{noA_xmM1c?QT*l^qOEIbH%#2c_e0tqRL>>y$TC{ZFV
ziGl$e2iZ=ffX6f4#iDy=x_ibTl+0+PsmuB6Kj+jre}&}Pe!_?ECZRDg9wl1y^FL{3
zPq_V*6oWK@9(W>OnzJ|^1?9|IsClLOUz)6yf_zvHW=*?BI>$A~)o5TKFB;M6noiwm
z9@X|^$~h^V$cqWkG|26Qq?S=PG|ib4L;0wY(`nAez-^HBj#;jw%H{vM7^xMr)Cfc9
zT%3{N7;yIV(>OPIHQh~A*JcV8T0xF8PL(yg)VL&Ni@;x=$OE<U*ujTNXXO$OoJdNn
z=ue<`99Xw$VL~8GLXelr$+;E8=XzduNy1GBlSo~42}55x(vykavD&!gL_s`JC{(Zk
zKL{4=3xcT7vti4o1-C@eb%&O1SrXl?*#%LoLzicrGJhZ{{br;mpzx|q$!7*0DePJE
zzP>#->?-PA6+#rN7@DNyp~trM?b`7oN`*s($9An*_bs-p;DWcE>(om`9vWrGZJf8}
zzF%Ax6bj!sR?564I>xff=6s7vs-4ectHAGx`py`5U}!;UWX(DJ;iff7Qi`pvGj_L1
zO3URvkMw<IAQ`#m6{W%(F5-qe_AD6rQ<MasxagY2R(}d&CaQj!?*x4tw!NTmM<yu+
znP}g@v6mI@yCw6reLq{St*dWVC1qMAKjKX<;n2r^btD=2)Ug7KE?c+lch`MksOO3}
ziQc%{8VvUwS#(8|dETnhPm)sUj3pc1azXTgZKd3XtFFmp@`{;ECJNuD|F0o`JG3=t
zZQqVOo6)UqV@fm4cGXI!byYT*D9=0nZdR(Att_<^r`^_6fbkTKIIZb7XS)`$y4ay3
z+fyd7&Y)JuZ0~A@DmGo#lBcdPg^u#gSMn%pmR?2r-<}yxeX>mZVICUzX%3UnGD)4?
rZIxN}ocyEr(u{gN)m!ITKj;1d*B?jyesyp300000NkvXXu0mjf86%5h

literal 0
HcmV?d00001

diff --git a/source/images/arrangeCarosselle.png b/source/images/arrangeCarosselle.png
new file mode 100644
index 0000000000000000000000000000000000000000..a92af5351914aa21f77cf63384b2ede4ee554d29
GIT binary patch
literal 1674
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
Ub2o>k4*&oF07*qoM6N<$f-b}iOaK4?

literal 0
HcmV?d00001

diff --git a/source/images/arrangeCarosselle_gray.png b/source/images/arrangeCarosselle_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe51cae4080f585fef4dc33bf172f6eac8e688c
GIT binary patch
literal 1016
zcmV<U0|)$xP)<h;3K|Lk000e1NJLTq001Ze001Be1ONa4%B1p(000BONkl<Zc-pO&
z-)me&6vsbjX7*PS)0pmB+a?+bt!RDHSLuVO^~p#75)r{aVG(@uMG7K_FIogq#J8eS
z3aw3pVq(m;wnp8g-DZ<ba<li&@!`(Bdv~))h2CM8dk=HIbH3+%XU>T7Xdij|!oy8e
zWZ00<qr*KOH2Xt<OFG_B$G|AUVEW!xx844J`4d*T-;8s>)qF;A@@Q1U%Vghzvfo+%
z{KxlcHKTyCtPe|7^M46;0b;zaesk?zR+@(Zazlq*M{||Yl*0Rfy5R8~(E8%$JG7b}
zTs#&`M-q^^k6IM)^jUaw>&nJQbU?1?D7_RcecNS|HXUBY;W0yb%(9-)N7(uO@>?u5
z6X(aQ2?zX5mo)$;iTDx_goM|b%)zn&%Jkx?*EZJZy1gN?if5Hy>0mg)CRG$m8;7C7
zArW6OLzx*CspKU}AsZJqKBMalpn(j)Hn-?fMldJ|C88h^OM+#eU4#mTMam(sX)u$g
znFePHrRZ{-yCgYrk77vh7#yA$16Y)Z6*|n)U^Wk?JVg~;hM%y^5;2xK9zpT>&jW_T
zg7}3V>#Q@!OB@@-DIr1tLxkXf7>6&2*ar#sL#_t-wm2$CSSF3s7%Ucp<qUNcPehF*
zID>GAV(|2XjMJDsN{M-<uow(B5I2G#7%ay*i3cKT#K9#ARLew#s52#6>SX>B;x+?=
zWuC`S`hjTb=;)(3A_OHV<kj;y(-;I(1T^`lqs}=zN<<~N2!{wI68gD>eUP)~Y>=0P
zQHU@#*LaQ^$^kVz3Roh93Oxk!+$DGt94E24x5<i<7Q}|qR9V2XPbE-x#25@wsPAB_
z!3i8Dlq4OY))JH@2$ttLjwiw9*%D%WkhvDD3zUQYGQy(Z+|V&)nd1z95m60t^;C(1
z7K_KnET^gEQWuo|E(hSuXxHKyZqj1{j}1hVA*l2ysZ-Cjmp;8e>4I}dj{62@xlWl4
zO2kZXjA?e*rk4YQ@&psO!mbhSeoF_O9ce<s1TS)j4a!V1&pDoAiamC?$8W5$i=xzd
zI&8XZKmD`*$9MF`PzFPT1=_s8%RCv<P-2EtJPWkB%Fi@tP%32K$3J~YtC@rdb>xsO
zbDme2%<bvMH<VBonBzRkG^XHl{nDLFx(y(=lp~!)hI(DmB0~)$ovq1@uYY(iYomd(
zjOoJWzpo;}y3@Y;@h=x?rEuU(;m|Dh2q|<nK`}>Wb+_)fZ(qLlsjL*QBJP7X{{Ll3
m5lGnM0h=;<S$fphxqkswjJ%$_n$b}J0000<MNUMnLSTZ$OWqg&

literal 0
HcmV?d00001

diff --git a/source/images/arrangeGrid.png b/source/images/arrangeGrid.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fe33e3b7e2edfb55dbe64a8b0c141e49fe8b987
GIT binary patch
literal 910
zcmV;919AL`P)<h;3K|Lk000e1NJLTq001Ze001Be1^@s6V68d;000A3Nkl<Zc-rlk
zJ#QpM5Qd+s?)mWU`i#K_M@XCm0m+3VkdVM{b4JSVARr=v1YJae1V{%0&R(7Ev%P!k
zot^$7n6b@)<Y}K*oC7M_ou{Yk?YFwCcj2Cg?C<Y?cCQ6K{%xA>GC{gExM|4s6W2PH
z%LR6$s@5hgWeUrQCI&na+jxJSAl=cmHCCZ%J&TpYx|p)xOs^_F-F|6p2(;c~oloo9
zb$46DKS1jvtJY&(41*IM|Nbk@#S3ES#)>FKy}{nY_c?s>3%*$r`*}nSMOCx+@B^k#
ze#SKoF$G8oHI`~TVfWql26H;^X<CO3eTi>c`RweJW<DdvZoe8+P>xo(7&$*ZCM;LP
z=s*OcmU1-4r;hpMikKWA7-R7vupQH&t1d)Z=dfpu8(huP=`)t+r^Mh90aKLJlLx%f
zcn%Jq;g=WxV%v@9V0!d2D=Q{0v9<DpIcLii&*uxQh-B@Wlp>@^LLeqc2@$z^p2s56
zv%v-}AgWl+5!m;i6cZx!i4!UUsVh$&OC)+W5GsO-<T;q=5_di%lrB;CZpvmRUAsH%
zpdf(FG7yL{kzxXo-ifXZ+=lToyHQ|2&Z-WNw$@_Hg4mBWMS-yfRl(eXsl8@{0#y*r
zEO9*^le{N{zFiar^=N{Kurc1m8k@yzQBsY@*(C;$uYNjM_tm<VIDdY^(c#m)Q~cxi
z-!VHm#=BKt#*)$I7LPvplpntRhKu<*!L@_T78MWP+Tp{GKF&MEWS02i#hk@#M(73F
zvc?#Th_INQv7FDZMclxOs-_-|@=vj9-XRIj;oXYRuC6w4@E%p^S)0XF^@<HTsDen!
z?1L#1V<d!#h!8>`#ej$qV<d)57USP~WQKzxSfiTr&j3m3>PqigC|tfP<gv?-IXP7o
z70nYUlKR^uT{#K~ql#W$VHpe}+OwfBA{e7sV>HJ<L{i`0FTZyaAOcD@LzJAH#wbQJ
z9W1MgqO1|o{(DVPmKasavZSnPG=mjYMcK1KfvRY(z&Cf^#uz2Eu5Tp;<IOFMDm(A&
zF&a+@E{BzD@9yUBK|mfKE$-z_a(Z&i^v^$XPw{^rMigsIUZZ{;(dkN=zo=hBRCUE<
kvWflr%P&6X|9JKI3+&Y#7b+c)3;+NC07*qoM6N<$f|wJpPyhe`

literal 0
HcmV?d00001

diff --git a/source/images/arrangeGrid_gray.png b/source/images/arrangeGrid_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdae2bb905be7f9e88fe77dab0d11dadd07d1789
GIT binary patch
literal 760
zcmV<U0tfwxP)<h;3K|Lk000e1NJLTq001Ze001Be1ONa4%B1p(0008NNkl<Zc-pO&
zJ95-O5Qe|*8EI|r8Yh&CA|vrJh+GBt;UHWHBC5Cm5d<c&1B$12ZOg0248e?~8A+xH
ztgTh4XGY!s-!HXz9`}+ruOwUW$l~*VEBxg97d<k0nxpSmm-b-KE%q?MGAarZ1417a
zjB<u*c=rxl569&}3^|^M&_hLqZL<SD!H_#3r9JaogwRl9+k|ks=?5w!b{@do@3riM
zLP@ZBF1RDC9&*NK?s0%}z!_ht@OTUxUL<D2)v(998P(rxae!e@$1kcV9pU&%g+nm3
zxLN#LYV6I7?j>6~1j{kETv5>>6l}QViu)+-sb+4t;SW{;k47t+B#FnP`1o^)H0DK~
zMuNdg;sqTnIs}hLaGBJb3tr7LG2A0UnWS-^vT1BRF0Se%tpr5^!V!G`N{>kq94=xP
z1eX{HtC}d69${KmmJ$UD3KSD1i@^+g7K<5t-s4p?_hGm;bhHSTBZLi>4k%b7tTD7e
z$x#v#B02%&qnCx2<!AmQtDp45Si0Z2#7Y)?LHNKA8ayS(ob!$?4T9wf=e%b}gQwsr
zFB5Fxue}e`E&@BQX@LTRaLo-3P+}3b>}Y@$YjlBuV$CEdo|={#P+ANv4K;$&qBJx#
z_$Z~FNC4BPjZ8Ap(IK=r1V=}Q(9xl|7%(>>>xZ<ny3jsHn>ryhR*ORubUqfI1j>1T
z(^zJqP03KbV9+741vBfPis==S^yg3?kw7e{SOqbXI!JlzGgz#hbZ9uBM1U153<aww
zl_)DpKqy&7v#IwrM0xs2I>l1sDLFxT&W;)=Il=IZH4Q?+DQ5O<F@RinGL@3i$Ujv}
z<3PIpjjw%_Wzw>kbn*F<EQ|w!9fLBT5i}mxtT5+THKFXWn%HHMJZUFNsY^C%j5rTD
q!M=U{@8M@YFfETzL#;gaIQJJXbwofj7!{oW0000<MNUMnLSTZxt4ZYm

literal 0
HcmV?d00001

diff --git a/source/images/favIcon.png b/source/images/favIcon.png
index 868daa9db9f2e8eb0e5995d0c6a61304a44cc415..1b1314b978d9b6437c45561a651ddce92a713388 100644
GIT binary patch
literal 1553
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
D4Y~kf

literal 1650
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

diff --git a/source/images/favIcon_gray.png b/source/images/favIcon_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bf8a82d8672514880644606f24deddd5884d721
GIT binary patch
literal 983
zcmV;|11S87P)<h;3K|Lk000e1NJLTq001Ze001Be1ONa4%B1p(000A?Nkl<Zc-pO&
z&2C&Z6vuzZc5Wt_d{4uq4Xq$ZghUM_C@7(HK{r*TE_ef^z5}yoh1hk~XXyfoUD+Un
zkPsVCK~OafA;~0UCNp>LwOL$WU(b+cRa>^~<Kw^2r)_b(-eRg@OGsE?ky%$0b=4+^
zypk3GTjMmRH*Y^&+Nw8_DTpPPD`s)&b5R1e>a6X3{pQ{A@nVDXTMOVAqNEL%g2R=7
zU)1Zn_a5I|%}B!rhxkV52?q^JTym%MG0;k6?cU?1)tr39HYI3}-<e}6td?}bK?N-%
zLwAH5J72BbO>t!4)wQ^wxaBX7$*3{rsTS)whii{>49WD?dwUrJa$IzFRR+93=+b6l
zNczgR<&FUZ42|0l%|s9Dr73MxG4As(lUNR!Bl(}NtKN~5Vpv?>&antK_$uDyct#%q
z&RJmb%E(OVqnMePw*kZr`Og8zoT16du^i!$ODe%gf^w5)A_qVrs3A6s<vAIS9E;_U
z4%Oij!AO{y#)7EItd0&Rq&Nm-q+}c*-m;MM3kgDkL7|yuma#}5M~Xo^uSik8=Lqd3
zF6fFZtRDH0u|Q7F8tYNmbm?Fmpd&SAIrD&}6|Hwpp?J}Xag7>ThzW&4VZ>GWD!>OM
zJo6C=mYkdnizCAZK8G;Jj`zAm&3NAg)`Sge{6vq;%Q6}uMO$WvsgaCUNTD)OB3a-q
z5}wkFE`jQzD15rgN0B>XSXCHzKt@I$GG&?jG($!^tZxp7VVh4#Mq;rHI%TsQ>kX<<
zXfz5%gAW<_i=eE<Y=O<dTkz|!TQH|>mx~668nOo*&|`AsDg!v@g1V=v$Rve~if-DC
z&(XeF_EAI9mC|-Oh;-3mtUcse_a7Y=O@QpPAL5T-M{xA`JMdS%@x9{k#Sh{M#-F4y
z9B~`~6V|u^0rVvj_>Hf+6z9&M(|hN^SfbG027(5D<PZOXHF?0ttkdV16o*6cHq)N7
zbcP^YaE88<r`=@b`g*mb5iH+whGL2xKBI{+#=9(WN*m~Ni|bwhiGaJb(NFoNxBu(4
z-T9`eVhQ+}6V}*c8x!KJ!3KsCQZ{)5P(C}#+T|2+K&xKc{q)hwh91d`%bv~Aas0%-
z<WKaM!2Q9K!{5G>`NpjzQC=PuZV-vWUWGLkUC3qMrCmr^enloX-~asP*6g+VjJotm
zAC+qK6VT>)1qdx++%3o=Gt^MSkLjysE_zS=%Ip5l{RiKTndPJ(^a20?002ovPDHLk
FV1k*q+m`?U

literal 0
HcmV?d00001

diff --git a/source/images/playCountIcon.png b/source/images/playCountIcon.png
index 8580c729d2c84ab89df93d209b59f9367f771479..d3ed1896f892b58c0354e3460b819248bc7cdd94 100644
GIT binary patch
literal 778
zcmV+l1NHogP)<h;3K|Lk000e1NJLTq001Ze001Be1^@s6V68d;0008fNkl<Zc-rlk
z!ERes5Qe{*b7Gq~MHN*ADiRW~WCIc`x}^(P^aWtULv-6G$c_~fPXb5?i48&s!GaAE
zYDE*ZO`9|U>NxhjcYYR56FbE5vExQvFw4>0Ip6*NnPXpg!Nb<q*FSop0e`-?B>=Q|
z6D^BI$Gz%m$U%RfyxM9l?LaMu5rCm;Y6ZDpH_JOv<sD}AKB#K;tD0PgPJL2y;ORNc
zUR4Lfx*}JNmSc-%zk=qN!>SGj!-iZ(6e)4%hi`f7`i*jRHJ`dC>jq8DpsFSTr#&H{
zzdxXEVnMq#m2}z*)O9cz*5rN_6RK#emvsF2!$*&}Hms3O(eRY>$NMc3fA{)q@BMZ5
z7LP}NzsG+T>O}nh{nzZ>-vD6k>TA4n<0fVcUeE^SPWHkMftXb*ptHKlO3tiyyZEAX
zfSciFWGif<2xitwD1uOw)t{-LVL&eJ5g}&tiHJZ=fP!=IVTU$n_d*2~%&HY5z(yhj
zrM*uDbi;fOi$@CD>`OKRH4W1FEe6V$L=i_r|L1SN@XwPS0J<+<=FNBCKT^3-;1ZIS
zvn0iUItF}v?=HI!Hc9SWe)Sq}zxTn>k`RHSSq>lzS}ct$NGapVC-O}M9$JdUqkFJ$
zkYi#=1kW~hVi~687f{d*GnFgIgn}aow}7$xZd(57-V>_9U^MhAEiS!srA$FHa&j+L
zaJ)7`ga;wb%>Vk`H$1rW2WH0A*Wcj7Pd+P9&~fu}K*boK1PT;}p`v`dwL(gXc6)`A
zGm{x9IXR_5K;T)e9V%+_bLGzjOiuDS6y$`(3V{c9!s2=JQvuy^ckIWlr$ztRzPNph
zZnsOX*8`x_X_HbuoV$j8|6s2Cr?+m?>bx}dyxpB`wl+7gpC0#~$2ZTpV|QnphnpL7
zSbV{e%*iR0U(^>JBQBNy7GHF<J8jn1E|I_b^7D`RKNgRF0pbC#4qTXKEC2ui07*qo
IM6N<$f;0whTL1t6

literal 1372
zcmV-i1*7_jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000FeNkl<Zc-qaE
zJ&YSw5XXP>cGveoe7WRwx_l9Z1OgF4X%GRSK$V7yp05HV1gVgaTO>q-8w3R%bch0~
zh>A2w2%&(00OFJj2}+a?ayjQn;>34e@0+1`yY_lbE*I$vo@Ch`y`A~bfBrLL3#HR+
zHYb2>z$_30#>O21QeY8SY&05aVJw2zfPMR)IQ&6<cJ684>vh=3=mNE*Hh%5Wxi8QB
z^5eU}#YUsyrP*u>5KnHN-n(gb`_U&49eR0Ys=hgLVonN-HcEw!(qk24@zKoiYADF^
z^77)zpMU!3^4Zg$0Ie7po1WXg$0RzkW$%GkG)|^6H4H>#5Xl&I9PD-n`w*-Ez>H{o
za&Ff{2j0AX^~$OHrl#j(U}|RfzE^LptUPgG$IRqJEx`o54ZM^y8v<g(L56LE=Pb7y
z#&|7Z$L!Xvt-bqSpWIacD+b0hV~4q9JaU0_Ra?Vp?z&<N-)(TG#6lT}1H6foxHe_N
z&KSUZpP8vwHF`b-mr6kTSq#%(rM=2l0n7lkTv4i)`OK?NvZB?D{DOJ~U~%DhwmtG#
zg>EZ3Edp4DiBT5J47Knci6Gj4$l}l<g3B)!XgZw^J+GC3rJ7bmIAF(ym>L1(jK~bh
zIgZPX>dgSbFnU=ppw7M9NNq<0RW)NJtrUL51SwT6E;?OAP#ffwr5RdrS`}bf-D?LP
z+z|sY&4U&IBoJaHdegLv+S;`}ck%@7)*`0H#Pk*(c>M67Ons47Iz|lBz_cLc5)d+$
z@Nn8o(Q12DDEFDixriusI2X}V#cP;)-Ynd)yi~cLNCcO4{ZI*zz=$%qoTe#iHqvfI
zHkm3n+HGzwEupH^Hm|a&+ZzbkMztaNP5?8JAq_~-0A@jikapAHNCwLH`ApB$$h^|J
zw#<#IO90eeEf;YqTB*E+$;q%SE;f}2Lp4u(X}=59!hp(D>E*!<xV_S0rMpU!Bq&-e
zk2Uvk5o@>vISMsHat(C5UA!ro8mU(@Z~YSWMXQE-k2;5W#jO{>;8y^pK_sDWISbdX
zU#FV|01H2U&+_8mf$FU@Jo4l-r8TQKRn%-<0Nen@@Ej=jb*f6M)gsl9@x?QzXq`Vx
z6h+MJ+|7Zfo*neNdQ2VI`b$vgu2cfSiI7>)Y)_3_w{8cj1xytYM-;_GQB1xxF;%=*
zoKsY-Z(kEY_@%)}8zRtCvtmwaDWfn<6g9=TyZvq;tSUk$pdvUC!MQN|Rf(MI*GAP)
zubA3h?KiJ2k*=<U0JSluXXp9>9fpbILY6`U4kv~o=0u1@(2_$lLse1Luu|`0|L)kA
zTv(V#MA)`xAJ4z>)&PJhDy}jI95{o>Ib0N+sCuIOGZ?BKRl!WxWv|r|;y7k}yjHS@
zWz-)A`7#P$MFM~#yP*>Ncc%Aj2Sh`;^NH+Yz~b6iqGm}H4FG86!8<v;S34Myb1qJj
zBu;9vG@H#W4<9=GQkr%T?|Ss$b8%9e1bFYY7pT|kwA*a}CMG6`<IptTdpe!YJ=u@G
z{~==&li)q8?HjGj3-e!1)~8OzKzrfDx1UYV?YOx8!TnE<jg3zNyz}YjZ1~C7{c8K>
z()sycKL-Acjvqg+M~)onW@-1zrG-CE&+NSa;KZi-j1;Z1QLh}pm9q;!{PxY)Zv($H
z8jW@g&}cLiSZ+3(KVjB(>li5ap1h$x!@OPq<{OR1?cr@0&Xp6#zIZYJhdj3NHJ}4r
e0{-Fua{dKPqR1`e8u7va0000<MNUMnLSTZyNRe9r

diff --git a/source/menu.cpp b/source/menu.cpp
index a3fa8e24..b7c2423d 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -1130,6 +1130,10 @@ int GameWindowPrompt()
 	btnFavorite.SetEffectGrow();
 
 	GuiImage btnLeftImg(&imgLeft);
+	if (Settings.wsprompt == yes)
+		{
+			btnLeftImg.SetWidescreen(CFG.widescreen);
+		}
 	GuiButton btnLeft(imgLeft.GetWidth(), imgLeft.GetHeight());
 	btnLeft.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
 	btnLeft.SetPosition(20, 0);
@@ -1141,6 +1145,10 @@ int GameWindowPrompt()
 	btnLeft.SetEffectGrow();
 
 	GuiImage btnRightImg(&imgRight);
+	if (Settings.wsprompt == yes)
+		{
+			btnRightImg.SetWidescreen(CFG.widescreen);
+		}
 	GuiButton btnRight(imgRight.GetWidth(), imgRight.GetHeight());
 	btnRight.SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE);
 	btnRight.SetPosition(-20, 0);
@@ -2768,25 +2776,28 @@ static int MenuDiscList()
 	GuiImageData batteryRed(imgPath, battery_red_png);
 	snprintf(imgPath, sizeof(imgPath), "%sbattery_bar.png", CFG.theme_path);
 	GuiImageData batteryBar(imgPath, battery_bar_png);
-
-	/*snprintf(imgPath, sizeof(imgPath), "%sfavorite.png", CFG.theme_path);
-	GuiImageData imgFavoriteOn(imgPath, favorite_png);
-	snprintf(imgPath, sizeof(imgPath), "%snot_favorite.png", CFG.theme_path);
-	GuiImageData imgFavoriteOff(imgPath, not_favorite_png);*/
-
+	//NEW
     snprintf(imgPath, sizeof(imgPath), "%sfavIcon.png", CFG.theme_path);
 	GuiImageData imgfavIcon(imgPath, favIcon_png);
-	//snprintf(imgPath, sizeof(imgPath), "%snot_favorite.png", CFG.theme_path);
-	//GuiImageData imgFavoriteOff(imgPath, not_favorite_png);
-
+    snprintf(imgPath, sizeof(imgPath), "%sfavIcon_gray.png", CFG.theme_path);
+	GuiImageData imgfavIcon_gray(imgPath, favIcon_gray_png);
     snprintf(imgPath, sizeof(imgPath), "%sabcIcon.png", CFG.theme_path);
 	GuiImageData imgabcIcon(imgPath, abcIcon_png);
-	//snprintf(imgPath, sizeof(imgPath), "%snot_favorite.png", CFG.theme_path);
-	//GuiImageData imgFavoriteOff(imgPath, not_favorite_png);
+    snprintf(imgPath, sizeof(imgPath), "%sabcIcon_gray.png", CFG.theme_path);
+	GuiImageData imgabcIcon_gray(imgPath, abcIcon_gray_png);
 	snprintf(imgPath, sizeof(imgPath), "%splayCountIcon.png", CFG.theme_path);
 	GuiImageData imgplayCountIcon(imgPath, playCountIcon_png);
-
-
+	snprintf(imgPath, sizeof(imgPath), "%splayCountIcon_gray.png", CFG.theme_path);
+	GuiImageData imgplayCountIcon_gray(imgPath, playCountIcon_gray_png);
+	snprintf(imgPath, sizeof(imgPath), "%sarrangeGrid.png", CFG.theme_path);
+	GuiImageData imgarrangeGrid(imgPath, arrangeGrid_png);
+	snprintf(imgPath, sizeof(imgPath), "%sarrangeGrid_gray.png", CFG.theme_path);
+	GuiImageData imgarrangeGrid_gray(imgPath, arrangeGrid_gray_png);
+	snprintf(imgPath, sizeof(imgPath), "%sarrangeCarosselle.png", CFG.theme_path);
+	GuiImageData imgarrangeCarosselle(imgPath, arrangeCarosselle_png);
+	snprintf(imgPath, sizeof(imgPath), "%sarrangeCarosselle_gray.png", CFG.theme_path);
+	GuiImageData imgarrangeCarosselle_gray(imgPath, arrangeCarosselle_gray_png);
+	
     GuiTrigger trigA;
 	trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
     GuiTrigger trigHome;
@@ -2907,45 +2918,93 @@ static int MenuDiscList()
 	wiiBtn.SetTrigger(&trigA);
 
 	GuiImage favoriteBtnImg(&imgfavIcon);
+	GuiImage favoriteBtnImg_g(&imgfavIcon_gray);
 	favoriteBtnImg.SetWidescreen(CFG.widescreen);
-	GuiButton favoriteBtn(imgfavIcon.GetWidth(), imgfavIcon.GetHeight());
+	favoriteBtnImg_g.SetWidescreen(CFG.widescreen);
+	GuiButton favoriteBtn(favoriteBtnImg.GetWidth(), favoriteBtnImg.GetHeight());
 	favoriteBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE);
-	favoriteBtn.SetPosition(-80, 15);
-	favoriteBtn.SetImage(&favoriteBtnImg);
+	favoriteBtn.SetPosition(20, 15);
+	favoriteBtn.SetImage(&favoriteBtnImg_g);
 	favoriteBtn.SetSoundOver(&btnSoundOver);
 	favoriteBtn.SetSoundClick(&btnClick);
 	favoriteBtn.SetTrigger(&trigA);
 	favoriteBtn.SetEffectGrow();
-	favoriteBtn.SetAlpha(70);
+	favoriteBtn.SetAlpha(180);
 
 	GuiImage abcBtnImg(&imgabcIcon);
 	abcBtnImg.SetWidescreen(CFG.widescreen);
+	GuiImage abcBtnImg_g(&imgabcIcon_gray);
+	abcBtnImg_g.SetWidescreen(CFG.widescreen);
 	GuiButton abcBtn(abcBtnImg.GetWidth(), abcBtnImg.GetHeight());
 	abcBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE);
-	abcBtn.SetPosition(-30, 15);
-	abcBtn.SetImage(&abcBtnImg);
+	abcBtn.SetPosition(52, 15);
+	abcBtn.SetImage(&abcBtnImg_g);
 	abcBtn.SetSoundOver(&btnSoundOver);
 	abcBtn.SetSoundClick(&btnClick);
 	abcBtn.SetTrigger(&trigA);
 	abcBtn.SetEffectGrow();
-	abcBtn.SetAlpha(70);
+	abcBtn.SetAlpha(180);
 
 
 	GuiImage countBtnImg(&imgplayCountIcon);
 	countBtnImg.SetWidescreen(CFG.widescreen);
+	GuiImage countBtnImg_g(&imgplayCountIcon_gray);
+	countBtnImg_g.SetWidescreen(CFG.widescreen);
 	GuiButton countBtn(countBtnImg.GetWidth(), countBtnImg.GetHeight());
 	countBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE);
-	countBtn.SetPosition(10, 15);
-	countBtn.SetImage(&countBtnImg);
+	countBtn.SetPosition(84, 15);
+	countBtn.SetImage(&countBtnImg_g);
+	countBtn.SetImage(&countBtnImg_g);
 	countBtn.SetSoundOver(&btnSoundOver);
 	countBtn.SetSoundClick(&btnClick);
 	countBtn.SetTrigger(&trigA);
 	countBtn.SetEffectGrow();
-	countBtn.SetAlpha(70);
+	countBtn.SetAlpha(180);
+	
+	//NEW
+	GuiImage gridBtnImg(&imgarrangeGrid);
+	gridBtnImg.SetWidescreen(CFG.widescreen);
+	GuiImage gridBtnImg_g(&imgarrangeGrid_gray);
+	gridBtnImg_g.SetWidescreen(CFG.widescreen);
+	GuiButton gridBtn(gridBtnImg.GetWidth(), gridBtnImg.GetHeight());
+	gridBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE);
+	gridBtn.SetPosition(116, 15);
+	gridBtn.SetImage(&gridBtnImg_g);
+	gridBtn.SetSoundOver(&btnSoundOver);
+	gridBtn.SetSoundClick(&btnClick);
+	gridBtn.SetTrigger(&trigA);
+	gridBtn.SetEffectGrow();
+	gridBtn.SetAlpha(180);
+	
+	GuiImage carosselleBtnImg(&imgarrangeCarosselle);
+	carosselleBtnImg.SetWidescreen(CFG.widescreen);
+	GuiImage carosselleBtnImg_g(&imgarrangeCarosselle_gray);
+	carosselleBtnImg_g.SetWidescreen(CFG.widescreen);
+	GuiButton carosselleBtn(carosselleBtnImg.GetWidth(), carosselleBtnImg.GetHeight());
+	carosselleBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE);
+	carosselleBtn.SetPosition(148, 15);
+	carosselleBtn.SetImage(&carosselleBtnImg_g);
+	carosselleBtn.SetSoundOver(&btnSoundOver);
+	carosselleBtn.SetSoundClick(&btnClick);
+	carosselleBtn.SetTrigger(&trigA);
+	carosselleBtn.SetEffectGrow();
+	carosselleBtn.SetAlpha(180);
 
-	if (Settings.fave)favoriteBtn.SetAlpha(255);
-	if (Settings.sort==all)abcBtn.SetAlpha(255);
-	else if (Settings.sort==pcount)countBtn.SetAlpha(255);
+	if (Settings.fave)
+	{
+		favoriteBtn.SetImage(&favoriteBtnImg);
+		favoriteBtn.SetAlpha(255);
+	}
+	if (Settings.sort==all)
+	{
+		abcBtn.SetImage(&abcBtnImg);
+		abcBtn.SetAlpha(255);
+	}
+	else if (Settings.sort==pcount)
+	{
+		countBtn.SetImage(&countBtnImg);
+		countBtn.SetAlpha(255);
+	}
 
 	//Downloading Covers
 	GuiTooltip DownloadBtnTT(LANGUAGE.ClicktoDownloadCovers);
@@ -3001,6 +3060,9 @@ static int MenuDiscList()
 	w.Append(&favoriteBtn);
 	w.Append(&abcBtn);
 	w.Append(&countBtn);
+	//NEW
+	w.Append(&gridBtn);
+	w.Append(&carosselleBtn);
 
     if((Settings.hddinfo == hr12)||(Settings.hddinfo == hr24))
     {
@@ -3083,6 +3145,7 @@ static int MenuDiscList()
 			}
 
 		}
+		//BLA
 		else if(homeBtn.GetState() == STATE_CLICKED)
 		{
 		    s32 thetimeofbg = bgMusic->GetPlayTime();
@@ -3218,7 +3281,7 @@ static int MenuDiscList()
 			gamecntTxt.SetText(GamesCnt);
 			selectedold = 1;
 			favoriteBtn.ResetState();
-			favoriteBtn.SetAlpha(Settings.fave ? 255 : 70);
+			Settings.fave ? (favoriteBtn.SetImage(&favoriteBtnImg), favoriteBtn.SetAlpha(255)) : (favoriteBtn.SetImage(&favoriteBtnImg_g), favoriteBtn.SetAlpha(180));
 		}
 
 		else if(abcBtn.GetState() == STATE_CLICKED)
@@ -3231,8 +3294,10 @@ static int MenuDiscList()
 				__Menu_GetEntries();
 				gameBrowser.Reload(gameList, gameCnt);
 				selectedold = 1;
+				abcBtn.SetImage(&abcBtnImg);
 				abcBtn.SetAlpha(255);
-				countBtn.SetAlpha(70);
+				countBtn.SetImage(&countBtnImg_g);
+				countBtn.SetAlpha(180);
 			}
 			abcBtn.ResetState();
 		}
@@ -3247,7 +3312,9 @@ static int MenuDiscList()
 				__Menu_GetEntries();
 				gameBrowser.Reload(gameList, gameCnt);
 				selectedold = 1;
-				abcBtn.SetAlpha(70);
+				abcBtn.SetImage(&abcBtnImg_g);
+				abcBtn.SetAlpha(180);
+				countBtn.SetImage(&countBtnImg);
 				countBtn.SetAlpha(255);
 			}
 			countBtn.ResetState();
@@ -3882,6 +3949,7 @@ static int MenuSettings()
 	int menu = MENU_NONE;
 	int ret;
 	char cfgtext[20];
+	int choice = 0; //BLA
 
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
 	GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol);
@@ -3941,6 +4009,12 @@ static int MenuSettings()
 	backBtn.SetTrigger(&trigA);
 	backBtn.SetTrigger(&trigB);
 	backBtn.SetEffectGrow();
+	
+	//BLA
+	GuiButton homo(1,1);
+	homo.SetTrigger(&trigHome);
+	homo.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
+	homo.SetPosition(0,0);
 
 	GuiImage tab1Img(&tab1);
 	GuiImage tab2Img(&tab2);
@@ -4039,6 +4113,7 @@ static int MenuSettings()
 			w.Append(&backBtn);
 			w.Append(&lockBtn);
 			w.Append(btnLogo);
+			w.Append(&homo);
 			//set triggers for tabs
 			page1Btn.RemoveTrigger(1);
 			page1Btn.RemoveTrigger(2);
@@ -4806,6 +4881,42 @@ static int MenuSettings()
 				}
 				lockBtn.ResetState();
 			}
+			//BLA
+			else if(homo.GetState() == STATE_CLICKED)
+			{
+				optionBrowser2.SetState(STATE_DISABLED);
+				s32 thetimeofbg = bgMusic->GetPlayTime();
+				bgMusic->Stop();
+				choice = WindowExitPrompt(LANGUAGE.ExitUSBISOLoader,0, LANGUAGE.BacktoLoader,LANGUAGE.WiiMenu,LANGUAGE.Back,0);
+				if(!strcmp("", CFG.oggload_path) || !strcmp("notset", CFG.ogg_path)) 
+				{
+					bgMusic->Play();
+				} 
+				else 
+				{
+					bgMusic->PlayOggFile(CFG.ogg_path);
+				}
+				bgMusic->SetPlayTime(thetimeofbg);
+				SetVolumeOgg(255*(vol/100.0));
+
+				if(choice == 3)
+				{
+					SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); // Back to System Menu
+				}
+				else if (choice == 2)
+				{
+					if (*(unsigned int*) 0x80001800) exit(0);
+					// Channel Version
+					SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
+				} 
+				else 
+				{
+					homo.ResetState();
+					//optionBrowser2.SetState(STATE_DEFAULT);
+					//optionBrowser2.SetFocus(1);
+				}
+
+			}
 			if(settingsbackgroundbtn.GetState() == STATE_CLICKED)
 			{
 			optionBrowser2.SetFocus(1);