Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed some GAME_LIST constants to GAMELIST.

Browse source
This commit is contained in:
Leon Styhre 2022-01-15 13:49:14 +01:00
parent c7964b7ebc
commit 7323dd5dfd
13 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
es-app/src/guis/GuiGamelistFilter.h
View file

@ -8,8 +8,8 @@
// Actual filter logic is covered by FileFilterIndex. // Actual filter logic is covered by FileFilterIndex.
// //
#ifndef ES_APP_GUIS_GUI_GAME_LIST_FILTER_H #ifndef ES_APP_GUIS_GUI_GAMELIST_FILTER_H
#define ES_APP_GUIS_GUI_GAME_LIST_FILTER_H #define ES_APP_GUIS_GUI_GAMELIST_FILTER_H
#include "FileFilterIndex.h" #include "FileFilterIndex.h"
#include "GuiComponent.h" #include "GuiComponent.h"
@ -50,4 +50,4 @@ private:
bool mFiltersChanged; bool mFiltersChanged;
}; };
#endif // ES_APP_GUIS_GUI_GAME_LIST_FILTER_H #endif // ES_APP_GUIS_GUI_GAMELIST_FILTER_H

6
es-app/src/guis/GuiGamelistOptions.h
View file

@ -10,8 +10,8 @@
// metadata edit interface is covered by GuiMetaDataEd. // metadata edit interface is covered by GuiMetaDataEd.
// //
#ifndef ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H #ifndef ES_APP_GUIS_GUI_GAMELIST_OPTIONS_H
#define ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H #define ES_APP_GUIS_GUI_GAMELIST_OPTIONS_H
#include "FileData.h" #include "FileData.h"
#include "GuiComponent.h" #include "GuiComponent.h"
@ -64,4 +64,4 @@ private:
std::string mCurrentFirstCharacter; std::string mCurrentFirstCharacter;
}; };
#endif // ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H #endif // ES_APP_GUIS_GUI_GAMELIST_OPTIONS_H

14
es-app/src/views/ViewController.cpp
View file

