From f08ed3d245b52ee96eb5e35ac361005e6f066aac Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Thu, 21 May 2009 14:05:30 +0000
Subject: [PATCH] *Fixed options clicking problem (didnt work sometimes) *Added
dummy star pngs which will be replaced later *New languagefile *Changed the
cfg to treat all the files as Textfiles and not as binary.
---
Languages/french | 13 ++++-
gui.pnproj | 2 +-
source/cfg.c | 10 ++--
source/fatmounter.c | 2 +-
source/images/favorite.png | Bin 0 -> 5039 bytes
source/images/not_favorite.png | Bin 0 -> 2442 bytes
source/libwiigui/gui_customoptionbrowser.cpp | 51 ++++++++++---------
7 files changed, 46 insertions(+), 32 deletions(-)
create mode 100644 source/images/favorite.png
create mode 100644 source/images/not_favorite.png
diff --git a/Languages/french b/Languages/french
index fbcf179a..75320374 100644
--- a/Languages/french
+++ b/Languages/french
@@ -1,9 +1,12 @@
//French translation for USB Loader GX - [Version final 1.2] - [05.17.2009]
t3Covers = Jaquettes 3D
+all = Nom
AppLanguage = Langue d'interface
Areyousure = Êtes-vous sûr ?
AutoPatch = AutoPatch
Back = Retour
+Backgroundmusic = Musique de fond
+Backgroundmusicpath = Dossier de Musique de fond changé.
BacktoHBCorWiiMenu = Retour loader / menu Wii
BacktoLoader = Loader
BacktoWiiMenu = Menu Wii
@@ -23,6 +26,7 @@ CorrectPassword = Mot de passe correct
Couldnotinitializenetwork = Initialisation réseau impossible !
CouldnotopenDisc = Initialisation disque impossible
CouldnotinitializeDIPmodule = Initialisation DIP impossible !
+count = Fréquence d'utilisation
CoverDownload = Téléchargement des jaquettes
CoverPath = Jaquettes
CoverpathChanged = Dossier des jaquettes modifié
@@ -48,6 +52,7 @@ InitializingNetwork = Initialisation du r
InsertDisk = Insérez un disque
InsertaWiiDisc = Insérez un disque Wii !
InsertaSDCardtodownloadimages = Insérez une carte SD pour télécharger les jaquettes.
+InsertaSDCardtousethatoption = Insérez une carte SD pour utiliser cette fonction.
InsertaSDCardtosave = Insérez une carte SD pour enregistrer.
InstallRenameandDeleteareunlocked = Toutes les fonctionnalités de l'USB Loader GX sont déverrouillées.
Installerror = Erreur à l'installation !
@@ -57,6 +62,7 @@ Failedtoboot =
FailedtomountfrontSDcard = Échec à l'initialisation de la SD
FailedtosetUSB = Échec d'intialisation USB :
Failedformating = Échec du formatage
+fave = Favoris
Filenotfound = Fichier introuvable.
filesnotfoundontheserver = fichiers introuvables sur le serveur !
filesleft = fichier(s) restant(s)
@@ -76,14 +82,17 @@ GameRegion = R
GameSize = Taille du jeu
GoBack = Retour
//GotoPage = Aller à la page
+hour = Heure
HowtoShutdown = Mode d'extinction de la Wii ?
keyboard = clavier
Language = Langue
Langchange = Changer la langue
Left = Gauche
LikeSysMenu = Menu système
+ListSort = Tri des jeux
LoadingincIOS = Charger avec le cIOS249
Loadingstandardlanguage = Chargement de la langue par défaut.
+Loadingstandardmusic = Chargement de la musique par défaut.
Lock = Verrouiller
LockConsole = Verrouiller la console
MP3Menu = Menu MP3
@@ -103,7 +112,7 @@ Normal = Normal
NotaWiiDisc = Ce n'est pas un jeu Wii
NoUSBDevicefound = Aucun périphérique USB trouvé.
Notenoughfreespace = Espace libre insuffisant !
-notset = non défini
+notset = Non défini
of = sur
OFF = Désactivé
OfficialSite = Site officiel
@@ -115,6 +124,7 @@ Password = Mot de passe
PasswordChanged = Mot de passe modifié
Passwordhasbeenchanged = Mot de passe modifié
Passwordchange = Changement de mot de passe
+Plays = Utilisation Jeu
PowerofftheWii = Éteindre la Wii
Prev = Précédent
PromptsButtons = Interface
@@ -133,6 +143,7 @@ For = pour
theUSBLoaderandreleasingthesourcecodethe = et pour avoir partagé le code source
secondsleft = secondes restantes
SelectthePartition = Choisissez la partition
+Setasbackgroundmusic = Définir comme musique de fond?
youwanttoformat = que vous voulez formater
settings = Paramètres
ShutdowntoIdle = Veille
diff --git a/gui.pnproj b/gui.pnproj
index de715c18..9d732305 100644
--- a/gui.pnproj
+++ b/gui.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/source/cfg.c b/source/cfg.c
index c103705c..356d85a4 100644
--- a/source/cfg.c
+++ b/source/cfg.c
@@ -913,7 +913,7 @@ bool cfg_parsefile(char *fname, void (*set_func)(char*, char*))
char line[200];
//printf("opening(%s)\n", fname);
- f = fopen(fname, "rb");
+ f = fopen(fname, "rt");
if (!f) {
//printf("error opening(%s)\n", fname);
return false;
@@ -933,7 +933,7 @@ bool cfg_parsetitlefile(char *fname, void (*set_func)(char*, char*, u8))
char line[200];
//printf("opening(%s)\n", fname);
- f = fopen(fname, "rb");
+ f = fopen(fname, "rt");
if (!f) {
//printf("error opening(%s)\n", fname);
return false;
@@ -1020,7 +1020,7 @@ bool cfg_save_global()// save global settings
mkdir("SD:/config", 0777);
}
FILE *f;
- f = fopen("SD:/config/GXGlobal.cfg", "wb");
+ f = fopen("SD:/config/GXGlobal.cfg", "wt");
if (!f) {
printf("Error saving %s\n", "GXGlobal.cfg");
sleep(1);
@@ -1186,7 +1186,7 @@ bool cfg_save_games()// save per game setings
FILE *f;
int i;
mkdir("SD:/config/", 0777);
- f = fopen("SD:/config/GXGameSettings.cfg", "wb");
+ f = fopen("SD:/config/GXGameSettings.cfg", "wt");
if (!f) {
printf("Error saving %s\n", "GXGameSettings.cfg");
sleep(1);
@@ -1217,7 +1217,7 @@ bool cfg_save_game_num()
FILE *f;
int i;
mkdir("SD:/config/", 0777);
- f = fopen("SD:/config/GXGameFavorites.cfg", "wb");
+ f = fopen("SD:/config/GXGameFavorites.cfg", "wt");
if (!f) {
printf("Error saving %s\n", "GXGameFavorites.cfg");
sleep(1);
diff --git a/source/fatmounter.c b/source/fatmounter.c
index f39a821e..5bf7769b 100644
--- a/source/fatmounter.c
+++ b/source/fatmounter.c
@@ -6,7 +6,7 @@
#include
#include
-#define CACHE 4
+#define CACHE 1
#define SECTORS 64
diff --git a/source/images/favorite.png b/source/images/favorite.png
new file mode 100644
index 0000000000000000000000000000000000000000..54e83dbc9540f8bef042aacba8178e25a4eff2a8
GIT binary patch
literal 5039
zcmV;g6Hx4lP)5Q(|t3<|v)6Ytp2;uSEdxCNOvQvQavtzi+p;
z8-MrRdw%WOHHRA^LcAXw`abc?E3fRp-?~M*bLS+pT;$VnuVtcZB+awLVqm^_G&IXz
zVzHGpU!Rm2ZhV?9?_8;#<)@o9f#R3X|sGr(-KWfq}_kg!v29+JYkj&g?6vTY%$n!wjOEe
z$Oi{k60aTW&70Ttyu$sz69|w9ByON^U3u-T#KkGGBwv{CHNER>jVy$;G~qyUbLi#K
z&ui0t5}ko`pdBI|+U$Sa%IY(c+d~sMP|{MHG*3A5R=BQl1C98z
zt5g0lHGU_to7aVx?+F|W7cVE4WJcQUtm{&wS(aG1%f6roZrf)9|7($EjYx}XOAv&B
zNMy0;7u?1_QeB#g)f!S$G?uOS{?iL*B;fMypI^Qf+`JUT&3LS*_mWor5zwz7a07T<
z;GXazdVBGlK6e*=SRdqO+G|pDT^(37oi45VerP&~kRvIp&uF{+kVFRUa2iBF5Q2)d
z%PZcWeYVc_9|);>^-5ApUE|w{uxXT1*LvYD_4aem`EyTf9IiQB3V1Q%#tq@~I}(q{
zZ?2WuCFSBw4_5mLt*PDbnpCYVQs+tXa;$Nn+8%^(C}s6wP2H!3
z4BCJuMDn>51Ca)-qV4=s=9~W&X|JfHsx_=;k33WnF_rx;G1hWW_l=8Y+_~foYv+Zx
zoR_b~j?B$?oR)Os2Fg8@7q2O|zLU7LO!QN}Kcr^T!=?yr6VX{-b}8xHCRwJYTNc-Y
zoaNAJx*(w!#P0o~HjAG^8Z^y8W~g?EBtVIXT^5iwY}^YLZ-N@JBZ#=Tm}Ut*>mzlk
z*HK*i+UcxJN?8f}lknD3xby_vye<4YNH=~N<@uNN_8VP3y7E+d_*QD>3mT7kn~TqK
zq*-d3xq2)r?J_*?i|BzwI;^G_LbxEYeX(tuUl5w4c?oHO=mJS|&=wFxb{Ao&@&T*U
zyEVEqaBx>K(loPR*yLTE`az~Lw=$D$(I;|Y
zvCplWFG~6szx-lDOSaRot>ms|pEJoK<-ACe_cZCgqlX&lAVLozAGyl~NXKqmXj1cu
zw&i1@2SPqXbRT31xA>cv}}y^HQ?SU0Ar6V^RBH
z5`9i}{GjB;6Dj9o(!QVv2y@^ZAVEYR_)h;J5DhQ~Rm73DS${f9{qt5=_XxWaUcU|T
zT`_w^)NKm35wZ=h+c36OBw2MWB};PO^=&wAmH7m;i%LKr&hcA00{B
zs>oBC{Hd_*Rjd~Gaf6TF#m8?IuiwD^w!p(AWF>?ggqKL6miK3#&+ci?Gs!BcZ8c_7
zu@8ukFKW_HX*2s-$;)RYEoPdRNM7KyAPXezA?Xm!Gg2e`w^wiRZ-4!Na^b>)fBcU=
z&2!H`g-sPA$TRrfckl79e)Y?I|ND>lJAdn=eD2yuuyGGUF%d*l3TadF*(`K>F>3l4
zp?sysgx4ZujB)v`wOOoptR+@QRv$T_rKF{ISBK9ev|GVV&ljK<^?Ho-rNF7LG
zS9=qp-T7h7z(k?&Uw`MD{Of=7H9q>$KgTcq!%u(~!UG~8DU%zozIumOzx*8z4>~^c
z*=JEncUc4<|nS)6a74Gau&Z%X?79-7qD<
z_TqEQQjKfRP`dux1Y5=dhhzYDuD|ha0$xUW|Pg&#%
zOu>Z^h#Isx*xOT@oVb5)V0C)NUN_;^>?Rs1NEEED@#zeS5uxk|)JjCbOMN3n`psgd
zVj){I$;?x9GQ}{p(WpKso_~#6KV&f;Iz5{6uAb|RG*`qs+ydE6XlU-(tS8p%0^ux|
zkQ&E}omU=kg48J&j~l?*Y>d@<HpfQ)0!?>I
zBx+PQ!acgivrmn8ORr|BOm35gOsQ+X7^VEQr26r?-hvd=3~v-of~OJ5i=D3$4Uf)x
zR-2LetYtX|q<~dGh=2%(5a#nBqO$D^4fzrn@<5y*QB%=D{~
z@_$M0qf1PI6vXR#nmk+6Tk03J_gX~L7%BDYtU}ViSD8Pld3E
zg($361H(|5%@SSf5C!*wXgUWUfS_tbIHek=X9I-cbws>}vc;wqHf*W=fKL<6;R4CC
zJ09sbl{j&sPv(QTO=A;v!C1ANF3iPhN;<08AW^mwwn^dNbC=)H`N1R285<^S7_ib4
zbpV^dM~K39J2FiLw@TLdfh25#C_n)(Br&WOrc&tpY1iO3H
zuQ2@&f`3QwwM5+}vB9cLGmlc{3)3gtGdu8Fy1JRtSO$&QVzxGkl?dM`8~;yvaX6s~
z8wy@_T{dhYY*!^}sZ@8Y)*av|h!-Nx3D^#7M5UIBRomTb)9yLv&+}oVY$rsO=IE%}
zz!zNQ>t?YMv9-8wP0CQ(%~W-)Pd+>|y>)NtcV{cBR!dDX*3o;LV#{c2x4P1K{)4iO
z-)#>s;0`_(yq;GFe|!~cDU@3A^WW~{4wQ|!??{DLN-0=1!VSU*47_4fp$r8=XpfJn
zgZ{pB`YKV+a@b0oO%3a7k#RgJWz5@p>)z7!>ZR9x^X|fqE*z9L>zEh^vDliiN$3iE
zm6x;M8CUU@W_gTNi0Xtn5r*KXI;B*msZyr%sE0w+^X~#wYMq$MPC~oxHc)sXFWEIK%h+`HHs!0h%wwpO+LEGvh{CL3X@lv1NgL$PAj`^NUui9NXY0SAK56WkzvU~JtY`lnxy
zC$C)b?>^l6c6sE?+Ps2pkcp;-HVcn&7b&6(Znz-kB9a
zcK0=)DyS$3Xro!ocNHLOP1P)GV<|uK?V}X^^REZL#UER5`P>kS_&mJyC4#4O_(&|8
z(Zw2fcMla8k5H9_1e(s_se=VJIZ?_^R$+uY?vCy#5I|BTR1r;R&PbDYvdM~Q5W%jZ
zC6-nrBDu>HF(FZ9h`p*|7d2j5?V>L?&W)}2vK9~bHS8hKOc5bLXha~Int9j`q~Pa~
zbtD;TM#zNMidQG9Q9Tgdh00PwazdJfh$HGK89{fWMmP}}!VaMdH6pj+b@Z6IMjUEf
zxtN37KgJvV67bw@IIO@-V=^O!L<$Q-6Zjq$c&+d_i{^+M;pM!kIpV%+P!WW&^Mk~Y
zP=vgDZ?;NE!u|1?d7Q48g*%CeQiV24MEMEL-N&CMB%DI65~2uJ7mg5RJbxo|u$^3@
zR-zbD0lXrchE2$Hl>eXuBu{pLQ=VQ4O!>ny*e2$8C3*n`KM0w*-ahY(w2l)M99(Xf`A%
zkrl}qQAJg80!f`p)DRK#@QB6(MoviYxeItt0!Kx|!lP-#&2Yj^MN7C5wc=CV%|q3Q
zx{G+&F5-F7&>k$2cCntee9tUwesTG1yT93=&eqgTp-zS-g``MhXih{A#Vv-&bHdZJtiKyP6NXpKA8{4@~PVwwZ|05mTaxo#e72$wb0ygp{e8B@5s5
zIjjNt9M{%=a!2qU8F-V!`6V}!yUdKJRkDm2V_;4-qU@rtSW3u
zx%p{-@5g80Ch+2#@T5^Sn|P^_Vv^87VT-7XDAHxxy&005t%Uv`AN^}p$2T#1$0a6_
zm?ESqV!LHTs7U0{@}Lg&4OD+mNH4VA;xEKv{xe>tWmH2DM6^bf^;pxGvQKWMhGvr~
zVpW!+jL7a%jx2y5{T6rS1-OowO$H?i0K-Vxmq|&Fz
z(sGvmk_GdyapcjXhxM!3
z%dbiDFN<(DTu#G%WylJNRd}pJWNn451Y7awMd(9f6nwCdQB((U9|BpU@lF)`T2x+r
zbZT#U^(-1ng;4P*)skv)uQjDq%u|hNbWh>{YN670TGet=&&g7w;<;+h
z;-S0VCZ4la6Ps$ulQc0TY}~HLX+EEqll})I^barl@{g>&ZxB~s#^3DUvi;#nX^%%9
zoOE-DkWsx8H4VvTH~c|lA4;-)hNEm)xAhO?ua6DX~R>hq$!om)MTS3
z$)R0=Xe1)kI#0DAb)c4u%{a+nTUYj$JszR|^wL${YsGr=Ci?sd`qBr{yLLHsX~^64
zBImuDw76<@WeJ-N%(J?W>WhP|J?z!@G@G3!_u~}S>&_0IyXc8YIy6lS)6I#c%pz&$
z+E>@*4?n9>uj_1!y=@(BR-aC9*=yg!zjcgX|5MQi_`g|e5mOSXEOGz<002ovPDHLk
FV1m_P0HFW?
literal 0
HcmV?d00001
diff --git a/source/images/not_favorite.png b/source/images/not_favorite.png
new file mode 100644
index 0000000000000000000000000000000000000000..530061866debd40a4821afe515861d50a8479489
GIT binary patch
literal 2442
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
IM6N<$fname[i], 20, (GXColor){0, 0, 0, 0xff});
optionTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
optionTxt[i]->SetPosition(24,0);
-
+
optionBg[i] = new GuiImage(bgOptionsEntry);
-
+
optionVal[i] = new GuiText(NULL, 20, (GXColor){0, 0, 0, 0xff});
optionVal[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
optionVal[i]->SetPosition(250,0);
-
+
optionBtn[i] = new GuiButton(width,GAMESELECTSIZE);//(width-28,GAMESELECTSIZE);
optionBtn[i]->SetParent(this);
optionBtn[i]->SetLabel(optionTxt[i], 0);
@@ -140,7 +140,7 @@ GuiCustomOptionBrowser::GuiCustomOptionBrowser(int w, int h, customOptionList *
optionBtn[i]->SetRumble(false);
optionBtn[i]->SetTrigger(trigA);
optionBtn[i]->SetSoundClick(btnSoundClick);
-
+
}
}
@@ -206,6 +206,7 @@ void GuiCustomOptionBrowser::SetFocus(int f)
optionBtn[i]->ResetState();
if(f == 1)
+ optionBtn[selectedItem]->ResetState();
optionBtn[selectedItem]->SetState(STATE_SELECTED);
}
@@ -312,13 +313,13 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t)
if(state == STATE_DISABLED || !t)
return;
-
-
+
+
// scrolldelay affects how fast the list scrolls
// when the arrows are clicked
float scrolldelay = 3.5;
-
-
+
+
if (scrollbaron == 1) {
// update the location of the scroll box based on the position in the option list
@@ -342,12 +343,12 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t)
optionTxt[i]->SetText(options->name[next]);
optionVal[i]->SetText(options->value[next]);
char* pch;
-
+
pch=strrchr((options->value[next]),'_');
-
+
if (pch!=NULL){optionVal[i]->SetPosition(coL2, 15);}
else {optionVal[i]->SetPosition(coL2, 0);}
-
+
optionIndex[i] = next;
next = this->FindMenuItem(next, 1);
}
@@ -359,10 +360,11 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t)
if(focus)
{
- if(i != selectedItem && optionBtn[i]->GetState() == STATE_SELECTED)
+ if(i != selectedItem && optionBtn[i]->GetState() == STATE_SELECTED) {
optionBtn[i]->ResetState();
- else if(i == selectedItem && optionBtn[i]->GetState() == STATE_DEFAULT)
- optionBtn[selectedItem]->SetState(STATE_SELECTED, t->chan);
+ } else if(i == selectedItem && optionBtn[i]->GetState() == STATE_DEFAULT) {
+ optionBtn[selectedItem]->SetState(STATE_SELECTED);
+ }
}
optionBtn[i]->Update(t);
@@ -371,6 +373,7 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t)
{
selectedItem = i;
}
+
}
// pad/joystick navigation
@@ -378,16 +381,16 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t)
return; // skip navigation
if (scrollbaron == 1) {
-
- if (t->Down() ||
+
+ if (t->Down() ||
arrowDownBtn->GetState() == STATE_CLICKED || ////////////////////////////////////////////down
- arrowDownBtn->GetState() == STATE_HELD)
+ arrowDownBtn->GetState() == STATE_HELD)
{
next = this->FindMenuItem(optionIndex[selectedItem], 1);
-
+
if(next >= 0)
- {
+ {
if(selectedItem == size-1)
{
// move list down by 1
@@ -412,11 +415,11 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t)
} else {
arrowDownBtn->ResetState();
-
+
}
-
+
}
- else if(t->Up() ||
+ else if(t->Up() ||
arrowUpBtn->GetState() == STATE_CLICKED || ////////////////////////////////////////////up
arrowUpBtn->GetState() == STATE_HELD)
{
@@ -448,8 +451,8 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t)
} else {
arrowUpBtn->ResetState();
-
- }
+
+ }
}
if(scrollbarBoxBtn->GetState() == STATE_HELD &&