From e5bf0b4931255ce21f441f87dae7d91ee15f2f9f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 26 Nov 2021 21:50:59 +0100 Subject: [PATCH] imageinfo-ni: align to image version Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/3ebf9095027fa7983be1ce986df4cb0c43aeb193 Author: vanhofen Date: 2021-11-26 (Fri, 26 Nov 2021) Origin message was: ------------------ - imageinfo-ni: align to image version --- src/gui/imageinfo_ni.cpp | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/src/gui/imageinfo_ni.cpp b/src/gui/imageinfo_ni.cpp index 9f7f55372..9f1d2af29 100644 --- a/src/gui/imageinfo_ni.cpp +++ b/src/gui/imageinfo_ni.cpp @@ -289,25 +289,13 @@ void CImageInfoNI::paint() CConfigFile config('\t'); config.loadConfig(IMAGE_VERSION_FILE); - std::string imagename = config.getString("imagename", "NI \\o/ Neutrino-Image"); - std::string version = config.getString("version", "n/a"); - std::string describe = config.getString("describe", "n/a"); - std::string builddate = config.getString("builddate", "n/a"); - std::string creator = config.getString("creator", "NI-Team"); - std::string homepage = config.getString("homepage", "www.neutrino-images.de"); + std::string imagename = config.getString("imagename", "NI \\o/ Neutrino-Image"); + std::string imageversion = config.getString("imageversion", "n/a"); + //std::string describe = config.getString("describe", "n/a"); + std::string builddate = config.getString("builddate", "n/a"); + std::string creator = config.getString("creator", "NI-Team"); + std::string homepage = config.getString("homepage", "www.neutrino-images.de"); -#if 0 - std::ostringstream imageversion; - imageversion.str("n/a"); - - if (version.compare("n/a") != 0) - { - static CFlashVersionInfo versionInfo(version); - std::string v = versionInfo.getVersionString(); - imageversion.str(""); - imageversion << v << " (" << versionInfo.getType(true) << ")"; - } -#endif std::ostringstream guiversion; guiversion.str(""); @@ -326,11 +314,8 @@ void CImageInfoNI::paint() ypos += iheight; paintLine(xpos, font_info, g_Locale->getText(LOCALE_IMAGEINFO_VERSION)); -#if 0 - paintLine(xpos + offset, font_info, imageversion.str()); -#else - paintLine(xpos + offset, font_info, describe); -#endif + paintLine(xpos + offset, font_info, imageversion); + //paintLine(xpos + offset, font_info, describe); ypos += iheight; paintLine(xpos, font_info, g_Locale->getText(LOCALE_IMAGEINFO_DATE));