From e2e53f7c88f6c404d97a673c69c701ea01293de2 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 7 Apr 2010 13:16:06 +0000 Subject: [PATCH] add svn rev. to imageinfo git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@538 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ce744400e0e138c9a8b20576c353fcc54e759c9d Author: Jacek Jendrzej Date: 2010-04-07 (Wed, 07 Apr 2010) Origin message was: ------------------ -add svn rev. to imageinfo git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@538 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/Makefile.am | 6 +++++- src/gui/imageinfo.cpp | 13 ++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 7676f8ea3..7e01e645c 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -1,6 +1,11 @@ AM_CPPFLAGS = -fno-rtti -fno-exceptions #AM_CPPFLAGS = -fno-rtti +svn_version.h: + sleep 30 && rm svn_version.h & echo "#define SVNVERSION \"$$(svnversion -n || echo svn_oops!)\" " > svn_version.h + +noinst_HEADERS = svn_version.h + SUBDIRS = widget bedit INCLUDES = \ @@ -34,4 +39,3 @@ libneutrino_gui2_a_SOURCES = \ libtimerlist_a_SOURCES = \ timerlist.cpp - diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index e7629cdc2..ab83bc450 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -37,6 +37,8 @@ #include #include +#include "svn_version.h" +#define SVN_REV "SVN Rev.:" extern cVideo * videoDecoder; extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ @@ -87,7 +89,10 @@ void CImageInfo::Init(void) offset = tmpoffset; } } - + int off_tmp = g_Font[font_info]->getRenderWidth(SVN_REV); + if(off_tmp > offset) + offset = off_tmp; + offset = offset + 15; } @@ -175,7 +180,6 @@ void CImageInfo::paint() ypos += hheight; ypos += (iheight >>1); - CConfigFile config('\t'); config.loadConfig("/.version"); @@ -191,7 +195,6 @@ void CImageInfo::paint() sprintf((char*) imagedate, "%s %s", versionInfo.getDate(), versionInfo.getTime()); ypos += iheight; - paintLine(xpos , font_info, g_Locale->getText(LOCALE_IMAGEINFO_IMAGE)); paintLine(xpos+offset, font_info, imagename); @@ -203,6 +206,10 @@ void CImageInfo::paint() paintLine(xpos , font_info, g_Locale->getText(LOCALE_IMAGEINFO_VERSION)); paintLine(xpos+offset, font_info, releaseCycle); + ypos += iheight; + paintLine(xpos , font_info, SVN_REV); + paintLine(xpos+offset, font_info, SVNVERSION ); + ypos += iheight; paintLine(xpos , font_info, g_Locale->getText(LOCALE_IMAGEINFO_CREATOR)); paintLine(xpos+offset, font_info, creator);