From 2f40cee1d4e21a7a320e9ed5bbc17086474a7b8a Mon Sep 17 00:00:00 2001 From: Zalo Date: Sat, 5 Jan 2019 11:04:44 +0100 Subject: [PATCH 1/2] removed ImageFolder and getting it from PreviewImage and the folders --- source/menu.cpp | 5 +---- source/preferences.cpp | 3 --- source/vbagx.cpp | 10 ++++++++++ source/vbagx.h | 4 +++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/source/menu.cpp b/source/menu.cpp index cd2d07b..5ab4b85 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -1021,7 +1021,7 @@ static int MenuGameSelection() if(previousBrowserIndex != browser.selIndex) { previousBrowserIndex = browser.selIndex; - snprintf(imagePath, MAXJOLIET, "%s%s/%s.png", pathPrefix[GCSettings.LoadMethod], GCSettings.ImageFolder, browserList[browser.selIndex].displayname); + snprintf(imagePath, MAXJOLIET, "%s%s/%s.png", pathPrefix[GCSettings.LoadMethod], ImageFolder(), browserList[browser.selIndex].displayname); AllocSaveBuffer(); int width, height; @@ -3803,15 +3803,12 @@ static int MenuSettingsMenu() { case 0: sprintf(options.value[6], "Screenshots"); - snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.ScreenshotsFolder); break; case 1: sprintf(options.value[6], "Covers"); - snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.CoverFolder); break; case 2: sprintf(options.value[6], "Artwork"); - snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.ArtworkFolder); break; } optionBrowser.TriggerUpdate(); diff --git a/source/preferences.cpp b/source/preferences.cpp index 774a315..65646f8 100644 --- a/source/preferences.cpp +++ b/source/preferences.cpp @@ -174,7 +174,6 @@ preparePrefsData () createXMLSetting("BorderFolder", "SGB Borders Folder", GCSettings.BorderFolder); createXMLSetting("CoverFolder", "Covers Folder", GCSettings.CoverFolder); createXMLSetting("ArtworkFolder", "Artwork Folder", GCSettings.ArtworkFolder); - createXMLSetting("ImageFolder", "Image Folder", GCSettings.ImageFolder); createXMLSection("Network", "Network Settings"); @@ -490,7 +489,6 @@ decodePrefsData () loadXMLSetting(GCSettings.BorderFolder, "BorderFolder", sizeof(GCSettings.BorderFolder)); loadXMLSetting(GCSettings.CoverFolder, "CoverFolder", sizeof(GCSettings.CoverFolder)); loadXMLSetting(GCSettings.ArtworkFolder, "ArtworkFolder", sizeof(GCSettings.ArtworkFolder)); - loadXMLSetting(GCSettings.ImageFolder, "ImageFolder", sizeof(GCSettings.ImageFolder)); // Network Settings @@ -638,7 +636,6 @@ DefaultSettings () sprintf (GCSettings.BorderFolder, "%s/borders", APPFOLDER); sprintf (GCSettings.CoverFolder, "%s/covers", APPFOLDER); // Path to cover files sprintf (GCSettings.ArtworkFolder, "%s/artwork", APPFOLDER); // Path to artwork files - sprintf (GCSettings.ImageFolder, "%s/screenshots", APPFOLDER); GCSettings.AutoLoad = 1; GCSettings.AutoSave = 1; diff --git a/source/vbagx.cpp b/source/vbagx.cpp index 681dbe7..f9b460a 100644 --- a/source/vbagx.cpp +++ b/source/vbagx.cpp @@ -469,3 +469,13 @@ int main(int argc, char *argv[]) } // main loop return 0; } + +char* ImageFolder() +{ + switch(GCSettings.PreviewImage) + { + case 1 : return GCSettings.CoverFolder; break; + case 2 : return GCSettings.ArtworkFolder; break; + default: return GCSettings.ScreenshotsFolder; break; + } +} diff --git a/source/vbagx.h b/source/vbagx.h index 2febf5b..7f993a0 100644 --- a/source/vbagx.h +++ b/source/vbagx.h @@ -107,7 +107,6 @@ struct SGCSettings char ScreenshotsFolder[MAXPATHLEN]; //Path to screenshots files char CoverFolder[MAXPATHLEN]; //Path to cover files char ArtworkFolder[MAXPATHLEN]; //Path to artwork files - char ImageFolder[MAXPATHLEN]; //Saved image folder path char BorderFolder[MAXPATHLEN]; // Path to Super Game Boy border files char smbip[80]; @@ -115,6 +114,9 @@ struct SGCSettings char smbpwd[20]; char smbshare[20]; }; + +char* ImageFolder(); + void ExitApp(); void ShutdownWii(); bool SupportedIOS(u32 ios); From 36aedc24c41cf30ea8352226505998033ba35aa9 Mon Sep 17 00:00:00 2001 From: Zalo Date: Sat, 5 Jan 2019 13:18:57 +0100 Subject: [PATCH 2/2] swapping preiews with + button --- source/menu.cpp | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/source/menu.cpp b/source/menu.cpp index 5ab4b85..fd4e858 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -928,8 +928,15 @@ static int MenuGameSelection() gameBrowser.SetPosition(20, 98); ResetBrowser(); + GuiTrigger trigPlusMinus; + trigPlusMinus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_PLUS | WPAD_CLASSIC_BUTTON_PLUS, PAD_TRIGGER_Z, WIIDRC_BUTTON_PLUS); + GuiImage bgPreview(&bgPreviewImg); - bgPreview.SetPosition(365, 98); + GuiButton bgPreviewBtn(bgPreview.GetWidth(), bgPreview.GetHeight()); + bgPreviewBtn.SetImage(&bgPreview); + bgPreviewBtn.SetPosition(365, 98); + bgPreviewBtn.SetTrigger(&trigPlusMinus); + int previousPreviewImg = GCSettings.PreviewImage; GuiImage preview; preview.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); @@ -944,7 +951,7 @@ static int MenuGameSelection() mainWindow->Append(&titleTxt); mainWindow->Append(&gameBrowser); mainWindow->Append(&buttonWindow); - mainWindow->Append(&bgPreview); + mainWindow->Append(&bgPreviewBtn); mainWindow->Append(&preview); ResumeGui(); @@ -1018,9 +1025,10 @@ static int MenuGameSelection() } //update gamelist image - if(previousBrowserIndex != browser.selIndex) + if(previousBrowserIndex != browser.selIndex || previousPreviewImg != GCSettings.PreviewImage) { previousBrowserIndex = browser.selIndex; + previousPreviewImg = GCSettings.PreviewImage; snprintf(imagePath, MAXJOLIET, "%s%s/%s.png", pathPrefix[GCSettings.LoadMethod], ImageFolder(), browserList[browser.selIndex].displayname); AllocSaveBuffer(); @@ -1048,6 +1056,11 @@ static int MenuGameSelection() menu = MENU_SETTINGS; else if(exitBtn.GetState() == STATE_CLICKED) ExitRequested = 1; + else if(bgPreviewBtn.GetState() == STATE_CLICKED) + { + GCSettings.PreviewImage = (GCSettings.PreviewImage + 1) % 3; + bgPreviewBtn.ResetState(); + } } HaltParseThread(); // halt parsing @@ -1056,7 +1069,7 @@ static int MenuGameSelection() mainWindow->Remove(&titleTxt); mainWindow->Remove(&buttonWindow); mainWindow->Remove(&gameBrowser); - mainWindow->Remove(&bgPreview); + mainWindow->Remove(&bgPreviewBtn); mainWindow->Remove(&preview); MEM_DEALLOC(imgBuffer); return menu;