From 61888beb2bbe946de316221ae23b75a3807ca6ad Mon Sep 17 00:00:00 2001
From: Konstantin Isakov <ikm@users.berlios.de>
Date: Sun, 12 Apr 2009 22:02:15 +0000
Subject: [PATCH] * The program version is now propagated to the program; and
 it now ends up   showed in the About dialog.

---
 src/about.ui       | 31 ++++++++++++++++++++++++-------
 src/goldendict.pro |  2 ++
 src/locale/ru.ts   | 17 +++++++++++++----
 src/mainwindow.cc  |  2 ++
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/about.ui b/src/about.ui
index 221d473a..1ede63bb 100644
--- a/src/about.ui
+++ b/src/about.ui
@@ -38,14 +38,31 @@
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>GoldenDict dictionary lookup program, version 0.7</string>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="spacing">
+          <number>0</number>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-         </property>
-        </widget>
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>GoldenDict dictionary lookup program, version </string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="version">
+           <property name="accessibleDescription">
+            <string/>
+           </property>
+           <property name="text">
+            <string>#.#</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
        <item>
         <widget class="QLabel" name="label_2">
diff --git a/src/goldendict.pro b/src/goldendict.pro
index b78b2ad4..9b75d089 100644
--- a/src/goldendict.pro
+++ b/src/goldendict.pro
@@ -43,6 +43,8 @@ unix {
   INSTALLS += target locale
 }
 
+DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
+
 # Input
 HEADERS += folding.hh \
            inc_case_folding.hh \
diff --git a/src/locale/ru.ts b/src/locale/ru.ts
index aa156bd6..53061978 100644
--- a/src/locale/ru.ts
+++ b/src/locale/ru.ts
@@ -19,17 +19,26 @@
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../about.ui" line="43"/>
         <source>GoldenDict dictionary lookup program, version 0.7</source>
-        <translation>Словарь GoldenDict, версия 0.7</translation>
+        <translation type="obsolete">Словарь GoldenDict, версия 0.7</translation>
     </message>
     <message>
-        <location filename="../about.ui" line="53"/>
+        <location filename="../about.ui" line="48"/>
+        <source>GoldenDict dictionary lookup program, version </source>
+        <translation>Словарь GoldenDict, версия </translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="61"/>
+        <source>#.#</source>
+        <translation>#.#</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="70"/>
         <source>(c) 2008-2009 Konstantin Isakov (ikm@users.berlios.de)</source>
         <translation>© Константин Исаков (ikm@users.berlios.de), 2008-2009</translation>
     </message>
     <message>
-        <location filename="../about.ui" line="63"/>
+        <location filename="../about.ui" line="80"/>
         <source>Licensed under GNU GPLv3 or later</source>
         <translation>Лицензия: GNU GPLv3 или более поздняя версия</translation>
     </message>
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index deb89a1f..12aed05f 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -1138,6 +1138,8 @@ void MainWindow::showAbout()
 
   ui.setupUi( &about );
 
+  ui.version->setText( PROGRAM_VERSION );
+
   about.show();
   about.exec();
 }