Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-29 19:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

New themes are now flagged as such in GuiThemeDownloader

Browse source
This commit is contained in:
Leon Styhre 2023-03-29 23:34:32 +02:00
parent c285ae7d63
commit b64f0a2d9e
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,9 +113,7 @@ GuiThemeDownloader::GuiThemeDownloader()
mGrid.setEntry(mScrollDown, glm::ivec2 {7, 1}, false, false, glm::ivec2 {1, 1});
std::vector<std::shared_ptr<ButtonComponent>> buttons;
// buttons.push_back(
// std::make_shared<ButtonComponent>("Update all", "Update all", [&] { delete this; }));
buttons.push_back(std::make_shared<ButtonComponent>("Exit", "Exit", [&] { delete this; }));
buttons.push_back(std::make_shared<ButtonComponent>("CLOSE", "CLOSE", [&] { delete this; }));
mButtons = makeButtonGrid(buttons);
mGrid.setEntry(mButtons, glm::ivec2 {0, 7}, true, false, glm::ivec2 {8, 1},
GridFlags::BORDER_TOP);
@ -376,7 +374,6 @@ void GuiThemeDownloader::makeInventory()
{
for (auto& theme : mThemeSets) {
const std::string path {mThemeDirectory + theme.reponame};
theme.newEntry = false;
theme.invalidRepository = false;
theme.manuallyDownloaded = false;
theme.hasLocalChanges = false;
@ -530,7 +527,8 @@ void GuiThemeDownloader::parseThemesList()
}
}
LOG(LogInfo) << "GuiThemeDownloader: Parsed " << mThemeSets.size() << " theme sets";
LOG(LogDebug) << "GuiThemeDownloader::parseThemesList(): Parsed " << mThemeSets.size()
<< " theme sets";
}
void GuiThemeDownloader::populateGUI()
@ -540,6 +538,8 @@ void GuiThemeDownloader::populateGUI()
for (auto& theme : mThemeSets) {
std::string themeName {Utils::String::toUpper(theme.name)};
if (theme.newEntry && !theme.isCloned)
themeName.append(" ").append(ViewController::BRANCH_CHAR);
if (theme.isCloned)
themeName.append(" ").append(ViewController::TICKMARK_CHAR);
if (theme.manuallyDownloaded || theme.invalidRepository)
@ -634,6 +634,8 @@ void GuiThemeDownloader::updateGUI()
for (size_t i {0}; i < mThemeSets.size(); ++i) {
std::string themeName {Utils::String::toUpper(mThemeSets[i].name)};
if (mThemeSets[i].newEntry && !mThemeSets[i].isCloned)
themeName.append(" ").append(ViewController::BRANCH_CHAR);
if (mThemeSets[i].isCloned)
themeName.append(" ").append(ViewController::TICKMARK_CHAR);
if (mThemeSets[i].manuallyDownloaded || mThemeSets[i].invalidRepository)
@ -662,10 +664,12 @@ void GuiThemeDownloader::updateInfoPane()
mDownloadStatus->setColor(0x992222FF);
}
else {
mDownloadStatus->setText("NOT INSTALLED");
if (mThemeSets[mList->getCursorId()].newEntry)
mDownloadStatus->setText("NOT INSTALLED (NEW)");
else
mDownloadStatus->setText("NOT INSTALLED");
mDownloadStatus->setColor(0x999999FF);
}
if (mThemeSets[mList->getCursorId()].hasLocalChanges) {
mLocalChanges->setText(ViewController::EXCLAMATION_CHAR + " LOCAL CHANGES");
mLocalChanges->setColor(0x992222FF);

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

@ -134,6 +134,7 @@ public:
// Font Awesome symbols.
#if defined(_MSC_VER) // MSVC compiler.
static inline const std::string BRANCH_CHAR {Utils::String::wideStringToString(L"\uf18c")};
static inline const std::string CONTROLLER_CHAR {Utils::String::wideStringToString(L"\uf11b")};
static inline const std::string CROSSEDCIRCLE_CHAR {
Utils::String::wideStringToString(L"\uf05e")};
@ -146,6 +147,7 @@ public:
static inline const std::string KEYBOARD_CHAR {Utils::String::wideStringToString(L"\uf11c")};
static inline const std::string TICKMARK_CHAR {Utils::String::wideStringToString(L"\uf14A")};
#else
static inline const std::string BRANCH_CHAR {"\uf18c"};
static inline const std::string CONTROLLER_CHAR {"\uf11b"};
static inline const std::string CROSSEDCIRCLE_CHAR {"\uf05e"};
static inline const std::string EXCLAMATION_CHAR {"\uf06a"};