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

src/gui/imageinfo.cpp: add entry for operating system

Browse Source
This commit is contained in:
Thilo Graf
2018-07-29 00:26:14 +02:00
parent f81816df96
commit 351559f664
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -818,6 +818,7 @@ imageinfo.homepage Homepage:
imageinfo.image Image: imageinfo.image Image:
imageinfo.kernel Kernel: imageinfo.kernel Kernel:
imageinfo.license Lizenz imageinfo.license Lizenz
imageinfo.os System:
imageinfo.vcs Git: imageinfo.vcs Git:
imageinfo.version Version: imageinfo.version Version:
imdb.api_key IMDb API Schlüssel imdb.api_key IMDb API Schlüssel

1
data/locale/english.locale
View File

@@ -818,6 +818,7 @@ imageinfo.homepage Home page:
imageinfo.image Image: imageinfo.image Image:
imageinfo.kernel Kernel: imageinfo.kernel Kernel:
imageinfo.license License imageinfo.license License
imageinfo.os System:
imageinfo.vcs Git: imageinfo.vcs Git:
imageinfo.version Version: imageinfo.version Version:
imdb.api_key IMDb API-Key imdb.api_key IMDb API-Key

16
src/gui/imageinfo.cpp
View File

@@ -48,6 +48,7 @@
#include <ctype.h> #include <ctype.h>
#define VERSION_FILE "/.version" #define VERSION_FILE "/.version"
#define RELEASE_FILE "/etc/os-release"
using namespace std; using namespace std;
@@ -74,7 +75,6 @@ void CImageInfo::Init(void)
y_tmp = 0; y_tmp = 0;
license_txt = ""; license_txt = "";
v_info.clear(); v_info.clear();
config.loadConfig(VERSION_FILE);
} }
CImageInfo::~CImageInfo() CImageInfo::~CImageInfo()
@@ -269,6 +269,16 @@ void CImageInfo::InitInfoData()
{ {
v_info.clear(); v_info.clear();
image_info_t pretty_name = {LOCALE_IMAGEINFO_OS,""};
if (file_exists(RELEASE_FILE)){
config.loadConfig(RELEASE_FILE);
string tmpstr = config.getString("PRETTY_NAME", "");
pretty_name.info_text = str_replace("\"", "", tmpstr);
config.clear();
}
config.loadConfig(VERSION_FILE);
#ifdef BUILT_DATE #ifdef BUILT_DATE
const char * builddate = BUILT_DATE; const char * builddate = BUILT_DATE;
#else #else
@@ -276,6 +286,7 @@ void CImageInfo::InitInfoData()
#endif #endif
string version_string = config.getString("version", ""); string version_string = config.getString("version", "");
#ifdef IMAGE_VERSION #ifdef IMAGE_VERSION
version_string = IMAGE_VERSION; version_string = IMAGE_VERSION;
#else #else
@@ -307,6 +318,9 @@ void CImageInfo::InitInfoData()
}else }else
v_info.push_back(imagename); v_info.push_back(imagename);
if (!pretty_name.info_text.empty())
v_info.push_back(pretty_name);
struct utsname uts_info; struct utsname uts_info;
if (uname(&uts_info) == 0) { if (uname(&uts_info) == 0) {
image_info_t kernel = {LOCALE_IMAGEINFO_KERNEL, uts_info.release}; image_info_t kernel = {LOCALE_IMAGEINFO_KERNEL, uts_info.release};

1
src/system/locals.h
View File

@@ -845,6 +845,7 @@ typedef enum
LOCALE_IMAGEINFO_IMAGE, LOCALE_IMAGEINFO_IMAGE,
LOCALE_IMAGEINFO_KERNEL, LOCALE_IMAGEINFO_KERNEL,
LOCALE_IMAGEINFO_LICENSE, LOCALE_IMAGEINFO_LICENSE,
LOCALE_IMAGEINFO_OS,
LOCALE_IMAGEINFO_VCS, LOCALE_IMAGEINFO_VCS,
LOCALE_IMAGEINFO_VERSION, LOCALE_IMAGEINFO_VERSION,
LOCALE_IMDB_API_KEY, LOCALE_IMDB_API_KEY,

1
src/system/locals_intern.h
View File

@@ -845,6 +845,7 @@ const char * locale_real_names[] =
"imageinfo.image", "imageinfo.image",
"imageinfo.kernel", "imageinfo.kernel",
"imageinfo.license", "imageinfo.license",
"imageinfo.os",
"imageinfo.vcs", "imageinfo.vcs",
"imageinfo.version", "imageinfo.version",
"imdb.api_key", "imdb.api_key",