novelWriter 2.4b1__py3-none-any.whl → 2.4.1__py3-none-any.whl

novelwriter/dialogs/about.py

@@ -26,16 +26,16 @@ from __future__ import annotations
 import logging
 
 from PyQt5.QtGui import QCloseEvent, QColor
-from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import (
     QDialog, QDialogButtonBox, QHBoxLayout, QLabel, QTextBrowser, QVBoxLayout,
     QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import readTextFile
+from novelwriter.common import cssCol, readTextFile
 from novelwriter.extensions.configlayout import NColourLabel
 from novelwriter.extensions.versioninfo import VersionInfoWidget
+from novelwriter.types import QtAlignRightTop, QtDialogClose
 
 logger = logging.getLogger(__name__)
 
@@ -70,7 +70,7 @@ class GuiAbout(QDialog):
 
         self.nwLicence = QLabel(self.tr("This application is licenced under {0}").format(
             "<a href='https://www.gnu.org/licenses/gpl-3.0.html'>GPL v3.0</a>"
-        ))
+        ), self)
         self.nwLicence.setOpenExternalLinks(True)
 
         # Credits
@@ -84,7 +84,7 @@ class GuiAbout(QDialog):
         self.txtCredits.setViewportMargins(0, hA, hA, 0)
 
         # Buttons
-        self.btnBox = QDialogButtonBox(QDialogButtonBox.Close, self)
+        self.btnBox = QDialogButtonBox(QtDialogClose, self)
         self.btnBox.rejected.connect(self.close)
 
         # Assemble
@@ -100,10 +100,8 @@ class GuiAbout(QDialog):
         self.innerBox.addSpacing(hB)
         self.innerBox.addWidget(self.btnBox)
 
-        topRight = Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignRight
-
         self.outerBox = QHBoxLayout()
-        self.outerBox.addWidget(self.nwLogo, 0, topRight)
+        self.outerBox.addWidget(self.nwLogo, 0, QtAlignRightTop)
         self.outerBox.addLayout(self.innerBox, 1)
 
         self.setLayout(self.outerBox)
@@ -149,10 +147,10 @@ class GuiAbout(QDialog):
 
     def _setStyleSheet(self) -> None:
         """Set stylesheet for all browser tabs."""
-        baseCol = self.palette().window().color()
-        self.txtCredits.setStyleSheet((
-            "QTextBrowser {{border: none; background: rgb({r},{g},{b});}} "
-        ).format(r=baseCol.red(), g=baseCol.green(), b=baseCol.blue()))
+        baseCol = cssCol(self.palette().window().color())
+        self.txtCredits.setStyleSheet(
+            f"QTextBrowser {{border: none; background: {baseCol};}} "
+        )
         return
 
 # END Class GuiAbout

novelwriter/dialogs/docmerge.py

@@ -26,8 +26,8 @@ from __future__ import annotations
 
 import logging
 
+from PyQt5.QtCore import Qt, pyqtSlot
 from PyQt5.QtGui import QCloseEvent
-from PyQt5.QtCore import Qt, QSize, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QDialog, QDialogButtonBox, QGridLayout, QLabel,
     QListWidget, QListWidgetItem, QVBoxLayout, QWidget
@@ -36,13 +36,14 @@ from PyQt5.QtWidgets import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.configlayout import NColourLabel
+from novelwriter.types import QtDialogCancel, QtDialogOk, QtDialogReset, QtUserRole
 
 logger = logging.getLogger(__name__)
 
 
 class GuiDocMerge(QDialog):
 
-    D_HANDLE = Qt.ItemDataRole.UserRole
+    D_HANDLE = QtUserRole
 
     def __init__(self, parent: QWidget, sHandle: str, itemList: list[str]) -> None:
         super().__init__(parent=parent)
@@ -53,27 +54,29 @@ class GuiDocMerge(QDialog):
 
         self._data = {}
 
