From 351559f6640b74db997a1d8f11b264a6cac021f5 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Sun, 29 Jul 2018 00:26:14 +0200
Subject: [PATCH] src/gui/imageinfo.cpp: add entry for operating system

---
 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 e44d707d8..a7f6b6aae 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -818,6 +818,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 f1ef0c610..d412c5b44 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -818,6 +818,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 4f6debb3f..b6a866751 100644
--- a/src/gui/imageinfo.cpp
+++ b/src/gui/imageinfo.cpp
@@ -48,6 +48,7 @@
 #include <ctype.h>
 
 #define VERSION_FILE "/.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 9b26ad2d1..35efa74cf 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -845,6 +845,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 d6c56708a..77295cc7c 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -845,6 +845,7 @@ const char * locale_real_names[] =
 	"imageinfo.image",
 	"imageinfo.kernel",
 	"imageinfo.license",
+	"imageinfo.os",
 	"imageinfo.vcs",
 	"imageinfo.version",
 	"imdb.api_key",