From 66d672fad71c3c3746ee1217d866a52d56f2ba28 Mon Sep 17 00:00:00 2001
From: Ian Farrell <ianfarrell47@gmail.com>
Date: Fri, 13 Sep 2024 16:00:49 -0400
Subject: [PATCH] Change dialog button from QToolButton to QPushButton

Change the "Settings" dialog button to a QPushButton. This simplifies the Designer UI file and fixes text/icon alignment
(for example on Fusion.)
---
 lxqt-config-monitor/monitorsettingsdialog.cpp | 2 +-
 lxqt-config-monitor/monitorsettingsdialog.ui  | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lxqt-config-monitor/monitorsettingsdialog.cpp b/lxqt-config-monitor/monitorsettingsdialog.cpp
index e20235fa6..861c52e2d 100644
--- a/lxqt-config-monitor/monitorsettingsdialog.cpp
+++ b/lxqt-config-monitor/monitorsettingsdialog.cpp
@@ -86,7 +86,7 @@ MonitorSettingsDialog::MonitorSettingsDialog() :
 
     });
 
-    connect(ui.settingsButton, &QToolButton::clicked, this, &MonitorSettingsDialog::showSettingsDialog);
+    connect(ui.settingsButton, &QPushButton::clicked, this, &MonitorSettingsDialog::showSettingsDialog);
 
     // also make sure that widgets are shown completely (a Qt bug under Wayland?)
     LXQt::Settings settings(QStringLiteral("lxqt-config-monitor"));
diff --git a/lxqt-config-monitor/monitorsettingsdialog.ui b/lxqt-config-monitor/monitorsettingsdialog.ui
index 699d0abc3..ce3e16d12 100644
--- a/lxqt-config-monitor/monitorsettingsdialog.ui
+++ b/lxqt-config-monitor/monitorsettingsdialog.ui
@@ -65,7 +65,7 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QToolButton" name="settingsButton">
+      <widget class="QPushButton" name="settingsButton">
        <property name="text">
         <string>Settings</string>
        </property>
@@ -73,12 +73,6 @@
         <iconset theme="preferences-system">
          <normaloff>.</normaloff>.</iconset>
        </property>
-       <property name="toolButtonStyle">
-        <enum>Qt::ToolButtonTextBesideIcon</enum>
-       </property>
-       <property name="autoRaise">
-        <bool>false</bool>
-       </property>
       </widget>
      </item>
      <item>