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

imageinfo: show both vcs-info and built-date

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed9b4278b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)

Origin message was:
------------------
- imageinfo: show both vcs-info and built-date

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2013-06-01 09:52:19 +02:00
parent 91d7e4af9b
commit 874d3b8cb0
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -594,6 +594,7 @@ imageinfo.image Image:
imageinfo.kernel Kernel: imageinfo.kernel Kernel:
imageinfo.license Lizenz: imageinfo.license Lizenz:
imageinfo.version Version: imageinfo.version Version:
imageinfo.vcs Git:
inetradio.name Internetradio inetradio.name Internetradio
infoviewer.epgnotload Informationen noch nicht geladen... infoviewer.epgnotload Informationen noch nicht geladen...
infoviewer.epgwait Warte auf EPG-Informationen... infoviewer.epgwait Warte auf EPG-Informationen...

1
data/locale/english.locale
View File

@@ -594,6 +594,7 @@ imageinfo.image Image:
imageinfo.kernel Kernel: imageinfo.kernel Kernel:
imageinfo.license License: imageinfo.license License:
imageinfo.version Version: imageinfo.version Version:
imageinfo.vcs Git:
inetradio.name Internetradio inetradio.name Internetradio
infoviewer.epgnotload EPG not loaded.... infoviewer.epgnotload EPG not loaded....
infoviewer.epgwait waiting for EPG... infoviewer.epgwait waiting for EPG...

19
src/gui/imageinfo.cpp
View File

@@ -40,8 +40,7 @@
#include <system/flashtool.h> #include <system/flashtool.h>
#include "version.h" #include "version.h"
#define GIT_DESC "GIT Desc.:"
#define GIT_REV "GIT Build:"
#define LICENSEDIR DATADIR "/neutrino/license/" #define LICENSEDIR DATADIR "/neutrino/license/"
using namespace std; using namespace std;
@@ -168,13 +167,13 @@ void CImageInfo::InitInfos()
{ {
v_info.clear(); v_info.clear();
#ifdef GITVERSION #ifdef BUILT_DATE
const char * builddate = GITVERSION; const char * builddate = BUILT_DATE;
#else #else
const char * builddate = config.getString("builddate", BUILT_DATE).c_str(); const char * builddate = config.getString("builddate", "n/a").c_str();
#endif #endif
const char * _version = config.getString("version", "no version").c_str(); const char * _version = config.getString("version", "n/a").c_str();
static CFlashVersionInfo versionInfo(_version); static CFlashVersionInfo versionInfo(_version);
std::string version_string; std::string version_string;
@@ -186,10 +185,14 @@ void CImageInfo::InitInfos()
image_info_t imagename = {LOCALE_IMAGEINFO_IMAGE, config.getString("imagename", "Neutrino-HD")}; image_info_t imagename = {LOCALE_IMAGEINFO_IMAGE, config.getString("imagename", "Neutrino-HD")};
v_info.push_back(imagename); v_info.push_back(imagename);
image_info_t date = {LOCALE_IMAGEINFO_DATE, builddate};
v_info.push_back(date);
image_info_t version = {LOCALE_IMAGEINFO_VERSION, version_string}; image_info_t version = {LOCALE_IMAGEINFO_VERSION, version_string};
v_info.push_back(version); v_info.push_back(version);
#ifdef VCS
image_info_t vcs = {LOCALE_IMAGEINFO_VCS, VCS};
v_info.push_back(vcs);
#endif
image_info_t date = {LOCALE_IMAGEINFO_DATE, builddate};
v_info.push_back(date);
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};
v_info.push_back(kernel); v_info.push_back(kernel);

1
src/system/locals.h
View File

@@ -621,6 +621,7 @@ typedef enum
LOCALE_IMAGEINFO_KERNEL, LOCALE_IMAGEINFO_KERNEL,
LOCALE_IMAGEINFO_LICENSE, LOCALE_IMAGEINFO_LICENSE,
LOCALE_IMAGEINFO_VERSION, LOCALE_IMAGEINFO_VERSION,
LOCALE_IMAGEINFO_VCS,
LOCALE_INETRADIO_NAME, LOCALE_INETRADIO_NAME,
LOCALE_INFOVIEWER_EPGNOTLOAD, LOCALE_INFOVIEWER_EPGNOTLOAD,
LOCALE_INFOVIEWER_EPGWAIT, LOCALE_INFOVIEWER_EPGWAIT,

1
src/system/locals_intern.h
View File

@@ -621,6 +621,7 @@ const char * locale_real_names[] =
"imageinfo.kernel", "imageinfo.kernel",
"imageinfo.license", "imageinfo.license",
"imageinfo.version", "imageinfo.version",
"imageinfo.vcs",
"inetradio.name", "inetradio.name",
"infoviewer.epgnotload", "infoviewer.epgnotload",
"infoviewer.epgwait", "infoviewer.epgwait",