Included application version in the about dialog. This closes ticket #9.

diff --git a/confclerk.pro b/confclerk.pro
index 8f2160ce05fe28cce3f8f33f82bcbeece9f15ec3..0b88c7623359b7ad2d4b87317b5848f534eb2257 100644 (file)
--- a/confclerk.pro
+++ b/confclerk.pro
@@ -3,14 +3,15 @@
 QMAKEVERSION = $$[QMAKE_VERSION]
 ISQT4 = $$find(QMAKEVERSION, ^[2-9])
 isEmpty( ISQT4 ) {
-error("Use the qmake include with Qt4.4 or greater, on Debian that is
-qmake-qt4");
+       error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4");
 }
 
 TEMPLATE = subdirs
 SUBDIRS = src
 
-VERSION = 0.5.0
+# The global.pri defines the VERSION of the project
+include(src/global.pri)
+
 
 QMAKE_DISTCLEAN += src/bin/*.a
 QMAKE_EXTRA_TARGETS += changelog icon man release tarball

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 0d450f66b08d6191513741264f4b7f9a4111f037..d70f890959ce14ac970761130509d77d1108faf9 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
     // needed by QDesktopServices
     QCoreApplication::setOrganizationName("Toastfreeware");
     QCoreApplication::setApplicationName("ConfClerk");
+    QCoreApplication::setApplicationVersion(VERSION);
  
     SqlEngine::initialize(); // creates "SQLITE" DB connection
 

diff --git a/src/global.pri b/src/global.pri
index 468a0280a7d852c9cc70aaaff1b74d9cf6d1df29..1a72c7ee73694e2bc122dc2e7ef820bfac9393d8 100644 (file)
--- a/src/global.pri
+++ b/src/global.pri
@@ -3,6 +3,10 @@
 # include this file in each "*.pro" file, where it's needed
 # USAGE: include(./global.pri)
 
+# VERSION
+VERSION = 0.5.0
+DEFINES += VERSION=\\\"$$VERSION\\\"
+
 # Define 'MAEMO' specific CONFIG/DEFINE
 # To handle 'MAEMO' specific soruces/code
 DISTRO = $$system(cat /etc/issue)

diff --git a/src/gui/about.ui b/src/gui/about.ui
index 6ea6df9861f4d3a0313600cabee3e00e9631e91d..818a11692cda4ba0779620dd62da2d10c12eb5c2 100644 (file)
--- a/src/gui/about.ui
+++ b/src/gui/about.ui
@@ -192,6 +192,13 @@
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QLabel" name="labelVersion">
+                <property name="text">
+                 <string>Version %1</string>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="QLabel" name="spacer">
                 <property name="text">

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 1d92544bde73e30de913a1b5fc8a52c7249072c3..74db6b99be2bd9e5920bdc379a9d43f3600037e5 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -133,6 +133,7 @@ void MainWindow::aboutApp()
     QDialog dialog(this);
     Ui::AboutDialog ui;
     ui.setupUi(&dialog);
+    ui.labelVersion->setText(ui.labelVersion->text().arg(qApp->applicationVersion()));
 #ifdef N810
     dialog.setFixedWidth(width());
 #endif