-        self.headLabel = QLabel("<b>{0}</b>".format(self.tr("Documents to Merge")))
+        self.headLabel = QLabel(self.tr("Documents to Merge"), self)
+        self.headLabel.setFont(SHARED.theme.guiFontB)
         self.helpLabel = NColourLabel(
             self.tr("Drag and drop items to change the order, or uncheck to exclude."),
             SHARED.theme.helpText, parent=self, wrap=True
         )
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         hSp = CONFIG.pxInt(12)
         vSp = CONFIG.pxInt(8)
         bSp = CONFIG.pxInt(12)
 
-        self.listBox = QListWidget()
-        self.listBox.setIconSize(QSize(iPx, iPx))
+        self.listBox = QListWidget(self)
+        self.listBox.setIconSize(iSz)
         self.listBox.setMinimumWidth(CONFIG.pxInt(400))
         self.listBox.setMinimumHeight(CONFIG.pxInt(180))
-        self.listBox.setSelectionBehavior(QAbstractItemView.SelectRows)
-        self.listBox.setSelectionMode(QAbstractItemView.SingleSelection)
-        self.listBox.setDragDropMode(QAbstractItemView.InternalMove)
+        self.listBox.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
+        self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
+        self.listBox.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove)
 
         # Merge Options
-        self.trashLabel = QLabel(self.tr("Move merged items to Trash"))
+        self.trashLabel = QLabel(self.tr("Move merged items to Trash"), self)
         self.trashSwitch = NSwitch(self, height=iPx)
 
         self.optBox = QGridLayout()
@@ -83,11 +86,11 @@ class GuiDocMerge(QDialog):
         self.optBox.setColumnStretch(2, 1)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.buttonBox = QDialogButtonBox(QtDialogOk | QtDialogCancel, self)
         self.buttonBox.accepted.connect(self.accept)
         self.buttonBox.rejected.connect(self.reject)
 
-        self.resetButton = self.buttonBox.addButton(QDialogButtonBox.Reset)
+        self.resetButton = self.buttonBox.addButton(QtDialogReset)
         self.resetButton.clicked.connect(self._resetList)
 
         # Assemble
@@ -119,7 +122,7 @@ class GuiDocMerge(QDialog):
         finalItems = []
         for i in range(self.listBox.count()):
             item = self.listBox.item(i)
-            if item is not None and item.checkState() == Qt.Checked:
+            if item is not None and item.checkState() == Qt.CheckState.Checked:
                 finalItems.append(item.data(self.D_HANDLE))
 
         self._data["moveToTrash"] = self.trashSwitch.isChecked()
@@ -174,7 +177,7 @@ class GuiDocMerge(QDialog):
             newItem.setIcon(itemIcon)
             newItem.setText(nwItem.itemName)
             newItem.setData(self.D_HANDLE, tHandle)
-            newItem.setCheckState(Qt.Checked)
+            newItem.setCheckState(Qt.CheckState.Checked)
 
             self.listBox.addItem(newItem)
 

novelwriter/dialogs/docsplit.py

@@ -26,8 +26,8 @@ from __future__ import annotations
 
 import logging
 
+from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtGui import QCloseEvent
-from PyQt5.QtCore import Qt, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QComboBox, QDialog, QDialogButtonBox, QGridLayout,
     QLabel, QListWidget, QListWidgetItem, QVBoxLayout, QWidget
@@ -36,15 +36,16 @@ from PyQt5.QtWidgets import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.configlayout import NColourLabel
+from novelwriter.types import QtDialogCancel, QtDialogOk, QtUserRole
 
 logger = logging.getLogger(__name__)
 
 
 class GuiDocSplit(QDialog):
 
-    LINE_ROLE  = Qt.ItemDataRole.UserRole
-    LEVEL_ROLE = Qt.ItemDataRole.UserRole + 1
-    LABEL_ROLE = Qt.ItemDataRole.UserRole + 2
+    LINE_ROLE  = QtUserRole
+    LEVEL_ROLE = QtUserRole + 1
+    LABEL_ROLE = QtUserRole + 2
 
     def __init__(self, parent: QWidget, sHandle: str) -> None:
         super().__init__(parent=parent)
