Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-17 22:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed GuiGeneralScreensaverOptions to GuiScreensaverOptions.

Browse source
This commit is contained in:
Leon Styhre 2020-11-05 18:35:08 +01:00
parent bbe85b2707
commit 72a077d6f2
5 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
es-app/CMakeLists.txt
View file

@ -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

25
es-app/src/guis/GuiGeneralScreensaverOptions.h
View file

@ -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

4
es-app/src/guis/GuiMenu.cpp
View file

@ -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() {

14
es-app/src/guis/GuiGeneralScreensaverOptions.cpp → es-app/src/guis/GuiScreensaverOptions.cpp
View file

@ -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");

25
es-app/src/guis/GuiScreensaverOptions.h Normal file
View file

@ -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