mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

CImageInfo: add yweb version info

Browse Source
This commit is contained in:
Thilo Graf
2016-10-03 00:16:44 +02:00
parent 6b88cea7bf
commit 7355ebb883
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/imageinfo.cpp
View File

@@ -45,6 +45,10 @@
#ifdef ENABLE_LUA #ifdef ENABLE_LUA
#include <gui/lua/lua_api_version.h> #include <gui/lua/lua_api_version.h>
#endif #endif
#include <nhttpd/yconfig.h>
#define VERSION_FILE TARGET_PREFIX "/.version"
#define Y_VERSION_FILE TARGET_PREFIX "/share/tuxbox/neutrino/httpd/Y_Version.txt"
using namespace std; using namespace std;
@@ -71,7 +75,7 @@ void CImageInfo::Init(void)
license_txt = ""; license_txt = "";
v_info.clear(); v_info.clear();
config.loadConfig(TARGET_PREFIX "/.version"); config.loadConfig(VERSION_FILE);
} }
CImageInfo::~CImageInfo() CImageInfo::~CImageInfo()
@@ -301,7 +305,18 @@ void CImageInfo::InitInfoData()
string s_api; string s_api;
#ifdef ENABLE_LUA #ifdef ENABLE_LUA
s_api += "LUA " + to_string(LUA_API_VERSION_MAJOR) + "." + to_string(LUA_API_VERSION_MINOR); s_api += "LUA " + to_string(LUA_API_VERSION_MAJOR) + "." + to_string(LUA_API_VERSION_MINOR);
s_api += ", ";
#endif #endif
s_api += "yWeb ";
s_api += getYApi();
s_api += ", ";
s_api += HTTPD_NAME;
s_api += + " ";
s_api += HTTPD_VERSION;
s_api += + ", ";
s_api += YHTTPD_NAME;
s_api += + " ";
s_api += YHTTPD_VERSION;
image_info_t api = {LOCALE_IMAGEINFO_API, s_api}; image_info_t api = {LOCALE_IMAGEINFO_API, s_api};
v_info.push_back(api); v_info.push_back(api);
if (uname(&uts_info) == 0) { if (uname(&uts_info) == 0) {
@@ -440,3 +455,13 @@ void CImageInfo::hide()
Clean(); Clean();
} }
} }
string CImageInfo::getYApi()
{
string ret;
config.loadConfig(Y_VERSION_FILE);
ret = config.getString("version", "n/a");
config.loadConfig(VERSION_FILE);
return ret;
}

1
src/gui/imageinfo.h
View File

@@ -63,6 +63,7 @@ class CImageInfo : public CMenuTarget
std::string getLicenseText(); std::string getLicenseText();
void ShowWindow(); void ShowWindow();
void ScrollLic(bool scrollDown); void ScrollLic(bool scrollDown);
std::string getYApi();
CComponentsWindowMax *cc_win; CComponentsWindowMax *cc_win;
CComponentsForm *cc_info; CComponentsForm *cc_info;