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

Fix progressbar issues.

Browse Source
This commit is contained in:
giantpune 2009-05-06 15:02:18 +00:00
parent 5f04fb3b9f
commit 1ee089f618
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/menu.cpp
View File

@ -1519,12 +1519,12 @@ ShowProgress (s32 done, s32 total)
sprintf(prozent, "%0.2f%%", percent); sprintf(prozent, "%0.2f%%", percent);
prTxt.SetText(prozent); prTxt.SetText(prozent);
prTxt.SetFont(fontClock); //prTxt.SetFont(fontClock);
sprintf(timet,"Time left: %d:%02d:%02d",h,m,s); sprintf(timet,"Time left: %d:%02d:%02d",h,m,s);
timeTxt.SetText(timet); timeTxt.SetText(timet);
// timeTxt.SetFont(fontClock); // timeTxt.SetFont(fontClock);
if ((Settings.wsprompt == yes) && (CFG.widescreen)){ if ((Settings.wsprompt == yes) && (CFG.widescreen)){
progressbarImg.SetTile(78*progressDone/progressTotal);} progressbarImg.SetTile(80*progressDone/progressTotal);}
else {progressbarImg.SetTile(100*progressDone/progressTotal);} else {progressbarImg.SetTile(100*progressDone/progressTotal);}
} }
@ -1554,21 +1554,23 @@ ProgressWindow(const char *title, const char *msg)
GuiImageData progressbarOutline(progressbar_outline_png); GuiImageData progressbarOutline(progressbar_outline_png);
GuiImage progressbarOutlineImg(&progressbarOutline); GuiImage progressbarOutlineImg(&progressbarOutline);
progressbarOutlineImg.SetWidescreen(CFG.widescreen);/////////// if (Settings.wsprompt == yes){
progressbarOutlineImg.SetWidescreen(CFG.widescreen);}///////////
progressbarOutlineImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); progressbarOutlineImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
progressbarOutlineImg.SetPosition(25, 40); progressbarOutlineImg.SetPosition(25, 40);
GuiImageData progressbarEmpty(progressbar_empty_png); GuiImageData progressbarEmpty(progressbar_empty_png);
GuiImage progressbarEmptyImg(&progressbarEmpty); GuiImage progressbarEmptyImg(&progressbarEmpty);
if (Settings.wsprompt == yes){ //if (Settings.wsprompt == yes){
progressbarEmptyImg.SetWidescreen(CFG.widescreen);}/////////// //progressbarEmptyImg.SetWidescreen(CFG.widescreen);}///////////
progressbarEmptyImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); progressbarEmptyImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
progressbarEmptyImg.SetPosition(25, 40); progressbarEmptyImg.SetPosition(25, 40);
progressbarEmptyImg.SetTile(100); progressbarEmptyImg.SetTile(100);
GuiImageData progressbar(progressbar_png); GuiImageData progressbar(progressbar_png);
if (Settings.wsprompt == yes){ //if (Settings.wsprompt == yes){
progressbarImg.SetWidescreen(CFG.widescreen);}/////////// //progressbarImg.SetWidescreen(CFG.widescreen);}///////////
progressbarImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); progressbarImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
progressbarImg.SetPosition(25, 40); progressbarImg.SetPosition(25, 40);
@ -1577,13 +1579,7 @@ ProgressWindow(const char *title, const char *msg)
titleTxt.SetPosition(0,60); titleTxt.SetPosition(0,60);
GuiText msgTxt(msg, 26, (GXColor){0, 0, 0, 255}); GuiText msgTxt(msg, 26, (GXColor){0, 0, 0, 255});
msgTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); msgTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
msgTxt.SetPosition(0,130); msgTxt.SetPosition(0,120);
prTxt.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
prTxt.SetPosition(0, 40);
timeTxt.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
timeTxt.SetPosition(0,-50);
if ((Settings.wsprompt == yes) && (CFG.widescreen)){/////////////adjust for widescreen if ((Settings.wsprompt == yes) && (CFG.widescreen)){/////////////adjust for widescreen
progressbarOutlineImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); progressbarOutlineImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
@ -1591,8 +1587,15 @@ ProgressWindow(const char *title, const char *msg)
progressbarEmptyImg.SetPosition(80,40); progressbarEmptyImg.SetPosition(80,40);
progressbarEmptyImg.SetTile(78); progressbarEmptyImg.SetTile(78);
progressbarImg.SetPosition(80, 40); progressbarImg.SetPosition(80, 40);
msgTxt.SetMaxWidth(380);
} }
prTxt.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
prTxt.SetPosition(0, 40);
timeTxt.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
timeTxt.SetPosition(0,-50);
promptWindow.Append(&dialogBoxImg); promptWindow.Append(&dialogBoxImg);
promptWindow.Append(&titleTxt); promptWindow.Append(&titleTxt);
promptWindow.Append(&msgTxt); promptWindow.Append(&msgTxt);
@ -1607,7 +1610,7 @@ ProgressWindow(const char *title, const char *msg)
mainWindow->Append(&promptWindow); mainWindow->Append(&promptWindow);
mainWindow->ChangeFocus(&promptWindow); mainWindow->ChangeFocus(&promptWindow);
ResumeGui(); ResumeGui();
promptWindow.Append(&prTxt);
s32 ret; s32 ret;
ret = wbfs_add_disc(hdd, __WBFS_ReadDVD, NULL, ShowProgress, ONLY_GAME_PARTITION, 0); ret = wbfs_add_disc(hdd, __WBFS_ReadDVD, NULL, ShowProgress, ONLY_GAME_PARTITION, 0);
@ -1650,25 +1653,22 @@ ProgressDownloadWindow(int choice2)
GuiImageData dialogBox(dialogue_box_png); GuiImageData dialogBox(dialogue_box_png);
GuiImage dialogBoxImg(&dialogBox); GuiImage dialogBoxImg(&dialogBox);
if (Settings.wsprompt == yes){ if (Settings.wsprompt == yes){
dialogBoxImg.SetWidescreen(CFG.widescreen);}/////////// dialogBoxImg.SetWidescreen(CFG.widescreen);}
GuiImageData progressbarOutline(progressbar_outline_png); GuiImageData progressbarOutline(progressbar_outline_png);
GuiImage progressbarOutlineImg(&progressbarOutline); GuiImage progressbarOutlineImg(&progressbarOutline);
if (Settings.wsprompt == yes){ if (Settings.wsprompt == yes){
progressbarOutlineImg.SetWidescreen(CFG.widescreen);}/////////// progressbarOutlineImg.SetWidescreen(CFG.widescreen);}
progressbarOutlineImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); progressbarOutlineImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
progressbarOutlineImg.SetPosition(25, 40); progressbarOutlineImg.SetPosition(25, 40);
GuiImageData progressbarEmpty(progressbar_empty_png); GuiImageData progressbarEmpty(progressbar_empty_png);
GuiImage progressbarEmptyImg(&progressbarEmpty); GuiImage progressbarEmptyImg(&progressbarEmpty);
if (Settings.wsprompt == yes){
progressbarEmptyImg.SetWidescreen(CFG.widescreen);}///////////
progressbarEmptyImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); progressbarEmptyImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
progressbarEmptyImg.SetPosition(25, 40); progressbarEmptyImg.SetPosition(25, 40);
progressbarEmptyImg.SetTile(100); progressbarEmptyImg.SetTile(100);
GuiImageData progressbar(progressbar_png); GuiImageData progressbar(progressbar_png);
progressbarImg.SetWidescreen(CFG.widescreen);
progressbarImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); progressbarImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
progressbarImg.SetPosition(25, 40); progressbarImg.SetPosition(25, 40);
@ -1690,7 +1690,7 @@ ProgressDownloadWindow(int choice2)
GuiText btn1Txt("Cancel", 22, (GXColor){0, 0, 0, 255}); GuiText btn1Txt("Cancel", 22, (GXColor){0, 0, 0, 255});
GuiImage btn1Img(&btnOutline); GuiImage btn1Img(&btnOutline);
if (Settings.wsprompt == yes){ if (Settings.wsprompt == yes){
btn1Img.SetWidescreen(CFG.widescreen);}/////////// btn1Img.SetWidescreen(CFG.widescreen);}
GuiButton btn1(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton btn1(btnOutline.GetWidth(), btnOutline.GetHeight());
btn1.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM); btn1.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
btn1.SetPosition(0, -45); btn1.SetPosition(0, -45);
@ -1751,7 +1751,7 @@ ProgressDownloadWindow(int choice2)
sprintf(prozent, "%i%%", 100*i/cntMissFiles); sprintf(prozent, "%i%%", 100*i/cntMissFiles);
prTxt.SetText(prozent); prTxt.SetText(prozent);
prTxt.SetFont(fontClock); //prTxt.SetFont(fontClock);
if ((Settings.wsprompt == yes) && (CFG.widescreen)){/////////////adjust for widescreen if ((Settings.wsprompt == yes) && (CFG.widescreen)){/////////////adjust for widescreen
progressbarImg.SetPosition(80,40); progressbarImg.SetPosition(80,40);