mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

-add svn rev. to imageinfo

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@538 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-04-07 13:16:06 +00:00
parent 03b56ffd1c
commit ce744400e0
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/Makefile.am
View File

@@ -1,6 +1,11 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions AM_CPPFLAGS = -fno-rtti -fno-exceptions
#AM_CPPFLAGS = -fno-rtti #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 SUBDIRS = widget bedit
INCLUDES = \ INCLUDES = \
@@ -34,4 +39,3 @@ libneutrino_gui2_a_SOURCES = \
libtimerlist_a_SOURCES = \ libtimerlist_a_SOURCES = \
timerlist.cpp timerlist.cpp

11
src/gui/imageinfo.cpp
View File

@@ -37,6 +37,8 @@
#include <system/flashtool.h> #include <system/flashtool.h>
#include <video_cs.h> #include <video_cs.h>
#include "svn_version.h"
#define SVN_REV "SVN Rev.:"
extern cVideo * videoDecoder; extern cVideo * videoDecoder;
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
@@ -87,6 +89,9 @@ void CImageInfo::Init(void)
offset = tmpoffset; offset = tmpoffset;
} }
} }
int off_tmp = g_Font[font_info]->getRenderWidth(SVN_REV);
if(off_tmp > offset)
offset = off_tmp;
offset = offset + 15; offset = offset + 15;
} }
@@ -175,7 +180,6 @@ void CImageInfo::paint()
ypos += hheight; ypos += hheight;
ypos += (iheight >>1); ypos += (iheight >>1);
CConfigFile config('\t'); CConfigFile config('\t');
config.loadConfig("/.version"); config.loadConfig("/.version");
@@ -191,7 +195,6 @@ void CImageInfo::paint()
sprintf((char*) imagedate, "%s %s", versionInfo.getDate(), versionInfo.getTime()); sprintf((char*) imagedate, "%s %s", versionInfo.getDate(), versionInfo.getTime());
ypos += iheight; ypos += iheight;
paintLine(xpos , font_info, g_Locale->getText(LOCALE_IMAGEINFO_IMAGE)); paintLine(xpos , font_info, g_Locale->getText(LOCALE_IMAGEINFO_IMAGE));
paintLine(xpos+offset, font_info, imagename); 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 , font_info, g_Locale->getText(LOCALE_IMAGEINFO_VERSION));
paintLine(xpos+offset, font_info, releaseCycle); paintLine(xpos+offset, font_info, releaseCycle);
ypos += iheight;
paintLine(xpos , font_info, SVN_REV);
paintLine(xpos+offset, font_info, SVNVERSION );
ypos += iheight; ypos += iheight;
paintLine(xpos , font_info, g_Locale->getText(LOCALE_IMAGEINFO_CREATOR)); paintLine(xpos , font_info, g_Locale->getText(LOCALE_IMAGEINFO_CREATOR));
paintLine(xpos+offset, font_info, creator); paintLine(xpos+offset, font_info, creator);