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

Fixed not showing version on GuiMenu and added an additional RetroDECK definition for "Quit RetroDECK"
Some checks failed
Build ES-DE / Building_RetroDECK-ES-DE (push) Has been cancelled
Details

Browse source
This commit is contained in:
XargonWan 2024-11-19 12:01:05 +09:00
parent affd8aa447
commit 98421be00c
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,7 @@ GuiMenu::GuiMenu()
if (!Settings::getInstance()->getBool("ForceKiosk") && if (!Settings::getInstance()->getBool("ForceKiosk") &&
Settings::getInstance()->getString("UIMode") != "kiosk") { Settings::getInstance()->getString("UIMode") != "kiosk") {
#if defined(__APPLE__) #if defined(__APPLE__)
addEntry(_("QUIT ES-DE")}, mMenuColorPrimary, false, [this] { openQuitMenu(); }); addEntry(_("QUIT ES-DE"), mMenuColorPrimary, false, [this] { openQuitMenu(); });
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
if (!AndroidVariables::sIsHomeApp) if (!AndroidVariables::sIsHomeApp)
addEntry(_("QUIT ES-DE"), mMenuColorPrimary, false, [this] { openQuitMenu(); }); addEntry(_("QUIT ES-DE"), mMenuColorPrimary, false, [this] { openQuitMenu(); });
@ -2305,7 +2305,11 @@ void GuiMenu::openQuitMenu()
_("NO"), nullptr)); _("NO"), nullptr));
}); });
auto quitText = std::make_shared<TextComponent>( auto quitText = std::make_shared<TextComponent>(
#if not defined RETRODECK
("QUIT ES-DE"), Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary);
# else // RetroDECK is defined
_("QUIT RETRODECK"), Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); _("QUIT RETRODECK"), Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary);
#endif
quitText->setSelectable(true); quitText->setSelectable(true);
row.addElement(quitText, true); row.addElement(quitText, true);
s->addRow(row); s->addRow(row);
@ -2351,28 +2355,12 @@ void GuiMenu::openQuitMenu()
void GuiMenu::addVersionInfo() void GuiMenu::addVersionInfo()
{ {
mVersion.setFont(Font::get(FONT_SIZE_SMALL)); mVersion.setFont(Font::get(FONT_SIZE_SMALL));
mVersion.setAutoCalcExtent(glm::ivec2 {0, 0}); mVersion.setAutoCalcExtent(glm::ivec2 {0, 0});
mVersion.setColor(mMenuColorTertiary); mVersion.setColor(mMenuColorTertiary);
#if defined(RETRODECK) const std::string applicationName {"ES-DE"};
// Only execute this block if RETRODECK is defined
LOG(LogInfo) << "Reading /app/retrodeck/version...";
std::ifstream versionFile("/app/retrodeck/version");
std::string retroDeckVersion;
// Attempt to open the version file and read a line into retroDeckVersion;
// also check that the line is not empty to ensure valid version information
if (versionFile && std::getline(versionFile, retroDeckVersion) && !retroDeckVersion.empty()) {
mVersion.setText("RetroDECK " + retroDeckVersion);
LOG(LogInfo) << "RetroDECK version read OK.";
} else {
LOG(LogInfo) << "Error: Cannot read version from file or file is empty!";
retroDeckVersion = "UNKNOWN";
mVersion.setText("RetroDECK " + retroDeckVersion);
}
#else // If RETRODECK is NOT defined, execute this block
#if defined(IS_PRERELEASE) #if defined(IS_PRERELEASE)
#if defined(__ANDROID__) #if defined(__ANDROID__)
@ -2391,7 +2379,26 @@ void GuiMenu::addVersionInfo()
#endif #endif
#endif #endif
#endif // End of RetroDECK logic check #if defined(RETRODECK)
// Only execute this block if RETRODECK is defined
LOG(LogInfo) << "Reading /app/retrodeck/version...";
std::ifstream versionFile("/app/retrodeck/version");
std::string retroDeckVersion;
// Attempt to open the version file and read a line into retroDeckVersion;
// also check that the line is not empty to ensure valid version information
if (versionFile && std::getline(versionFile, retroDeckVersion) && !retroDeckVersion.empty()) {
LOG(LogInfo) << "RetroDECK version read OK. Version: " + retroDeckVersion;
mVersion.setText("RetroDECK " + retroDeckVersion);
} else {
LOG(LogInfo) << "Error: Cannot read version from file or file is empty!";
retroDeckVersion = "UNKNOWN";
mVersion.setText("RetroDECK " + retroDeckVersion);
}
#endif
mVersion.setHorizontalAlignment(ALIGN_CENTER);
addChild(&mVersion);
} }
void GuiMenu::openThemeDownloader(GuiSettings* settings) void GuiMenu::openThemeDownloader(GuiSettings* settings)