From 2d5c6ed6c4e09df90e03519be934e28045a88265 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 22 May 2021 22:48:44 +0200 Subject: [PATCH] Standardized some GuiMenu function names. --- es-app/src/guis/GuiMenu.cpp | 20 ++++++++++---------- es-app/src/guis/GuiMenu.h | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index c7447ba57..15e91baaf 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -41,19 +41,19 @@ GuiMenu::GuiMenu(Window* window) : GuiComponent(window), bool isFullUI = UIModeController::getInstance()->isUIModeFull(); if (isFullUI) - addEntry("SCRAPER", 0x777777FF, true, [this] { openScraperSettings(); }); + addEntry("SCRAPER", 0x777777FF, true, [this] { openScraperOptions(); }); if (isFullUI) - addEntry("UI SETTINGS", 0x777777FF, true, [this] { openUISettings(); }); + addEntry("UI SETTINGS", 0x777777FF, true, [this] { openUIOptions(); }); - addEntry("SOUND SETTINGS", 0x777777FF, true, [this] { openSoundSettings(); }); + addEntry("SOUND SETTINGS", 0x777777FF, true, [this] { openSoundOptions(); }); if (isFullUI) addEntry("GAME COLLECTION SETTINGS", 0x777777FF, true, [this] { - openCollectionSystemSettings(); }); + openCollectionSystemOptions(); }); if (isFullUI) - addEntry("OTHER SETTINGS", 0x777777FF, true, [this] { openOtherSettings(); }); + addEntry("OTHER SETTINGS", 0x777777FF, true, [this] { openOtherOptions(); }); if (isFullUI) addEntry("CONFIGURE INPUT", 0x777777FF, true, [this] { openConfigInput(); }); @@ -81,12 +81,12 @@ GuiMenu::~GuiMenu() ViewController::get()->stopScrolling(); } -void GuiMenu::openScraperSettings() +void GuiMenu::openScraperOptions() { mWindow->pushGui(new GuiScraperMenu(mWindow, "SCRAPER")); } -void GuiMenu::openUISettings() +void GuiMenu::openUIOptions() { auto s = new GuiSettings(mWindow, "UI SETTINGS"); @@ -539,7 +539,7 @@ void GuiMenu::openUISettings() mWindow->pushGui(s); } -void GuiMenu::openSoundSettings() +void GuiMenu::openSoundOptions() { auto s = new GuiSettings(mWindow, "SOUND SETTINGS"); @@ -750,7 +750,7 @@ void GuiMenu::openSoundSettings() mWindow->pushGui(s); } -void GuiMenu::openOtherSettings() +void GuiMenu::openOtherOptions() { auto s = new GuiSettings(mWindow, "OTHER SETTINGS"); @@ -1191,7 +1191,7 @@ void GuiMenu::openScreensaverOptions() mWindow->pushGui(new GuiScreensaverOptions(mWindow, "SCREENSAVER SETTINGS")); } -void GuiMenu::openCollectionSystemSettings() +void GuiMenu::openCollectionSystemOptions() { mWindow->pushGui(new GuiCollectionSystemsOptions(mWindow, "GAME COLLECTION SETTINGS")); } diff --git a/es-app/src/guis/GuiMenu.h b/es-app/src/guis/GuiMenu.h index 5b35d2804..5332a9b68 100644 --- a/es-app/src/guis/GuiMenu.h +++ b/es-app/src/guis/GuiMenu.h @@ -30,13 +30,13 @@ private: bool add_arrow, const std::function& func); void addVersionInfo(); - void openScraperSettings(); - void openUISettings(); + void openScraperOptions(); + void openUIOptions(); void openMediaViewerOptions(); void openScreensaverOptions(); - void openSoundSettings(); - void openCollectionSystemSettings(); - void openOtherSettings(); + void openSoundOptions(); + void openCollectionSystemOptions(); + void openOtherOptions(); void openConfigInput(); void openQuitMenu();