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

Removed legacy theme support from GuiThemeDownloader.

Browse source
This commit is contained in:
Leon Styhre 2023-02-27 18:06:35 +01:00
parent 875a6bf7d7
commit b1fec4683e
2 changed files with 53 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
es-app/src/guis/GuiThemeDownloader.cpp
View file

@ -57,11 +57,8 @@ void GuiThemeDownloader::parseThemesList()
return; return;
} }
std::vector<std::string> themeObjects {"themeSets", "legacyThemeSets"}; if (doc.HasMember("themeSets") && doc["themeSets"].IsArray()) {
const rapidjson::Value& themeSets {doc["themeSets"]};
for (auto& themeObject : themeObjects) {
if (doc.HasMember(themeObject.c_str()) && doc[themeObject.c_str()].IsArray()) {
const rapidjson::Value& themeSets {doc[themeObject.c_str()]};
for (int i {0}; i < static_cast<int>(themeSets.Size()); ++i) { for (int i {0}; i < static_cast<int>(themeSets.Size()); ++i) {
ThemeEntry themeEntry; ThemeEntry themeEntry;
const rapidjson::Value& theme {themeSets[i]}; const rapidjson::Value& theme {themeSets[i]};
@ -109,8 +106,7 @@ void GuiThemeDownloader::parseThemesList()
if (screenshots[i].HasMember("image") && screenshots[i]["image"].IsString()) if (screenshots[i].HasMember("image") && screenshots[i]["image"].IsString())
screenshotEntry.image = screenshots[i]["image"].GetString(); screenshotEntry.image = screenshots[i]["image"].GetString();
if (screenshots[i].HasMember("caption") && if (screenshots[i].HasMember("caption") && screenshots[i]["caption"].IsString())
screenshots[i]["caption"].IsString())
screenshotEntry.caption = screenshots[i]["caption"].GetString(); screenshotEntry.caption = screenshots[i]["caption"].GetString();
if (screenshotEntry.image != "" && screenshotEntry.caption != "") if (screenshotEntry.image != "" && screenshotEntry.caption != "")
@ -118,16 +114,11 @@ void GuiThemeDownloader::parseThemesList()
} }
} }
if (themeObject == "themeSets")
mThemeSets.emplace_back(themeEntry); mThemeSets.emplace_back(themeEntry);
else
mLegacyThemeSets.emplace_back(themeEntry);
}
} }
} }
LOG(LogInfo) << "GuiThemeDownloader: Parsed " << mThemeSets.size() << " theme sets and " LOG(LogInfo) << "GuiThemeDownloader: Parsed " << mThemeSets.size() << " theme sets";
<< mLegacyThemeSets.size() << " legacy theme sets";
} }
void GuiThemeDownloader::onSizeChanged() void GuiThemeDownloader::onSizeChanged()

1
es-app/src/guis/GuiThemeDownloader.h
View file

@ -54,7 +54,6 @@ private:
std::shared_ptr<TextComponent> mTitle; std::shared_ptr<TextComponent> mTitle;
std::vector<ThemeEntry> mThemeSets; std::vector<ThemeEntry> mThemeSets;
std::vector<ThemeEntry> mLegacyThemeSets;
}; };
#endif // ES_APP_GUIS_GUI_THEME_DOWNLOADER_H #endif // ES_APP_GUIS_GUI_THEME_DOWNLOADER_H