@ -267,7 +267,7 @@ void ViewController::ReloadAndGoToStart()
{ {
mWindow->renderLoadingScreen("Loading..."); mWindow->renderLoadingScreen("Loading...");
reloadAll(); reloadAll();
if (mState.viewing == GAME_LIST) { if (mState.viewing == GAMELIST) {
goToSystemView(SystemData::sSystemVector.front(), false); goToSystemView(SystemData::sSystemVector.front(), false);
goToSystem(SystemData::sSystemVector.front(), false); goToSystem(SystemData::sSystemVector.front(), false);
} }
@ -418,7 +418,7 @@ void ViewController::goToSystem(SystemData* system, bool animate)
void ViewController::goToNextGamelist() void ViewController::goToNextGamelist()
{ {
assert(mState.viewing == GAME_LIST); assert(mState.viewing == GAMELIST);
SystemData* system = getState().getSystem(); SystemData* system = getState().getSystem();
assert(system); assert(system);
NavigationSounds::getInstance().playThemeNavigationSound(QUICKSYSSELECTSOUND); NavigationSounds::getInstance().playThemeNavigationSound(QUICKSYSSELECTSOUND);
@ -428,7 +428,7 @@ void ViewController::goToNextGamelist()
void ViewController::goToPrevGamelist() void ViewController::goToPrevGamelist()
{ {
assert(mState.viewing == GAME_LIST); assert(mState.viewing == GAMELIST);
SystemData* system = getState().getSystem(); SystemData* system = getState().getSystem();
assert(system); assert(system);
NavigationSounds::getInstance().playThemeNavigationSound(QUICKSYSSELECTSOUND); NavigationSounds::getInstance().playThemeNavigationSound(QUICKSYSSELECTSOUND);
@ -459,7 +459,7 @@ void ViewController::goToGamelist(SystemData* system)
mPreviousView.reset(); mPreviousView.reset();
mPreviousView = nullptr; mPreviousView = nullptr;
} }
else if (!mPreviousView && mState.viewing == GAME_LIST) { else if (!mPreviousView && mState.viewing == GAMELIST) {
// This is needed as otherwise the static image would not get rendered during the // This is needed as otherwise the static image would not get rendered during the
// first Slide transition when coming from the System view. // first Slide transition when coming from the System view.
mSkipView = getGamelistView(system); mSkipView = getGamelistView(system);
@ -476,7 +476,7 @@ void ViewController::goToGamelist(SystemData* system)
// Find if we're wrapping around the first and last systems, which requires the gamelist // Find if we're wrapping around the first and last systems, which requires the gamelist
// to be moved in order to avoid weird camera movements. This is only needed for the // to be moved in order to avoid weird camera movements. This is only needed for the
// slide transition style. // slide transition style.
if (mState.viewing == GAME_LIST && SystemData::sSystemVector.size() > 1 && slideTransitions) { if (mState.viewing == GAMELIST && SystemData::sSystemVector.size() > 1 && slideTransitions) {
if (SystemData::sSystemVector.front() == mState.getSystem()) { if (SystemData::sSystemVector.front() == mState.getSystem()) {
if (SystemData::sSystemVector.back() == system) if (SystemData::sSystemVector.back() == system)
wrapFirstToLast = true; wrapFirstToLast = true;
@ -558,7 +558,7 @@ void ViewController::goToGamelist(SystemData* system)
} }
} }
mState.viewing = GAME_LIST; mState.viewing = GAMELIST;
mState.system = system; mState.system = system;
auto it = mGamelistViews.find(system); auto it = mGamelistViews.find(system);
@ -1063,7 +1063,7 @@ void ViewController::reloadAll()
getSystemListView(); getSystemListView();
// Update mCurrentView since the pointers changed. // Update mCurrentView since the pointers changed.
if (mState.viewing == GAME_LIST) { if (mState.viewing == GAMELIST) {
mCurrentView = getGamelistView(mState.getSystem()); mCurrentView = getGamelistView(mState.getSystem());
} }
else if (mState.viewing == SYSTEM_SELECT) { else if (mState.viewing == SYSTEM_SELECT) {

4
es-app/src/views/ViewController.h
View file

@ -81,7 +81,7 @@ public:
NOTHING, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0). NOTHING, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
START_SCREEN, START_SCREEN,
SYSTEM_SELECT, SYSTEM_SELECT,
GAME_LIST GAMELIST
}; };
enum GamelistViewStyle { enum GamelistViewStyle {
@ -98,7 +98,7 @@ public:
SystemData* getSystem() const SystemData* getSystem() const
{ {
assert(viewing == GAME_LIST || viewing == SYSTEM_SELECT); assert(viewing == GAMELIST || viewing == SYSTEM_SELECT);
return system; return system;
} }

4
es-app/src/views/gamelist/BasicGamelistView.cpp
View file

@ -317,7 +317,7 @@ std::vector<HelpPrompt> BasicGamelistView::getHelpPrompts()
prompts.push_back(HelpPrompt("left/right", "system")); prompts.push_back(HelpPrompt("left/right", "system"));
if (mRoot->getSystem()->getThemeFolder() == "custom-collections" && mCursorStack.empty() && if (mRoot->getSystem()->getThemeFolder() == "custom-collections" && mCursorStack.empty() &&
ViewController::getInstance()->getState().viewing == ViewController::GAME_LIST) ViewController::getInstance()->getState().viewing == ViewController::GAMELIST)
prompts.push_back(HelpPrompt("a", "enter")); prompts.push_back(HelpPrompt("a", "enter"));
else else
prompts.push_back(HelpPrompt("a", "launch")); prompts.push_back(HelpPrompt("a", "launch"));
@ -332,7 +332,7 @@ std::vector<HelpPrompt> BasicGamelistView::getHelpPrompts()
if (mRoot->getSystem()->getThemeFolder() == "custom-collections" && if (mRoot->getSystem()->getThemeFolder() == "custom-collections" &&
!CollectionSystemsManager::getInstance()->isEditing() && mCursorStack.empty() && !CollectionSystemsManager::getInstance()->isEditing() && mCursorStack.empty() &&
ViewController::getInstance()->getState().viewing == ViewController::GAME_LIST && ViewController::getInstance()->getState().viewing == ViewController::GAMELIST &&
ViewController::getInstance()->getState().viewstyle != ViewController::BASIC) { ViewController::getInstance()->getState().viewstyle != ViewController::BASIC) {
prompts.push_back(HelpPrompt("y", "jump to game")); prompts.push_back(HelpPrompt("y", "jump to game"));
} }

6
es-app/src/views/gamelist/BasicGamelistView.h
View file

@ -6,8 +6,8 @@
// Interface that defines a GamelistView of the type 'basic'. // Interface that defines a GamelistView of the type 'basic'.
// //
#ifndef ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAMELIST_BASIC_GAMELIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H #define ES_APP_VIEWS_GAMELIST_BASIC_GAMELIST_VIEW_H
#include "components/TextListComponent.h" #include "components/TextListComponent.h"
#include "views/gamelist/ISimpleGamelistView.h" #include "views/gamelist/ISimpleGamelistView.h"
@ -60,4 +60,4 @@ protected:
std::string FOLDER_CHAR; std::string FOLDER_CHAR;
}; };
#endif // ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H #endif // ES_APP_VIEWS_GAMELIST_BASIC_GAMELIST_VIEW_H

6
es-app/src/views/gamelist/DetailedGamelistView.h
View file

@ -6,8 +6,8 @@
// Interface that defines a GamelistView of the type 'detailed'. // Interface that defines a GamelistView of the type 'detailed'.
// //
#ifndef ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAMELIST_DETAILED_GAMELIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H #define ES_APP_VIEWS_GAMELIST_DETAILED_GAMELIST_VIEW_H
#include "components/BadgeComponent.h" #include "components/BadgeComponent.h"
#include "components/DateTimeComponent.h" #include "components/DateTimeComponent.h"
@ -70,4 +70,4 @@ private:
FileData* mLastUpdated; FileData* mLastUpdated;
}; };
#endif // ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H #endif // ES_APP_VIEWS_GAMELIST_DETAILED_GAMELIST_VIEW_H

2
es-app/src/views/gamelist/GridGamelistView.cpp
View file

@ -698,7 +698,7 @@ std::vector<HelpPrompt> GridGamelistView::getHelpPrompts()
prompts.push_back(HelpPrompt("up/down/left/right", "choose")); prompts.push_back(HelpPrompt("up/down/left/right", "choose"));
if (mRoot->getSystem()->getThemeFolder() == "custom-collections" && mCursorStack.empty() && if (mRoot->getSystem()->getThemeFolder() == "custom-collections" && mCursorStack.empty() &&
ViewController::getInstance()->getState().viewing == ViewController::GAME_LIST) ViewController::getInstance()->getState().viewing == ViewController::GAMELIST)
prompts.push_back(HelpPrompt("a", "enter")); prompts.push_back(HelpPrompt("a", "enter"));
else else
prompts.push_back(HelpPrompt("a", "launch")); prompts.push_back(HelpPrompt("a", "launch"));

6
es-app/src/views/gamelist/GridGamelistView.h
View file

@ -6,8 +6,8 @@
// Interface that defines a GamelistView of the type 'grid'. // Interface that defines a GamelistView of the type 'grid'.
// //
#ifndef ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAMELIST_GRID_GAMELIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H #define ES_APP_VIEWS_GAMELIST_GRID_GAMELIST_VIEW_H
#include "components/BadgeComponent.h" #include "components/BadgeComponent.h"
#include "components/DateTimeComponent.h" #include "components/DateTimeComponent.h"
@ -108,4 +108,4 @@ private:
TextComponent mGamelistInfo; TextComponent mGamelistInfo;
}; };
#endif // ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H #endif // ES_APP_VIEWS_GAMELIST_GRID_GAMELIST_VIEW_H

6
es-app/src/views/gamelist/IGamelistView.h
View file

@ -6,8 +6,8 @@
// Interface that defines the minimum for a GamelistView. // Interface that defines the minimum for a GamelistView.
// //
#ifndef ES_APP_VIEWS_GAME_LIST_IGAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAMELIST_IGAMELIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_IGAME_LIST_VIEW_H #define ES_APP_VIEWS_GAMELIST_IGAMELIST_VIEW_H
#include "FileData.h" #include "FileData.h"
#include "GuiComponent.h" #include "GuiComponent.h"
@ -63,4 +63,4 @@ protected:
std::shared_ptr<ThemeData> mTheme; std::shared_ptr<ThemeData> mTheme;
}; };
#endif // ES_APP_VIEWS_GAME_LIST_IGAME_LIST_VIEW_H #endif // ES_APP_VIEWS_GAMELIST_IGAMELIST_VIEW_H

