From bc4aff009d35242ba775f9a91a8219bc09548a43 Mon Sep 17 00:00:00 2001 From: dborth Date: Mon, 15 Mar 2010 07:41:40 +0000 Subject: [PATCH] changes for multi-language support --- source/ngc/FreeTypeGX.cpp | 14 +- source/ngc/filelist.h | 6 + source/ngc/gui/gui_button.cpp | 2 + source/ngc/gui/gui_optionbrowser.cpp | 4 +- source/ngc/gui/gui_savebrowser.cpp | 14 +- source/ngc/images/button_long.png | Bin 0 -> 1866 bytes source/ngc/images/button_long_over.png | Bin 0 -> 1896 bytes source/ngc/images/button_short.png | Bin 1789 -> 1821 bytes source/ngc/images/button_short_over.png | Bin 1875 -> 1907 bytes source/ngc/lang/de.lang | 470 +++++++++++++++++++++++- source/ngc/lang/es.lang | 392 +++++++++++++++++++- source/ngc/lang/fr.lang | 444 +++++++++++++++++++++- source/ngc/lang/jp.lang | 392 +++++++++++++++++++- source/ngc/lang/nl.lang | 392 +++++++++++++++++++- source/ngc/menu.cpp | 233 ++++++------ source/ngc/networkop.cpp | 4 +- 16 files changed, 2231 insertions(+), 136 deletions(-) create mode 100644 source/ngc/images/button_long.png create mode 100644 source/ngc/images/button_long_over.png diff --git a/source/ngc/FreeTypeGX.cpp b/source/ngc/FreeTypeGX.cpp index ca9740e..dffbf36 100644 --- a/source/ngc/FreeTypeGX.cpp +++ b/source/ngc/FreeTypeGX.cpp @@ -65,12 +65,18 @@ void ClearFontData() wchar_t* charToWideChar(const char* strChar) { - wchar_t *strWChar; - strWChar = new wchar_t[strlen(strChar) + 1]; + wchar_t *strWChar = new(std::nothrow) wchar_t[strlen(strChar) + 1]; + if(!strWChar) + return NULL; - char *tempSrc = (char *)strChar; + int bt = mbstowcs(strWChar, strChar, strlen(strChar)); + if (bt > 0) + { + strWChar[bt] = (wchar_t)'\0'; + return strWChar; + } wchar_t *tempDest = strWChar; - while((*tempDest++ = *tempSrc++)); + while ((*tempDest++ = *strChar++)); return strWChar; } diff --git a/source/ngc/filelist.h b/source/ngc/filelist.h index dd63922..2d377f0 100644 --- a/source/ngc/filelist.h +++ b/source/ngc/filelist.h @@ -123,6 +123,12 @@ extern const u32 button_png_size; extern const u8 button_over_png[]; extern const u32 button_over_png_size; +extern const u8 button_long_png[]; +extern const u32 button_long_png_size; + +extern const u8 button_long_over_png[]; +extern const u32 button_long_over_png_size; + extern const u8 button_short_png[]; extern const u32 button_short_png_size; diff --git a/source/ngc/gui/gui_button.cpp b/source/ngc/gui/gui_button.cpp index 3b4dd5e..3ae6023 100644 --- a/source/ngc/gui/gui_button.cpp +++ b/source/ngc/gui/gui_button.cpp @@ -199,6 +199,8 @@ void GuiButton::ResetText() if(labelOver[i]) labelOver[i]->ResetText(); } + if(tooltip) + tooltip->ResetText(); } void GuiButton::Update(GuiTrigger * t) diff --git a/source/ngc/gui/gui_optionbrowser.cpp b/source/ngc/gui/gui_optionbrowser.cpp index 616a529..7dbeb2e 100644 --- a/source/ngc/gui/gui_optionbrowser.cpp +++ b/source/ngc/gui/gui_optionbrowser.cpp @@ -77,11 +77,11 @@ GuiOptionBrowser::GuiOptionBrowser(int w, int h, OptionList * l) for(int i=0; iSetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); optionTxt[i]->SetPosition(8,0); - optionVal[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); + optionVal[i] = new GuiText(NULL, 20, (GXColor){0, 0, 0, 0xff}); optionVal[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); optionVal[i]->SetPosition(250,0); diff --git a/source/ngc/gui/gui_savebrowser.cpp b/source/ngc/gui/gui_savebrowser.cpp index e26d529..3824948 100644 --- a/source/ngc/gui/gui_savebrowser.cpp +++ b/source/ngc/gui/gui_savebrowser.cpp @@ -81,14 +81,14 @@ GuiSaveBrowser::GuiSaveBrowser(int w, int h, SaveList * s, int a) for(int i=0; iSetAlignment(ALIGN_LEFT, ALIGN_TOP); saveDate[i]->SetPosition(80,5); - saveTime[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); + saveTime[i] = new GuiText(NULL, 18, (GXColor){0, 0, 0, 0xff}); saveTime[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP); saveTime[i]->SetPosition(80,27); - saveType[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); + saveType[i] = new GuiText(NULL, 18, (GXColor){0, 0, 0, 0xff}); saveType[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP); saveType[i]->SetPosition(80,50); @@ -321,10 +321,10 @@ void GuiSaveBrowser::Update(GuiTrigger * t) { saveDate[0]->SetText(NULL); saveDate[1]->SetText(NULL); - saveTime[0]->SetText("New SRAM"); - saveTime[1]->SetText("New Snapshot"); - saveType[0]->SetText(NULL); - saveType[1]->SetText(NULL); + saveTime[0]->SetText("New"); + saveTime[1]->SetText("New"); + saveType[0]->SetText("SRAM"); + saveType[1]->SetText("Snapshot"); savePreviewImg[0]->SetImage(gameSaveBlank); savePreviewImg[1]->SetImage(gameSaveBlank); savePreviewImg[0]->SetScale(1); diff --git a/source/ngc/images/button_long.png b/source/ngc/images/button_long.png new file mode 100644 index 0000000000000000000000000000000000000000..82fa9a23310dd216a2884a78995f452dae77a082 GIT binary patch literal 1866 zcmV-Q2etT#P)`6pHRCwC#oeNNuRTRgM>-s<`ABmAK z21PLvQ`8I}p%^}bd=!dGqt=LK>f}u21e#@&V?GcQ4Ydpd6;TvnuuM@j@eyf|8i}GP z51(mhC~Bge3%hi=yDaQN4UhkC=D&mI`@VJOd~@cUd++(~SLgBL$0TUl&5J4#Tb2XM zi2$hjWU|tAGMn6#xKfX4E9nO|XL+-Rvih-XaL+(BB%gIarzlGUPDWF~>)lu}tZS?_ ztWgLqP>r$DC5eTsv#i6cNvyj6cYwL+{`38;;T8D-090XIS)saMn_|fqm|G%>?6jOU z-qcAgpK40>ZJ(je?c3oNfhte-mFsjq^D<>*UoPzwdtHSlf^0G?<-Z6p57x%gO2A%S zJCm2YD~))$FWI$z8g~s;J8tLQp_ur?bTs)lii}I3f=7?kQ+lv|V)?U{mFGL_lyesG zLtR~JfZtdz8q&Wf4eHYacL>xN&R)o&$esIW^`=<5bN8OHQ=(bEtb9|mh~)_|Q4+qZ z8V7Sw`T2NpV7cIKfEvrioU0VFF^1M|HX1~UtPvbwH!TgYVAc%P=s(SuKJfE__d%^; zQ|w;)G&qc|-S|^Il*AgqL6&dqI!zg6VTs^sV{1c^E9N1%K&@l^@IjQgWd#j%?XDhr zfwh$rR9$ldOsoZbCL3J3bfWNO0p!uIC%g@6B`umYp>30Ey7Wv&pf2 zTiGN^#4kBf)i)JjqK~k|BJ$knZ_pUef$%5*5>GU4M6)Knu9`)I`#e)6qG*3|)gKh& zt%&7w;Y|QaVbPihTJlw-Y|3NV>8I}H4CXEem*6e$q3|F8CV1b^M=cetNm@6S1FXc9 z{Nyp7m@x#P4C-n$G|tOiHBZxz#k9KeP(07&DW5UqrCy{j9{~WRBiaQw#Kcqj#T>oK zMi)=f`V1x>mMotAaCxpH4e0$mJO@BIs9#S@BR%@6W^cJfbd!&~I;ao427nnD8BVzu zmxxsKD9XP9=KdneLjcU6yOTrVGmsfs#m|)4^3cmk!ym0lT3EKVX-@50;dw3q%%!Vi zd)4GDGMIyGv2SCG>;-@Ybg*lsnjFO#tV9n~yH+jXDF7@$Bqs$25n$G`rLmP2JOzLS zG<(uoH8t0&0oKT>0ZK#wETEB9L)B!hfm;Bm93K4r(7+@z*e%&|JMS(s7yuTKfA7A5 zNuvhXUmRcn0Q0$#ds{VK7Xg+bTQV#VX$Z_Y9B2wtTlAUIU;UT*$scVbQx) zbGY~@ED^=FzfHS&iJd#9>5p!R*-N8`xxsq?ltI+4AL-ux2eK)RV=76`V1h5GX!FFP z(b=gp6cLvI?*U+f)8{fND0G`@UZVd)4lq$fM#*Qb+7P2gCICQUb%eoNS2FeGVR4Bl zAvQr2?^&*|uPp-tzo9_?sqiEK3g2$uU05C}_;Y#qz*q(ohy}0(vO!FC1c&c{Hvy3N z`D7Z+4GLAwi5y&;WP`D8`p-#u2kqjukrcio9$p1NjHS+JQNYr5s#!E_Oi+!+-q9@5 z+i2D?RujE3AaETOJSw1xqXxsnpw@EgOh)0b>GXMnwy3F`y$o78N_!qml!{|@!B)&i zLF;Mh*IVIbP%GK~!$F!jdkLlde$Jrk$mSVmbC<8?Rb`{>&toxx*pNeA!wk?|Bj(}>9So@8MKTNw0 z9;1Cnl8v1rlFn?_GVu@2U=@)W4@QIXmKwn4tP_>FN#I zbLe>C^!uJeznE&U5DUq^tVF$`vI0zx=vQ1w(hOs1IM}tOh7IcB?tvJZ((7CRsLqJF2+@F%YVL)WZrdgvZF!H? zhBcFlW*iG}A3zP_IO}6pM_oynYRQ*qEBGUB>C)y(UCAik(&EE%WI5v=foepiE{Jxr zqFI$verYT52Z~^eqLLl?PAu%j4XQdPNolI6EdCK-07-lc9r2mqy#N3J07*qoM6N<$ Ef-a157XSbN literal 0 HcmV?d00001 diff --git a/source/ngc/images/button_long_over.png b/source/ngc/images/button_long_over.png new file mode 100644 index 0000000000000000000000000000000000000000..5674c9438fde52713097c35aa1a388bb2b301277 GIT binary patch literal 1896 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 delta 1771 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 delta 1859 zcmV-J2fX<64$}@HiBL{Q4GJ0x0000DNk~Le0001t0000q2nGNE09aYjCXpd0e+KnQ zL_t(|+U#9>Y*S?vKkfQhw{Bg#2ZI6wfdCuR5#k>RW)3C67$qhciLYp)5)zCiCPt#s zm}np|5{($bUl0vOA_>vN1bhUIh(MT7EH7H%YQ~bHkp3_s08ug^Me{!%pYM{7e z4&S0_KrGr1(eMq3g?n=yvQUi(B$^j#3VSOAvmSXMSI8+TUj(kImEfvg1-9ZUzH2i8 ziFg?NeXTI$zW{?hCqa^u`a@PBPa(G>cTJ^W-c;jY1}eQRQ0}=K$~+B%RpPrf15jis z22br8nKkn^fDc8}*ZmVDe-lyhFdOnCHCcIDohVOAFcgAb)f>w_jZitK<)%<17RgM8 z-7yPl7i^Tp)7SkY@|gY*N?5)}ZbS~`I*)0LI?SiYZF=LZx<{dA{v&)B?qK+OeuwK< z4nsT^&<~wPKG4*%KRjN+WP~BB-2>jmo6)PR;45ALh>wKeYR5hZfBDYqhrT0EgQ7{~ z8ehOrcQwj?jwn5kVy%6Yc6Ne~#yoY={9}h!i{WdWh zvfABHSHA^{OTB!R3lvxW`V2yY|D+{Z$cNF({4kba4(RJF-X+gMMa{i@RSOu&Lq2@NQke^{=Nv{o+`n%q`YW4fN1!!rs9X0r{dybnV6g#)6Q7LeZ&LzCXa zP`Q7#Ht2NM!~Eqh@zpdCdaoWq9u-X?WF2~$0lkM=CyIsOnROp~7K5SM`w#^B&O$WY zlkyv&)ZyNhJ&|y1TD`?xy9P=tmdP0r(?A3hxT-Vet6MPwf7wzV2LIwwQ>hfn+_d+J zy^9gynY{)Edrygrm({914r?KaHb2?4(PHO3c`;GqaAZ)JC za~FfdS+P_vn04Z$cYWHy?gp;r8XWc#FWBsr^4=O1wK#RDx8RExgsQH^S_W3Ti{~#4 zu$Rsj1w&}Gf2hTo6s*M_p1Uw)kcZJ>DG6p_nqX`dEEt9oZR~EnX|Y8u%%os8TY19E zkWo}roRM*72*zZ#fy7%Z8L}3v8Oc+Y{V)=H7>1$*DXurgNHBiUl1M~&4#SXD$PN40Y>G-_naFm?NM(9_i8MF~Pxha8@kiD`!B&V}1zw z&gsoxf6$A(MN@q&@}M{x8u**zxIszJCrQb)qFo1SqB{rD(_&Yj&z$rb#pS`_6#5$RB0db|l`Hv57XXHX zf0rQ8+X{(9Mzg7%D3*iS-ZNVIL&dxoKxzMxLU5oB;v)fYRjra6(lGASZ0JwCm*=t# z?Lo0@&-K2s@@1OvP-B_TMNbnBUV-RPH#psma)$@Tor7@jGA1$|*;b+nREv9UwD;#z zU?JB;U1q)p;rXRxazw7vghQR+aMppNe{3OooD#kxGZ2!LkU!*+p{v=}h(L7;Z$KWs zdh@Nw(U%+0#N{hcnhvGSu!&Ugp@z=((z#%F)XEJM8Pf;aEl1)QiS**n|76kR02St_ zKkxB;&O4qGE=iNVR)$u!cZeBOD!q#I$j+cTe-Kc8*3q@dlPe-vv& z`JQ_sHUB+on0gD8wI^q;1GDsiWy}oF+>{Em?c;spM8D01wnDs)oQr%#&8QN5A7(UK zLFpp3L=8dh6FJFbR~7xLTidOMDCz=1iSetAlignment(ALIGN_CENTRE, ALIGN_TOP); txt[i]->SetPosition(0,y); i++; y+=40; - txt[i]->SetPresets(22, (GXColor){0, 0, 0, 255}, 0, + txt[i]->SetPresets(20, (GXColor){0, 0, 0, 255}, 0, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_TOP, ALIGN_LEFT, ALIGN_TOP); txt[i] = new GuiText("Coding & menu design"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Tantric"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Coding"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("michniewski"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Menu artwork"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("the3seashells"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Menu sound"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Peter de Man"); - txt[i]->SetPosition(320,y); i++; y+=48; + txt[i]->SetPosition(335,y); i++; y+=48; txt[i] = new GuiText("Snes9x GX GameCube"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("SoftDev, crunchy2,"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("eke-eke, others"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Snes9x"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Snes9x Team"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("libogc / devkitPPC"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("shagkur & wintermute"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("FreeTypeGX"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Armin Tamzarian"); - txt[i]->SetPosition(320,y); i++; y+=48; + txt[i]->SetPosition(335,y); i++; y+=48; txt[i]->SetPresets(18, (GXColor){0, 0, 0, 255}, 0, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_TOP, ALIGN_CENTRE, ALIGN_TOP); @@ -905,7 +905,7 @@ static int MenuGameSelection() bool res; int i; - GuiText titleTxt("Choose Game", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Choose Game", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -913,8 +913,8 @@ static int MenuGameSelection() GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); GuiImageData iconHome(icon_home_png); GuiImageData iconSettings(icon_settings_png); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) trigA.SetSimpleTrigger(-1, WPAD_BUTTON_2 | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); @@ -923,15 +923,15 @@ static int MenuGameSelection() GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText settingsBtnTxt("Settings", 24, (GXColor){0, 0, 0, 255}); + GuiText settingsBtnTxt("Settings", 22, (GXColor){0, 0, 0, 255}); GuiImage settingsBtnIcon(&iconSettings); settingsBtnIcon.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); - settingsBtnIcon.SetPosition(20,0); + settingsBtnIcon.SetPosition(14,0); GuiImage settingsBtnImg(&btnOutline); GuiImage settingsBtnImgOver(&btnOutlineOver); GuiButton settingsBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); settingsBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - settingsBtn.SetPosition(100, -35); + settingsBtn.SetPosition(90, -35); settingsBtn.SetLabel(&settingsBtnTxt); settingsBtn.SetIcon(&settingsBtnIcon); settingsBtn.SetImage(&settingsBtnImg); @@ -941,15 +941,15 @@ static int MenuGameSelection() settingsBtn.SetTrigger(&trigA); settingsBtn.SetEffectGrow(); - GuiText exitBtnTxt("Exit", 24, (GXColor){0, 0, 0, 255}); + GuiText exitBtnTxt("Exit", 22, (GXColor){0, 0, 0, 255}); GuiImage exitBtnIcon(&iconHome); exitBtnIcon.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); - exitBtnIcon.SetPosition(20,0); + exitBtnIcon.SetPosition(14,0); GuiImage exitBtnImg(&btnOutline); GuiImage exitBtnImgOver(&btnOutlineOver); GuiButton exitBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); exitBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - exitBtn.SetPosition(-100, -35); + exitBtn.SetPosition(-90, -35); exitBtn.SetLabel(&exitBtnTxt); exitBtn.SetIcon(&exitBtnIcon); exitBtn.SetImage(&exitBtnImg); @@ -1133,7 +1133,7 @@ static void ControllerWindow() arrowRightBtn.SetSelectable(false); arrowRightBtn.SetUpdateCallback(ControllerWindowRightClick); - settingText = new GuiText(ctrlName[GCSettings.Controller], 24, (GXColor){0, 0, 0, 255}); + settingText = new GuiText(ctrlName[GCSettings.Controller], 22, (GXColor){0, 0, 0, 255}); int currentController = GCSettings.Controller; @@ -1157,7 +1157,7 @@ static int MenuGame() { int menu = MENU_NONE; - GuiText titleTxt((char *)Memory.ROMFilename, 24, (GXColor){255, 255, 255, 255}); + GuiText titleTxt((char *)Memory.ROMFilename, 22, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -1187,7 +1187,7 @@ static int MenuGame() GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText saveBtnTxt("Save", 24, (GXColor){0, 0, 0, 255}); + GuiText saveBtnTxt("Save", 22, (GXColor){0, 0, 0, 255}); GuiImage saveBtnImg(&btnLargeOutline); GuiImage saveBtnImgOver(&btnLargeOutlineOver); GuiImage saveBtnIcon(&iconSave); @@ -1203,7 +1203,7 @@ static int MenuGame() saveBtn.SetTrigger(&trigA); saveBtn.SetEffectGrow(); - GuiText loadBtnTxt("Load", 24, (GXColor){0, 0, 0, 255}); + GuiText loadBtnTxt("Load", 22, (GXColor){0, 0, 0, 255}); GuiImage loadBtnImg(&btnLargeOutline); GuiImage loadBtnImgOver(&btnLargeOutlineOver); GuiImage loadBtnIcon(&iconLoad); @@ -1219,7 +1219,7 @@ static int MenuGame() loadBtn.SetTrigger(&trigA); loadBtn.SetEffectGrow(); - GuiText resetBtnTxt("Reset", 24, (GXColor){0, 0, 0, 255}); + GuiText resetBtnTxt("Reset", 22, (GXColor){0, 0, 0, 255}); GuiImage resetBtnImg(&btnLargeOutline); GuiImage resetBtnImgOver(&btnLargeOutlineOver); GuiImage resetBtnIcon(&iconReset); @@ -1235,8 +1235,8 @@ static int MenuGame() resetBtn.SetTrigger(&trigA); resetBtn.SetEffectGrow(); - GuiText gameSettingsBtnTxt("Game Settings", 24, (GXColor){0, 0, 0, 255}); - gameSettingsBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText gameSettingsBtnTxt("Game Settings", 22, (GXColor){0, 0, 0, 255}); + gameSettingsBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage gameSettingsBtnImg(&btnLargeOutline); GuiImage gameSettingsBtnImgOver(&btnLargeOutlineOver); GuiImage gameSettingsBtnIcon(&iconGameSettings); @@ -1252,7 +1252,7 @@ static int MenuGame() gameSettingsBtn.SetTrigger(&trigA); gameSettingsBtn.SetEffectGrow(); - GuiText mainmenuBtnTxt("Main Menu", 24, (GXColor){0, 0, 0, 255}); + GuiText mainmenuBtnTxt("Main Menu", 22, (GXColor){0, 0, 0, 255}); GuiImage mainmenuBtnImg(&btnOutline); GuiImage mainmenuBtnImgOver(&btnOutlineOver); GuiButton mainmenuBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -1266,7 +1266,7 @@ static int MenuGame() mainmenuBtn.SetTrigger(&trigA); mainmenuBtn.SetEffectGrow(); - GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); + GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255}); GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); @@ -1300,7 +1300,7 @@ static int MenuGame() else sprintf(txt, "P%d", i+1); - batteryTxt[i] = new GuiText(txt, 22, (GXColor){255, 255, 255, 255}); + batteryTxt[i] = new GuiText(txt, 20, (GXColor){255, 255, 255, 255}); batteryTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); batteryImg[i] = new GuiImage(&battery); batteryImg[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); @@ -1550,7 +1550,7 @@ static int MenuGameSaves(int action) if(!ChangeInterface(device, NOTSILENT)) return MENU_GAME; - GuiText titleTxt(NULL, 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt(NULL, 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -1575,7 +1575,7 @@ static int MenuGameSaves(int action) GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -1589,7 +1589,7 @@ static int MenuGameSaves(int action) backBtn.SetTrigger(&trigA); backBtn.SetEffectGrow(); - GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); + GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255}); GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); @@ -1796,7 +1796,7 @@ static int MenuGameSettings() { int menu = MENU_NONE; - GuiText titleTxt("Game Settings", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -1822,8 +1822,8 @@ static int MenuGameSettings() GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText mappingBtnTxt("Button Mappings", 24, (GXColor){0, 0, 0, 255}); - mappingBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText mappingBtnTxt("Button Mappings", 22, (GXColor){0, 0, 0, 255}); + mappingBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage mappingBtnImg(&btnLargeOutline); GuiImage mappingBtnImgOver(&btnLargeOutlineOver); GuiImage mappingBtnIcon(&iconMappings); @@ -1839,8 +1839,8 @@ static int MenuGameSettings() mappingBtn.SetTrigger(&trigA); mappingBtn.SetEffectGrow(); - GuiText videoBtnTxt("Video", 24, (GXColor){0, 0, 0, 255}); - videoBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText videoBtnTxt("Video", 22, (GXColor){0, 0, 0, 255}); + videoBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage videoBtnImg(&btnLargeOutline); GuiImage videoBtnImgOver(&btnLargeOutlineOver); GuiImage videoBtnIcon(&iconVideo); @@ -1856,7 +1856,7 @@ static int MenuGameSettings() videoBtn.SetTrigger(&trigA); videoBtn.SetEffectGrow(); - GuiText controllerBtnTxt("Controller", 24, (GXColor){0, 0, 0, 255}); + GuiText controllerBtnTxt("Controller", 22, (GXColor){0, 0, 0, 255}); GuiImage controllerBtnImg(&btnLargeOutline); GuiImage controllerBtnImgOver(&btnLargeOutlineOver); GuiImage controllerBtnIcon(&iconController); @@ -1872,7 +1872,7 @@ static int MenuGameSettings() controllerBtn.SetTrigger(&trigA); controllerBtn.SetEffectGrow(); - GuiText cheatsBtnTxt("Cheats", 24, (GXColor){0, 0, 0, 255}); + GuiText cheatsBtnTxt("Cheats", 22, (GXColor){0, 0, 0, 255}); GuiImage cheatsBtnImg(&btnLargeOutline); GuiImage cheatsBtnImgOver(&btnLargeOutlineOver); GuiImage cheatsBtnIcon(&iconCheats); @@ -1888,7 +1888,7 @@ static int MenuGameSettings() cheatsBtn.SetTrigger(&trigA); cheatsBtn.SetEffectGrow(); - GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); + GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255}); GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); @@ -1903,7 +1903,7 @@ static int MenuGameSettings() closeBtn.SetTrigger(&trigHome); closeBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2003,7 +2003,7 @@ static int MenuGameCheats() options.length = i; - GuiText titleTxt("Game Settings - Cheats", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings - Cheats", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -2018,7 +2018,7 @@ static int MenuGameCheats() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2079,7 +2079,7 @@ static int MenuSettingsMappings() { int menu = MENU_NONE; - GuiText titleTxt("Game Settings - Button Mappings", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings - Button Mappings", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -2100,8 +2100,8 @@ static int MenuSettingsMappings() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText snesBtnTxt("SNES Controller", 24, (GXColor){0, 0, 0, 255}); - snesBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText snesBtnTxt("SNES Controller", 22, (GXColor){0, 0, 0, 255}); + snesBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-50); GuiImage snesBtnImg(&btnLargeOutline); GuiImage snesBtnImgOver(&btnLargeOutlineOver); GuiImage snesBtnIcon(&iconSNESController); @@ -2117,8 +2117,8 @@ static int MenuSettingsMappings() snesBtn.SetTrigger(&trigA); snesBtn.SetEffectGrow(); - GuiText superscopeBtnTxt("Super Scope", 24, (GXColor){0, 0, 0, 255}); - superscopeBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText superscopeBtnTxt("Super Scope", 22, (GXColor){0, 0, 0, 255}); + superscopeBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage superscopeBtnImg(&btnLargeOutline); GuiImage superscopeBtnImgOver(&btnLargeOutlineOver); GuiImage superscopeBtnIcon(&iconSuperscope); @@ -2134,8 +2134,8 @@ static int MenuSettingsMappings() superscopeBtn.SetTrigger(&trigA); superscopeBtn.SetEffectGrow(); - GuiText mouseBtnTxt("SNES Mouse", 24, (GXColor){0, 0, 0, 255}); - mouseBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-40); + GuiText mouseBtnTxt("SNES Mouse", 22, (GXColor){0, 0, 0, 255}); + mouseBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-70); GuiImage mouseBtnImg(&btnLargeOutline); GuiImage mouseBtnImgOver(&btnLargeOutlineOver); GuiImage mouseBtnIcon(&iconMouse); @@ -2151,7 +2151,7 @@ static int MenuSettingsMappings() mouseBtn.SetTrigger(&trigA); mouseBtn.SetEffectGrow(); - GuiText justifierBtnTxt("Justifier", 24, (GXColor){0, 0, 0, 255}); + GuiText justifierBtnTxt("Justifier", 22, (GXColor){0, 0, 0, 255}); GuiImage justifierBtnImg(&btnLargeOutline); GuiImage justifierBtnImgOver(&btnLargeOutlineOver); GuiImage justifierBtnIcon(&iconJustifier); @@ -2167,7 +2167,7 @@ static int MenuSettingsMappings() justifierBtn.SetTrigger(&trigA); justifierBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2236,12 +2236,12 @@ static int MenuSettingsMappingsController() char menuSubtitle[100]; sprintf(menuTitle, "Game Settings - Button Mappings"); - GuiText titleTxt(menuTitle, 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt(menuTitle, 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,30); sprintf(menuSubtitle, "%s", ctrlName[mapMenuCtrlSNES]); - GuiText subtitleTxt(menuSubtitle, 22, (GXColor){255, 255, 255, 255}); + GuiText subtitleTxt(menuSubtitle, 20, (GXColor){255, 255, 255, 255}); subtitleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); subtitleTxt.SetPosition(50,60); @@ -2262,8 +2262,8 @@ static int MenuSettingsMappingsController() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText gamecubeBtnTxt("GameCube Controller", 24, (GXColor){0, 0, 0, 255}); - gamecubeBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText gamecubeBtnTxt("GameCube Controller", 22, (GXColor){0, 0, 0, 255}); + gamecubeBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage gamecubeBtnImg(&btnLargeOutline); GuiImage gamecubeBtnImgOver(&btnLargeOutlineOver); GuiImage gamecubeBtnIcon(&iconGamecube); @@ -2279,7 +2279,7 @@ static int MenuSettingsMappingsController() gamecubeBtn.SetTrigger(&trigA); gamecubeBtn.SetEffectGrow(); - GuiText wiimoteBtnTxt("Wiimote", 24, (GXColor){0, 0, 0, 255}); + GuiText wiimoteBtnTxt("Wiimote", 22, (GXColor){0, 0, 0, 255}); GuiImage wiimoteBtnImg(&btnLargeOutline); GuiImage wiimoteBtnImgOver(&btnLargeOutlineOver); GuiImage wiimoteBtnIcon(&iconWiimote); @@ -2295,8 +2295,8 @@ static int MenuSettingsMappingsController() wiimoteBtn.SetTrigger(&trigA); wiimoteBtn.SetEffectGrow(); - GuiText classicBtnTxt("Classic Controller", 24, (GXColor){0, 0, 0, 255}); - classicBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText classicBtnTxt("Classic Controller", 22, (GXColor){0, 0, 0, 255}); + classicBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage classicBtnImg(&btnLargeOutline); GuiImage classicBtnImgOver(&btnLargeOutlineOver); GuiImage classicBtnIcon(&iconClassic); @@ -2312,9 +2312,9 @@ static int MenuSettingsMappingsController() classicBtn.SetTrigger(&trigA); classicBtn.SetEffectGrow(); - GuiText nunchukBtnTxt1("Wiimote", 24, (GXColor){0, 0, 0, 255}); + GuiText nunchukBtnTxt1("Wiimote", 22, (GXColor){0, 0, 0, 255}); GuiText nunchukBtnTxt2("&", 18, (GXColor){0, 0, 0, 255}); - GuiText nunchukBtnTxt3("Nunchuk", 24, (GXColor){0, 0, 0, 255}); + GuiText nunchukBtnTxt3("Nunchuk", 22, (GXColor){0, 0, 0, 255}); nunchukBtnTxt1.SetPosition(0, -20); nunchukBtnTxt3.SetPosition(0, +20); GuiImage nunchukBtnImg(&btnLargeOutline); @@ -2334,7 +2334,7 @@ static int MenuSettingsMappingsController() nunchukBtn.SetTrigger(&trigA); nunchukBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2540,12 +2540,12 @@ static int MenuSettingsMappingsMap() char menuSubtitle[100]; sprintf(menuTitle, "Game Settings - Button Mappings"); - GuiText titleTxt(menuTitle, 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt(menuTitle, 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,30); sprintf(menuSubtitle, "%s - %s", ctrlName[mapMenuCtrlSNES], ctrlrName[mapMenuCtrl]); - GuiText subtitleTxt(menuSubtitle, 22, (GXColor){255, 255, 255, 255}); + GuiText subtitleTxt(menuSubtitle, 20, (GXColor){255, 255, 255, 255}); subtitleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); subtitleTxt.SetPosition(50,60); @@ -2562,7 +2562,7 @@ static int MenuSettingsMappingsMap() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2576,7 +2576,7 @@ static int MenuSettingsMappingsMap() backBtn.SetTrigger(&trigA); backBtn.SetEffectGrow(); - GuiText resetBtnTxt("Reset", 24, (GXColor){0, 0, 0, 255}); + GuiText resetBtnTxt("Reset", 22, (GXColor){0, 0, 0, 255}); GuiImage resetBtnImg(&btnShortOutline); GuiImage resetBtnImgOver(&btnShortOutlineOver); GuiButton resetBtn(btnShortOutline.GetWidth(), btnShortOutline.GetHeight()); @@ -2637,7 +2637,7 @@ static int MenuSettingsMappingsMap() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - optionBrowser.SetCol2Position(180); + optionBrowser.SetCol2Position(215); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -2824,8 +2824,8 @@ static void ScreenZoomWindow() screenPositionImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); screenPositionImg.SetPosition(0, 0); - settingText = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); - settingText2 = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); + settingText = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255}); + settingText2 = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255}); char zoom[10]; sprintf(zoom, "%.2f%%", GCSettings.zoomHor*100); settingText->SetText(zoom); @@ -2957,7 +2957,7 @@ static void ScreenPositionWindow() GuiImage screenPositionImg(&screenPosition); screenPositionImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - settingText = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); + settingText = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255}); char shift[10]; sprintf(shift, "%i, %i", GCSettings.xshift, GCSettings.yshift); settingText->SetText(shift); @@ -3002,7 +3002,7 @@ static int MenuSettingsVideo() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Game Settings - Video", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings - Video", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -3017,7 +3017,7 @@ static int MenuSettingsVideo() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -3141,14 +3141,14 @@ static int MenuSettings() { int menu = MENU_NONE; - GuiText titleTxt("Settings", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiImageData btnLargeOutline(button_large_png); GuiImageData btnLargeOutlineOver(button_large_over_png); GuiImageData iconFile(icon_settings_file_png); @@ -3161,9 +3161,9 @@ static int MenuSettings() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText savingBtnTxt1("Saving", 24, (GXColor){0, 0, 0, 255}); + GuiText savingBtnTxt1("Saving", 22, (GXColor){0, 0, 0, 255}); GuiText savingBtnTxt2("&", 18, (GXColor){0, 0, 0, 255}); - GuiText savingBtnTxt3("Loading", 24, (GXColor){0, 0, 0, 255}); + GuiText savingBtnTxt3("Loading", 22, (GXColor){0, 0, 0, 255}); savingBtnTxt1.SetPosition(0, -20); savingBtnTxt3.SetPosition(0, +20); GuiImage savingBtnImg(&btnLargeOutline); @@ -3183,8 +3183,8 @@ static int MenuSettings() savingBtn.SetTrigger(&trigA); savingBtn.SetEffectGrow(); - GuiText menuBtnTxt("Menu", 24, (GXColor){0, 0, 0, 255}); - menuBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText menuBtnTxt("Menu", 22, (GXColor){0, 0, 0, 255}); + menuBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage menuBtnImg(&btnLargeOutline); GuiImage menuBtnImgOver(&btnLargeOutlineOver); GuiImage menuBtnIcon(&iconMenu); @@ -3200,8 +3200,8 @@ static int MenuSettings() menuBtn.SetTrigger(&trigA); menuBtn.SetEffectGrow(); - GuiText networkBtnTxt("Network", 24, (GXColor){0, 0, 0, 255}); - networkBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText networkBtnTxt("Network", 22, (GXColor){0, 0, 0, 255}); + networkBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage networkBtnImg(&btnLargeOutline); GuiImage networkBtnImgOver(&btnLargeOutlineOver); GuiImage networkBtnIcon(&iconNetwork); @@ -3217,12 +3217,12 @@ static int MenuSettings() networkBtn.SetTrigger(&trigA); networkBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - backBtn.SetPosition(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3231,12 +3231,12 @@ static int MenuSettings() backBtn.SetTrigger(&trigA); backBtn.SetEffectGrow(); - GuiText resetBtnTxt("Reset Settings", 24, (GXColor){0, 0, 0, 255}); + GuiText resetBtnTxt("Reset Settings", 22, (GXColor){0, 0, 0, 255}); GuiImage resetBtnImg(&btnOutline); GuiImage resetBtnImgOver(&btnOutlineOver); GuiButton resetBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); resetBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - resetBtn.SetPosition(-100, -35); + resetBtn.SetPosition(-90, -35); resetBtn.SetLabel(&resetBtnTxt); resetBtn.SetImage(&resetBtnImg); resetBtn.SetImageOver(&resetBtnImgOver); @@ -3325,14 +3325,14 @@ static int MenuSettingsFile() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Settings - Saving & Loading", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings - Saving & Loading", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) @@ -3340,12 +3340,12 @@ static int MenuSettingsFile() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - backBtn.SetPosition(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3357,7 +3357,7 @@ static int MenuSettingsFile() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - optionBrowser.SetCol2Position(185); + optionBrowser.SetCol2Position(215); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -3503,14 +3503,14 @@ static int MenuSettingsMenu() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Settings - Menu", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings - Menu", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) @@ -3518,12 +3518,12 @@ static int MenuSettingsMenu() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - backBtn.SetPosition(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3535,6 +3535,7 @@ static int MenuSettingsMenu() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + optionBrowser.SetCol2Position(275); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -3679,14 +3680,14 @@ static int MenuSettingsNetwork() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Settings - Network", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings - Network", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) @@ -3694,12 +3695,12 @@ static int MenuSettingsNetwork() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - backBtn.SetPosition(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3711,6 +3712,7 @@ static int MenuSettingsNetwork() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + optionBrowser.SetCol2Position(275); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -3765,6 +3767,7 @@ static int MenuSettingsNetwork() mainWindow->Remove(&optionBrowser); mainWindow->Remove(&w); mainWindow->Remove(&titleTxt); + CloseShare(); #endif return menu; } diff --git a/source/ngc/networkop.cpp b/source/ngc/networkop.cpp index 6c8b5ae..0bea67f 100644 --- a/source/ngc/networkop.cpp +++ b/source/ngc/networkop.cpp @@ -234,6 +234,7 @@ void CloseShare() if(networkShareInit) smbClose("smb"); networkShareInit = false; + isMounted[DEVICE_SMB] = false; } /**************************************************************************** @@ -272,9 +273,6 @@ ConnectShare (bool silent) return false; } - if(unmountRequired[DEVICE_SMB]) - CloseShare(); - if(!networkInit) InitializeNetwork(silent);