From 4f035ece4b6a966f764fb2584c80e115c467bebd Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Mar 2017 15:39:42 +0100 Subject: [PATCH] imageinfo_ni: add yWeb version Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/227f5cbfff4d52ab84481c6167cb79b162172556 Author: vanhofen Date: 2017-03-03 (Fri, 03 Mar 2017) Origin message was: ------------------ - imageinfo_ni: add yWeb version ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/imageinfo_ni.cpp | 11 +++++++++++ src/gui/imageinfo_ni.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/src/gui/imageinfo_ni.cpp b/src/gui/imageinfo_ni.cpp index d10f36a3d..ee4d1704c 100644 --- a/src/gui/imageinfo_ni.cpp +++ b/src/gui/imageinfo_ni.cpp @@ -321,6 +321,10 @@ void CImageInfoNI::paint() paintLine(xpos+offset, font_info, to_string(LUA_API_VERSION_MAJOR) + "." + to_string(LUA_API_VERSION_MINOR)); #endif + ypos += iheight; + paintLine(xpos, font_info, "yWeb:"); + paintLine(xpos+offset, font_info, getYWebVersion()); + ypos += iheight; paintLine(xpos, font_info, g_Locale->getText(LOCALE_IMAGEINFO_DATE)); paintLine(xpos+offset, font_info, builddate ); @@ -894,3 +898,10 @@ void CImageInfoNI::paint_NET_Info(int posx, int posy) read_old = read_akt; write_old = write_akt; } + +string CImageInfoNI::getYWebVersion() +{ + CConfigFile yV('=', false); + yV.loadConfig(PRIVATE_HTTPDDIR "/Y_Version.txt"); + return yV.getString("version", "n/a"); +} diff --git a/src/gui/imageinfo_ni.h b/src/gui/imageinfo_ni.h index 209a43a34..c889445d8 100644 --- a/src/gui/imageinfo_ni.h +++ b/src/gui/imageinfo_ni.h @@ -140,6 +140,8 @@ class CImageInfoNI : public CMenuTarget void get_NET_Info(uint64_t *read_akt, long *read_packet, long *dummy, uint64_t *write_akt, long *write_packet); void paint_NET_Info(int posx, int posy); + std::string getYWebVersion(); + public: CImageInfoNI();