The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-12-23 18:31:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

add wait to WindowPrompt constructor. wait is # of loops the prompt will wait then select choice 1. if wait<0 it is void.

Browse Source 
add prompt if ocarina is on but no code file is found
This commit is contained in:
giantpune 2009-06-26 12:38:03 +00:00
parent 2f3c679f0f
commit 9c1a0e2d8b
7 changed files with 151 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/cheatmenu.cpp
View File

@ -65,9 +65,9 @@ int CheatMenu(const char * gameID)
int check = c.openTxtfile(txtfilename); int check = c.openTxtfile(txtfilename);
switch(check) switch(check)
{ {
case -1: WindowPrompt(tr("Error"),tr("Cheatfile is blank"),tr("OK"),NULL,NULL,NULL); case -1: WindowPrompt(tr("Error"),tr("Cheatfile is blank"),tr("OK"),NULL,NULL,NULL,-1);
break; break;
case 0: WindowPrompt(tr("Error"),tr("No Cheatfile found"),tr("OK"),NULL,NULL,NULL); case 0: WindowPrompt(tr("Error"),tr("No Cheatfile found"),tr("OK"),NULL,NULL,NULL,-1);
break; break;
case 1: //WindowPrompt("Opened File","File found for Game","Okay",NULL,NULL,NULL); case 1: //WindowPrompt("Opened File","File found for Game","Okay",NULL,NULL,NULL);
int cntcheats = c.getCnt()+1; int cntcheats = c.getCnt()+1;
@ -139,10 +139,10 @@ int CheatMenu(const char * gameID)
string chtpath = Settings.Cheatcodespath; string chtpath = Settings.Cheatcodespath;
string gctfname = chtpath + c.getGameID() + ".gct"; string gctfname = chtpath + c.getGameID() + ".gct";
c.createGCT(selectednrs,x,gctfname.c_str()); c.createGCT(selectednrs,x,gctfname.c_str());
WindowPrompt(tr("GCT File created"),NULL,tr("OK"),NULL,NULL,NULL); WindowPrompt(tr("GCT File created"),NULL,tr("OK"),NULL,NULL,NULL,-1);
exit = true; exit = true;
break; break;
} else WindowPrompt(tr("Error"),tr("Could not create GCT file"),tr("OK"),NULL,NULL,NULL); } else WindowPrompt(tr("Error"),tr("Could not create GCT file"),tr("OK"),NULL,NULL,NULL,-1);
} }

135
source/menu.cpp
View File