@@ -57,14 +58,15 @@ class GuiDocSplit(QDialog):
 
         self.setWindowTitle(self.tr("Split Document"))
 
-        self.headLabel = QLabel("<b>{0}</b>".format(self.tr("Document Headings")))
+        self.headLabel = QLabel(self.tr("Document Headings"), self)
+        self.headLabel.setFont(SHARED.theme.guiFontB)
         self.helpLabel = NColourLabel(
             self.tr("Select the maximum level to split into files."),
             SHARED.theme.helpText, parent=self, wrap=True
         )
 
         # Values
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
         hSp = CONFIG.pxInt(12)
         vSp = CONFIG.pxInt(8)
         bSp = CONFIG.pxInt(12)
@@ -75,8 +77,8 @@ class GuiDocSplit(QDialog):
         docHierarchy = pOptions.getBool("GuiDocSplit", "docHierarchy", True)
 
         # Heading Selection
-        self.listBox = QListWidget()
-        self.listBox.setDragDropMode(QAbstractItemView.NoDragDrop)
+        self.listBox = QListWidget(self)
+        self.listBox.setDragDropMode(QAbstractItemView.DragDropMode.NoDragDrop)
         self.listBox.setMinimumWidth(CONFIG.pxInt(400))
         self.listBox.setMinimumHeight(CONFIG.pxInt(180))
 
@@ -91,15 +93,15 @@ class GuiDocSplit(QDialog):
         self.splitLevel.currentIndexChanged.connect(self._reloadList)
 
         # Split Options
-        self.folderLabel = QLabel(self.tr("Split into a new folder"))
+        self.folderLabel = QLabel(self.tr("Split into a new folder"), self)
         self.folderSwitch = NSwitch(self, height=iPx)
         self.folderSwitch.setChecked(intoFolder)
 
-        self.hierarchyLabel = QLabel(self.tr("Create document hierarchy"))
+        self.hierarchyLabel = QLabel(self.tr("Create document hierarchy"), self)
         self.hierarchySwitch = NSwitch(self, height=iPx)
         self.hierarchySwitch.setChecked(docHierarchy)
 
-        self.trashLabel = QLabel(self.tr("Move split document to Trash"))
+        self.trashLabel = QLabel(self.tr("Move split document to Trash"), self)
         self.trashSwitch = NSwitch(self, height=iPx)
 
         self.optBox = QGridLayout()
@@ -114,7 +116,7 @@ class GuiDocSplit(QDialog):
         self.optBox.setColumnStretch(3, 1)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.buttonBox = QDialogButtonBox(QtDialogOk | QtDialogCancel, self)
         self.buttonBox.accepted.connect(self.accept)
         self.buttonBox.rejected.connect(self.reject)
 

novelwriter/dialogs/editlabel.py

@@ -31,6 +31,7 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter import CONFIG
+from novelwriter.types import QtDialogCancel, QtDialogOk
 
 logger = logging.getLogger(__name__)
 
@@ -55,13 +56,13 @@ class GuiEditLabel(QDialog):
         self.labelValue.selectAll()
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.buttonBox = QDialogButtonBox(QtDialogOk | QtDialogCancel, self)
         self.buttonBox.accepted.connect(self.accept)
         self.buttonBox.rejected.connect(self.reject)
 
         # Assemble
         self.innerBox = QHBoxLayout()
-        self.innerBox.addWidget(QLabel(self.tr("Label")), 0)
+        self.innerBox.addWidget(QLabel(self.tr("Label"), self), 0)
         self.innerBox.addWidget(self.labelValue, 1)
         self.innerBox.setSpacing(mSp)
 
