Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed the default theme from slate-es-de to linear-es-de

Browse source
This commit is contained in:
Leon Styhre 2024-01-28 18:50:26 +01:00
parent 5b4e284a2e
commit f8d2086ef1
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,12 +166,12 @@ void GuiMenu::openUIOptions()
Scripting::fireEvent("theme-changed", theme->getSelected(), Scripting::fireEvent("theme-changed", theme->getSelected(),
Settings::getInstance()->getString("Theme")); Settings::getInstance()->getString("Theme"));
// Handle the situation where the previously selected theme has been deleted // Handle the situation where the previously selected theme has been deleted
// using the theme downloader. In this case attempt to fall back to slate-es-de // using the theme downloader. In this case attempt to fall back to linear-es-de
// and if this theme doesn't exist then select the first available one. // and if this theme doesn't exist then select the first available one.
auto themes = ThemeData::getThemes(); auto themes = ThemeData::getThemes();
if (themes.find(theme->getSelected()) == themes.end()) { if (themes.find(theme->getSelected()) == themes.end()) {
if (themes.find("slate-es-de") != themes.end()) if (themes.find("linear-es-de") != themes.end())
Settings::getInstance()->setString("Theme", "slate-es-de"); Settings::getInstance()->setString("Theme", "linear-es-de");
else else
Settings::getInstance()->setString("Theme", themes.begin()->first); Settings::getInstance()->setString("Theme", themes.begin()->first);
} }

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

@ -162,7 +162,7 @@ void Settings::setDefaults()
mBoolMap["ScraperRegionFallback"] = {true, true}; mBoolMap["ScraperRegionFallback"] = {true, true};
// UI settings. // UI settings.
mStringMap["Theme"] = {"slate-es-de", "slate-es-de"}; mStringMap["Theme"] = {"linear-es-de", "linear-es-de"};
mStringMap["ThemeVariant"] = {"", ""}; mStringMap["ThemeVariant"] = {"", ""};
mStringMap["ThemeColorScheme"] = {"", ""}; mStringMap["ThemeColorScheme"] = {"", ""};
mStringMap["ThemeFontSize"] = {"", ""}; mStringMap["ThemeFontSize"] = {"", ""};

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

@ -820,11 +820,11 @@ const std::string ThemeData::getSystemThemeFile(const std::string& system)
std::map<std::string, Theme, StringComparator>::const_iterator theme { std::map<std::string, Theme, StringComparator>::const_iterator theme {
sThemes.find(Settings::getInstance()->getString("Theme"))}; sThemes.find(Settings::getInstance()->getString("Theme"))};
if (theme == sThemes.cend()) { if (theme == sThemes.cend()) {
// Currently configured theme is missing, attempt to load the default theme slate-es-de // Currently configured theme is missing, attempt to load the default theme linear-es-de
// instead, and if that's also missing then pick the first available one. // instead, and if that's also missing then pick the first available one.
bool defaultSetFound {true}; bool defaultSetFound {true};
theme = sThemes.find("slate-es-de"); theme = sThemes.find("linear-es-de");
if (theme == sThemes.cend()) { if (theme == sThemes.cend()) {
theme = sThemes.cbegin(); theme = sThemes.cbegin();