Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 09:35:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Changed most setting values to lowercase in es_settings.cfg

Browse source 
Audio devices apparently need to be case sensitive.
This commit is contained in:
Leon Styhre 2020-07-27 12:11:30 +02:00
parent b5485b4ca9
commit bad9e772e9
10 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,7 @@ private:
void resetAllFilters(); void resetAllFilters();
void addFiltersToMenu(); void addFiltersToMenu();
std::map<FilterIndexType, std::shared_ptr< OptionListComponent<std::string> >> mFilterOptions; std::map<FilterIndexType, std::shared_ptr<OptionListComponent<std::string>>> mFilterOptions;
MenuComponent mMenu; MenuComponent mMenu;
SystemData* mSystem; SystemData* mSystem;

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

@ -313,7 +313,7 @@ void GuiMenu::openUISettings()
Window* window = mWindow; Window* window = mWindow;
s->addSaveFunc([ UImodeSelection, window, this] { s->addSaveFunc([ UImodeSelection, window, this] {
std::string selectedMode = UImodeSelection->getSelected(); std::string selectedMode = UImodeSelection->getSelected();
if (selectedMode != "Full") { if (selectedMode != "full") {
std::string msg = "YOU ARE CHANGING THE UI TO A RESTRICTED MODE:\n\"" + std::string msg = "YOU ARE CHANGING THE UI TO A RESTRICTED MODE:\n\"" +
Utils::String::toUpper(selectedMode) + "\"\n"; Utils::String::toUpper(selectedMode) + "\"\n";
msg += "THIS WILL HIDE MOST MENU OPTIONS TO PREVENT CHANGES TO THE SYSTEM.\n"; msg += "THIS WILL HIDE MOST MENU OPTIONS TO PREVENT CHANGES TO THE SYSTEM.\n";

8
es-app/src/guis/GuiScraperSearch.cpp
View file

@ -76,7 +76,7 @@ GuiScraperSearch::GuiScraperSearch(
mMD_Players = std::make_shared<TextComponent>(mWindow, "", font, mdColor); mMD_Players = std::make_shared<TextComponent>(mWindow, "", font, mdColor);
if (Settings::getInstance()->getBool("ScrapeRatings") && if (Settings::getInstance()->getBool("ScrapeRatings") &&
Settings::getInstance()->getString("Scraper") != "TheGamesDB") Settings::getInstance()->getString("Scraper") != "thegamesdb")
mMD_Pairs.push_back(MetaDataPair(std::make_shared<TextComponent> mMD_Pairs.push_back(MetaDataPair(std::make_shared<TextComponent>
(mWindow, "RATING:", font, mdLblColor), mMD_Rating, false)); (mWindow, "RATING:", font, mdLblColor), mMD_Rating, false));
mMD_Pairs.push_back(MetaDataPair(std::make_shared<TextComponent> mMD_Pairs.push_back(MetaDataPair(std::make_shared<TextComponent>
@ -193,7 +193,7 @@ void GuiScraperSearch::resizeMetadata()
mMD_Grid->setColWidthPerc(0, maxLblWidth / mMD_Grid->getSize().x()); mMD_Grid->setColWidthPerc(0, maxLblWidth / mMD_Grid->getSize().x());
if (Settings::getInstance()->getBool("ScrapeRatings") && if (Settings::getInstance()->getBool("ScrapeRatings") &&
Settings::getInstance()->getString("Scraper") != "TheGamesDB") { Settings::getInstance()->getString("Scraper") != "thegamesdb") {
// Rating is manually sized. // Rating is manually sized.
mMD_Rating->setSize(mMD_Grid->getColWidth(1), fontLbl->getHeight() * 0.65f); mMD_Rating->setSize(mMD_Grid->getColWidth(1), fontLbl->getHeight() * 0.65f);
mMD_Grid->onSizeChanged(); mMD_Grid->onSizeChanged();
@ -392,7 +392,7 @@ void GuiScraperSearch::updateInfoPane()
// Metadata. // Metadata.
if (Settings::getInstance()->getBool("ScrapeRatings") && if (Settings::getInstance()->getBool("ScrapeRatings") &&
Settings::getInstance()->getString("Scraper") != "TheGamesDB") { Settings::getInstance()->getString("Scraper") != "thegamesdb") {
mMD_Rating->setValue(Utils::String::toUpper(res.mdl.get("rating"))); mMD_Rating->setValue(Utils::String::toUpper(res.mdl.get("rating")));
mMD_Rating->setOpacity(255); mMD_Rating->setOpacity(255);
} }
@ -410,7 +410,7 @@ void GuiScraperSearch::updateInfoPane()
// Metadata. // Metadata.
if (Settings::getInstance()->getBool("ScrapeRatings") && if (Settings::getInstance()->getBool("ScrapeRatings") &&
Settings::getInstance()->getString("Scraper") != "TheGamesDB") { Settings::getInstance()->getString("Scraper") != "thegamesdb") {
mMD_Rating->setValue(""); mMD_Rating->setValue("");
mMD_Rating->setOpacity(0); mMD_Rating->setOpacity(0);
} }

2
es-app/src/main.cpp
View file

@ -267,7 +267,7 @@ bool parseArgs(int argc, char* argv[])
i++; // Skip vsync value. i++; // Skip vsync value.
} }
else if (strcmp(argv[i], "--force-full") == 0) { else if (strcmp(argv[i], "--force-full") == 0) {
Settings::getInstance()->setString("UIMode", "Full"); Settings::getInstance()->setString("UIMode", "full");
} }
else if (strcmp(argv[i], "--force-kiosk") == 0) { else if (strcmp(argv[i], "--force-kiosk") == 0) {
Settings::getInstance()->setBool("ForceKiosk", true); Settings::getInstance()->setBool("ForceKiosk", true);

4
es-app/src/scrapers/GamesDBJSONScraper.cpp
View file

@ -161,8 +161,8 @@ void thegamesdb_generate_json_scraper_requests(
first = false; first = false;
} }
else { else {
LOG(LogWarning) << "TheGamesDB scraper warning - " LOG(LogWarning) << "TheGamesDB scraper - no support for platform " <<
"no support for platform " << getPlatformName(*platformIt); getPlatformName(*platformIt);
} }
} }
path += platformQueryParam; path += platformQueryParam;

4
es-app/src/scrapers/Scraper.cpp
View file

@ -20,8 +20,8 @@
#include <fstream> #include <fstream>
const std::map<std::string, generate_scraper_requests_func> scraper_request_funcs { const std::map<std::string, generate_scraper_requests_func> scraper_request_funcs {
{ "TheGamesDB", &thegamesdb_generate_json_scraper_requests }, { "thegamesdb", &thegamesdb_generate_json_scraper_requests },
{ "ScreenScraper", &screenscraper_generate_scraper_requests } { "screenscraper", &screenscraper_generate_scraper_requests }
}; };
std::unique_ptr<ScraperSearchHandle> startScraperSearch(const ScraperSearchParams& params) std::unique_ptr<ScraperSearchHandle> startScraperSearch(const ScraperSearchParams& params)

6
es-app/src/views/SystemView.cpp
View file

@ -130,10 +130,10 @@ void SystemView::populate()
if (mEntries.size() == 0) { if (mEntries.size() == 0) {
// Something is wrong, there is not a single system to show, check if UI mode is not full. // Something is wrong, there is not a single system to show, check if UI mode is not full.
if (!UIModeController::getInstance()->isUIModeFull()) { if (!UIModeController::getInstance()->isUIModeFull()) {
Settings::getInstance()->setString("UIMode", "Full"); Settings::getInstance()->setString("UIMode", "full");
mWindow->pushGui(new GuiMsgBox(mWindow, getHelpStyle(), mWindow->pushGui(new GuiMsgBox(mWindow, getHelpStyle(),
"The selected UI mode has nothing to show,\n returning to UI mode: FULL", "OK", "The selected UI mode has nothing to show,\n returning to UI mode \"Full\"",
nullptr)); "OK", nullptr));
} }
} }
} }

12
es-app/src/views/UIModeController.cpp
View file

@ -46,7 +46,7 @@ bool UIModeController::listen(InputConfig* config, Input input)
if (Settings::getInstance()->getBool("Debug")) if (Settings::getInstance()->getBool("Debug"))
logInput(config, input); logInput(config, input);
if ((Settings::getInstance()->getString("UIMode") == "Full") || !isValidInput(config, input)) if ((Settings::getInstance()->getString("UIMode") == "full") || !isValidInput(config, input))
return false; // Already unlocked, or invalid input, nothing to do here. return false; // Already unlocked, or invalid input, nothing to do here.
if (!inputIsMatch(config, input)) if (!inputIsMatch(config, input))
@ -75,27 +75,27 @@ bool UIModeController::inputIsMatch(InputConfig* config, Input input)
void UIModeController::unlockUIMode() void UIModeController::unlockUIMode()
{ {
LOG(LogDebug) << LOG(LogDebug) <<
" UIModeController::listen(): Passkey sequence completed, switching UIMode to full"; " UIModeController::listen(): Passkey sequence completed, switching UIMode to Full";
Settings::getInstance()->setString("UIMode", "Full"); Settings::getInstance()->setString("UIMode", "full");
Settings::getInstance()->saveFile(); Settings::getInstance()->saveFile();
mPassKeyCounter = 0; mPassKeyCounter = 0;
} }
bool UIModeController::isUIModeFull() bool UIModeController::isUIModeFull()
{ {
return ((mCurrentUIMode == "Full") && !Settings::getInstance()->getBool("ForceKiosk")); return ((mCurrentUIMode == "full") && !Settings::getInstance()->getBool("ForceKiosk"));
} }
bool UIModeController::isUIModeKid() bool UIModeController::isUIModeKid()
{ {
return (Settings::getInstance()->getBool("ForceKid") || return (Settings::getInstance()->getBool("ForceKid") ||
((mCurrentUIMode == "Kid") && !Settings::getInstance()->getBool("ForceKiosk"))); ((mCurrentUIMode == "kid") && !Settings::getInstance()->getBool("ForceKiosk")));
} }
bool UIModeController::isUIModeKiosk() bool UIModeController::isUIModeKiosk()
{ {
return (Settings::getInstance()->getBool("ForceKiosk") || return (Settings::getInstance()->getBool("ForceKiosk") ||
((mCurrentUIMode == "Kiosk") && !Settings::getInstance()->getBool("ForceKid"))); ((mCurrentUIMode == "kiosk") && !Settings::getInstance()->getBool("ForceKid")));
} }
std::string UIModeController::getFormattedPassKeyStr() std::string UIModeController::getFormattedPassKeyStr()

2
es-app/src/views/UIModeController.h
View file

@ -48,7 +48,7 @@ private:
void unlockUIMode(); void unlockUIMode();
static UIModeController * sInstance; static UIModeController * sInstance;
const std::vector<std::string> mUIModes = { "Full", "Kiosk", "Kid" }; const std::vector<std::string> mUIModes = { "full", "kiosk", "kid" };
// Default passkeyseq = "uuddlrlrba", as defined in the setting 'UIMode_passkey'. // Default passkeyseq = "uuddlrlrba", as defined in the setting 'UIMode_passkey'.
std::string mPassKeySequence; std::string mPassKeySequence;

4
es-core/src/Settings.cpp
View file

@ -82,7 +82,7 @@ void Settings::setDefaults()
mStringMap["GamelistViewStyle"] = "automatic"; mStringMap["GamelistViewStyle"] = "automatic";
mStringMap["TransitionStyle"] = "instant"; mStringMap["TransitionStyle"] = "instant";
mStringMap["ThemeSet"] = ""; mStringMap["ThemeSet"] = "";
mStringMap["UIMode"] = "Full"; mStringMap["UIMode"] = "full";
mStringMap["DefaultSortOrder"] = "filename, ascending"; mStringMap["DefaultSortOrder"] = "filename, ascending";
mBoolMap["FavoritesFirst"] = true; mBoolMap["FavoritesFirst"] = true;
mBoolMap["ForceDisableFilters"] = false; mBoolMap["ForceDisableFilters"] = false;
@ -144,7 +144,7 @@ void Settings::setDefaults()
mBoolMap["CollectionShowSystemInfo"] = true; mBoolMap["CollectionShowSystemInfo"] = true;
// Scraper. // Scraper.
mStringMap["Scraper"] = "ScreenScraper"; mStringMap["Scraper"] = "screenscraper";
mStringMap["ScraperRegion"] = "eu"; mStringMap["ScraperRegion"] = "eu";
mStringMap["ScraperLanguage"] = "en"; mStringMap["ScraperLanguage"] = "en";
// mBoolMap["ScraperGenerateMiximages"] = false; // mBoolMap["ScraperGenerateMiximages"] = false;