@ -605,7 +605,7 @@ int MenuDiscList()
char idiotBuffer[200]; char idiotBuffer[200];
snprintf(idiotBuffer, sizeof(idiotBuffer), "%s (%s). %s",tr("You have attempted to load a bad image"), idiotChar,tr("Most likely it has dimensions that are not evenly divisible by 4. Way to go dipshit.")); snprintf(idiotBuffer, sizeof(idiotBuffer), "%s (%s). %s",tr("You have attempted to load a bad image"), idiotChar,tr("Most likely it has dimensions that are not evenly divisible by 4. Way to go dipshit."));
WindowPrompt(0,idiotBuffer,tr("Ok"), 0, 0,0); WindowPrompt(0,idiotBuffer,tr("Ok"), 0, 0,0,-1);
idiotFlag=-1;} idiotFlag=-1;}
//CLOCK //CLOCK
@ -647,7 +647,7 @@ int MenuDiscList()
if(poweroffBtn.GetState() == STATE_CLICKED) if(poweroffBtn.GetState() == STATE_CLICKED)
{ {
choice = WindowPrompt(tr("How to Shutdown?"),0,tr("Full Shutdown"), tr("Shutdown to Idle"), tr("Cancel"),0); choice = WindowPrompt(tr("How to Shutdown?"),0,tr("Full Shutdown"), tr("Shutdown to Idle"), tr("Cancel"),0,-1);
if(choice == 2) if(choice == 2)
{ {
Sys_ShutdownToIdel(); Sys_ShutdownToIdel();
@ -698,7 +698,7 @@ int MenuDiscList()
} }
else if(installBtn.GetState() == STATE_CLICKED) else if(installBtn.GetState() == STATE_CLICKED)
{ {
choice = WindowPrompt(tr("Install a game"),0,tr("Yes"),tr("No"),0,0); choice = WindowPrompt(tr("Install a game"),0,tr("Yes"),tr("No"),0,0,-1);
if (choice == 1) if (choice == 1)
{ {
menu = MENU_INSTALL; menu = MENU_INSTALL;
@ -740,7 +740,7 @@ int MenuDiscList()
{ {
//if(isSdInserted()) { //if(isSdInserted()) {
if(isInserted(bootDevice)) { if(isInserted(bootDevice)) {
choice = WindowPrompt(tr("Cover Download"), 0, tr("Normal Covers"), tr("3D Covers"), tr("Disc Images"), tr("Back")); // ask for download choice choice = WindowPrompt(tr("Cover Download"), 0, tr("Normal Covers"), tr("3D Covers"), tr("Disc Images"), tr("Back"),-1); // ask for download choice
if (choice != 0) if (choice != 0)
{ {
@ -750,7 +750,7 @@ int MenuDiscList()
if(IsNetworkInit() == false) if(IsNetworkInit() == false)
{ {
WindowPrompt(tr("Network init error"), 0, tr("OK"),0,0,0); WindowPrompt(tr("Network init error"), 0, tr("OK"),0,0,0,-1);
} else { } else {
@ -760,26 +760,26 @@ int MenuDiscList()
char tempCnt[40]; char tempCnt[40];
sprintf(tempCnt,"%i %s",cntMissFiles,tr("Missing files")); sprintf(tempCnt,"%i %s",cntMissFiles,tr("Missing files"));
choice = WindowPrompt(tr("Download Boxart image?"),tempCnt,tr("Yes"),tr("No"),0,0); choice = WindowPrompt(tr("Download Boxart image?"),tempCnt,tr("Yes"),tr("No"),0,0,-1);
if (choice == 1) if (choice == 1)
{ {
ret = ProgressDownloadWindow(choice2); ret = ProgressDownloadWindow(choice2);
if (ret == 0) { if (ret == 0) {
WindowPrompt(tr("Download finished"),0,tr("OK"),0,0,0); WindowPrompt(tr("Download finished"),0,tr("OK"),0,0,0,-1);
} else { } else {
sprintf(tempCnt,"%i %s",ret,tr("files not found on the server!")); sprintf(tempCnt,"%i %s",ret,tr("files not found on the server!"));
WindowPrompt(tr("Download finished"),tempCnt,tr("OK"),0,0,0); WindowPrompt(tr("Download finished"),tempCnt,tr("OK"),0,0,0,-1);
} }
} }
} }
else else
{ {
WindowPrompt(tr("No file missing!"),0,tr("OK"),0,0,0); WindowPrompt(tr("No file missing!"),0,tr("OK"),0,0,0,-1);
} }
} }
} }
} else { } else {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to download images."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to download images."), tr("OK"), 0,0,0,-1);
} }
DownloadBtn.ResetState(); DownloadBtn.ResetState();
if (Settings.gameDisplay==list){gameBrowser->SetFocus(1);} if (Settings.gameDisplay==list){gameBrowser->SetFocus(1);}
@ -1044,33 +1044,47 @@ int MenuDiscList()
strncat(text, "...", 3); strncat(text, "...", 3);
} }
//check if alt Dol and gct file is present
FILE *exeFile = NULL;
char nipple[100];
header = &gameList[gameSelected]; //reset header
snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
struct Game_CFG* game_cfg = CFG_get_game_opt(header->id);
if (game_cfg) {
ocarinaChoice = game_cfg->ocarina;
alternatedol = game_cfg->loadalternatedol;
} else {
alternatedol = off;
ocarinaChoice = Settings.ocarina;
}
if (Settings.qboot == yes)//quickboot game if (Settings.qboot == yes)//quickboot game
{ //check if alt Dol is on present { if (alternatedol != off){
struct Game_CFG* game_cfg = CFG_get_game_opt(header->id);
if (game_cfg) {
alternatedol = game_cfg->loadalternatedol;
} else {
alternatedol = off;
}
if (alternatedol != off){
SDCard_Init();
USBDevice_Init();
FILE *exeFile = NULL;
char nipple[100];
/* Open dol File and check exist */ /* Open dol File and check exist */
snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]); sprintf(nipple, "%s%s.dol",Settings.dolpath,IDfull);
sprintf(nipple, "%s%s.dol",Settings.dolpath,IDfull);
exeFile = fopen (nipple ,"rb"); exeFile = fopen (nipple ,"rb");
if (exeFile==NULL) if (exeFile==NULL)
{ {
sprintf(nipple, "%s %s",nipple,tr("does not exist! You Messed something up, Idiot.")); sprintf(nipple, "%s %s",nipple,tr("does not exist! You Messed something up, Idiot."));
WindowPrompt(tr("Error"),nipple,tr("OK"),NULL,NULL,NULL); WindowPrompt(tr("Error"),nipple,tr("OK"),NULL,NULL,NULL,-1);
menu = MENU_CHECK; menu = MENU_CHECK;
wiilight(0); wiilight(0);
break; break;
} }
} }
if (ocarinaChoice != off){
/* Open gct File and check exist */
sprintf(nipple, "%s%s.gct",Settings.Cheatcodespath,IDfull);
exeFile = fopen (nipple ,"rb");
if (exeFile==NULL)
{
sprintf(nipple, "%s %s",nipple,tr("does not exist! Loading game without cheats."));
WindowPrompt(tr("Error"),nipple,tr("OK"),NULL,NULL,NULL,170);
}
}
SDCard_deInit();
wiilight(0); wiilight(0);
if(isInserted(bootDevice)) { if(isInserted(bootDevice)) {
//////////save game play count//////////////// //////////save game play count////////////////
@ -1098,37 +1112,34 @@ int MenuDiscList()
returnHere = false; returnHere = false;
if(Settings.wiilight != 2) wiilight(1); if(Settings.wiilight != 2) wiilight(1);
choice = GameWindowPrompt(); choice = GameWindowPrompt();
header = &gameList[gameSelected]; //reset header // header = &gameList[gameSelected]; //reset header
if(choice == 1) if(choice == 1)
{ {
//check if alt Dol is on present
struct Game_CFG* game_cfg = CFG_get_game_opt(header->id);
if (game_cfg) {
alternatedol = game_cfg->loadalternatedol;
} else {
alternatedol = off;
}
if (alternatedol != off){ if (alternatedol != off){
SDCard_Init();
USBDevice_Init();
FILE *exeFile = NULL;
char nipple[100];
/* Open dol File and check exist */ /* Open dol File and check exist */
snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]); sprintf(nipple, "%s%s.dol",Settings.dolpath,IDfull);
sprintf(nipple, "%s%s.dol",Settings.dolpath,IDfull);
exeFile = fopen (nipple ,"rb"); exeFile = fopen (nipple ,"rb");
if (exeFile==NULL) if (exeFile==NULL)
{ //alt dol is not there, so make them feel bad for wasting our time. and boot the game anyways, just for spite {
sprintf(nipple, "%s %s",nipple,tr("does not exist! You Messed something up, Idiot.")); sprintf(nipple, "%s %s",nipple,tr("does not exist! You Messed something up, Idiot."));
WindowPrompt(tr("Error"),nipple,tr("OK"),NULL,NULL,NULL); WindowPrompt(tr("Error"),nipple,tr("OK"),NULL,NULL,NULL,-1);
menu = MENU_CHECK; menu = MENU_CHECK;
wiilight(0); wiilight(0);
break; break;
} }
} }
if (ocarinaChoice != off){
/* Open gct File and check exist */
sprintf(nipple, "%s%s.gct",Settings.Cheatcodespath,IDfull);
exeFile = fopen (nipple ,"rb");
if (exeFile==NULL)
{
sprintf(nipple, "%s %s",nipple,tr("does not exist! Loading game without cheats."));
WindowPrompt(tr("Error"),nipple,NULL,NULL,NULL,NULL,170);
}
} SDCard_deInit();
wiilight(0); wiilight(0);
returnHere = false; returnHere = false;
menu = MENU_EXIT; menu = MENU_EXIT;
@ -1244,20 +1255,20 @@ static int MenuInstall()
ret = DiscWait(tr("Insert Disk"),tr("Waiting..."),tr("Cancel"),0,0); ret = DiscWait(tr("Insert Disk"),tr("Waiting..."),tr("Cancel"),0,0);
if (ret < 0) { if (ret < 0) {
WindowPrompt (tr("Error reading Disc"),0,tr("Back"),0,0,0); WindowPrompt (tr("Error reading Disc"),0,tr("Back"),0,0,0,-1);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
break; break;
} }
ret = Disc_Open(); ret = Disc_Open();
if (ret < 0) { if (ret < 0) {
WindowPrompt (tr("Could not open Disc"),0,tr("Back"),0,0,0); WindowPrompt (tr("Could not open Disc"),0,tr("Back"),0,0,0,-1);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
break; break;
} }
ret = Disc_IsWii(); ret = Disc_IsWii();
if (ret < 0) { if (ret < 0) {
choice = WindowPrompt (tr("Not a Wii Disc"),"Insert a Wii Disc!",tr("OK"),tr("Back"),0,0); choice = WindowPrompt (tr("Not a Wii Disc"),"Insert a Wii Disc!",tr("OK"),tr("Back"),0,0,-1);
if (choice == 1) { if (choice == 1) {
menu = MENU_INSTALL; menu = MENU_INSTALL;
@ -1281,7 +1292,7 @@ static int MenuInstall()
ret = WBFS_CheckGame(headerdisc.id); ret = WBFS_CheckGame(headerdisc.id);
if (ret) { if (ret) {
WindowPrompt (tr("Game is already installed:"),name,tr("Back"),0,0,0); WindowPrompt (tr("Game is already installed:"),name,tr("Back"),0,0,0,-1);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
break; break;
} }
@ -1295,7 +1306,7 @@ static int MenuInstall()
sprintf(gametxt, "%s : %.2fGB", name, gamesize); sprintf(gametxt, "%s : %.2fGB", name, gamesize);
wiilight(1); wiilight(1);
choice = WindowPrompt(tr("Continue to install game?"),gametxt,tr("OK"),tr("Cancel"),0,0); choice = WindowPrompt(tr("Continue to install game?"),gametxt,tr("OK"),tr("Cancel"),0,0,-1);
if(choice == 1) { if(choice == 1) {
@ -1304,18 +1315,18 @@ static int MenuInstall()
if (gamesize > freespace) { if (gamesize > freespace) {
char errortxt[50]; char errortxt[50];
sprintf(errortxt, "%s: %.2fGB, %s: %.2fGB",tr("Game Size"), gamesize, tr("Free Space"), freespace); sprintf(errortxt, "%s: %.2fGB, %s: %.2fGB",tr("Game Size"), gamesize, tr("Free Space"), freespace);
choice = WindowPrompt(tr("Not enough free space!"),errortxt,tr("OK"), tr("Return"),0,0); choice = WindowPrompt(tr("Not enough free space!"),errortxt,tr("OK"), tr("Return"),0,0,-1);
if (choice == 1) { if (choice == 1) {
ret = ProgressWindow(gametxt, name); ret = ProgressWindow(gametxt, name);
wiilight(0); wiilight(0);
if (ret != 0) { if (ret != 0) {
WindowPrompt (tr("Install Error!"),0,tr("Back"),0,0,0); WindowPrompt (tr("Install Error!"),0,tr("Back"),0,0,0,-1);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
break; break;
} }
else { else {
__Menu_GetEntries(); //get the entries again __Menu_GetEntries(); //get the entries again
WindowPrompt (tr("Successfully installed:"),name,tr("OK"),0,0,0); WindowPrompt (tr("Successfully installed:"),name,tr("OK"),0,0,0,-1);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
break; break;
} }
@ -1329,12 +1340,12 @@ static int MenuInstall()
ret = ProgressWindow(gametxt, name); ret = ProgressWindow(gametxt, name);
wiilight(0); wiilight(0);
if (ret != 0) { if (ret != 0) {
WindowPrompt (tr("Install Error!"),0,tr("Back"),0,0,0); WindowPrompt (tr("Install Error!"),0,tr("Back"),0,0,0,-1);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
break; break;
} else { } else {
__Menu_GetEntries(); //get the entries again __Menu_GetEntries(); //get the entries again
WindowPrompt (tr("Successfully installed:"),name,tr("OK"),0,0,0); WindowPrompt (tr("Successfully installed:"),name,tr("OK"),0,0,0,-1);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
break; break;
} }
@ -1464,17 +1475,17 @@ static int MenuFormat()
tr("Do you want to format:"), tr("Do you want to format:"),
text, text,
tr("Yes"), tr("Yes"),
tr("No"),0,0); tr("No"),0,0,-1);
if(choice == 1) { if(choice == 1) {
ret = FormatingPartition(tr("Formatting, please wait..."), entry); ret = FormatingPartition(tr("Formatting, please wait..."), entry);
if (ret < 0) { if (ret < 0) {
WindowPrompt(tr("Error !"),tr("Failed formating"),tr("Return"),0,0,0); WindowPrompt(tr("Error !"),tr("Failed formating"),tr("Return"),0,0,0,-1);
menu = MENU_SETTINGS; menu = MENU_SETTINGS;
} else { } else {
ret = WBFS_Open(); ret = WBFS_Open();
sprintf(text, "%s %s", text,tr("formatted!")); sprintf(text, "%s %s", text,tr("formatted!"));
WindowPrompt(tr("Success:"),text,tr("OK"),0,0,0); WindowPrompt(tr("Success:"),text,tr("OK"),0,0,0,-1);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
} }
} }
@ -1488,7 +1499,7 @@ static int MenuFormat()
if(poweroffBtn.GetState() == STATE_CLICKED) if(poweroffBtn.GetState() == STATE_CLICKED)
{ {
choice = WindowPrompt (tr("Shutdown System"),tr("Are you sure?"),tr("Yes"),tr("No"),0,0); choice = WindowPrompt (tr("Shutdown System"),tr("Are you sure?"),tr("Yes"),tr("No"),0,0,-1);
if(choice == 1) if(choice == 1)
{ {
Sys_Shutdown(); Sys_Shutdown();
@ -1496,7 +1507,7 @@ static int MenuFormat()
} else if(exitBtn.GetState() == STATE_CLICKED) } else if(exitBtn.GetState() == STATE_CLICKED)
{ {
choice = WindowPrompt (tr("Return to Wii Menu"),tr("Are you sure?"),tr("Yes"),tr("No"),0,0); choice = WindowPrompt (tr("Return to Wii Menu"),tr("Are you sure?"),tr("Yes"),tr("No"),0,0,-1);
if(choice == 1) if(choice == 1)
{ {
Sys_LoadMenu(); Sys_LoadMenu();
@ -1535,7 +1546,7 @@ static int MenuCheck()
ret2 = WindowPrompt(tr("No USB Device found."), ret2 = WindowPrompt(tr("No USB Device found."),
tr("Do you want to retry for 30 secs?"), tr("Do you want to retry for 30 secs?"),
"cIOS249", "cIOS222", "cIOS249", "cIOS222",
tr("Back to Wii Menu"), 0); tr("Back to Wii Menu"), 0,-1);
SDCard_deInit(); SDCard_deInit();
USBDevice_deInit(); USBDevice_deInit();
WPAD_Flush(0); WPAD_Flush(0);
@ -1554,14 +1565,14 @@ static int MenuCheck()
WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR); WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR);
WPAD_SetVRes(WPAD_CHAN_ALL, screenwidth, screenheight); WPAD_SetVRes(WPAD_CHAN_ALL, screenwidth, screenheight);
if (ret2 < 0) { if (ret2 < 0) {
WindowPrompt (tr("Error !"),tr("USB Device not found"), tr("OK"), 0,0,0); WindowPrompt (tr("Error !"),tr("USB Device not found"), tr("OK"), 0,0,0,-1);
Sys_LoadMenu(); Sys_LoadMenu();
} }
} }
ret2 = Disc_Init(); ret2 = Disc_Init();
if (ret2 < 0) { if (ret2 < 0) {
WindowPrompt (tr("Error !"),tr("Could not initialize DIP module!"),tr("OK"), 0,0,0); WindowPrompt (tr("Error !"),tr("Could not initialize DIP module!"),tr("OK"), 0,0,0,-1);
Sys_LoadMenu(); Sys_LoadMenu();
} }
@ -1570,7 +1581,7 @@ static int MenuCheck()
choice = WindowPrompt(tr("No WBFS partition found"), choice = WindowPrompt(tr("No WBFS partition found"),
tr("You need to format a partition"), tr("You need to format a partition"),
tr("Format"), tr("Format"),
tr("Return"),0,0); tr("Return"),0,0,-1);
if(choice == 0) if(choice == 0)
{ {
Sys_LoadMenu(); Sys_LoadMenu();
@ -1579,7 +1590,7 @@ static int MenuCheck()
u32 sector_size; u32 sector_size;
ret2 = Partition_GetEntries(partitions, &sector_size); ret2 = Partition_GetEntries(partitions, &sector_size);
if (ret2 < 0) { if (ret2 < 0) {
WindowPrompt (tr("No partitions found"),0, tr("Restart"), 0,0,0); WindowPrompt (tr("No partitions found"),0, tr("Restart"), 0,0,0,-1);
Sys_LoadMenu(); Sys_LoadMenu();
} }

2
source/network/networkops.cpp
View File

@ -249,7 +249,7 @@ static void * networkinitcallback(void *arg)
if(CheckUpdate() > 0) { if(CheckUpdate() > 0) {
/** Here we can enter the update function later ** /** Here we can enter the update function later **
** when network problem is solved **/ ** when network problem is solved **/
WindowPrompt("Update available",0,"OK",0,0,0); WindowPrompt("Update available",0,"OK",0,0,0,-1);
} }
updatechecked = true; updatechecked = true;
} }

23
source/prompts/PromptWindows.cpp
View File

@ -382,9 +382,10 @@ void WindowScreensaver()
int int
WindowPrompt(const char *title, const char *msg, const char *btn1Label, WindowPrompt(const char *title, const char *msg, const char *btn1Label,
const char *btn2Label, const char *btn3Label, const char *btn2Label, const char *btn3Label,
const char *btn4Label) const char *btn4Label, int wait)
{ {
int choice = -1; int choice = -1;
int count = wait;
GuiWindow promptWindow(472,320); GuiWindow promptWindow(472,320);
promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
@ -610,6 +611,8 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label,
else if(btn4.GetState() == STATE_CLICKED) { else if(btn4.GetState() == STATE_CLICKED) {
choice = 0; choice = 0;
} }
if (count>0)count--;
if (count==0) choice = 1;
} }
promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50); promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50);
@ -873,7 +876,7 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label,
wiimoteImg.SetPosition(50,165); wiimoteImg.SetPosition(50,165);
} }
else if(btn2.GetState() == STATE_CLICKED) { else if(btn2.GetState() == STATE_CLICKED) {
ret = WindowPrompt(tr("Are you sure?"), 0, tr("Yes"), tr("No"), 0, 0); ret = WindowPrompt(tr("Are you sure?"), 0, tr("Yes"), tr("No"), 0, 0,-1);
if (ret == 1) { if (ret == 1) {
choice = 2; choice = 2;
} }
@ -885,7 +888,7 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label,
btn2.ResetState(); btn2.ResetState();
} }
else if(btn3.GetState() == STATE_CLICKED) { else if(btn3.GetState() == STATE_CLICKED) {
ret = WindowPrompt(tr("Are you sure?"), 0, tr("Yes"), tr("No"), 0, 0); ret = WindowPrompt(tr("Are you sure?"), 0, tr("Yes"), tr("No"), 0, 0,-1);
if (ret == 1) { if (ret == 1) {
choice = 3; choice = 3;
} }
@ -1274,7 +1277,7 @@ int GameWindowPrompt()
} }
choice = 1; choice = 1;
SDCard_deInit(); //SDCard_deInit();// moved this into menu.cpp after checking for gct file and alt dol
} }
else if(btn2.GetState() == STATE_CLICKED) { //back else if(btn2.GetState() == STATE_CLICKED) { //back
@ -2032,13 +2035,13 @@ ProgressDownloadWindow(int choice2)
struct stat st; struct stat st;
if(stat(Settings.covers_path, &st) != 0) { if(stat(Settings.covers_path, &st) != 0) {
if(subfoldercreate(Settings.covers_path) != 1) { if(subfoldercreate(Settings.covers_path) != 1) {
WindowPrompt(tr("Error !"),tr("Can't create directory"),tr("OK"),0,0,0); WindowPrompt(tr("Error !"),tr("Can't create directory"),tr("OK"),0,0,0,-1);
cntMissFiles = 0; cntMissFiles = 0;
} }
} }
if(stat(Settings.disc_path,&st) != 0) { if(stat(Settings.disc_path,&st) != 0) {
if(subfoldercreate(Settings.disc_path) != 1) { if(subfoldercreate(Settings.disc_path) != 1) {
WindowPrompt(tr("Error !"),tr("Can't create directory"),tr("OK"),0,0,0); WindowPrompt(tr("Error !"),tr("Can't create directory"),tr("OK"),0,0,0,-1);
cntMissFiles = 0; cntMissFiles = 0;
} }
} }
@ -2257,7 +2260,7 @@ int ProgressUpdateWindow()
struct stat st; struct stat st;
if(stat(Settings.update_path, &st) != 0) { if(stat(Settings.update_path, &st) != 0) {
if(subfoldercreate(Settings.update_path) != 1) { if(subfoldercreate(Settings.update_path) != 1) {
WindowPrompt(tr("Error !"),tr("Can't create directory"),tr("OK"),0,0,0); WindowPrompt(tr("Error !"),tr("Can't create directory"),tr("OK"),0,0,0,-1);
ret = -1; ret = -1;
failed = -1; failed = -1;
} }
@ -2295,7 +2298,7 @@ int ProgressUpdateWindow()
if(newrev > 0) { if(newrev > 0) {
sprintf(msg, "Rev%i %s.", newrev, tr("available")); sprintf(msg, "Rev%i %s.", newrev, tr("available"));
int choice = WindowPrompt(msg, tr("How do you want to update?"), tr("Update DOL"), tr("Update All"), tr("Cancel"), 0); int choice = WindowPrompt(msg, tr("How do you want to update?"), tr("Update DOL"), tr("Update All"), tr("Cancel"), 0,-1);
if(choice == 1 || choice == 2) { if(choice == 1 || choice == 2) {
titleTxt.SetTextf("%s USB Loader GX", tr("Updating")); titleTxt.SetTextf("%s USB Loader GX", tr("Updating"));
msgTxt.SetPosition(0,100); msgTxt.SetPosition(0,100);
@ -2380,7 +2383,7 @@ int ProgressUpdateWindow()
} }
} else { } else {
WindowPrompt(tr("No new updates."), 0, tr("OK"), 0, 0, 0); WindowPrompt(tr("No new updates."), 0, tr("OK"), 0, 0, 0,-1);
ret = -1; ret = -1;
} }
@ -2389,7 +2392,7 @@ int ProgressUpdateWindow()
CloseConnection(); CloseConnection();
if(!failed && ret >= 0) { if(!failed && ret >= 0) {
WindowPrompt(tr("Successfully Updated") , tr("Restarting..."), tr("OK"), 0, 0, 0); WindowPrompt(tr("Successfully Updated") , tr("Restarting..."), tr("OK"), 0, 0, 0,-1);
Sys_BackToLoader(); Sys_BackToLoader();
} }

2
source/prompts/PromptWindows.h
View File

@ -12,7 +12,7 @@
void WindowCredits(); void WindowCredits();
int OnScreenKeyboard(char * var, u32 maxlen, int min); int OnScreenKeyboard(char * var, u32 maxlen, int min);
int WindowPrompt(const char *title, const char *msg, const char *btn1Label, const char *btn2Label, const char *btn3Label, const char *btn4Label); int WindowPrompt(const char *title, const char *msg, const char *btn1Label, const char *btn2Label, const char *btn3Label, const char *btn4Label, int wait);
int WindowExitPrompt(const char *title, const char *msg, const char *btn1Label, const char *btn2Label, const char *btn3Label, const char *btn4Label); int WindowExitPrompt(const char *title, const char *msg, const char *btn1Label, const char *btn2Label, const char *btn3Label, const char *btn4Label);
int GameWindowPrompt(); int GameWindowPrompt();
int DiscWait(const char *title, const char *msg, const char *btn1Label, const char *btn2Label, int IsDeviceWait); int DiscWait(const char *title, const char *msg, const char *btn1Label, const char *btn2Label, int IsDeviceWait);

91
source/settings/Settings.cpp
View File

@ -641,10 +641,10 @@ int MenuSettings()
while(w.GetEffect()>0) usleep(50); while(w.GetEffect()>0) usleep(50);
} }
} else { } else {
WindowPrompt(tr("Language change:"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0); WindowPrompt(tr("Language change:"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0,-1);
} }
} else { } else {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to use this option."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to use this option."), tr("OK"), 0,0,0,-1);
} }
break; break;
case 1: case 1:
@ -974,19 +974,19 @@ int MenuSettings()
if (!strcmp(entered, Settings.unlockCode)) //if password correct if (!strcmp(entered, Settings.unlockCode)) //if password correct
{ {
if (Settings.godmode == 0) { if (Settings.godmode == 0) {
WindowPrompt(tr("Correct Password"),tr("All the features of USB Loader GX are unlocked."),tr("OK"),0,0,0); WindowPrompt(tr("Correct Password"),tr("All the features of USB Loader GX are unlocked."),tr("OK"),0,0,0,-1);
Settings.godmode = 1; Settings.godmode = 1;
//__Menu_GetEntries(); //__Menu_GetEntries();
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
} }
} else { } else {
WindowPrompt(tr("Wrong Password"),tr("USB Loader GX is protected"),tr("OK"),0,0,0); WindowPrompt(tr("Wrong Password"),tr("USB Loader GX is protected"),tr("OK"),0,0,0,-1);
} }
} }
} else { } else {
int choice = WindowPrompt (tr("Lock Console"),tr("Are you sure?"),tr("Yes"),tr("No"),0,0); int choice = WindowPrompt (tr("Lock Console"),tr("Are you sure?"),tr("Yes"),tr("No"),0,0,-1);
if(choice == 1) { if(choice == 1) {
WindowPrompt(tr("Console Locked"),tr("USB Loader GX is protected"),tr("OK"),0,0,0); WindowPrompt(tr("Console Locked"),tr("USB Loader GX is protected"),tr("OK"),0,0,0,-1);
Settings.godmode = 0; Settings.godmode = 0;
//__Menu_GetEntries(); //__Menu_GetEntries();
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
@ -1005,10 +1005,10 @@ int MenuSettings()
w.Append(&backBtn); w.Append(&backBtn);
if ( result == 1 ) { if ( result == 1 ) {
strncpy(Settings.unlockCode, entered, sizeof(Settings.unlockCode)); strncpy(Settings.unlockCode, entered, sizeof(Settings.unlockCode));
WindowPrompt(tr("Password Changed"),tr("Password has been changed"),tr("OK"),0,0,0); WindowPrompt(tr("Password Changed"),tr("Password has been changed"),tr("OK"),0,0,0,-1);
} }
} else { } else {
WindowPrompt(tr("Password Changed"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0); WindowPrompt(tr("Password Changed"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0,-1);
} }
break; break;
case 2: case 2:
@ -1138,7 +1138,7 @@ int MenuSettings()
while(w.GetEffect()>0) usleep(50); while(w.GetEffect()>0) usleep(50);
} }
else else
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to use this option."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to use this option."), tr("OK"), 0,0,0,-1);
break; break;
case 1: case 1:
Settings.volume += 10; Settings.volume += 10;
@ -1276,14 +1276,14 @@ int MenuSettings()
if(entered[len] !='/') if(entered[len] !='/')
strncat (entered, "/", 1); strncat (entered, "/", 1);
strncpy(Settings.covers_path, entered, sizeof(Settings.covers_path)); strncpy(Settings.covers_path, entered, sizeof(Settings.covers_path));
WindowPrompt(tr("Coverpath Changed"),0,tr("OK"),0,0,0); WindowPrompt(tr("Coverpath Changed"),0,tr("OK"),0,0,0,-1);
// if(!isSdInserted()) { // if(!isSdInserted()) {
if(!isInserted(bootDevice)) { if(!isInserted(bootDevice)) {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0,-1);
} }
} }
} else { } else {
WindowPrompt(tr("Coverpath Changed"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0); WindowPrompt(tr("Coverpath Changed"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0,-1);
} }
break; break;
case 1: case 1:
@ -1302,14 +1302,14 @@ int MenuSettings()
if(entered[len] !='/') if(entered[len] !='/')
strncat (entered, "/", 1); strncat (entered, "/", 1);
strncpy(Settings.disc_path, entered, sizeof(Settings.disc_path)); strncpy(Settings.disc_path, entered, sizeof(Settings.disc_path));
WindowPrompt(tr("Discpath Changed"),0,tr("OK"),0,0,0); WindowPrompt(tr("Discpath Changed"),0,tr("OK"),0,0,0,-1);
// if(!isSdInserted()) { // if(!isSdInserted()) {
if(!isInserted(bootDevice)) { if(!isInserted(bootDevice)) {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0,-1);
} }
} }
} else { } else {
WindowPrompt(tr("Discpath change"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0); WindowPrompt(tr("Discpath change"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0,-1);
} }
break; break;
case 2: case 2:
@ -1328,10 +1328,10 @@ int MenuSettings()
if(entered[len] !='/') if(entered[len] !='/')
strncat (entered, "/", 1); strncat (entered, "/", 1);
strncpy(CFG.theme_path, entered, sizeof(CFG.theme_path)); strncpy(CFG.theme_path, entered, sizeof(CFG.theme_path));
WindowPrompt(tr("Themepath Changed"),0,tr("OK"),0,0,0); WindowPrompt(tr("Themepath Changed"),0,tr("OK"),0,0,0,-1);
// if(!isSdInserted()) { // if(!isSdInserted()) {
if(!isInserted(bootDevice)) { if(!isInserted(bootDevice)) {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0,-1);
} else { } else {
cfg_save_global(); cfg_save_global();
} }
@ -1366,7 +1366,7 @@ int MenuSettings()
w.Append(&optionBrowser2); w.Append(&optionBrowser2);
ResumeGui(); ResumeGui();
} else { } else {
WindowPrompt(tr("Themepath change"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0); WindowPrompt(tr("Themepath change"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0,-1);
} }
break; break;
case 3: case 3:
@ -1385,19 +1385,19 @@ int MenuSettings()
if(entered[len] !='/') if(entered[len] !='/')
strncat (entered, "/", 1); strncat (entered, "/", 1);
strncpy(Settings.titlestxt_path, entered, sizeof(Settings.titlestxt_path)); strncpy(Settings.titlestxt_path, entered, sizeof(Settings.titlestxt_path));
WindowPrompt(tr("Path of titles.txt changed."),0,tr("OK"),0,0,0); WindowPrompt(tr("Path of titles.txt changed."),0,tr("OK"),0,0,0,-1);
// if(isSdInserted()) { // if(isSdInserted()) {
if(isInserted(bootDevice)) { if(isInserted(bootDevice)) {
cfg_save_global(); cfg_save_global();
CFG_Load(); CFG_Load();
} else { } else {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0,-1);
} }
} }
} }
else else
{ {
WindowPrompt(tr("Path of titles.txt change"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0); WindowPrompt(tr("Path of titles.txt change"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0,-1);
} }
break; break;
case 4: case 4:
@ -1416,11 +1416,11 @@ int MenuSettings()
if(entered[len] !='/') if(entered[len] !='/')
strncat (entered, "/", 1); strncat (entered, "/", 1);
strncpy(Settings.update_path, entered, sizeof(Settings.update_path)); strncpy(Settings.update_path, entered, sizeof(Settings.update_path));
WindowPrompt(tr("Updatepath changed."),0,tr("OK"),0,0,0); WindowPrompt(tr("Updatepath changed."),0,tr("OK"),0,0,0,-1);
} }
} }
else else
WindowPrompt(0,tr("Console should be unlocked to modify it."),tr("OK"),0,0,0); WindowPrompt(0,tr("Console should be unlocked to modify it."),tr("OK"),0,0,0,-1);
break; break;
case 5: case 5:
if ( Settings.godmode == 1) if ( Settings.godmode == 1)
@ -1438,11 +1438,11 @@ int MenuSettings()
if(entered[len] !='/') if(entered[len] !='/')
strncat (entered, "/", 1); strncat (entered, "/", 1);
strncpy(Settings.Cheatcodespath, entered, sizeof(Settings.Cheatcodespath)); strncpy(Settings.Cheatcodespath, entered, sizeof(Settings.Cheatcodespath));
WindowPrompt(tr("Cheatcodes Path changed"),0,tr("OK"),0,0,0); WindowPrompt(tr("Cheatcodes Path changed"),0,tr("OK"),0,0,0,-1);
} }
} }
else else
WindowPrompt(0,tr("Console should be unlocked to modify it."),tr("OK"),0,0,0); WindowPrompt(0,tr("Console should be unlocked to modify it."),tr("OK"),0,0,0,-1);
break; break;
case 6: case 6:
if ( Settings.godmode == 1) if ( Settings.godmode == 1)
@ -1460,11 +1460,11 @@ int MenuSettings()
if(entered[len] !='/') if(entered[len] !='/')
strncat (entered, "/", 1); strncat (entered, "/", 1);
strncpy(Settings.TxtCheatcodespath, entered, sizeof(Settings.TxtCheatcodespath)); strncpy(Settings.TxtCheatcodespath, entered, sizeof(Settings.TxtCheatcodespath));
WindowPrompt("TxtCheatcodespathchanged",0,tr("OK"),0,0,0); WindowPrompt("TxtCheatcodespathchanged",0,tr("OK"),0,0,0,-1);
} }
} }
else else
WindowPrompt(0,tr("Console should be unlocked to modify it."),tr("OK"),0,0,0); WindowPrompt(0,tr("Console should be unlocked to modify it."),tr("OK"),0,0,0,-1);
break; break;
case 7: case 7:
if ( Settings.godmode == 1) if ( Settings.godmode == 1)
@ -1482,14 +1482,14 @@ int MenuSettings()
if(entered[len] !='/') if(entered[len] !='/')
strncat (entered, "/", 1); strncat (entered, "/", 1);
strncpy(Settings.dolpath, entered, sizeof(Settings.dolpath)); strncpy(Settings.dolpath, entered, sizeof(Settings.dolpath));
WindowPrompt(tr("Dolpath Changed"),0,tr("OK"),0,0,0); WindowPrompt(tr("Dolpath Changed"),0,tr("OK"),0,0,0,-1);
// if(!isSdInserted()) { // if(!isSdInserted()) {
if(!isInserted(bootDevice)) { if(!isInserted(bootDevice)) {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0,-1);
} }
} }
} else { } else {
WindowPrompt(tr("Dolpath change"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0); WindowPrompt(tr("Dolpath change"),tr("Console should be unlocked to modify it."),tr("OK"),0,0,0,-1);
} }
break; break;
@ -1497,7 +1497,7 @@ int MenuSettings()
} }
/** If not godmode don't let him inside **/ /** If not godmode don't let him inside **/
} else { } else {
WindowPrompt(tr("Console Locked"), tr("Unlock console to use this option."), tr("OK"), 0, 0, 0); WindowPrompt(tr("Console Locked"), tr("Unlock console to use this option."), tr("OK"), 0, 0, 0,-1);
} }
optionBrowser2.SetEffect(EFFECT_FADE, -20); optionBrowser2.SetEffect(EFFECT_FADE, -20);
while(optionBrowser2.GetEffect() > 0) usleep(50); while(optionBrowser2.GetEffect() > 0) usleep(50);
@ -1528,12 +1528,12 @@ int MenuSettings()
w.Remove(&backBtn); w.Remove(&backBtn);
int ret = ProgressUpdateWindow(); int ret = ProgressUpdateWindow();
if(ret < 0) { if(ret < 0) {
WindowPrompt(tr("Update failed"),0,tr("OK"),0,0,0); WindowPrompt(tr("Update failed"),0,tr("OK"),0,0,0,-1);
} }
w.Append(&optionBrowser2); w.Append(&optionBrowser2);
w.Append(&backBtn); w.Append(&backBtn);
} else { } else {
WindowPrompt(tr("Console Locked"), tr("Unlock console to use this option."), tr("OK"), 0,0,0); WindowPrompt(tr("Console Locked"), tr("Unlock console to use this option."), tr("OK"), 0,0,0,-1);
} }
slidedirection = FADE; slidedirection = FADE;
pageToDisplay = 2; pageToDisplay = 2;
@ -1558,7 +1558,7 @@ int MenuSettings()
w.Remove(&backBtn); w.Remove(&backBtn);
w.Remove(&optionBrowser2); w.Remove(&optionBrowser2);
if(Settings.godmode) { if(Settings.godmode) {
int choice = WindowPrompt(tr("Are you sure?"), 0, tr("Yes"), tr("Cancel"), 0, 0); int choice = WindowPrompt(tr("Are you sure?"), 0, tr("Yes"), tr("Cancel"), 0, 0,-1);
if(choice == 1) { if(choice == 1) {
// if(isSdInserted()) // if(isSdInserted())
if(isInserted(bootDevice)) if(isInserted(bootDevice))
@ -1574,7 +1574,7 @@ int MenuSettings()
pageToDisplay = 0; pageToDisplay = 0;
} }
} else { } else {
WindowPrompt(tr("Console Locked"), tr("Unlock console to use this option."), tr("OK"), 0, 0, 0); WindowPrompt(tr("Console Locked"), tr("Unlock console to use this option."), tr("OK"), 0, 0, 0,-1);
} }
w.Append(&backBtn); w.Append(&backBtn);
w.Append(&optionBrowser2); w.Append(&optionBrowser2);
@ -1815,8 +1815,9 @@ int GameSettings(struct discHdr * header)
GuiImage GCTBtnImg(&btnOcarina); GuiImage GCTBtnImg(&btnOcarina);
if (Settings.wsprompt == yes){ if (Settings.wsprompt == yes){
GCTBtnImg.SetWidescreen(CFG.widescreen);} GCTBtnImg.SetWidescreen(CFG.widescreen);}
GuiButton GCTBtn(&GCTBtnImg,&GCTBtnImg, ALIGN_RIGHT, ALIGN_TOP, 0, 80, &trigA, &btnSoundOver, &btnClick,1); GuiButton GCTBtn(&GCTBtnImg,&GCTBtnImg, ALIGN_RIGHT, ALIGN_TOP, -20, 90, &trigA, &btnSoundOver, &btnClick,1);
GCTBtn.SetScale(0.5); GCTBtn.SetSize(80,80);
GCTBtnImg.SetScale(0.5);
GuiCustomOptionBrowser optionBrowser3(396, 280, &options3, CFG.theme_path, "bg_options_gamesettings.png", bg_options_settings_png, 1, 200); GuiCustomOptionBrowser optionBrowser3(396, 280, &options3, CFG.theme_path, "bg_options_gamesettings.png", bg_options_settings_png, 1, 200);
optionBrowser3.SetPosition(0, 90); optionBrowser3.SetPosition(0, 90);
@ -1970,7 +1971,7 @@ int GameSettings(struct discHdr * header)
break; break;
case 10: case 10:
int result; int result;
result = WindowPrompt(tr("Are you sure?"),0,tr("Yes"),tr("Cancel"),0,0); result = WindowPrompt(tr("Are you sure?"),0,tr("Yes"),tr("Cancel"),0,0,-1);
if(result == 1) { if(result == 1) {
if(isInserted(bootDevice)) { if(isInserted(bootDevice)) {
struct Game_NUM* game_num = CFG_get_game_num(header->id); struct Game_NUM* game_num = CFG_get_game_num(header->id);
@ -1987,7 +1988,7 @@ int GameSettings(struct discHdr * header)
} }
break; break;
case 11: case 11:
int choice = WindowPrompt(tr("Are you sure?"),0,tr("Yes"),tr("Cancel"),0,0); int choice = WindowPrompt(tr("Are you sure?"),0,tr("Yes"),tr("Cancel"),0,0,-1);
if(choice == 1) { if(choice == 1) {
videoChoice = Settings.video; videoChoice = Settings.video;
viChoice = Settings.vpatch; viChoice = Settings.vpatch;
@ -2027,14 +2028,14 @@ int GameSettings(struct discHdr * header)
if (Settings.titlesOverride==1 && opt_lang != opt_langnew) if (Settings.titlesOverride==1 && opt_lang != opt_langnew)
OpenXMLDatabase(Settings.titlestxt_path, Settings.db_language, Settings.db_JPtoEN, true, true, false); // open file, reload titles, do not keep in memory OpenXMLDatabase(Settings.titlestxt_path, Settings.db_language, Settings.db_JPtoEN, true, true, false); // open file, reload titles, do not keep in memory
// titles are refreshed in menu.cpp as soon as this function returns // titles are refreshed in menu.cpp as soon as this function returns
WindowPrompt(tr("Successfully Saved"), 0, tr("OK"), 0,0,0); WindowPrompt(tr("Successfully Saved"), 0, tr("OK"), 0,0,0,-1);
} }
else else
{ {
WindowPrompt(tr("Save Failed"), 0, tr("OK"), 0,0,0); WindowPrompt(tr("Save Failed"), 0, tr("OK"), 0,0,0,-1);
} }
} else { } else {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0,-1);
} }
saveBtn.ResetState(); saveBtn.ResetState();
@ -2052,7 +2053,7 @@ int GameSettings(struct discHdr * header)
int choice = WindowPrompt( int choice = WindowPrompt(
tr("Do you really want to delete:"), tr("Do you really want to delete:"),
gameName, gameName,
tr("Yes"),tr("Cancel"),0,0); tr("Yes"),tr("Cancel"),0,0,-1);
if (choice == 1) if (choice == 1)
{ {
@ -2064,14 +2065,14 @@ int GameSettings(struct discHdr * header)
WindowPrompt( WindowPrompt(
tr("Can't delete:"), tr("Can't delete:"),
gameName, gameName,
tr("OK"),0,0,0); tr("OK"),0,0,0,-1);
} }
else { else {
//__Menu_GetEntries(); //__Menu_GetEntries();
WindowPrompt( WindowPrompt(
tr("Successfully deleted:"), tr("Successfully deleted:"),
gameName, gameName,
tr("OK"),0,0,0); tr("OK"),0,0,0,-1);
retVal = 1; retVal = 1;
} }
break; break;

