From e2f0d015be5a6e6eb43886017e51f356a34da3b4 Mon Sep 17 00:00:00 2001 From: gsherman Date: Fri, 27 Feb 2004 05:42:25 +0000 Subject: [PATCH] version number now fetched from VERSION set by configure git-svn-id: http://svn.osgeo.org/qgis/trunk@951 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/qgis.h | 4 +++- src/qgisapp.cpp | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qgis.h b/src/qgis.h index dc99e48324c..f2941005f55 100644 --- a/src/qgis.h +++ b/src/qgis.h @@ -16,9 +16,11 @@ namespace QGis // Version constants // // Version string - static const char *qgisVersion = "0.2 Development 'Pumpkin'"; + static const char *qgisVersion = VERSION; // Version number used for comparing versions using the "Check QGIS Version" function static const int qgisVersionInt =200; + // Release name + static const char *qgisReleaseName = "Pumpkin"; // Enumerations // diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp index b055e0a3318..0ebfad901d5 100644 --- a/src/qgisapp.cpp +++ b/src/qgisapp.cpp @@ -260,7 +260,8 @@ QgisApp::QgisApp(QWidget * parent, const char *name, WFlags fl):QgisAppBase(pare mapLegend->setMapCanvas(mapCanvas); mapLegend->setResizeMode(QListView::AllColumns); QString caption = tr("Quantum GIS - "); - caption += QGis::qgisVersion; + caption += QString("%1 ('%2')").arg(QGis::qgisVersion).arg(QGis::qgisReleaseName); + setCaption(caption); connect(mapCanvas, SIGNAL(xyCoordinates(QgsPoint &)), this, SLOT(showMouseCoordinate(QgsPoint &))); connect(mapLegend, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(layerProperties(QListViewItem *)));