From 8aebd159fc2941b600b08535cf5ced805c185e87 Mon Sep 17 00:00:00 2001
From: Matthew Woehlke <matthew.woehlke@kitware.com>
Date: Fri, 15 Jan 2021 11:24:16 -0500
Subject: CMake GUI: Don't use QToolButton

Replace QToolButton instances with QPushButton. QToolButton is only
meant to be used on tool bars and some other special situations. Worse,
we had a mix of QToolButton and QPushButton for things that clearly
should be using the same widget. This will improve visual consistency
and may fix some rendering issues.
---
 Source/QtDialog/CMakeSetupDialog.cxx |  1 -
 Source/QtDialog/CMakeSetupDialog.ui  | 10 ++--------
 Source/QtDialog/EnvironmentDialog.ui | 10 ++--------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 7c4d96b..0313088 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -22,7 +22,6 @@
 #include <QShortcut>
 #include <QStatusBar>
 #include <QString>
-#include <QToolButton>
 #include <QUrl>
 #include <QVector>
 
diff --git a/Source/QtDialog/CMakeSetupDialog.ui b/Source/QtDialog/CMakeSetupDialog.ui
index a5c35b1..25d1cbe 100644
--- a/Source/QtDialog/CMakeSetupDialog.ui
+++ b/Source/QtDialog/CMakeSetupDialog.ui
@@ -208,7 +208,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QToolButton" name="AddEntry">
+          <widget class="QPushButton" name="AddEntry">
            <property name="toolTip">
             <string>Add New Entry</string>
            </property>
@@ -219,13 +219,10 @@
             <iconset resource="CMakeSetup.qrc">
              <normaloff>:/Icons/Plus16.png</normaloff>:/Icons/Plus16.png</iconset>
            </property>
-           <property name="toolButtonStyle">
-            <enum>Qt::ToolButtonTextBesideIcon</enum>
-           </property>
           </widget>
          </item>
          <item>
-          <widget class="QToolButton" name="RemoveEntry">
+          <widget class="QPushButton" name="RemoveEntry">
            <property name="toolTip">
             <string>Remove Selected Entries</string>
            </property>
@@ -236,9 +233,6 @@
             <iconset resource="CMakeSetup.qrc">
              <normaloff>:/Icons/Delete16.png</normaloff>:/Icons/Delete16.png</iconset>
            </property>
-           <property name="toolButtonStyle">
-            <enum>Qt::ToolButtonTextBesideIcon</enum>
-           </property>
           </widget>
          </item>
          <item>
diff --git a/Source/QtDialog/EnvironmentDialog.ui b/Source/QtDialog/EnvironmentDialog.ui
index dea7624..c0b5e9d 100644
--- a/Source/QtDialog/EnvironmentDialog.ui
+++ b/Source/QtDialog/EnvironmentDialog.ui
@@ -46,7 +46,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="QToolButton" name="AddEntry">
+      <widget class="QPushButton" name="AddEntry">
        <property name="text">
         <string>&amp;Add Entry</string>
        </property>
@@ -54,13 +54,10 @@
         <iconset resource="CMakeSetup.qrc">
          <normaloff>:/Icons/Plus16.png</normaloff>:/Icons/Plus16.png</iconset>
        </property>
-       <property name="toolButtonStyle">
-        <enum>Qt::ToolButtonTextBesideIcon</enum>
-       </property>
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="RemoveEntry">
+      <widget class="QPushButton" name="RemoveEntry">
        <property name="text">
         <string>&amp;Remove Entry</string>
        </property>
@@ -68,9 +65,6 @@
         <iconset resource="CMakeSetup.qrc">
          <normaloff>:/Icons/Delete16.png</normaloff>:/Icons/Delete16.png</iconset>
        </property>
-       <property name="toolButtonStyle">
-        <enum>Qt::ToolButtonTextBesideIcon</enum>
-       </property>
       </widget>
      </item>
     </layout>
-- 
cgit v0.12