From 20a5838c57f3818b5f6c9f68b22d6a556ec9bd99 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 7 May 2017 14:56:35 +0200 Subject: [PATCH] Code cleanup and bug fixed + more - Fixed the intial value of the GuiToogle - updated the filelist and added a icon for a settings menu --- data/images/settingsbtn.png | Bin 0 -> 21985 bytes src/gui/Gui.h | 2 + src/gui/GuiToggle.cpp | 2 +- src/main.cpp | 34 +++++++++-------- src/main.h | 3 +- src/menu/MainWindow.h | 1 - src/menu/drc/content/ContentHome.h | 1 - src/resources/filelist.h | 58 ++++++++++++++++++++++++++++- 8 files changed, 79 insertions(+), 22 deletions(-) create mode 100644 data/images/settingsbtn.png diff --git a/data/images/settingsbtn.png b/data/images/settingsbtn.png new file mode 100644 index 0000000000000000000000000000000000000000..1dc671d6d60f8adafe5cae3d6a9ca59ae6f21438 GIT binary patch literal 21985 zcmeI4c{r47`1oH-wvc4Y))0~~3kDNo-}ils493_;OxB1(wi2>uNy)B7NcJU?A`)35 zdlF8T$od`CIn|tV{LXd#zQ2Edm$@!8@BQ4*ec$i%dG6<06>r1{UaK-Kjs4fR633d3c9)uSRB^V0qYJ@ zQ&0f8dtmJyUC;pFGmvh8F*KNAl3pENme&Xmx}ky9XQTk>%SQz<#PSJnQPQc0bKUA^ z)N44bq(sX0EGwMk+O?o)Mm<65NUFEw6I|KXF5eE1e7-U2f7`jYdUfjMc3B^Cx@alA zw3ED^f;v%EL{BV;I$xgi@cYZH%`Kx7!m`0sJnjG;MX4Q^=hkr|U@cHe>J)c9c`ZQX z^ZFnKP_LC%4`IKubLgXd${C`d5Tbfqtb_(d5Cb6VcTN5-AgfFil%C9I0A!H@*6p@7 zKdFp3N8+7<+tvIdXusWD^el^Pe;UU>F zAZup8WXXM(jnb{_mHqvb6BBRMo8>J~&rJfhF^y;IO}1RV21;$NuDq`u;|YdY2CI;+ zy>EQ6teL~!8AlmnGc*;WvRQF(XOrVKce9#JrKteJxE}qvYl^ASORya72>G~^PkFm{ z?8Zg}H%O2pV!(YTB$0otP@bhN$rp_ibf&oau~h(Atim?*@KcZkIb0s?^xj#J*;2{k z1%m9=;?4npl_HO@;qy|NRtkJFW(5n}mt$LQU=ge*V{bSx)NpXq8Xh9g)7&UeCr@P; z#O`5zvgndLf7r|W90Jzh9$602dOe4*cz0UiMx)2H((Z@WQ4|>s{MEsfq;k(Fj-a>( z!ij7mO^;urU``2L<7!YPrH|qPwS_b2acjhisY3N54M9e#9E;K(#FAIeC_jlk{S1Iz z+6=2!f!+vys3+Y+U8Yc(C(at8oPF?>9S)ir!<3cw%Ht8MbTs_d^s7RLLjy5Lg;q%Y z2NrUXW*3NXOOyNq2|>zu+x7?CMbw2YtoMzJNU9=MY&#!#lhOw()lPIK(CPgR7(8(}4quZ(a@A7UL9u|u+moL6mu76MOO5PFC z^Qn?AFEgoW

Koyk>P^c35@1_W}3h@Vf*~?W9*G-R(0fACf+hEPGSagfU)j4ae{w zO=BTv!5sBwxtFYY_vq`WqpgMzap-LFbjqO=tdXfexxfX+*ymIU>Ir-aYyx1z{DQj$ z!vzP8mWe)JKrZnWix8e6UzE--DO^7rX?jlD9ajqNEG*Z%HbMsEe4C z>Mz}}mmwcdKDTxgr%gG{pPRH47&*+aaB}P<+g(x3N+|k_b3tNKqG_ROpluigs){GtM*a+Tz-Bn~#i-i%&!Aqt<+?zEbS{{JH*f3)%o|ZJt$JfLM zJPEkEB~4CqrJuHt!<-|~^N|Mw!Wc1}+HrGUCgACE;tUvL+DX^>R%E>VNc+iV$8>|V z*D4rhOr_`LrSPZ-jZ5vqNl4)|ww8C#Y9`ciE9Wdn{km7u(@N7C=kf;c&BNy%=dTQ9 zz7WkknPDd4`Ksxe!h5~RE}4Uw2@vOzqCg!5onTDa^l`8)IM$@N?|wy&cfl%Zff@M) z>5(~(9G4Owh7FsYeIZ_7@vNd;hXXO`~1w>lb^Lvxw(h3N$m ziL#pE+7dVZkfRgGV~XZoJmSrJjmo!?qY=Xm?t*uPzg0LRz^T2cDxl>T_bIko%$Mh> zNRHrSWyp#A>(!bxn(xvO8BD2OAXk_)q6T_7F82C4`2sGj_;Sog%#^)Xdl5SH;r3Iv zs0uJ=0(qNr>Gh%mWDa4O80tVrr{WVwLr8=b;AlcbWs8a_WQ z=U}Ub=a(AFh@58+8c|J#2Fwoi%~|T0g3U(CQ0rmoY)Hn4$P$J@<|M|8Z~2FOCfTlF zpVy@f-FTE=*j#DXY2R%>Gc_!fVL_W%kTjJ<>qgT*@Q7x__|e?T7o|aP(o6oqs>|gH zmAC7p9#^At+d5vJmNC3zxNNv?2%qnMSBC0abL*OC^RNCQ`svM}MfK_yvaNQ|h{#Cm zjr|++hT2Bys!T~l!OU9XhO1?BukrQg*o`C(U|uC9zQy$kd>vDMLD)$e^`zPMVa z`s}jooLs-cyDM*GEVhTKam6B@4aWxgEO_b4cMpOiE097){u0h6GYl za!kf!Yi2W7q0_FDFN1kId%L}anF$=Y_GY%Pqbs@VR?=cpe4XosoUM=bvq$d@wlubI z*0%YGK&_UIH|83=hrBr!ZjT(&nYaMD$iL(8^}&k4tK5zFqw(=Oq$J5po3{Yx!r&uQ!QPP0@ec!5)+0C*+NAmK;n|ZP%%jfn5ZBK27$uC5J@mpR0sk^ zKqL_mDCozF8%c$~lJc;#N9Zdm{|JYdq`4h%IClgX?CtF>>@6aU^}v9kl9G~O2n-B^ z3E_JPdHTBHP(DI#p2xpC`O}Xg+SAs<(H-ZAbp!4CMcH7_WdDKi!1;pWh_@+1+32e;tLL?O&Ge=RI7$0k*RRqg~Lh_?Vt}JLo@-0q1D{b8>zg z!mj3D!=Zf~|HW)q^WE%QDtw$EOYbgW~6N11EVGx9<1Oh643IanwAip^I-jl$G7C!gw zP&m|o@$y?=LO)nLM|~YLgouqe1a2>6 zF9JmiK}AJHgd{{IZG`OY#343N6xvQiLj2nxe>eY|YelT>`Q1FgyZ*lL?Xb3Z_kX1o zLc-P_4i&Y53yHuaY=xjuw78I@m?T6<0wOM9gNBKtP!QWc1O4LcZ-I0?9PxDt6P z-Lcr=gFz)AXmJrcxDXlw!-s&0N(iCQC`lo>7~ICj4rM1QVT1ZJ#6P(CTPRgWPkc7{ z{*q<*T>Dme4AAF(Z~ar@;`ptCxT8Eg(Yp&%n)}a{`B%yLtD@}Md|TiMlXPX zA^&A%e)syj8KHYA@NTVkar}QU5uPZo|GR1UZ>#G6i)r|o#kLM8Hw@Yi3H~#I|7`eg zGxvQye_vUDuGYV=M5&*Z< z`K8}4e(Y=!_E-;B6b|X=io&45?rs<<@Xy9ydhQ+q5cq10uMDVfRS@s}Z*7GAO?RuR z%lYs9VUXPy7`prZ!}eD_p{?2f!S+`@q3usoBR5AJ680k;LGv$GyJr=|H_`_9V>KFy z9~@y5VQ*bWAGC|9q9cAc_1xVR;1WM<2o?WmX!eVt|8=bY+v53aFZ$oS_&K8gO|JyL_Ja@r*<0MlwKpFE?LIC7AbX4Zxc25lpxwts z0Az1*AJ^V|2(j z-h2qO`?v^z>@Dtzi|XftvS>H_)3M(8$6#N*i#U#dgcfA0s;>nAe!Kt>bQu7??%+RX z0N^|X06tm+03sOxn6YtZpDF{up%OJkIYXa;o|^&gN2b$T>#7P(G|KJj7h2#CCYa40 zDiEuLpZheFGb;6(%R0_OJ08`2W8CkK_>5+9RolCe*{%3Tl5rh(QmWkDM>943a)O&r z9tdOQANT8SIwD&hdi89`{m*P~O%u_x=U2D?C|&;S$6Fi%9TF)mRo?g_mAO?T)7fZ^ zW>s(%?Ef$_!*`tq@OelXH?mMgd5Ny{_91%WgR%#LEbjU%6Djhm?tp{b?F{tl905Dx zXT;ZO>PbNyvaEm*ASMYW1yNYj)>8xEAWFa+(2O6qiK3J3QemVx5lhAxL=VgY3?$D$ zmznvEfHLxx-kHD$05Na@a3lWXdVnIgSeMEH3XS3W6x>H-8G~SeuU)+!74fkqIK{b7 zw66Xvz&Jogv`p7_xFLi$$b>ySkr+jGpHo&0Aemti>eZvtyb;I1E2~Jy{?)>;U6ME_ zJ}-%a?{T**3-M*%FDU7ttBOJnhp(w_Uwf_^tq&?94UZhyAUbp4mC`3_oh*t|M2ZSW zU&sS1&Bo!EX$?S)^!)mihZ({pG=gK*!y{ds9v&n6qYh9$*~I2|T~?711xOLSKMEk6 z{y-HR5v9w2u1e!1MM=b1ai1P^lQcX`YJ)z=%|pkG(VP~odL8O_4WeBWBLcUpBU4n=_zrt-jJo#g-k@B1h+|t+`W5OJ-*Gbz_{@B zBpiP++|y$y9REjG+*6JES7g#4UpXZp;|>qXNsW;#!_XHyf zi~xx+lqs*9$+AEiu$dEmm_}EZsh={beMK3Ko;)~q^+{D#%;4OY7^3%=4VUhza(O7oXvJi*TKob;X`-CkrROx7k9RWfe&+YTWV%z{oeVQ%@((coh#AeHoU0X zuxKrn#!WXsPmb===b&)8tCaPH!19f!w7SC~*Tj5)%`)e{z%zP!53~?@wY9bJi1d#8 zUULIs8&G!6m|QXXh!718jU978O(F(_a#tKOlS@)pkuF465dWzDj$kZZzCWXocZhnK zZKG*hZ-4*Sw2vP@`sg-07^`G06FnA86@=>A@6`P)3@{8@URl|iPs7%x z#73Ci(JPV2xBv`&_`u%^p+2rvD98PTUCoqTLu3Fx~EITR<~6)~!;pg^KQVx~ZxWC~d`Js-_++UtUe<8*6lE4XIy`Kb*jXXlIO zC!WPxbdP5SuFt4iTE5#66&GJ%V`JNh@Ahjev8*aT8N|gr=Bdb{tFPbKy;RgsuNOB! z(;r<{RHSKQYWi4?EBYD@8@$@{)7uAw5gl8L?cjx;o}TL44C*MOSOWtdO#!oj#^VvQYPD2UzL}a>)bEOu5J@XOp_#j~&vV{fDU3*us9AHWY_VLPK&j%Db)DX!hw z-eBgAeRk$y-_ffr#0SWXHJzX^7%^+Ou}$a!Nr+VE3F$$kh=}L-+UM~Kg99Fm6K!gl zozrSxp0ETYoKo@tAaHm&PtsvK`<{9KTahCRb(c3>0_%3*i4|SrHbmB5UdGn8H*b6r zZ6Luun9@sppj^c>NYe^x7gz1 z#ilv))O4!@2p9YW>u7xiCxVZnspVl@&cKJSao+~%E(9~k%3BWfTyRYxK)kc zO736<_U!FuH=LIjr!FxGpsb<-J{iJA-bxO9{rWX3`Xf&)gCZnD_^HGcNWKt|K79NH5N_^7Y!pA#p6U;9yU89<#pTp~! z85zDWb>cp3kY2$Vmhw0wBjaM$wD~b(d~tK~K%~oXA2IqY`^u_? z+&c2{5FL<_BX9a3?^DB=QJ{<9y`{~i&U*r2@WoNRHg9&?)~FuE1bY4oqCYq|I10d2S>mJdLlOVrA@Y_f7Xdw79WVjo)%oa2ej#*6(q8dR=vs zQ&ZdHvBy=0IayiP6(rcdoD8L-y@HYA?EI>O{5p||-;RcbPoDg064UxxAR!vRAzVJk zS1{3ANlQZUsGRr;t<$xqxAEoL zuVOHuW7J*H*Lkqq)gs`1eK2!|&sfAl>*aGZ-8r|(Y1t)C=BGB5Q|6M*E%i$&Xq*93~}aW?~!ZjFum?a{6Oe=ikZjpE|XnOGIsM zlx@1!!RPmNaZ>7bmk)VdX!S#+|Ah-u4i8L81uqQ0iI4#&=<4a(@C9cEeCao>Zuq#e z9^zTyS7UW#!6zHjtjj14EX=&lHId$48)s)iBI)UgiGo&U`=TcNh?Z?XH~I-%)!)sE zdn(u}sisPH@I6z|Vf@Yu7ZtTTlEfBU%KUKd?E~8j_}Y-Xxg=1@MWd7;a3e91sqe*$ z7uNXcXmho?SFuodulA#*GD}4SE~}=dM!oP2ZG37B-RxNMOZ(E9Gr~y@4&v4*T2n8x zspGoENtdB&V+FeSE&0|vw?lDBr!4NMKfc>E>2UzR4f@(doK~&9ZIp$4L3KHt_hWl@-$OjZ7!tYx$t(9Ogf5Gj&4ef_3HMkTM7U~cE~vNj(O)Z*~5866o-HiiY5)RdEPdw*f&m-lvzO( zwq`sbi43`~^Cd5=-T!hs2ASRGpGYT`-S?1hoxwb?h|CVxH<0Ty>r%Ll5 zRk^tsOJCp02%bFeqhXY}0)eV>=J>L~8DL?NX5X11ZG*H1=|22Ct#qM%>u`3=gp=nX$0c&)Rg@>w~(gBxYjp3ay_vl z`d>B0AhDzzRB+H?qT;Sm)?;O5 zMTGuM&yffyy#(Sp+S735>={wPzzC>Dxo<)Efr>%bw&%~E^MI5oi?ZmOD!FCvSQ7^a zo%8VMc3+y(+MdbH%s6w+e|2TW%)`S2_PV><=h`@5_`nN35}T*Ns`c&wuEF{h9R+Fk zrG~75>7@qz5_5St+SM;#!ph8rY#*5RFhwaDn40E^rM+BVUdE+&IrQYe zal$V|Qi*FzhZE?gGj6wC@^O&0dw<__(exec(); - log_printf("Menu_Main (line %d): Main application stopped result: %d\n",__LINE__,result); Application::destroyInstance(); log_printf("Menu_Main (line %d): Unmount SD\n",__LINE__); diff --git a/src/main.h b/src/main.h index b4692ba..4f10993 100644 --- a/src/main.h +++ b/src/main.h @@ -1,8 +1,7 @@ #ifndef _MAIN_H_ #define _MAIN_H_ -#include "common/types.h" -#include "dynamic_libs/os_functions.h" +#include /* Main */ #ifdef __cplusplus diff --git a/src/menu/MainWindow.h b/src/menu/MainWindow.h index 7d249cb..33983a1 100644 --- a/src/menu/MainWindow.h +++ b/src/menu/MainWindow.h @@ -165,7 +165,6 @@ private: void OnCloseEffectFinish(GuiElement *element); bool checkForRealProController(); - void OnInputGetterMenuFinish(GuiElement *element, bool result,UController_Type controller_type); void clickListEntryByController(UController_Type controller_type); diff --git a/src/menu/drc/content/ContentHome.h b/src/menu/drc/content/ContentHome.h index 8a7f487..6200641 100644 --- a/src/menu/drc/content/ContentHome.h +++ b/src/menu/drc/content/ContentHome.h @@ -18,7 +18,6 @@ #define _CONTENT_HOME_H #include "gui/Gui.h" -#include "ContentHome.h" #include "ContentTemplate.h" #include "language/gettext.h" diff --git a/src/resources/filelist.h b/src/resources/filelist.h index faa9b0f..2b6772b 100644 --- a/src/resources/filelist.h +++ b/src/resources/filelist.h @@ -1,7 +1,7 @@ /**************************************************************************** * Loadiine resource files. * This file is generated automatically. - * Includes 95 files. + * Includes 109 files. * * NOTE: * Any manual modification of this file will be overwriten by the generation. @@ -194,6 +194,15 @@ extern const u32 buttons_pro_zr_png_size; extern const u8 button_click_mp3[]; extern const u32 button_click_mp3_size; +extern const u8 checkbox_png[]; +extern const u32 checkbox_png_size; + +extern const u8 checkbox_highlighted_png[]; +extern const u32 checkbox_highlighted_png_size; + +extern const u8 checkbox_selected_png[]; +extern const u32 checkbox_selected_png_size; + extern const u8 font_ttf[]; extern const u32 font_ttf_size; @@ -209,6 +218,21 @@ extern const u32 gamepadBig_png_size; extern const u8 gamepadIcon_png[]; extern const u32 gamepadIcon_png_size; +extern const u8 gameSettingsButton_png[]; +extern const u32 gameSettingsButton_png_size; + +extern const u8 gameSettingsButtonEx_png[]; +extern const u32 gameSettingsButtonEx_png_size; + +extern const u8 gameSettingsButtonExHighlighted_png[]; +extern const u32 gameSettingsButtonExHighlighted_png_size; + +extern const u8 gameSettingsButtonExSelected_png[]; +extern const u32 gameSettingsButtonExSelected_png_size; + +extern const u8 gameSettingsButtonSelected_png[]; +extern const u32 gameSettingsButtonSelected_png_size; + extern const u8 GithubIcon_png[]; extern const u32 GithubIcon_png_size; @@ -293,6 +317,24 @@ extern const u32 selectorSmall_png_size; extern const u8 seperator_png[]; extern const u32 seperator_png_size; +extern const u8 settingsbtn_png[]; +extern const u32 settingsbtn_png_size; + +extern const u8 settings_click_2_mp3[]; +extern const u32 settings_click_2_mp3_size; + +extern const u8 switchIconBase_png[]; +extern const u32 switchIconBase_png_size; + +extern const u8 switchIconBaseHighlighted_png[]; +extern const u32 switchIconBaseHighlighted_png_size; + +extern const u8 switchIconOff_png[]; +extern const u32 switchIconOff_png_size; + +extern const u8 switchIconOn_png[]; +extern const u32 switchIconOn_png_size; + extern const u8 TVElementControllerBG_png[]; extern const u32 TVElementControllerBG_png_size; @@ -365,11 +407,19 @@ static RecourceFile RecourceList[] = {"buttons_pro_zl.png", buttons_pro_zl_png, buttons_pro_zl_png_size, NULL, 0}, {"buttons_pro_zr.png", buttons_pro_zr_png, buttons_pro_zr_png_size, NULL, 0}, {"button_click.mp3", button_click_mp3, button_click_mp3_size, NULL, 0}, + {"checkbox.png", checkbox_png, checkbox_png_size, NULL, 0}, + {"checkbox_highlighted.png", checkbox_highlighted_png, checkbox_highlighted_png_size, NULL, 0}, + {"checkbox_selected.png", checkbox_selected_png, checkbox_selected_png_size, NULL, 0}, {"font.ttf", font_ttf, font_ttf_size, NULL, 0}, {"footer.png", footer_png, footer_png_size, NULL, 0}, {"gamepad.png", gamepad_png, gamepad_png_size, NULL, 0}, {"gamepadBig.png", gamepadBig_png, gamepadBig_png_size, NULL, 0}, {"gamepadIcon.png", gamepadIcon_png, gamepadIcon_png_size, NULL, 0}, + {"gameSettingsButton.png", gameSettingsButton_png, gameSettingsButton_png_size, NULL, 0}, + {"gameSettingsButtonEx.png", gameSettingsButtonEx_png, gameSettingsButtonEx_png_size, NULL, 0}, + {"gameSettingsButtonExHighlighted.png", gameSettingsButtonExHighlighted_png, gameSettingsButtonExHighlighted_png_size, NULL, 0}, + {"gameSettingsButtonExSelected.png", gameSettingsButtonExSelected_png, gameSettingsButtonExSelected_png_size, NULL, 0}, + {"gameSettingsButtonSelected.png", gameSettingsButtonSelected_png, gameSettingsButtonSelected_png_size, NULL, 0}, {"GithubIcon.png", GithubIcon_png, GithubIcon_png_size, NULL, 0}, {"helpIcon.png", helpIcon_png, helpIcon_png_size, NULL, 0}, {"home.png", home_png, home_png_size, NULL, 0}, @@ -398,6 +448,12 @@ static RecourceFile RecourceList[] = {"selectorBig.png", selectorBig_png, selectorBig_png_size, NULL, 0}, {"selectorSmall.png", selectorSmall_png, selectorSmall_png_size, NULL, 0}, {"seperator.png", seperator_png, seperator_png_size, NULL, 0}, + {"settingsbtn.png", settingsbtn_png, settingsbtn_png_size, NULL, 0}, + {"settings_click_2.mp3", settings_click_2_mp3, settings_click_2_mp3_size, NULL, 0}, + {"switchIconBase.png", switchIconBase_png, switchIconBase_png_size, NULL, 0}, + {"switchIconBaseHighlighted.png", switchIconBaseHighlighted_png, switchIconBaseHighlighted_png_size, NULL, 0}, + {"switchIconOff.png", switchIconOff_png, switchIconOff_png_size, NULL, 0}, + {"switchIconOn.png", switchIconOn_png, switchIconOn_png_size, NULL, 0}, {"TVElementControllerBG.png", TVElementControllerBG_png, TVElementControllerBG_png_size, NULL, 0}, {"TVElementControllerBGSelected.png", TVElementControllerBGSelected_png, TVElementControllerBGSelected_png_size, NULL, 0}, {"TwitterIcon.png", TwitterIcon_png, TwitterIcon_png_size, NULL, 0},