@@ -88,9 +89,9 @@ class GuiEditLabel(QDialog):
     def getLabel(cls, parent: QWidget, text: str) -> tuple[str, bool]:
         """Pop the dialog and return the result."""
         cls = GuiEditLabel(parent, text=text)
-        cls.exec_()
+        cls.exec()
         label = cls.itemLabel
-        accepted = cls.result() == QDialog.Accepted
+        accepted = cls.result() == QDialog.DialogCode.Accepted
         cls.deleteLater()
         return label, accepted
 

novelwriter/dialogs/preferences.py

@@ -26,21 +26,25 @@ from __future__ import annotations
 
 import logging
 
-from PyQt5.QtGui import QCloseEvent, QFont, QKeyEvent, QKeySequence
 from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QCloseEvent, QFont, QKeyEvent, QKeySequence
 from PyQt5.QtWidgets import (
-    QAbstractButton, QCompleter, QDialog, QDialogButtonBox, QFileDialog,
-    QFontDialog, QHBoxLayout, QLineEdit, QPushButton, QToolButton, QVBoxLayout,
-    QWidget, qApp
+    QAbstractButton, QApplication, QCompleter, QDialog, QDialogButtonBox,
+    QFileDialog, QFontDialog, QHBoxLayout, QLineEdit, QPushButton, QVBoxLayout,
+    QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.constants import nwConst, nwUnicode
 from novelwriter.dialogs.quotes import GuiQuoteSelect
-from novelwriter.extensions.switch import NSwitch
-from novelwriter.extensions.modified import NComboBox, NDoubleSpinBox, NSpinBox
 from novelwriter.extensions.configlayout import NColourLabel, NScrollableForm
+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, QtDialogApply, QtDialogClose, QtDialogSave, QtRoleAccept,
+    QtRoleApply, QtRoleReject
+)
 
 logger = logging.getLogger(__name__)
 
@@ -83,11 +87,7 @@ class GuiPreferences(QDialog):
         self.mainForm.setHelpTextStyle(SHARED.theme.helpText)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(
-            QDialogButtonBox.StandardButton.Apply
-            | QDialogButtonBox.StandardButton.Save
-            | QDialogButtonBox.StandardButton.Close
-        )
+        self.buttonBox = QDialogButtonBox(QtDialogApply | QtDialogSave | QtDialogClose, self)
         self.buttonBox.clicked.connect(self._dialogButtonClicked)
 
         # Assemble
@@ -132,8 +132,8 @@ class GuiPreferences(QDialog):
     def buildForm(self) -> None:
         """Build the settings form."""
         section = 0
+        iSz = SHARED.theme.baseIconSize
         minWidth = CONFIG.pxInt(200)
-        mIcon = SHARED.theme.getIcon("more")
 
         # Label
         self.sidebar.addLabel(self.tr("General"))
