From 809950d37ccbcb089532c04d897ae4e76fecc4d8 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 31 Jul 2018 00:20:08 +0200 Subject: [PATCH] src/gui/imageinfo.cpp: add entry for operating system Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6cbad3c0a2710ace846ebd3b80d3007cd6c9be91 Author: Thilo Graf Date: 2018-07-31 (Tue, 31 Jul 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/gui/imageinfo.cpp | 16 +++++++++++++++- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 4d5f4a033..e3886a9ee 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -907,6 +907,7 @@ imageinfo.homepage Homepage: imageinfo.image Image: imageinfo.kernel Kernel: imageinfo.license Lizenz +imageinfo.os System: imageinfo.vcs Git: imageinfo.version Version: imdb.api_key IMDb API Schlüssel diff --git a/data/locale/english.locale b/data/locale/english.locale index e5e0d236e..ab79a3d07 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -907,6 +907,7 @@ imageinfo.homepage Home page: imageinfo.image Image: imageinfo.kernel Kernel: imageinfo.license License +imageinfo.os System: imageinfo.vcs Git: imageinfo.version Version: imdb.api_key IMDb API-Key diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 4a61b8a94..7f67a7680 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -48,6 +48,7 @@ #include #define VERSION_FILE TARGET_PREFIX "/.version" +#define RELEASE_FILE "/etc/os-release" using namespace std; @@ -74,7 +75,6 @@ void CImageInfo::Init(void) y_tmp = 0; license_txt = ""; v_info.clear(); - config.loadConfig(VERSION_FILE); } CImageInfo::~CImageInfo() @@ -269,6 +269,16 @@ void CImageInfo::InitInfoData() { 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 const char * builddate = BUILT_DATE; #else @@ -276,6 +286,7 @@ void CImageInfo::InitInfoData() #endif string version_string = config.getString("version", ""); + #ifdef IMAGE_VERSION version_string = IMAGE_VERSION; #else @@ -307,6 +318,9 @@ void CImageInfo::InitInfoData() }else v_info.push_back(imagename); + if (!pretty_name.info_text.empty()) + v_info.push_back(pretty_name); + struct utsname uts_info; if (uname(&uts_info) == 0) { image_info_t kernel = {LOCALE_IMAGEINFO_KERNEL, uts_info.release}; diff --git a/src/system/locals.h b/src/system/locals.h index 7f9973a87..b2fe70638 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -934,6 +934,7 @@ typedef enum LOCALE_IMAGEINFO_IMAGE, LOCALE_IMAGEINFO_KERNEL, LOCALE_IMAGEINFO_LICENSE, + LOCALE_IMAGEINFO_OS, LOCALE_IMAGEINFO_VCS, LOCALE_IMAGEINFO_VERSION, LOCALE_IMDB_API_KEY, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 2de0260e8..e621a44f8 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -934,6 +934,7 @@ const char * locale_real_names[] = "imageinfo.image", "imageinfo.kernel", "imageinfo.license", + "imageinfo.os", "imageinfo.vcs", "imageinfo.version", "imdb.api_key",