mirror of
https://github.com/wiidev/usbloadergx.git
synced 2024-11-19 17:59:16 +01:00
*Moved everything from config.txt to global_settings.cfg
*Added cover/discimage/theme path edit through global settings *Changed if no password is set, you are always godmode (even after reloading GUI). If you have password set: the unlock is only till you leave.
This commit is contained in:
parent
1e665c8bcb
commit
7e02aeb63f
File diff suppressed because one or more lines are too long
16
source/cfg.c
16
source/cfg.c
@ -909,7 +909,19 @@ bool cfg_save_global()// save global settings
|
|||||||
fprintf(f, "cios = %d\n ", Settings.cios);
|
fprintf(f, "cios = %d\n ", Settings.cios);
|
||||||
fprintf(f, "xflip = %d\n ", Settings.xflip);
|
fprintf(f, "xflip = %d\n ", Settings.xflip);
|
||||||
fprintf(f, "qboot = %d\n ", Settings.qboot);
|
fprintf(f, "qboot = %d\n ", Settings.qboot);
|
||||||
fprintf(f, "wsprompt = %d\n ", Settings.wsprompt);
|
fprintf(f, "parentalcontrol = %d\n ", CFG.parentalcontrol);
|
||||||
|
fprintf(f, "cover_path = %s\n ", CFG.covers_path);
|
||||||
|
if(CFG.widescreen) {
|
||||||
|
fprintf(f, "wtheme_path = %s\n ", CFG.theme_path);
|
||||||
|
} else {
|
||||||
|
fprintf(f, "theme_path = %s\n ", CFG.theme_path);
|
||||||
|
}
|
||||||
|
fprintf(f, "disc_path = %s\n ", CFG.disc_path);
|
||||||
|
if(!strcmp("", Settings.unlockCode)) {
|
||||||
|
fprintf(f, "godmode = %d\n ", CFG.godmode);
|
||||||
|
} else {
|
||||||
|
fprintf(f, "godmode = %d\n ", 0);
|
||||||
|
}
|
||||||
fclose(f);
|
fclose(f);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -1082,7 +1094,7 @@ void CFG_Load(int argc, char **argv)
|
|||||||
|
|
||||||
CFG_Default(-1); // set defaults non forced
|
CFG_Default(-1); // set defaults non forced
|
||||||
|
|
||||||
snprintf(pathname, sizeof(pathname), "SD:/config/config.txt");
|
snprintf(pathname, sizeof(pathname), "SD:/config/global_settings.cfg");
|
||||||
|
|
||||||
cfg_parsefile(pathname, &widescreen_set); //first set widescreen
|
cfg_parsefile(pathname, &widescreen_set); //first set widescreen
|
||||||
cfg_parsefile(pathname, &cfg_set); //then set config and layout options
|
cfg_parsefile(pathname, &cfg_set); //then set config and layout options
|
||||||
|
124
source/menu.cpp
124
source/menu.cpp
@ -3233,7 +3233,11 @@ static int MenuSettings()
|
|||||||
GuiTrigger trigL;
|
GuiTrigger trigL;
|
||||||
trigL.SetButtonOnlyTrigger(-1, WPAD_BUTTON_LEFT | WPAD_CLASSIC_BUTTON_LEFT, PAD_BUTTON_LEFT);
|
trigL.SetButtonOnlyTrigger(-1, WPAD_BUTTON_LEFT | WPAD_CLASSIC_BUTTON_LEFT, PAD_BUTTON_LEFT);
|
||||||
GuiTrigger trigR;
|
GuiTrigger trigR;
|
||||||
trigL.SetButtonOnlyTrigger(-1, WPAD_BUTTON_RIGHT | WPAD_CLASSIC_BUTTON_RIGHT, PAD_BUTTON_RIGHT);
|
trigR.SetButtonOnlyTrigger(-1, WPAD_BUTTON_RIGHT | WPAD_CLASSIC_BUTTON_RIGHT, PAD_BUTTON_RIGHT);
|
||||||
|
GuiTrigger trigMinus;
|
||||||
|
trigMinus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_MINUS | WPAD_CLASSIC_BUTTON_MINUS, 0);
|
||||||
|
GuiTrigger trigPlus;
|
||||||
|
trigPlus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_PLUS | WPAD_CLASSIC_BUTTON_PLUS, 0);
|
||||||
|
|
||||||
GuiText titleTxt("Settings", 28, (GXColor){0, 0, 0, 255});
|
GuiText titleTxt("Settings", 28, (GXColor){0, 0, 0, 255});
|
||||||
titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
|
titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
|
||||||
@ -3271,6 +3275,7 @@ static int MenuSettings()
|
|||||||
page1Btn.SetSoundClick(&btnClick);
|
page1Btn.SetSoundClick(&btnClick);
|
||||||
page1Btn.SetTrigger(&trigA);
|
page1Btn.SetTrigger(&trigA);
|
||||||
page1Btn.SetTrigger(&trigL);
|
page1Btn.SetTrigger(&trigL);
|
||||||
|
page1Btn.SetTrigger(&trigMinus);
|
||||||
|
|
||||||
GuiTooltip page1BtnTT("Go to Page 1");
|
GuiTooltip page1BtnTT("Go to Page 1");
|
||||||
if (Settings.wsprompt == yes)
|
if (Settings.wsprompt == yes)
|
||||||
@ -3289,6 +3294,7 @@ static int MenuSettings()
|
|||||||
page2Btn.SetSoundClick(&btnClick);
|
page2Btn.SetSoundClick(&btnClick);
|
||||||
page2Btn.SetTrigger(&trigA);
|
page2Btn.SetTrigger(&trigA);
|
||||||
page2Btn.SetTrigger(&trigR);
|
page2Btn.SetTrigger(&trigR);
|
||||||
|
page2Btn.SetTrigger(&trigPlus);
|
||||||
|
|
||||||
GuiTooltip page2BtnTT("Go to Page 2");
|
GuiTooltip page2BtnTT("Go to Page 2");
|
||||||
if (Settings.wsprompt == yes)
|
if (Settings.wsprompt == yes)
|
||||||
@ -3381,10 +3387,10 @@ static int MenuSettings()
|
|||||||
sprintf(options2.name[2], "Flip X");
|
sprintf(options2.name[2], "Flip X");
|
||||||
sprintf(options2.name[3], "Quick Boot");
|
sprintf(options2.name[3], "Quick Boot");
|
||||||
sprintf(options2.name[4], "Prompts & Buttons");
|
sprintf(options2.name[4], "Prompts & Buttons");
|
||||||
sprintf(options2.name[5], " ");
|
sprintf(options2.name[5], "Parentalcontrol");
|
||||||
sprintf(options2.name[6], " ");
|
sprintf(options2.name[6], "Cover Path");
|
||||||
sprintf(options2.name[7], " ");
|
sprintf(options2.name[7], "Discimage Path");
|
||||||
sprintf(options2.name[8], " ");
|
sprintf(options2.name[8], "Theme Path");
|
||||||
|
|
||||||
}
|
}
|
||||||
while(menu == MENU_NONE)
|
while(menu == MENU_NONE)
|
||||||
@ -3508,6 +3514,8 @@ static int MenuSettings()
|
|||||||
Settings.qboot = 0;
|
Settings.qboot = 0;
|
||||||
if ( Settings.wsprompt > 1 )
|
if ( Settings.wsprompt > 1 )
|
||||||
Settings.wsprompt = 0;
|
Settings.wsprompt = 0;
|
||||||
|
if (CFG.parentalcontrol > 3 )
|
||||||
|
CFG.parentalcontrol = 0;
|
||||||
|
|
||||||
|
|
||||||
if ( CFG.godmode != 1) sprintf(options2.value[0], "********");
|
if ( CFG.godmode != 1) sprintf(options2.value[0], "********");
|
||||||
@ -3526,11 +3534,20 @@ static int MenuSettings()
|
|||||||
if (Settings.wsprompt == no) sprintf (options2.value[4],"Normal");
|
if (Settings.wsprompt == no) sprintf (options2.value[4],"Normal");
|
||||||
else if (Settings.wsprompt == yes) sprintf (options2.value[4],"Widescreen Fix");
|
else if (Settings.wsprompt == yes) sprintf (options2.value[4],"Widescreen Fix");
|
||||||
|
|
||||||
sprintf (options2.value[5]," ");
|
if (CFG.godmode != 1) sprintf(options2.value[5], "********");
|
||||||
sprintf (options2.value[6]," ");
|
else if(CFG.parentalcontrol == 0) sprintf(options2.value[5], "0");
|
||||||
sprintf (options2.value[7]," ");
|
else if(CFG.parentalcontrol == 1) sprintf(options2.value[5], "1");
|
||||||
sprintf (options2.value[8]," ");
|
else if(CFG.parentalcontrol == 2) sprintf(options2.value[5], "2");
|
||||||
|
else if(CFG.parentalcontrol == 3) sprintf(options2.value[5], "3");
|
||||||
|
|
||||||
|
if (CFG.godmode != 1) sprintf(options2.value[6], "********");
|
||||||
|
else sprintf(options2.value[6], CFG.covers_path);
|
||||||
|
|
||||||
|
if (CFG.godmode != 1) sprintf(options2.value[7], "********");
|
||||||
|
else sprintf(options2.value[7], CFG.disc_path);
|
||||||
|
|
||||||
|
if (CFG.godmode != 1) sprintf(options2.value[8], "********");
|
||||||
|
else sprintf(options2.value[8], CFG.theme_path);
|
||||||
|
|
||||||
ret = optionBrowser2.GetClickedOption();
|
ret = optionBrowser2.GetClickedOption();
|
||||||
|
|
||||||
@ -3548,9 +3565,9 @@ static int MenuSettings()
|
|||||||
char entered[20] = "";
|
char entered[20] = "";
|
||||||
strncpy(entered, Settings.unlockCode, sizeof(entered));
|
strncpy(entered, Settings.unlockCode, sizeof(entered));
|
||||||
int result = OnScreenKeyboard(entered, 20);
|
int result = OnScreenKeyboard(entered, 20);
|
||||||
|
mainWindow->Append(&optionBrowser2);
|
||||||
mainWindow->Append(&page1Btn);
|
mainWindow->Append(&page1Btn);
|
||||||
mainWindow->Append(&page2Btn);
|
mainWindow->Append(&page2Btn);
|
||||||
mainWindow->Append(&optionBrowser2);
|
|
||||||
w.Append(&backBtn);
|
w.Append(&backBtn);
|
||||||
w.Append(&lockBtn);
|
w.Append(&lockBtn);
|
||||||
if ( result == 1 )
|
if ( result == 1 )
|
||||||
@ -3577,6 +3594,93 @@ static int MenuSettings()
|
|||||||
case 4:
|
case 4:
|
||||||
Settings.wsprompt++;
|
Settings.wsprompt++;
|
||||||
break;
|
break;
|
||||||
|
case 5:
|
||||||
|
CFG.parentalcontrol++;
|
||||||
|
break;
|
||||||
|
case 6:
|
||||||
|
if ( CFG.godmode == 1)
|
||||||
|
{
|
||||||
|
mainWindow->Remove(&optionBrowser2);
|
||||||
|
mainWindow->Remove(&page1Btn);
|
||||||
|
mainWindow->Remove(&page2Btn);
|
||||||
|
w.Remove(&backBtn);
|
||||||
|
w.Remove(&lockBtn);
|
||||||
|
char entered[20] = "";
|
||||||
|
strncpy(entered, CFG.covers_path, sizeof(entered));
|
||||||
|
int result = OnScreenKeyboard(entered, 20);
|
||||||
|
mainWindow->Append(&optionBrowser2);
|
||||||
|
mainWindow->Append(&page1Btn);
|
||||||
|
mainWindow->Append(&page2Btn);
|
||||||
|
w.Append(&backBtn);
|
||||||
|
w.Append(&lockBtn);
|
||||||
|
if ( result == 1 )
|
||||||
|
{
|
||||||
|
strncpy(CFG.covers_path, entered, sizeof(CFG.covers_path));
|
||||||
|
WindowPrompt("Coverpath Changed",0,"OK",0,0,0);
|
||||||
|
cfg_save_global();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
WindowPrompt("Coverpath change","Console should be unlocked to modify it.","OK",0,0,0);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 7:
|
||||||
|
if ( CFG.godmode == 1)
|
||||||
|
{
|
||||||
|
mainWindow->Remove(&optionBrowser2);
|
||||||
|
mainWindow->Remove(&page1Btn);
|
||||||
|
mainWindow->Remove(&page2Btn);
|
||||||
|
w.Remove(&backBtn);
|
||||||
|
w.Remove(&lockBtn);
|
||||||
|
char entered[20] = "";
|
||||||
|
strncpy(entered, CFG.disc_path, sizeof(entered));
|
||||||
|
int result = OnScreenKeyboard(entered, 20);
|
||||||
|
mainWindow->Append(&optionBrowser2);
|
||||||
|
mainWindow->Append(&page1Btn);
|
||||||
|
mainWindow->Append(&page2Btn);
|
||||||
|
w.Append(&backBtn);
|
||||||
|
w.Append(&lockBtn);
|
||||||
|
if ( result == 1 )
|
||||||
|
{
|
||||||
|
strncpy(CFG.disc_path, entered, sizeof(CFG.disc_path));
|
||||||
|
WindowPrompt("Discpath Changed",0,"OK",0,0,0);
|
||||||
|
cfg_save_global();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
WindowPrompt("Discpath change","Console should be unlocked to modify it.","OK",0,0,0);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 8:
|
||||||
|
if ( CFG.godmode == 1)
|
||||||
|
{
|
||||||
|
mainWindow->Remove(&optionBrowser2);
|
||||||
|
mainWindow->Remove(&page1Btn);
|
||||||
|
mainWindow->Remove(&page2Btn);
|
||||||
|
w.Remove(&backBtn);
|
||||||
|
w.Remove(&lockBtn);
|
||||||
|
char entered[20] = "";
|
||||||
|
strncpy(entered, CFG.theme_path, sizeof(entered));
|
||||||
|
int result = OnScreenKeyboard(entered, 20);
|
||||||
|
mainWindow->Append(&optionBrowser2);
|
||||||
|
mainWindow->Append(&page1Btn);
|
||||||
|
mainWindow->Append(&page2Btn);
|
||||||
|
w.Append(&backBtn);
|
||||||
|
w.Append(&lockBtn);
|
||||||
|
if ( result == 1 )
|
||||||
|
{
|
||||||
|
strncpy(CFG.theme_path, entered, sizeof(CFG.theme_path));
|
||||||
|
WindowPrompt("Themepath Changed",0,"OK",0,0,0);
|
||||||
|
cfg_save_global();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
WindowPrompt("Themepath change","Console should be unlocked to modify it.","OK",0,0,0);
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user