From 72a077d6f28346edfcbcbcd50cda021a18fa3815 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 5 Nov 2020 18:35:08 +0100 Subject: [PATCH] Renamed GuiGeneralScreensaverOptions to GuiScreensaverOptions. --- es-app/CMakeLists.txt | 4 +-- .../src/guis/GuiGeneralScreensaverOptions.h | 25 ------------------- es-app/src/guis/GuiMenu.cpp | 4 +-- ...rOptions.cpp => GuiScreensaverOptions.cpp} | 14 +++++------ es-app/src/guis/GuiScreensaverOptions.h | 25 +++++++++++++++++++ 5 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 es-app/src/guis/GuiGeneralScreensaverOptions.h rename es-app/src/guis/{GuiGeneralScreensaverOptions.cpp => GuiScreensaverOptions.cpp} (97%) create mode 100644 es-app/src/guis/GuiScreensaverOptions.h diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 5026c617d..f6e2b4b7e 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -17,7 +17,7 @@ set(ES_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.h ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.h ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGeneralScreensaverOptions.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScreensaverOptions.h ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.h ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.h ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMenu.h @@ -65,7 +65,7 @@ set(ES_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGeneralScreensaverOptions.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScreensaverOptions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMenu.cpp diff --git a/es-app/src/guis/GuiGeneralScreensaverOptions.h b/es-app/src/guis/GuiGeneralScreensaverOptions.h deleted file mode 100644 index 817550ad0..000000000 --- a/es-app/src/guis/GuiGeneralScreensaverOptions.h +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-License-Identifier: MIT -// -// EmulationStation Desktop Edition -// GuiGeneralScreensaverOptions.h -// -// User interface for the screensaver options. -// Submenu to the GuiMenu main menu. -// - -#ifndef ES_APP_GUIS_GUI_GENERAL_SCREENSAVER_OPTIONS_H -#define ES_APP_GUIS_GUI_GENERAL_SCREENSAVER_OPTIONS_H - -#include "guis/GuiSettings.h" - -class GuiGeneralScreensaverOptions : public GuiSettings -{ -public: - GuiGeneralScreensaverOptions(Window* window, const char* title); - -private: - void openSlideshowScreensaverOptions(); - void openVideoScreensaverOptions(); -}; - -#endif // ES_APP_GUIS_GUI_GENERAL_SCREENSAVER_OPTIONS_H diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index 84c633f6a..aa18ff617 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -15,7 +15,7 @@ #include "guis/GuiCollectionSystemsOptions.h" #include "guis/GuiComplexTextEditPopup.h" #include "guis/GuiDetectDevice.h" -#include "guis/GuiGeneralScreensaverOptions.h" +#include "guis/GuiScreensaverOptions.h" #include "guis/GuiMsgBox.h" #include "guis/GuiScraperMenu.h" #include "guis/GuiSettings.h" @@ -895,7 +895,7 @@ void GuiMenu::addVersionInfo() } void GuiMenu::openScreensaverOptions() { - mWindow->pushGui(new GuiGeneralScreensaverOptions(mWindow, "SCREENSAVER SETTINGS")); + mWindow->pushGui(new GuiScreensaverOptions(mWindow, "SCREENSAVER SETTINGS")); } void GuiMenu::openCollectionSystemSettings() { diff --git a/es-app/src/guis/GuiGeneralScreensaverOptions.cpp b/es-app/src/guis/GuiScreensaverOptions.cpp similarity index 97% rename from es-app/src/guis/GuiGeneralScreensaverOptions.cpp rename to es-app/src/guis/GuiScreensaverOptions.cpp index 195f4b73c..92e8bf18b 100644 --- a/es-app/src/guis/GuiGeneralScreensaverOptions.cpp +++ b/es-app/src/guis/GuiScreensaverOptions.cpp @@ -1,13 +1,13 @@ // SPDX-License-Identifier: MIT // // EmulationStation Desktop Edition -// GuiGeneralScreensaverOptions.cpp +// GuiScreensaverOptions.cpp // // User interface for the screensaver options. // Submenu to the GuiMenu main menu. // -#include "guis/GuiGeneralScreensaverOptions.h" +#include "guis/GuiScreensaverOptions.h" #include "components/OptionListComponent.h" #include "components/SliderComponent.h" @@ -15,7 +15,7 @@ #include "guis/GuiMsgBox.h" #include "Settings.h" -GuiGeneralScreensaverOptions::GuiGeneralScreensaverOptions(Window* window, const char* title) +GuiScreensaverOptions::GuiScreensaverOptions(Window* window, const char* title) : GuiSettings(window, title) { // Screensaver timer. @@ -84,7 +84,7 @@ GuiGeneralScreensaverOptions::GuiGeneralScreensaverOptions(Window* window, const "SLIDESHOW SCREENSAVER SETTINGS", Font::get(FONT_SIZE_MEDIUM), 0x777777FF), true); row.addElement(makeArrow(mWindow), false); row.makeAcceptInputHandler(std::bind( - &GuiGeneralScreensaverOptions::openSlideshowScreensaverOptions, this)); + &GuiScreensaverOptions::openSlideshowScreensaverOptions, this)); addRow(row); row.elements.clear(); @@ -92,11 +92,11 @@ GuiGeneralScreensaverOptions::GuiGeneralScreensaverOptions(Window* window, const "VIDEO SCREENSAVER SETTINGS", Font::get(FONT_SIZE_MEDIUM), 0x777777FF), true); row.addElement(makeArrow(mWindow), false); row.makeAcceptInputHandler(std::bind( - &GuiGeneralScreensaverOptions::openVideoScreensaverOptions, this)); + &GuiScreensaverOptions::openVideoScreensaverOptions, this)); addRow(row); } -void GuiGeneralScreensaverOptions::openSlideshowScreensaverOptions() +void GuiScreensaverOptions::openSlideshowScreensaverOptions() { auto s = new GuiSettings(mWindow, "SLIDESHOW SCREENSAVER"); @@ -209,7 +209,7 @@ void GuiGeneralScreensaverOptions::openSlideshowScreensaverOptions() mWindow->pushGui(s); } -void GuiGeneralScreensaverOptions::openVideoScreensaverOptions() +void GuiScreensaverOptions::openVideoScreensaverOptions() { auto s = new GuiSettings(mWindow, "VIDEO SCREENSAVER"); diff --git a/es-app/src/guis/GuiScreensaverOptions.h b/es-app/src/guis/GuiScreensaverOptions.h new file mode 100644 index 000000000..ee6b3f13e --- /dev/null +++ b/es-app/src/guis/GuiScreensaverOptions.h @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: MIT +// +// EmulationStation Desktop Edition +// GuiScreensaverOptions.h +// +// User interface for the screensaver options. +// Submenu to the GuiMenu main menu. +// + +#ifndef ES_APP_GUIS_GUI_SCREENSAVER_OPTIONS_H +#define ES_APP_GUIS_GUI_SCREENSAVER_OPTIONS_H + +#include "guis/GuiSettings.h" + +class GuiScreensaverOptions : public GuiSettings +{ +public: + GuiScreensaverOptions(Window* window, const char* title); + +private: + void openSlideshowScreensaverOptions(); + void openVideoScreensaverOptions(); +}; + +#endif // ES_APP_GUIS_GUI_SCREENSAVER_OPTIONS_H