mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 86bedc2a3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
This commit is contained in:
vanhofen
2017-03-03 15:52:12 +01:00
parent 9f3dad285f c88b0d0c19
commit b079d0307e
5 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/imageinfo_ni.cpp
View File

@@ -49,6 +49,10 @@
#include <sstream>
#include <gui/color_custom.h>
#include <gui/components/cc.h>
#ifdef ENABLE_LUA
#include <gui/lua/lua_api_version.h>
#endif
#include <system/helpers.h>
#include <system/debug.h>
#include <cs_api.h>
@@ -314,8 +318,17 @@ void CImageInfoNI::paint()
paintLine(xpos, font_info, "Kernel:");
paintLine(xpos+offset, font_info, uname(&uts_info) < 0 ? "n/a" : uts_info.release);
#ifdef ENABLE_LUA
ypos += iheight;
paintLine(xpos, font_info, "Lua-API:");
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 );
@@ -898,3 +911,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");
}