diff --git a/UI/Settings/GraphicsPage.cpp b/UI/Settings/GraphicsPage.cpp index 50fa61ff23..00e2b65232 100644 --- a/UI/Settings/GraphicsPage.cpp +++ b/UI/Settings/GraphicsPage.cpp @@ -93,6 +93,49 @@ static void OnRenderingDevice(SettingsPageHost *host) { } } +static void BuildSpeedHacksPage(SettingsPage *page) { + using namespace UI; + + page->Header(); + + page->Setting(&g_Config.iFrameSkip).EnabledFunc([] { + return !g_Config.bAutoFrameSkip; + }).Setup([](View *view) { + PopupMultiChoice *choice = static_cast(view); + choice->SetChoicesUntranslated(1, choice->NumChoices() - 1); + }); + + page->Setting(&g_Config.bAutoFrameSkip); + + page->Header(); + + page->Setting(&g_Config.bSkipBufferEffects).Disabled(&g_Config.bSoftwareRendering); + page->Hint({I18NCat::GRAPHICS, "RenderingMode NonBuffered Tip", "Faster, but graphics may be missing in some games"}); + + page->Setting(&g_Config.iSkipGPUReadbackMode).Disabled(&g_Config.bSoftwareRendering).Setup([](View *view) { + static_cast(view)->SetDefault(0); + }); + + page->Setting(&g_Config.iDepthRasterMode).Disabled(&g_Config.bSoftwareRendering).Setup([](View *view) { + PopupMultiChoice *depthRasterMode = static_cast(view); + depthRasterMode->SetChoiceIcon(3, ImageID("I_WARNING")); // It's a performance trap. + depthRasterMode->SetDefault(DefaultDepthRaster()); + if (g_Config.iDepthRasterMode != 3) + depthRasterMode->HideChoice(3); + }); +} + +static void BuildCardboardVRPage(SettingsPage *page) { + page->Header(); + + DisplayLayoutConfig &config = g_Config.GetDisplayLayoutConfig(g_display.GetDeviceOrientation()); + + page->Setting(&config.bEnableCardboardVR); + page->Setting(&config.iCardboardScreenSize).Enabled(&config.bEnableCardboardVR); + page->Setting(&config.iCardboardXShift).Enabled(&config.bEnableCardboardVR); + page->Setting(&config.iCardboardYShift).Enabled(&config.bEnableCardboardVR); +} + void BuildGraphicsSettings(SettingsPage *page) { using namespace UI; SettingsPageHost *host = page->Host(); @@ -257,32 +300,10 @@ void BuildGraphicsSettings(SettingsPage *page) { page->Setting(&g_Config.iAnalogAltSpeedPercent); } - page->Header({ I18NCat::GRAPHICS, "Speed Hacks", "Speed Hacks (can cause rendering errors!)" }); - - page->Setting(&g_Config.iFrameSkip).EnabledFunc([] { - return !g_Config.bAutoFrameSkip; - }).Setup([](View *view) { - PopupMultiChoice *choice = static_cast(view); - choice->SetChoicesUntranslated(1, choice->NumChoices() - 1); - }); - - page->Setting(&g_Config.bAutoFrameSkip); - - page->Setting(&g_Config.bSkipBufferEffects).Disabled(&g_Config.bSoftwareRendering); - page->Hint({ I18NCat::GRAPHICS, "RenderingMode NonBuffered Tip", "Faster, but graphics may be missing in some games" }); - - page->Setting(&g_Config.iSkipGPUReadbackMode).Disabled(&g_Config.bSoftwareRendering).Setup([](View *view) { - static_cast(view)->SetDefault(0); - }); - - page->Setting(&g_Config.iDepthRasterMode).Disabled(&g_Config.bSoftwareRendering).Setup([](View *view) { - PopupMultiChoice *depthRasterMode = static_cast(view); - depthRasterMode->SetChoiceIcon(3, ImageID("I_WARNING")); // It's a performance trap. - depthRasterMode->SetDefault(DefaultDepthRaster()); - if (g_Config.iDepthRasterMode != 3) - depthRasterMode->HideChoice(3); - }); + page->Header(); + page->Link({I18NCat::GRAPHICS, "Speed Hacks"}, I18NCat::GRAPHICS, &BuildSpeedHacksPage); + page->Header(); page->Setting(&g_Config.iBloomHack).EnabledFunc([] { return !g_Config.bSoftwareRendering && g_Config.iInternalResolution != 1; }); @@ -355,12 +376,10 @@ void BuildGraphicsSettings(SettingsPage *page) { // If you enabled it through the ini, you can see this. Useful for testing. bool showCardboardSettings = config.bEnableCardboardVR; #endif + // showCardboardSettings = true; // for testing ONLY if (showCardboardSettings) { - page->Header("Cardboard VR Settings"); - page->Setting(&config.bEnableCardboardVR); - page->Setting(&config.iCardboardScreenSize).Enabled(&config.bEnableCardboardVR); - page->Setting(&config.iCardboardXShift).Enabled(&config.bEnableCardboardVR); - page->Setting(&config.iCardboardYShift).Enabled(&config.bEnableCardboardVR); + page->Header(); + page->Link({I18NCat::GRAPHICS, "Cardboard VR Settings"}, I18NCat::GRAPHICS, &BuildCardboardVRPage); } page->Header("Overlay Information"); diff --git a/UI/Settings/SystemPage.cpp b/UI/Settings/SystemPage.cpp index 163a5f4730..972bc58345 100644 --- a/UI/Settings/SystemPage.cpp +++ b/UI/Settings/SystemPage.cpp @@ -273,6 +273,26 @@ static void OnRestoreDefaultSettings(SettingsPageHost *host, SystemPageState *st } } +// Using SYSTEM translations +static void BuildPSPSettingsPage(SettingsPage *page) { + SettingsPageHost *host = page->Host(); + + page->Header("PSP Settings"); + + // The ordering here is simply mapping directly to PSP_SYSTEMPARAM_LANGUAGE_*. + page->Setting(&g_Config.iLanguage); + page->Setting(&g_Config.iPSPModel).EnabledFunc([] { + return !PSP_IsInited(); + }); + page->Custom("Nickname", [host](UI::ViewGroup *parent) { + return AddNicknameChoice(host, parent); + }); + page->Setting(&g_Config.bDayLightSavings); + page->Setting(&g_Config.iDateFormat); + page->Setting(&g_Config.iTimeFormat); + page->Setting(&g_Config.iButtonPreference); +} + void BuildSystemSettings(SettingsPage *page, SystemPageState *state) { using namespace UI; @@ -380,6 +400,9 @@ void BuildSystemSettings(SettingsPage *page, SystemPageState *state) { page->Setting(&g_Config.fUISaturation).LiveUpdate().Setup(noDropShadow); } + page->Header(); + page->Link({I18NCat::SYSTEM, "PSP Settings"}, I18NCat::SYSTEM, &BuildPSPSettingsPage); + page->Header("PSP Memory Stick"); if (System_GetPropertyBool(SYSPROP_HAS_OPEN_DIRECTORY)) { @@ -525,21 +548,6 @@ void BuildSystemSettings(SettingsPage *page, SystemPageState *state) { page->Setting(&g_Config.bEnableCheats); page->Setting(&g_Config.bEnablePlugins); - page->Header("PSP Settings"); - - // The ordering here is simply mapping directly to PSP_SYSTEMPARAM_LANGUAGE_*. - page->Setting(&g_Config.iLanguage); - page->Setting(&g_Config.iPSPModel).EnabledFunc([] { - return !PSP_IsInited(); - }); - page->Custom("Nickname", [host](UI::ViewGroup *parent) { - return AddNicknameChoice(host, parent); - }); - page->Setting(&g_Config.bDayLightSavings); - page->Setting(&g_Config.iDateFormat); - page->Setting(&g_Config.iTimeFormat); - page->Setting(&g_Config.iButtonPreference); - #if defined(_WIN32) page->Header("Recording"); page->Setting(&g_Config.bDumpFrames);