4
es-app/src/views/gamelist/ISimpleGamelistView.cpp
View file

@ -185,7 +185,7 @@ bool ISimpleGamelistView::input(InputConfig* config, Input input)
mRoot->getSystem()->getThemeFolder() == "custom-collections" && mRoot->getSystem()->getThemeFolder() == "custom-collections" &&
mCursorStack.empty() && mCursorStack.empty() &&
ViewController::getInstance()->getState().viewing == ViewController::getInstance()->getState().viewing ==
ViewController::GAME_LIST) { ViewController::GAMELIST) {
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND); NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
// Jump to the randomly selected game. // Jump to the randomly selected game.
if (mRandomGame) { if (mRandomGame) {
@ -239,7 +239,7 @@ bool ISimpleGamelistView::input(InputConfig* config, Input input)
else if (config->isMappedTo("y", input) && else if (config->isMappedTo("y", input) &&
mRoot->getSystem()->getThemeFolder() == "custom-collections" && mRoot->getSystem()->getThemeFolder() == "custom-collections" &&
!CollectionSystemsManager::getInstance()->isEditing() && mCursorStack.empty() && !CollectionSystemsManager::getInstance()->isEditing() && mCursorStack.empty() &&
ViewController::getInstance()->getState().viewing == ViewController::GAME_LIST) { ViewController::getInstance()->getState().viewing == ViewController::GAMELIST) {
// Jump to the randomly selected game. // Jump to the randomly selected game.
if (mRandomGame) { if (mRandomGame) {
NavigationSounds::getInstance().playThemeNavigationSound(SELECTSOUND); NavigationSounds::getInstance().playThemeNavigationSound(SELECTSOUND);

6
es-app/src/views/gamelist/ISimpleGamelistView.h
View file

@ -6,8 +6,8 @@
// Interface that defines a simple gamelist view. // Interface that defines a simple gamelist view.
// //
#ifndef ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAMELIST_ISIMPLE_GAMELIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H #define ES_APP_VIEWS_GAMELIST_ISIMPLE_GAMELIST_VIEW_H
#include "components/ImageComponent.h" #include "components/ImageComponent.h"
#include "components/TextComponent.h" #include "components/TextComponent.h"
@ -75,4 +75,4 @@ protected:
bool mIsFolder; bool mIsFolder;
}; };
#endif // ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H #endif // ES_APP_VIEWS_GAMELIST_ISIMPLE_GAMELIST_VIEW_H

6
es-app/src/views/gamelist/VideoGamelistView.h
View file

@ -6,8 +6,8 @@
// Interface that defines a GamelistView of the type 'video'. // Interface that defines a GamelistView of the type 'video'.
// //
#ifndef ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAMELIST_VIDEO_GAMELIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H #define ES_APP_VIEWS_GAMELIST_VIDEO_GAMELIST_VIEW_H
#include "components/BadgeComponent.h" #include "components/BadgeComponent.h"
#include "components/DateTimeComponent.h" #include "components/DateTimeComponent.h"
@ -75,4 +75,4 @@ private:
FileData* mLastUpdated; FileData* mLastUpdated;
}; };
#endif // ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H #endif // ES_APP_VIEWS_GAMELIST_VIDEO_GAMELIST_VIEW_H