Fix alignment and description in About window.

diff --git a/gui/aboutanyanka.cpp b/gui/aboutanyanka.cpp
index d3bae244151b1bc91602b08a048fc9e7358b111b..43720f9d8b871f863d55fdcc3184f16b8ad9a0ce 100644 (file)
--- a/gui/aboutanyanka.cpp
+++ b/gui/aboutanyanka.cpp
@@ -29,9 +29,17 @@ AboutAnyanka::AboutAnyanka(QWidget *parent) :
   QDialog(parent),
   ui(new Ui::AboutAnyanka)
 {
+  QString version;
+  QString qtVersion;
+
   ui->setupUi(this);
-  ui->ql_version->setText(GlobalInfo::APP_VERSION_STRING());
-  ui->ql_qtVersion->setText(qVersion());
+  setWindowTitle("About Anyanka");
+  version = ui->ql_version->text();
+  qtVersion = ui->ql_qtVersion->text();
+  version += " " + GlobalInfo::APP_VERSION_STRING();
+  qtVersion += " " + QString(qVersion());
+  ui->ql_version->setText(version);
+  ui->ql_qtVersion->setText(qtVersion);
   ui->ql_qtLogo->setPixmap(QPixmap("://resources/Qt_master_logo.png").scaled(ui->ql_qtLogo->size(), Qt::KeepAspectRatio,
                                                                              Qt::SmoothTransformation));
 }

diff --git a/gui/aboutanyanka.ui b/gui/aboutanyanka.ui
index 4bf4e57554842300c194218235c6c056b7c911ed..4f92871a3ad645dbc9da4a406d75dd5d36110f70 100644 (file)
--- a/gui/aboutanyanka.ui
+++ b/gui/aboutanyanka.ui
@@ -33,33 +33,20 @@
     <string>Anyanka</string>
    </property>
   </widget>
-  <widget class="QLabel" name="ql_versionCap">
-   <property name="geometry">
-    <rect>
-     <x>135</x>
-     <y>60</y>
-     <width>53</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Version:</string>
-   </property>
-  </widget>
   <widget class="QLabel" name="ql_version">
    <property name="geometry">
     <rect>
-     <x>185</x>
+     <x>8</x>
      <y>60</y>
-     <width>41</width>
-     <height>16</height>
+     <width>345</width>
+     <height>20</height>
     </rect>
    </property>
    <property name="text">
-    <string>-</string>
+    <string>Version:</string>
    </property>
    <property name="alignment">
-    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+    <set>Qt::AlignCenter</set>
    </property>
   </widget>
   <widget class="QLabel" name="ql_qtLogo">
@@ -78,41 +65,28 @@
     <set>Qt::AlignCenter</set>
    </property>
   </widget>
-  <widget class="QLabel" name="ql_qtVersionCap">
-   <property name="geometry">
-    <rect>
-     <x>90</x>
-     <y>280</y>
-     <width>151</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Using Qt 5 libraries version:</string>
-   </property>
-  </widget>
   <widget class="QLabel" name="ql_qtVersion">
    <property name="geometry">
     <rect>
-     <x>244</x>
+     <x>8</x>
      <y>280</y>
-     <width>41</width>
-     <height>16</height>
+     <width>345</width>
+     <height>20</height>
     </rect>
    </property>
    <property name="text">
-    <string>-</string>
+    <string>Using Qt 5 libraries version:</string>
    </property>
    <property name="alignment">
-    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+    <set>Qt::AlignCenter</set>
    </property>
   </widget>
   <widget class="QLabel" name="ql_bunnies">
    <property name="geometry">
     <rect>
-     <x>62</x>
+     <x>8</x>
      <y>240</y>
-     <width>240</width>
+     <width>346</width>
      <height>21</height>
     </rect>
    </property>
@@ -126,6 +100,9 @@
    <property name="text">
     <string>&quot;Fear nothing except for bunnies!&quot;</string>
    </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
   </widget>
  </widget>
  <resources/>