24
source/settings/SettingsPrompts.cpp
View File

@ -198,7 +198,7 @@ bool MenuOGG()
} }
if (defaultBtn.GetState() == STATE_CLICKED) { if (defaultBtn.GetState() == STATE_CLICKED) {
choice = WindowPrompt(tr("Loading standard music."),0,tr("OK"), tr("Cancel"),0,0); choice = WindowPrompt(tr("Loading standard music."),0,tr("OK"), tr("Cancel"),0,0,-1);
if (choice == 1) { if (choice == 1) {
sprintf(Settings.ogg_path, "notset"); sprintf(Settings.ogg_path, "notset");
bgMusic->Play(); bgMusic->Play();
@ -230,7 +230,7 @@ bool MenuOGG()
if(entered[len] !='/') if(entered[len] !='/')
strncat (entered, "/", 1); strncat (entered, "/", 1);
strncpy(Settings.oggload_path, entered, sizeof(Settings.oggload_path)); strncpy(Settings.oggload_path, entered, sizeof(Settings.oggload_path));
WindowPrompt(tr("Backgroundmusic Path changed."),0,tr("OK"),0,0,0); WindowPrompt(tr("Backgroundmusic Path changed."),0,tr("OK"),0,0,0,-1);
// if(isSdInserted()) { // if(isSdInserted()) {
if(isInserted(bootDevice)) { if(isInserted(bootDevice)) {
if(!strcmp("", Settings.oggload_path)) { if(!strcmp("", Settings.oggload_path)) {
@ -241,7 +241,7 @@ bool MenuOGG()
returnhere = true; returnhere = true;
break; break;
} else { } else {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0,-1);
} }
} }
if(countoggs > 0) { if(countoggs > 0) {
@ -253,13 +253,13 @@ bool MenuOGG()
ret = optionBrowser4.GetClickedOption(); ret = optionBrowser4.GetClickedOption();
if(ret>=0) { if(ret>=0) {
choice = WindowPrompt(tr("Set as backgroundmusic?"),GetFileName(ret),tr("Yes"),tr("No"),0,0); choice = WindowPrompt(tr("Set as backgroundmusic?"),GetFileName(ret),tr("Yes"),tr("No"),0,0,-1);
if(choice == 1) { if(choice == 1) {
StopOgg(); StopOgg();
snprintf(fullpath,150,"%s%s",Settings.oggload_path,GetFileName(ret)); snprintf(fullpath,150,"%s%s",Settings.oggload_path,GetFileName(ret));
choice = bgMusic->PlayOggFile(fullpath); choice = bgMusic->PlayOggFile(fullpath);
if(choice < 0) { if(choice < 0) {
WindowPrompt(tr("Not supported format!"), tr("Loading standard music."), tr("OK"), 0,0,0); WindowPrompt(tr("Not supported format!"), tr("Loading standard music."), tr("OK"), 0,0,0,-1);
sprintf(Settings.ogg_path, "notset"); sprintf(Settings.ogg_path, "notset");
bgMusic->Play(); bgMusic->Play();
SetVolumeOgg(255*(Settings.volume/100.0)); SetVolumeOgg(255*(Settings.volume/100.0));
@ -279,7 +279,7 @@ bool MenuOGG()
snprintf(fullpath, 150,"%s%s", Settings.oggload_path,GetFileName(ret)); snprintf(fullpath, 150,"%s%s", Settings.oggload_path,GetFileName(ret));
choice = bgMusic->PlayOggFile(fullpath); choice = bgMusic->PlayOggFile(fullpath);
if(choice < 0) { if(choice < 0) {
WindowPrompt(tr("Not supported format!"), tr("Loading standard music."), tr("OK"), 0,0,0); WindowPrompt(tr("Not supported format!"), tr("Loading standard music."), tr("OK"), 0,0,0,-1);
if(!strcmp("", Settings.oggload_path) || !strcmp("notset", Settings.ogg_path)) { if(!strcmp("", Settings.oggload_path) || !strcmp("notset", Settings.ogg_path)) {
bgMusic->Play(); bgMusic->Play();
} else { } else {
@ -449,7 +449,7 @@ int MenuLanguageSelect()
} }
if (defaultBtn.GetState() == STATE_CLICKED) { if (defaultBtn.GetState() == STATE_CLICKED) {
choice = WindowPrompt(tr("Loading standard language."),0,tr("OK"), tr("Cancel"),0,0); choice = WindowPrompt(tr("Loading standard language."),0,tr("OK"), tr("Cancel"),0,0,-1);
if (choice == 1) { if (choice == 1) {
sprintf(Settings.language_path, "notset"); sprintf(Settings.language_path, "notset");
cfg_save_global(); cfg_save_global();
@ -479,14 +479,14 @@ int MenuLanguageSelect()
if(entered[len] !='/') if(entered[len] !='/')
strncat (entered, "/", 1); strncat (entered, "/", 1);
strncpy(Settings.languagefiles_path, entered, sizeof(Settings.languagefiles_path)); strncpy(Settings.languagefiles_path, entered, sizeof(Settings.languagefiles_path));
WindowPrompt(tr("Languagepath changed."),0,tr("OK"),0,0,0); WindowPrompt(tr("Languagepath changed."),0,tr("OK"),0,0,0,-1);
// if(isSdInserted()) { // if(isSdInserted()) {
if(isInserted(bootDevice)) { if(isInserted(bootDevice)) {
cfg_save_global(); cfg_save_global();
returnhere = 1; returnhere = 1;
break; break;
} else { } else {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0,-1);
} }
} }
if(countfiles > 0) { if(countfiles > 0) {
@ -498,7 +498,7 @@ int MenuLanguageSelect()
ret = optionBrowser4.GetClickedOption(); ret = optionBrowser4.GetClickedOption();
if(ret>=0) { if(ret>=0) {
choice = WindowPrompt(tr("Do you want to change language?"), 0, tr("Yes"), tr("Cancel"),0,0); choice = WindowPrompt(tr("Do you want to change language?"), 0, tr("Yes"), tr("Cancel"),0,0,-1);
if(choice == 1) { if(choice == 1) {
// if(isSdInserted()) { // if(isSdInserted()) {
if(isInserted(bootDevice)) { if(isInserted(bootDevice)) {
@ -506,7 +506,7 @@ int MenuLanguageSelect()
cfg_save_global(); cfg_save_global();
if(!checkfile(Settings.language_path)) { if(!checkfile(Settings.language_path)) {
sprintf(Settings.language_path, tr("not set")); sprintf(Settings.language_path, tr("not set"));
WindowPrompt(tr("File not found."),tr("Loading standard language."),tr("OK"),0,0,0); WindowPrompt(tr("File not found."),tr("Loading standard language."),tr("OK"),0,0,0,-1);
} }
gettextCleanUp(); gettextCleanUp();
//lang_default(); //lang_default();
@ -514,7 +514,7 @@ int MenuLanguageSelect()
returnhere = 2; returnhere = 2;
break; break;
} else { } else {
WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0); WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"), 0,0,0,-1);
} }
} }
optionBrowser4.SetFocus(1); optionBrowser4.SetFocus(1);