Version number in about from someplayer.h

diff --git a/src/aboutform.cpp b/src/aboutform.cpp
index 2edb7dd..a3956f2 100644 (file)
--- a/src/aboutform.cpp
+++ b/src/aboutform.cpp
@@ -3,6 +3,7 @@
 #include "config.h"
 #include <QWebView>
 #include <QDebug>
+#include "someplayer.h"
 
 using namespace SomePlayer::Storage;
 
@@ -32,6 +33,7 @@ void AboutForm::updateIcons() {
 
 void AboutForm::updateTranslations() {
        ui->retranslateUi(this);
+       ui->versionLabel->setText(QString("<b>%1</b>").arg(_SOMEPLAYER_VERSION_));
 }
 
 void AboutForm::onlineHelp() {

diff --git a/src/someplayer.h b/src/someplayer.h
index 85c2666..febecc0 100644 (file)
--- a/src/someplayer.h
+++ b/src/someplayer.h
@@ -48,7 +48,7 @@ namespace SomePlayer {
 #include "config.h"
 
 #define _DYNAMIC_PLAYLIST_MAX_COUNT_ 50
-#define _SOMEPLAYER_VERSION_ "1.5.2"
+#define _SOMEPLAYER_VERSION_ "1.5.2-5"
 #define NDEBUG
 
 #define _SERVICE_NAME_ "ru.somebody.someplayer"

diff --git a/src/ui/aboutform.ui b/src/ui/aboutform.ui
index f3388d6..613cb60 100644 (file)
--- a/src/ui/aboutform.ui
+++ b/src/ui/aboutform.ui
@@ -32,9 +32,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-208</y>
+        <y>0</y>
         <width>550</width>
-        <height>562</height>
+        <height>569</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
@@ -97,16 +97,53 @@
            </property>
           </spacer>
          </item>
-         <item row="1" column="0" colspan="3">
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <spacer name="horizontalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
           <widget class="QLabel" name="nameLabel">
            <property name="text">
-            <string>&lt;b&gt;SomePlayer 1.5.2&lt;/b&gt; </string>
+            <string>&lt;b&gt;SomePlayer&lt;/b&gt; </string>
            </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QLabel" name="versionLabel">
+           <property name="text">
+            <string>&gt;&lt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </item>
        <item>