@@ -175,8 +175,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 = NIconToolButton(self, iSz, "more")
         self.guiFontButton.clicked.connect(self._selectGuiFont)
         self.mainForm.addRow(
             self.tr("Application font family"), self.guiFont,
@@ -236,8 +235,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 = NIconToolButton(self, iSz, "more")
         self.textFontButton.clicked.connect(self._selectTextFont)
         self.mainForm.addRow(
             self.tr("Document font family"), self.textFont,
@@ -320,6 +318,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,
@@ -675,10 +674,9 @@ class GuiPreferences(QDialog):
         self.quoteSym["SO"].setMaxLength(1)
         self.quoteSym["SO"].setReadOnly(True)
         self.quoteSym["SO"].setFixedWidth(qWidth)
-        self.quoteSym["SO"].setAlignment(Qt.AlignCenter)
+        self.quoteSym["SO"].setAlignment(QtAlignCenter)
         self.quoteSym["SO"].setText(CONFIG.fmtSQuoteOpen)
-        self.btnSingleStyleO = QToolButton(self)
-        self.btnSingleStyleO.setIcon(mIcon)
+        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"],
@@ -690,10 +688,9 @@ class GuiPreferences(QDialog):
         self.quoteSym["SC"].setMaxLength(1)
         self.quoteSym["SC"].setReadOnly(True)
         self.quoteSym["SC"].setFixedWidth(qWidth)
-        self.quoteSym["SC"].setAlignment(Qt.AlignCenter)
+        self.quoteSym["SC"].setAlignment(QtAlignCenter)
         self.quoteSym["SC"].setText(CONFIG.fmtSQuoteClose)
-        self.btnSingleStyleC = QToolButton(self)
-        self.btnSingleStyleC.setIcon(mIcon)
+        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"],
@@ -706,10 +703,9 @@ class GuiPreferences(QDialog):
         self.quoteSym["DO"].setMaxLength(1)
         self.quoteSym["DO"].setReadOnly(True)
         self.quoteSym["DO"].setFixedWidth(qWidth)
-        self.quoteSym["DO"].setAlignment(Qt.AlignCenter)
+        self.quoteSym["DO"].setAlignment(QtAlignCenter)
         self.quoteSym["DO"].setText(CONFIG.fmtDQuoteOpen)
-        self.btnDoubleStyleO = QToolButton(self)
-        self.btnDoubleStyleO.setIcon(mIcon)
+        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"],
@@ -721,10 +717,9 @@ class GuiPreferences(QDialog):
         self.quoteSym["DC"].setMaxLength(1)
         self.quoteSym["DC"].setReadOnly(True)
         self.quoteSym["DC"].setFixedWidth(qWidth)
-        self.quoteSym["DC"].setAlignment(Qt.AlignCenter)
+        self.quoteSym["DC"].setAlignment(QtAlignCenter)
         self.quoteSym["DC"].setText(CONFIG.fmtDQuoteClose)
-        self.btnDoubleStyleC = QToolButton(self)
-        self.btnDoubleStyleC.setIcon(mIcon)
+        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"],
@@ -746,7 +741,7 @@ class GuiPreferences(QDialog):
         logger.debug("Close: GuiPreferences")
         self._saveWindowSize()
         event.accept()
-        qApp.processEvents()
+        QApplication.processEvents()
         self.done(nwConst.DLG_FINISHED)
         self.deleteLater()
         return
@@ -766,12 +761,12 @@ class GuiPreferences(QDialog):
     def _dialogButtonClicked(self, button: QAbstractButton) -> None:
         """Handle button clicks from the dialog button box."""
         role = self.buttonBox.buttonRole(button)
-        if role == QDialogButtonBox.ButtonRole.ApplyRole:
+        if role == QtRoleApply:
             self._saveValues()
-        elif role == QDialogButtonBox.ButtonRole.AcceptRole:
+        elif role == QtRoleAccept:
             self._saveValues()
             self.close()
-        elif role == QDialogButtonBox.ButtonRole.RejectRole:
+        elif role == QtRoleReject:
             self.close()
         return
 
@@ -800,7 +795,7 @@ class GuiPreferences(QDialog):
         return
 
     @pyqtSlot()
-    def _selectTextFont(self):
+    def _selectTextFont(self) -> None:
         """Open the QFontDialog and set a font for the font style."""
         current = QFont()
         current.setFamily(CONFIG.textFont)
@@ -816,7 +811,7 @@ class GuiPreferences(QDialog):
         """Open a dialog to select the backup folder."""
         if path := QFileDialog.getExistingDirectory(
             self, self.tr("Backup Directory"), str(self.backupPath) or "",
-            options=QFileDialog.ShowDirsOnly
+            options=QFileDialog.Option.ShowDirsOnly
         ):
             self.backupPath = path
             self.mainForm.setHelpText("backupPath", self.tr("Path: {0}").format(path))

novelwriter/dialogs/projectsettings.py

@@ -26,20 +26,21 @@ from __future__ import annotations
 
 import logging
 
-from PyQt5.QtGui import QCloseEvent, QColor, QIcon, QPixmap
 from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QCloseEvent, QColor, QIcon, QPixmap
 from PyQt5.QtWidgets import (
-    QColorDialog, QDialog, QDialogButtonBox, QHBoxLayout, QLineEdit,
-    QPushButton, QStackedWidget, QTreeWidget, QTreeWidgetItem, QVBoxLayout,
-    QWidget, qApp
+    QApplication, QColorDialog, QDialog, QDialogButtonBox, QHBoxLayout,
+    QLineEdit, QPushButton, QStackedWidget, QTreeWidget, QTreeWidgetItem,
+    QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import simplified
-from novelwriter.extensions.switch import NSwitch
-from novelwriter.extensions.modified import NComboBox
 from novelwriter.extensions.configlayout import NColourLabel, NFixedPage, NScrollableForm
+from novelwriter.extensions.modified import NComboBox, NIconToolButton
 from novelwriter.extensions.pagedsidebar import NPagedSideBar
+from novelwriter.extensions.switch import NSwitch
+from novelwriter.types import QtDialogCancel, QtDialogSave, QtUserRole
 
 logger = logging.getLogger(__name__)
 
@@ -83,9 +84,7 @@ class GuiProjectSettings(QDialog):
         self.sidebar.buttonClicked.connect(self._sidebarClicked)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(
-            QDialogButtonBox.StandardButton.Save | QDialogButtonBox.StandardButton.Cancel
-        )
+        self.buttonBox = QDialogButtonBox(QtDialogSave | QtDialogCancel, self)
         self.buttonBox.accepted.connect(self._doSave)
         self.buttonBox.rejected.connect(self.close)
 
@@ -195,7 +194,7 @@ class GuiProjectSettings(QDialog):
             project.data.setAutoReplace(newList)
 
         self.newProjectSettingsReady.emit(rebuildTrees)
-        qApp.processEvents()
+        QApplication.processEvents()
         self.close()
 
         return
@@ -258,17 +257,17 @@ class _SettingsPage(NScrollableForm):
         )
 
         # Project Language
+        projLang = data.language or CONFIG.guiLocale
         self.projLang = NComboBox(self)
         self.projLang.setMinimumWidth(xW)
         for tag, language in CONFIG.listLanguages(CONFIG.LANG_PROJ):
             self.projLang.addItem(language, tag)
+        self.projLang.setCurrentData(projLang, projLang)
         self.addRow(
             self.tr("Project language"), self.projLang,
             self.tr("Only used when building the manuscript."),
             stretch=(3, 2)
         )
-        if (idx := self.projLang.findData(data.language)) != -1:
-            self.projLang.setCurrentIndex(idx)
 
         # Spell Check Language
         self.spellLang = NComboBox(self)
@@ -305,9 +304,9 @@ class _StatusPage(NFixedPage):
     COL_LABEL = 0
     COL_USAGE = 1
 
-    KEY_ROLE = Qt.ItemDataRole.UserRole
-    COL_ROLE = Qt.ItemDataRole.UserRole + 1
-    NUM_ROLE = Qt.ItemDataRole.UserRole + 2
+    KEY_ROLE = QtUserRole
+    COL_ROLE = QtUserRole + 1
+    NUM_ROLE = QtUserRole + 2
 
     def __init__(self, parent: QWidget, isStatus: bool) -> None:
         super().__init__(parent=parent)
@@ -329,7 +328,9 @@ class _StatusPage(NFixedPage):
         self._colDeleted = []
         self._selColour = QColor(100, 100, 100)
 
-        self.iPx = SHARED.theme.baseIconSize
+        self.iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
+        bSz = SHARED.theme.buttonIconSize
 
         # Title
         self.pageTitle = NColourLabel(
@@ -348,16 +349,16 @@ class _StatusPage(NFixedPage):
             self._addItem(key, entry["name"], entry["cols"], entry["count"])
 
         # List Controls
-        self.addButton = QPushButton(SHARED.theme.getIcon("add"), "", self)
+        self.addButton = NIconToolButton(self, iSz, "add")
         self.addButton.clicked.connect(self._newItem)
 
-        self.delButton = QPushButton(SHARED.theme.getIcon("remove"), "", self)
+        self.delButton = NIconToolButton(self, iSz, "remove")
         self.delButton.clicked.connect(self._delItem)
 
-        self.upButton = QPushButton(SHARED.theme.getIcon("up"), "", self)
+        self.upButton = NIconToolButton(self, iSz, "up")
         self.upButton.clicked.connect(lambda: self._moveItem(-1))
 
-        self.dnButton = QPushButton(SHARED.theme.getIcon("down"), "", self)
+        self.dnButton = NIconToolButton(self, iSz, "down")
         self.dnButton.clicked.connect(lambda: self._moveItem(1))
 
         # Edit Form
@@ -368,12 +369,12 @@ class _StatusPage(NFixedPage):
 
         self.colPixmap = QPixmap(self.iPx, self.iPx)
         self.colPixmap.fill(QColor(100, 100, 100))
-        self.colButton = QPushButton(QIcon(self.colPixmap), self.tr("Colour"))
-        self.colButton.setIconSize(self.colPixmap.rect().size())
+        self.colButton = QPushButton(QIcon(self.colPixmap), self.tr("Colour"), self)
+        self.colButton.setIconSize(bSz)
         self.colButton.setEnabled(False)
         self.colButton.clicked.connect(self._selectColour)
 
-        self.saveButton = QPushButton(self.tr("Save"))
+        self.saveButton = QPushButton(self.tr("Save"), self)
         self.saveButton.setEnabled(False)
         self.saveButton.clicked.connect(self._saveItem)
 
@@ -589,6 +590,8 @@ class _ReplacePage(NFixedPage):
 
         self._changed = False
 
+        iSz = SHARED.theme.baseIconSize
+
         wCol0 = CONFIG.pxInt(
             SHARED.project.options.getInt("GuiProjectSettings", "replaceColW", 130)
         )
@@ -600,7 +603,7 @@ class _ReplacePage(NFixedPage):
         )
 
         # List Box
-        self.listBox = QTreeWidget()
+        self.listBox = QTreeWidget(self)
         self.listBox.setHeaderLabels([self.tr("Keyword"), self.tr("Replace With")])
         self.listBox.setColumnWidth(self.COL_KEY, wCol0)
         self.listBox.setIndentation(0)
@@ -610,14 +613,14 @@ class _ReplacePage(NFixedPage):
             newItem = QTreeWidgetItem(["<%s>" % aKey, aVal])
             self.listBox.addTopLevelItem(newItem)
 
-        self.listBox.sortByColumn(self.COL_KEY, Qt.AscendingOrder)
+        self.listBox.sortByColumn(self.COL_KEY, Qt.SortOrder.AscendingOrder)
         self.listBox.setSortingEnabled(True)
 
         # List Controls
-        self.addButton = QPushButton(SHARED.theme.getIcon("add"), "")
+        self.addButton = NIconToolButton(self, iSz, "add")
         self.addButton.clicked.connect(self._addEntry)
 
-        self.delButton = QPushButton(SHARED.theme.getIcon("remove"), "")
+        self.delButton = NIconToolButton(self, iSz, "remove")
         self.delButton.clicked.connect(self._delEntry)
 
         # Edit Form
@@ -630,7 +633,7 @@ class _ReplacePage(NFixedPage):
         self.editValue.setEnabled(False)
         self.editValue.setMaxLength(80)
 
-        self.saveButton = QPushButton(self.tr("Save"))
+        self.saveButton = QPushButton(self.tr("Save"), self)
         self.saveButton.clicked.connect(self._saveEntry)
 
         # Assemble