Mercurial > hg > syntilista

changeset 60:d7a2a48ebe24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a separate "About" button, don't use the logo as one. Change logo widget back to QLabel.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 08 Apr 2017 02:42:01 +0300
parents 423d2383a605
children 11fc54878035
files main.cpp main.h mainwindow.ui
diffstat 3 files changed, 26 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/main.cpp	Sat Apr 08 02:16:48 2017 +0300
+++ b/main.cpp	Sat Apr 08 02:42:01 2017 +0300
@@ -224,8 +224,8 @@
         arg(tr(APP_VERSION)));
 
     QPixmap logoImage(":/img/logo.png");
-    ui->button_LogoImage->setIcon(QIcon(logoImage));
-    ui->button_LogoImage->setIconSize(logoImage.rect().size());
+    ui->button_LogoImage->setPixmap(logoImage);
+    ui->button_LogoImage->setAlignment(Qt::AlignCenter);
 
     ui->edit_Amount->setValidator(new QDoubleValidator(0, 1000, 2, this));
     setCommonStyleSheet(this);
@@ -420,7 +420,7 @@
 }
 
 
-void SyntilistaMainWindow::on_button_LogoImage_clicked()
+void SyntilistaMainWindow::on_button_About_clicked()
 {
     QMessageBox::about(
         this,
--- a/main.h	Sat Apr 08 02:16:48 2017 +0300
+++ b/main.h	Sat Apr 08 02:42:01 2017 +0300
@@ -127,7 +127,7 @@
 
     void on_button_Quit_clicked();
 
-    void on_button_LogoImage_clicked();
+    void on_button_About_clicked();
 
     void on_button_AddDebt_clicked();
 
--- a/mainwindow.ui	Sat Apr 08 02:16:48 2017 +0300
+++ b/mainwindow.ui	Sat Apr 08 02:42:01 2017 +0300
@@ -227,13 +227,10 @@
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="button_LogoImage">
+       <widget class="QLabel" name="button_LogoImage">
         <property name="text">
          <string/>
         </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
       <item>
@@ -255,6 +252,26 @@
          <enum>QLayout::SetMinimumSize</enum>
         </property>
         <item>
+         <widget class="QPushButton" name="button_About">
+          <property name="text">
+           <string>?</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <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="QPushButton" name="button_Quit">
           <property name="text">
            <string>Poistu ohjelmasta</string>
@@ -276,7 +293,7 @@
   <tabstop>button_Quit</tabstop>
  </tabstops>
  <resources>
-  <include location="Syntilista.qrc"/>
+  <include location="resources.qrc"/>
  </resources>
  <connections/>
 </ui>