diff --git a/main/source/Prompts/prompt_device.cpp b/main/source/Prompts/prompt_device.cpp index 9ff6af0..1d2cedb 100644 --- a/main/source/Prompts/prompt_device.cpp +++ b/main/source/Prompts/prompt_device.cpp @@ -22,7 +22,11 @@ int devicePrompt() bool stop = false; int device = -1; +#ifndef VWII GuiWindow promptWindow(328,64); +#else + GuiWindow promptWindow(144,64); +#endif promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); promptWindow.SetPosition(-135, 280); GuiTrigger trigA; @@ -31,7 +35,11 @@ int devicePrompt() trigB.SetButtonOnlyTrigger(-1, WPAD_BUTTON_B | WPAD_CLASSIC_BUTTON_B, PAD_BUTTON_B); // Hintergrund +#ifndef VWII GuiImageData dialogBox(Theme.choice_large); +#else + GuiImageData dialogBox(Theme.choice); +#endif GuiImage dialogBoxImg(&dialogBox); // button data @@ -48,9 +56,9 @@ int devicePrompt() GuiImageData gca_BtnImgDataOver(Theme.gca_active); GuiImageData gcb_BtnImgData(Theme.gcb_inactive); GuiImageData gcb_BtnImgDataOver(Theme.gcb_active); -#endif GuiImageData all_BtnImgData(Theme.all_inactive); GuiImageData all_BtnImgDataOver(Theme.all_active); +#endif // button GuiImage sd_BtnImg(&sd_BtnImgData); @@ -60,8 +68,8 @@ int devicePrompt() GuiImage dvd_BtnImg(&dvd_BtnImgData); GuiImage gca_BtnImg(&gca_BtnImgData); GuiImage gcb_BtnImg(&gca_BtnImgData); -#endif GuiImage all_BtnImg(&all_BtnImgData); +#endif // button over GuiImage sd_BtnImgOver(&sd_BtnImgDataOver); @@ -71,8 +79,8 @@ int devicePrompt() GuiImage dvd_BtnImgOver(&dvd_BtnImgDataOver); GuiImage gca_BtnImgOver(&gca_BtnImgDataOver); GuiImage gcb_BtnImgOver(&gca_BtnImgDataOver); -#endif GuiImage all_BtnImgOver(&all_BtnImgDataOver); +#endif GuiButton sd_Btn(sd_BtnImgData.GetWidth(), sd_BtnImgData.GetHeight()); sd_Btn.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); @@ -115,14 +123,14 @@ int devicePrompt() gcb_Btn.SetImage(&gcb_BtnImg); gcb_Btn.SetImageOver(&gcb_BtnImgOver); gcb_Btn.SetTrigger(&trigA); -#endif + GuiButton all_Btn(all_BtnImgData.GetWidth(), all_BtnImgData.GetHeight()); all_Btn.SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE); all_Btn.SetPosition(-8, 0); all_Btn.SetImage(&all_BtnImg); all_Btn.SetImageOver(&all_BtnImgOver); all_Btn.SetTrigger(&trigA); - +#endif GuiButton back(0, 0); back.SetTrigger(&trigB); @@ -134,8 +142,8 @@ int devicePrompt() promptWindow.Append(&dvd_Btn); promptWindow.Append(&gca_Btn); promptWindow.Append(&gcb_Btn); -#endif promptWindow.Append(&all_Btn); +#endif promptWindow.Append(&back); HaltGui(); @@ -183,13 +191,13 @@ int devicePrompt() device = 6; stop = true; } -#endif + if(all_Btn.GetState() == STATE_CLICKED) { device = 7; stop = true; } - +#endif if(back.GetState() == STATE_CLICKED) stop = true; } diff --git a/svnrev/svnrev.c b/svnrev/svnrev.c index 38fe44e..f7da99e 100644 --- a/svnrev/svnrev.c +++ b/svnrev/svnrev.c @@ -1,4 +1,4 @@ -#define SVN_REV 45 +#define SVN_REV 46 int SvnRev() { diff --git a/web/updates b/web/updates index 1095759..ff7aed9 100644 --- a/web/updates +++ b/web/updates @@ -1,3 +1,9 @@ +//rev46: +- fix size and layout of device prompt in vWii builds +- remove 'All' button from device prompt in vWii builds +- re-enable 'SD Gecko' setting in vWii builds +- update german translation + //rev45: - built against libruntimeiospatch 1.5.2 - fixed loading newly downloaded HomebrewFilter from online