Improve how tool buttons are generated

novelwriter/dialogs/preferences.py

@@ -27,18 +27,18 @@ from __future__ import annotations
 import logging
 
 from PyQt5.QtGui import QCloseEvent, QFont, QKeyEvent, QKeySequence
-from PyQt5.QtCore import QSize, Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractButton, QCompleter, QDialog, QDialogButtonBox, QFileDialog,
-    QFontDialog, QHBoxLayout, QLineEdit, QPushButton, QToolButton, QVBoxLayout,
-    QWidget, qApp
+    QFontDialog, QHBoxLayout, QLineEdit, QPushButton, QVBoxLayout, QWidget,
+    qApp
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.constants import nwConst, nwUnicode
 from novelwriter.dialogs.quotes import GuiQuoteSelect
 from novelwriter.extensions.configlayout import NColourLabel, NScrollableForm
-from novelwriter.extensions.modified import NComboBox, NDoubleSpinBox, NSpinBox
+from novelwriter.extensions.modified import NComboBox, NDoubleSpinBox, NIconToolButton, NSpinBox
 from novelwriter.extensions.pagedsidebar import NPagedSideBar
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.types import QtAlignCenter
@@ -133,10 +133,8 @@ class GuiPreferences(QDialog):
     def buildForm(self) -> None:
         """Build the settings form."""
         section = 0
+        iSz = SHARED.theme.baseIconSize
         minWidth = CONFIG.pxInt(200)
-        iPx = SHARED.theme.baseIconSize
-        iconSize = QSize(iPx, iPx)
-        mIcon = SHARED.theme.getIcon("more")
 
         # Label
         self.sidebar.addLabel(self.tr("General"))
@@ -178,9 +176,7 @@ class GuiPreferences(QDialog):
         self.guiFont.setReadOnly(True)
         self.guiFont.setMinimumWidth(CONFIG.pxInt(162))
         self.guiFont.setText(CONFIG.guiFont)
-        self.guiFontButton = QToolButton(self)
-        self.guiFontButton.setIcon(mIcon)
-        self.guiFontButton.setIconSize(iconSize)
+        self.guiFontButton = NIconToolButton(self, iSz, "more")
         self.guiFontButton.clicked.connect(self._selectGuiFont)
         self.mainForm.addRow(
             self.tr("Application font family"), self.guiFont,
@@ -240,9 +236,7 @@ class GuiPreferences(QDialog):
         self.textFont.setReadOnly(True)
         self.textFont.setMinimumWidth(CONFIG.pxInt(162))
         self.textFont.setText(CONFIG.textFont)
-        self.textFontButton = QToolButton(self)
-        self.textFontButton.setIcon(mIcon)
-        self.textFontButton.setIconSize(iconSize)
+        self.textFontButton = NIconToolButton(self, iSz, "more")
         self.textFontButton.clicked.connect(self._selectTextFont)
         self.mainForm.addRow(
             self.tr("Document font family"), self.textFont,
@@ -325,6 +319,7 @@ class GuiPreferences(QDialog):
         # Backup Path
         self.backupPath = CONFIG.backupPath()
         self.backupGetPath = QPushButton(SHARED.theme.getIcon("browse"), self.tr("Browse"), self)
+        self.backupGetPath.setIconSize(iSz)
         self.backupGetPath.clicked.connect(self._backupFolder)
         self.mainForm.addRow(
             self.tr("Backup storage location"), self.backupGetPath,
@@ -682,9 +677,7 @@ class GuiPreferences(QDialog):
         self.quoteSym["SO"].setFixedWidth(qWidth)
         self.quoteSym["SO"].setAlignment(QtAlignCenter)
         self.quoteSym["SO"].setText(CONFIG.fmtSQuoteOpen)
-        self.btnSingleStyleO = QToolButton(self)
-        self.btnSingleStyleO.setIcon(mIcon)
-        self.btnSingleStyleO.setIconSize(iconSize)
+        self.btnSingleStyleO = NIconToolButton(self, iSz, "more")
         self.btnSingleStyleO.clicked.connect(lambda: self._getQuote("SO"))
         self.mainForm.addRow(
             self.tr("Single quote open style"), self.quoteSym["SO"],
@@ -698,9 +691,7 @@ class GuiPreferences(QDialog):
         self.quoteSym["SC"].setFixedWidth(qWidth)
         self.quoteSym["SC"].setAlignment(QtAlignCenter)
         self.quoteSym["SC"].setText(CONFIG.fmtSQuoteClose)
-        self.btnSingleStyleC = QToolButton(self)
-        self.btnSingleStyleC.setIcon(mIcon)
-        self.btnSingleStyleC.setIconSize(iconSize)
+        self.btnSingleStyleC = NIconToolButton(self, iSz, "more")
         self.btnSingleStyleC.clicked.connect(lambda: self._getQuote("SC"))
         self.mainForm.addRow(
             self.tr("Single quote close style"), self.quoteSym["SC"],
@@ -715,9 +706,7 @@ class GuiPreferences(QDialog):
         self.quoteSym["DO"].setFixedWidth(qWidth)
         self.quoteSym["DO"].setAlignment(QtAlignCenter)
         self.quoteSym["DO"].setText(CONFIG.fmtDQuoteOpen)
-        self.btnDoubleStyleO = QToolButton(self)
-        self.btnDoubleStyleO.setIcon(mIcon)
-        self.btnDoubleStyleO.setIconSize(iconSize)
+        self.btnDoubleStyleO = NIconToolButton(self, iSz, "more")
         self.btnDoubleStyleO.clicked.connect(lambda: self._getQuote("DO"))
         self.mainForm.addRow(
             self.tr("Double quote open style"), self.quoteSym["DO"],
@@ -731,9 +720,7 @@ class GuiPreferences(QDialog):
         self.quoteSym["DC"].setFixedWidth(qWidth)
         self.quoteSym["DC"].setAlignment(QtAlignCenter)
         self.quoteSym["DC"].setText(CONFIG.fmtDQuoteClose)
-        self.btnDoubleStyleC = QToolButton(self)
-        self.btnDoubleStyleC.setIcon(mIcon)
-        self.btnDoubleStyleC.setIconSize(iconSize)
+        self.btnDoubleStyleC = NIconToolButton(self, iSz, "more")
         self.btnDoubleStyleC.clicked.connect(lambda: self._getQuote("DC"))
         self.mainForm.addRow(
             self.tr("Double quote close style"), self.quoteSym["DC"],