diff options
| author |  Elvio Basello | 2008-04-20 15:08:52 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-04-20 15:08:52 +0000 |
| commit | 6da34205658470a4791ea0b9efcd6605dc061357 (patch) | |
| tree | b2635b18f9d7dc5bcb2dda8f4f1a8b925d44b1bd /src | |
| parent | compilation fixes (diff) | |
| download | KVIrc-6da34205658470a4791ea0b9efcd6605dc061357.tar.gz KVIrc-6da34205658470a4791ea0b9efcd6605dc061357.tar.bz2 KVIrc-6da34205658470a4791ea0b9efcd6605dc061357.zip | |
added Subversion to CMake rules;
added SVN revision number to KVIrc;
fixed compilation warning;
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1533 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/config/kvi_buildinfo.cpp | 7 | ||||
| -rw-r--r-- | src/kvilib/config/kvi_buildinfo.h | 4 | ||||
| -rw-r--r-- | src/modules/about/aboutdialog.cpp | 6 | ||||
| -rw-r--r-- | src/modules/about/abouttext.inc | 4 |
4 files changed, 18 insertions, 3 deletions
diff --git a/src/kvilib/config/kvi_buildinfo.cpp b/src/kvilib/config/kvi_buildinfo.cpp index 57de5a81d..ee6f8cf56 100644 --- a/src/kvilib/config/kvi_buildinfo.cpp +++ b/src/kvilib/config/kvi_buildinfo.cpp @@ -75,4 +75,11 @@ namespace KviBuildInfo { return QString(KVIRC_BUILD_COMPILER_FLAGS); } + + QString buildRevision() + { + QString rev = QString(KVIRC_BUILD_REVISION); + if(rev.isEmpty()) return "N/A"; + else return rev; + } }; diff --git a/src/kvilib/config/kvi_buildinfo.h b/src/kvilib/config/kvi_buildinfo.h index bfe86105e..e7f20ad44 100644 --- a/src/kvilib/config/kvi_buildinfo.h +++ b/src/kvilib/config/kvi_buildinfo.h @@ -76,6 +76,10 @@ namespace KviBuildInfo /// executable was built with. /// extern KVILIB_API QString buildCompilerFlags(); + /// + /// Returns the SVN revision number of the local repository + /// + extern KVILIB_API QString buildRevision(); }; #endif //!_KVI_BUILDINFO_H_ diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 625564f22..e5e8519b4 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -95,7 +95,7 @@ KviAboutDialog::KviAboutDialog() g->addWidget(l,0,0); - QString aboutString= "KVIrc <b>" KVI_VERSION " '" KVI_RELEASE_NAME "'</b><br>"; + QString aboutString= "<b>KVIrc " KVI_VERSION " '" KVI_RELEASE_NAME "'</b><br>"; aboutString += __tr2qs_ctx("Forged by the <b>KVIrc Development Team</b>","about"); l = new QLabel(aboutString,w); @@ -145,6 +145,10 @@ KviAboutDialog::KviAboutDialog() infoString += ": "; infoString += KviBuildInfo::buildSourcesDate(); infoString += "<br>"; + infoString += __tr2qs_ctx("Revision Number","about"); + infoString += ": "; + infoString += KviBuildInfo::buildRevision(); + infoString += "<br>"; infoString += __tr2qs_ctx("System Name","about"); infoString += ": "; infoString += KviBuildInfo::buildSystem(); diff --git a/src/modules/about/abouttext.inc b/src/modules/about/abouttext.inc index c35fc173e..3c54c1d7d 100644 --- a/src/modules/about/abouttext.inc +++ b/src/modules/about/abouttext.inc @@ -1,4 +1,4 @@ -static char * g_szAboutText = "" \ +static const char * g_szAboutText = "" \ "<html>" \ "<head>" \ "<title>Honor and glory</title>" \ @@ -197,7 +197,7 @@ static char * g_szAboutText = "" \ "<tr><td align=\"center\"><font color=\"#303030\">" \ "The 'light' inside the GNU clouds" \ "<br>" \ -"Generic (??!) official project supporter :)" \ +"Generic (?!?) official project supporter :)" \ "</font></td></tr>" \ "<tr><td align=\"center\"><font color=\"#606060\"><i>" \ "\"Pragma: seems that kvirc with all its plugins is becoming a desktop environment\"" \ |