[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1163164 by kuemmel:

add full version info for 2.0.0

 M  +1 -1      config.h  
 M  +1 -1      src/libkst/kstrevision.h  
 M  +2 -1      src/libkstapp/aboutdialog.cpp  
 M  +3 -0      src/libkstapp/debugdialog.cpp  


--- branches/work/kst/portto4/kst/config.h #1163163:1163164
@@ -1,7 +1,7 @@
 #ifndef KSTCONFIG_H
 #define KSTCONFIG_H
 
-#define KSTVERSION "2.0.0_devel"
+#define KSTVERSION "2.0.0"
 
 /* Define if you have unsetenv */
 #define HAVE_UNSETENV 1
--- branches/work/kst/portto4/kst/src/libkst/kstrevision.h #1163163:1163164
@@ -1,4 +1,4 @@
 #ifndef KSTREVISION
 //FIXME
-#define KSTREVISION "1"
+#define KSTREVISION ""
 #endif
--- branches/work/kst/portto4/kst/src/libkstapp/aboutdialog.cpp #1163163:1163164
@@ -9,6 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "config.h"
 #include "aboutdialog.h"
 
 #include <QDesktopServices>
@@ -41,7 +42,7 @@
     authors.replaceInStrings(QRegExp("^(.*)"), "<li>\\1</li>");
 
   QStringList msg = QStringList()
-  << tr("<qt><h2>Kst 2.0.0 - A data viewing program.</h2>")
+  << tr("<qt><h2>Kst "KSTVERSION" - A data viewing program.</h2>")
   << tr("Copyright &copy; 2000-2010 Barth Netterfield<br><hr>")
   << tr("Homepage: <a href=\"http://kst.kde.org/\">http://kst.kde.org/</a><br>")
   << tr("Please report bugs to: <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a><br>")
--- branches/work/kst/portto4/kst/src/libkstapp/debugdialog.cpp #1163163:1163164
@@ -36,7 +36,10 @@
   connect(_showNotice, SIGNAL(toggled(bool)), _log, SLOT(setShowNotice(bool)));
   connect(_showError, SIGNAL(toggled(bool)), _log, SLOT(setShowError(bool)));
 
+  if (!Debug::self()->kstRevision().isEmpty())
   _buildInfo->setText(i18n("<h1>Kst</h1> Version %1 (%2)").arg(KSTVERSION).arg(Debug::self()->kstRevision()));
+  else
+    _buildInfo->setText(i18n("<h1>Kst</h1> Version %1").arg(KSTVERSION));
 }