From db575d559f12604ac3011d59e7e9588255a80ebb Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 18 Aug 2013 20:14:33 +0200 Subject: [PATCH] Delete the NewUI setting, effectively forcing it on --- Core/Config.cpp | 2 -- Core/Config.h | 1 - UI/EmuScreen.cpp | 31 ++++++------------------------- UI/GameSettingsScreen.cpp | 1 - UI/MenuScreens.cpp | 7 +------ UI/MiscScreens.cpp | 5 +---- 6 files changed, 8 insertions(+), 39 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 97f54589c6..264ef8373e 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -50,7 +50,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) bSpeedLimit = false; general->Get("FirstRun", &bFirstRun, true); - general->Get("NewUI", &bNewUI, true); general->Get("Enable Logging", &bEnableLogging, true); general->Get("AutoLoadLast", &bAutoLoadLast, false); general->Get("AutoRun", &bAutoRun, true); @@ -218,7 +217,6 @@ void Config::Save() // Need to do this somewhere... bFirstRun = false; general->Set("FirstRun", bFirstRun); - general->Set("NewUI", bNewUI); general->Set("Enable Logging", bEnableLogging); general->Set("AutoLoadLast", bAutoLoadLast); general->Set("AutoRun", bAutoRun); diff --git a/Core/Config.h b/Core/Config.h index 8396742313..a82b28dfcf 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -46,7 +46,6 @@ public: #endif // General - bool bNewUI; int iNumWorkerThreads; bool bScreenshotsAsPNG; bool bEnableLogging; diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 3f54bebf06..be40e6ec61 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -126,10 +126,7 @@ void EmuScreen::dialogFinished(const Screen *dialog, DialogResult result) { // DR_CANCEL means clicked on "continue", DR_OK means clicked on "back to menu", // DR_YES means a message sent to PauseMenu by NativeMessageReceived. if (result == DR_OK) { - if (g_Config.bNewUI) - screenManager()->switchScreen(new MainScreen()); - else - screenManager()->switchScreen(new MenuScreen()); + screenManager()->switchScreen(new MainScreen()); } else if (result == DR_YES) { PauseScreen::Message* msg = (PauseScreen::Message*)((Screen*)dialog)->dialogData(); @@ -147,19 +144,13 @@ void EmuScreen::sendMessage(const char *message, const char *value) { if (!strcmp(message, "pause")) { screenManager()->push(new PauseScreen()); } else if (!strcmp(message, "stop")) { - if (g_Config.bNewUI) - screenManager()->switchScreen(new MainScreen()); - else - screenManager()->switchScreen(new MenuScreen()); + screenManager()->switchScreen(new MainScreen()); } else if (!strcmp(message, "reset")) { PSP_Shutdown(); std::string resetError; if (!PSP_Init(PSP_CoreParameter(), &resetError)) { ELOG("Error resetting: %s", resetError.c_str()); - if (g_Config.bNewUI) - screenManager()->switchScreen(new MainScreen()); - else - screenManager()->switchScreen(new MenuScreen()); + screenManager()->switchScreen(new MainScreen()); return; } host->BootDone(); @@ -224,10 +215,7 @@ void EmuScreen::onVKeyDown(int virtualKeyCode) { // Should get rid of that but not now. #ifndef ANDROID case VIRTKEY_PAUSE: - if (g_Config.bNewUI) - screenManager()->push(new GamePauseScreen(gamePath_)); - else - screenManager()->push(new PauseScreen()); + screenManager()->push(new GamePauseScreen(gamePath_)); break; #endif @@ -455,11 +443,7 @@ void EmuScreen::update(InputState &input) { // This is here to support the iOS on screen back button. if (pauseTrigger_) { pauseTrigger_ = false; - if (g_Config.bNewUI) { - screenManager()->push(new GamePauseScreen(gamePath_)); - } else { - screenManager()->push(new PauseScreen()); - } + screenManager()->push(new GamePauseScreen(gamePath_)); } } @@ -484,10 +468,7 @@ void EmuScreen::render() { coreState = CORE_RUNNING; } else if (coreState == CORE_POWERDOWN) { ILOG("SELF-POWERDOWN!"); - if (g_Config.bNewUI) - screenManager()->switchScreen(new MainScreen()); - else - screenManager()->switchScreen(new MenuScreen()); + screenManager()->switchScreen(new MainScreen()); } if (invalid_) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 329fdf0ce2..c38ba36dd0 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -433,7 +433,6 @@ void GlobalSettingsScreen::CreateViews() { LinearLayout *list = root_->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f))); list->Add(new ItemHeader(g->T("General"))); - list->Add(new CheckBox(&g_Config.bNewUI, gs->T("Enable New UI"))); list->Add(new CheckBox(&enableReports_, gs->T("Enable Compatibility Server Reports"))); #ifndef ANDROID // Need to move the cheat config dir somewhere where it can be read/written on android diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index 252c63792c..fbcbc9f7c5 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -768,8 +768,6 @@ void DeveloperScreen::render() { g_Config.sReportHost = reportingEnabled ? reportHostOfficial : ""; } - UICheckBox(GEN_ID, x, y += stride, d->T("New UI"), ALIGN_TOPLEFT, &g_Config.bNewUI); - VLinear vlinear(x, y + stride + 12, 16); if (UIButton(GEN_ID, Pos(dp_xres - 10, dp_yres - 10), LARGE_BUTTON_WIDTH, 0, g->T("Back"), ALIGN_RIGHT | ALIGN_BOTTOM)) { @@ -1490,10 +1488,7 @@ void SystemScreen::render() { ui_draw2d.DrawTextShadow(UBUNTU24, lang, x, y += stride, 0xFFFFFFFF, ALIGN_LEFT); HLinear hlinear2(x + 400, y, 20); if (UIButton(GEN_ID, hlinear2, 220, 0, s->T("Language"), ALIGN_TOPLEFT)) { - if (g_Config.bNewUI) - screenManager()->push(new NewLanguageScreen()); - else - screenManager()->push(new LanguageScreen()); + screenManager()->push(new NewLanguageScreen()); } y+=20; diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 2f538c199e..413a5179bb 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -159,10 +159,7 @@ void LogoScreen::Next() { if (bootFilename_.size()) { screenManager()->switchScreen(new EmuScreen(bootFilename_)); } else { - if (g_Config.bNewUI) - screenManager()->switchScreen(new MainScreen()); - else - screenManager()->switchScreen(new MenuScreen()); + screenManager()->switchScreen(new MainScreen()); } }