diff --git a/es-app/src/guis/GuiGamelistFilter.h b/es-app/src/guis/GuiGamelistFilter.h index 3d5cfbaaa..e4ada95fd 100644 --- a/es-app/src/guis/GuiGamelistFilter.h +++ b/es-app/src/guis/GuiGamelistFilter.h @@ -35,7 +35,7 @@ private: void resetAllFilters(); void addFiltersToMenu(); - std::map >> mFilterOptions; + std::map>> mFilterOptions; MenuComponent mMenu; SystemData* mSystem; diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index 6a3417b1e..7868cedc6 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -313,7 +313,7 @@ void GuiMenu::openUISettings() Window* window = mWindow; s->addSaveFunc([ UImodeSelection, window, this] { std::string selectedMode = UImodeSelection->getSelected(); - if (selectedMode != "Full") { + if (selectedMode != "full") { std::string msg = "YOU ARE CHANGING THE UI TO A RESTRICTED MODE:\n\"" + Utils::String::toUpper(selectedMode) + "\"\n"; msg += "THIS WILL HIDE MOST MENU OPTIONS TO PREVENT CHANGES TO THE SYSTEM.\n"; diff --git a/es-app/src/guis/GuiScraperSearch.cpp b/es-app/src/guis/GuiScraperSearch.cpp index 1d218c877..d1c2c02f1 100644 --- a/es-app/src/guis/GuiScraperSearch.cpp +++ b/es-app/src/guis/GuiScraperSearch.cpp @@ -76,7 +76,7 @@ GuiScraperSearch::GuiScraperSearch( mMD_Players = std::make_shared(mWindow, "", font, mdColor); if (Settings::getInstance()->getBool("ScrapeRatings") && - Settings::getInstance()->getString("Scraper") != "TheGamesDB") + Settings::getInstance()->getString("Scraper") != "thegamesdb") mMD_Pairs.push_back(MetaDataPair(std::make_shared (mWindow, "RATING:", font, mdLblColor), mMD_Rating, false)); mMD_Pairs.push_back(MetaDataPair(std::make_shared @@ -193,7 +193,7 @@ void GuiScraperSearch::resizeMetadata() mMD_Grid->setColWidthPerc(0, maxLblWidth / mMD_Grid->getSize().x()); if (Settings::getInstance()->getBool("ScrapeRatings") && - Settings::getInstance()->getString("Scraper") != "TheGamesDB") { + Settings::getInstance()->getString("Scraper") != "thegamesdb") { // Rating is manually sized. mMD_Rating->setSize(mMD_Grid->getColWidth(1), fontLbl->getHeight() * 0.65f); mMD_Grid->onSizeChanged(); @@ -392,7 +392,7 @@ void GuiScraperSearch::updateInfoPane() // Metadata. 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->setOpacity(255); } @@ -410,7 +410,7 @@ void GuiScraperSearch::updateInfoPane() // Metadata. if (Settings::getInstance()->getBool("ScrapeRatings") && - Settings::getInstance()->getString("Scraper") != "TheGamesDB") { + Settings::getInstance()->getString("Scraper") != "thegamesdb") { mMD_Rating->setValue(""); mMD_Rating->setOpacity(0); } diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp index cbb074f5b..076c965d1 100644 --- a/es-app/src/main.cpp +++ b/es-app/src/main.cpp @@ -267,7 +267,7 @@ bool parseArgs(int argc, char* argv[]) i++; // Skip vsync value. } 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) { Settings::getInstance()->setBool("ForceKiosk", true); diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index 518cf1c80..f45196155 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -161,8 +161,8 @@ void thegamesdb_generate_json_scraper_requests( first = false; } else { - LOG(LogWarning) << "TheGamesDB scraper warning - " - "no support for platform " << getPlatformName(*platformIt); + LOG(LogWarning) << "TheGamesDB scraper - no support for platform " << + getPlatformName(*platformIt); } } path += platformQueryParam; diff --git a/es-app/src/scrapers/Scraper.cpp b/es-app/src/scrapers/Scraper.cpp index e67241e9f..a74b145bd 100644 --- a/es-app/src/scrapers/Scraper.cpp +++ b/es-app/src/scrapers/Scraper.cpp @@ -20,8 +20,8 @@ #include const std::map scraper_request_funcs { - { "TheGamesDB", &thegamesdb_generate_json_scraper_requests }, - { "ScreenScraper", &screenscraper_generate_scraper_requests } + { "thegamesdb", &thegamesdb_generate_json_scraper_requests }, + { "screenscraper", &screenscraper_generate_scraper_requests } }; std::unique_ptr startScraperSearch(const ScraperSearchParams& params) diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp index 7b542b8b3..2a549e11a 100644 --- a/es-app/src/views/SystemView.cpp +++ b/es-app/src/views/SystemView.cpp @@ -130,10 +130,10 @@ void SystemView::populate() if (mEntries.size() == 0) { // Something is wrong, there is not a single system to show, check if UI mode is not full. if (!UIModeController::getInstance()->isUIModeFull()) { - Settings::getInstance()->setString("UIMode", "Full"); + Settings::getInstance()->setString("UIMode", "full"); mWindow->pushGui(new GuiMsgBox(mWindow, getHelpStyle(), - "The selected UI mode has nothing to show,\n returning to UI mode: FULL", "OK", - nullptr)); + "The selected UI mode has nothing to show,\n returning to UI mode \"Full\"", + "OK", nullptr)); } } } diff --git a/es-app/src/views/UIModeController.cpp b/es-app/src/views/UIModeController.cpp index 824f53ab2..29502f2ae 100644 --- a/es-app/src/views/UIModeController.cpp +++ b/es-app/src/views/UIModeController.cpp @@ -46,7 +46,7 @@ bool UIModeController::listen(InputConfig* config, Input input) if (Settings::getInstance()->getBool("Debug")) 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. if (!inputIsMatch(config, input)) @@ -75,27 +75,27 @@ bool UIModeController::inputIsMatch(InputConfig* config, Input input) void UIModeController::unlockUIMode() { LOG(LogDebug) << - " UIModeController::listen(): Passkey sequence completed, switching UIMode to full"; - Settings::getInstance()->setString("UIMode", "Full"); + " UIModeController::listen(): Passkey sequence completed, switching UIMode to Full"; + Settings::getInstance()->setString("UIMode", "full"); Settings::getInstance()->saveFile(); mPassKeyCounter = 0; } bool UIModeController::isUIModeFull() { - return ((mCurrentUIMode == "Full") && !Settings::getInstance()->getBool("ForceKiosk")); + return ((mCurrentUIMode == "full") && !Settings::getInstance()->getBool("ForceKiosk")); } bool UIModeController::isUIModeKid() { return (Settings::getInstance()->getBool("ForceKid") || - ((mCurrentUIMode == "Kid") && !Settings::getInstance()->getBool("ForceKiosk"))); + ((mCurrentUIMode == "kid") && !Settings::getInstance()->getBool("ForceKiosk"))); } bool UIModeController::isUIModeKiosk() { return (Settings::getInstance()->getBool("ForceKiosk") || - ((mCurrentUIMode == "Kiosk") && !Settings::getInstance()->getBool("ForceKid"))); + ((mCurrentUIMode == "kiosk") && !Settings::getInstance()->getBool("ForceKid"))); } std::string UIModeController::getFormattedPassKeyStr() diff --git a/es-app/src/views/UIModeController.h b/es-app/src/views/UIModeController.h index 79abd0aae..64c76dcd1 100644 --- a/es-app/src/views/UIModeController.h +++ b/es-app/src/views/UIModeController.h @@ -48,7 +48,7 @@ private: void unlockUIMode(); static UIModeController * sInstance; - const std::vector mUIModes = { "Full", "Kiosk", "Kid" }; + const std::vector mUIModes = { "full", "kiosk", "kid" }; // Default passkeyseq = "uuddlrlrba", as defined in the setting 'UIMode_passkey'. std::string mPassKeySequence; diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp index 757dcb253..80805d336 100644 --- a/es-core/src/Settings.cpp +++ b/es-core/src/Settings.cpp @@ -82,7 +82,7 @@ void Settings::setDefaults() mStringMap["GamelistViewStyle"] = "automatic"; mStringMap["TransitionStyle"] = "instant"; mStringMap["ThemeSet"] = ""; - mStringMap["UIMode"] = "Full"; + mStringMap["UIMode"] = "full"; mStringMap["DefaultSortOrder"] = "filename, ascending"; mBoolMap["FavoritesFirst"] = true; mBoolMap["ForceDisableFilters"] = false; @@ -144,7 +144,7 @@ void Settings::setDefaults() mBoolMap["CollectionShowSystemInfo"] = true; // Scraper. - mStringMap["Scraper"] = "ScreenScraper"; + mStringMap["Scraper"] = "screenscraper"; mStringMap["ScraperRegion"] = "eu"; mStringMap["ScraperLanguage"] = "en"; // mBoolMap["ScraperGenerateMiximages"] = false;