From 0012416d13b8f2b121e8c6d86c641f1434ef147c Mon Sep 17 00:00:00 2001
From: Rafael <Syping@users.noreply.github.com>
Date: Sat, 3 Dec 2016 13:03:14 +0100
Subject: [PATCH] button size/text fix

---
 OptionsDialog.ui     |   3 +--
 PictureDialog.ui     |   3 +--
 ProfileInterface.cpp |   1 +
 UserInterface.ui     |   5 ++---
 res/app.qrc          |   1 +
 res/empty1x16.png    | Bin 0 -> 157 bytes
 6 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 res/empty1x16.png

diff --git a/OptionsDialog.ui b/OptionsDialog.ui
index 16c08bf..7ee8e98 100755
--- a/OptionsDialog.ui
+++ b/OptionsDialog.ui
@@ -479,8 +479,7 @@
         <string extracomment="OK, Cancel, Apply">&amp;Cancel</string>
        </property>
        <property name="icon">
-        <iconset theme="dialog-cancel">
-         <normaloff>.</normaloff>.</iconset>
+        <iconset theme="dialog-cancel"/>
        </property>
       </widget>
      </item>
diff --git a/PictureDialog.ui b/PictureDialog.ui
index 50c65bd..ecf1214 100755
--- a/PictureDialog.ui
+++ b/PictureDialog.ui
@@ -189,8 +189,7 @@
                <string>&amp;Close</string>
               </property>
               <property name="icon">
-               <iconset theme="dialog-close">
-                <normaloff>.</normaloff>.</iconset>
+               <iconset theme="dialog-close"/>
               </property>
               <property name="autoDefault">
                <bool>false</bool>
diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp
index 7e9ed4f..9afa86f 100755
--- a/ProfileInterface.cpp
+++ b/ProfileInterface.cpp
@@ -227,6 +227,7 @@ void ProfileInterface::dialogNextPictureRequested(QWidget *dialog)
         {
             QString newWidgetKey = pictureKeyList.at(picIndex);
             SnapmaticWidget *picWidget = (SnapmaticWidget*)widgets.key(newWidgetKey);
+            picDialog->setMaximumSize(picDialog->width(), QWIDGETSIZE_MAX);
             picDialog->setSnapmaticPicture(picWidget->getPicture(), picIndex);
             //picDialog->adaptNewDialogSize();
         }
diff --git a/UserInterface.ui b/UserInterface.ui
index 567d15f..69a2883 100755
--- a/UserInterface.ui
+++ b/UserInterface.ui
@@ -147,8 +147,7 @@
              <string>&amp;Close</string>
             </property>
             <property name="icon">
-             <iconset theme="dialog-close">
-              <normaloff>.</normaloff>.</iconset>
+             <iconset theme="dialog-close"/>
             </property>
             <property name="autoDefault">
              <bool>true</bool>
@@ -169,7 +168,7 @@
      <x>0</x>
      <y>0</y>
      <width>625</width>
-     <height>19</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
diff --git a/res/app.qrc b/res/app.qrc
index 9bbc080..172dfd1 100755
--- a/res/app.qrc
+++ b/res/app.qrc
@@ -21,6 +21,7 @@
         <file>back.png</file>
         <file>next.png</file>
         <file>960x536.png</file>
+        <file>empty1x16.png</file>
     </qresource>
     <qresource prefix="/global">
         <file>global.de.ini</file>
diff --git a/res/empty1x16.png b/res/empty1x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ab4481f5b1e8f5e90688a296e75a1b7763b6cc9
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{F!3HF+&llYe5-1LGcVbv~PUa<$!;<dk>&U>c
zv7h@-A}f&3S>O>_%)r2R7=#&*=dVZs3QCr^MwA5Sr<If^7Ns&2BxdH7=;fuBD46IO
u=ouP0vt+*kD&qBYaSV|NPhOyvkO1TcFfd+r???u+7(8A5T-G@yGywqNH71q-

literal 0
HcmV?d00001