novelWriter 2.3rc1__py3-none-any.whl → 2.4__py3-none-any.whl

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

novelwriter/dialogs/quotes.py

@@ -26,7 +26,7 @@ from __future__ import annotations
 import logging
 
 from PyQt5.QtGui import QFontMetrics
-from PyQt5.QtCore import QSize, Qt, pyqtSlot
+from PyQt5.QtCore import QSize, pyqtSlot
 from PyQt5.QtWidgets import (
     QDialog, QDialogButtonBox, QFrame, QHBoxLayout, QLabel, QListWidget,
     QListWidgetItem, QVBoxLayout, QWidget
@@ -34,6 +34,7 @@ from PyQt5.QtWidgets import (
 
 from novelwriter import CONFIG
 from novelwriter.constants import trConst, nwQuotes
+from novelwriter.types import QtAlignCenter, QtAlignTop, QtDialogCancel, QtDialogOk, QtUserRole
 
 logger = logging.getLogger(__name__)
 
@@ -42,7 +43,7 @@ class GuiQuoteSelect(QDialog):
 
     _selected = ""
 
-    D_KEY = Qt.ItemDataRole.UserRole
+    D_KEY = QtUserRole
 
     def __init__(self, parent: QWidget, current: str = '"') -> None:
         super().__init__(parent=parent)
@@ -65,14 +66,14 @@ class GuiQuoteSelect(QDialog):
         lblFont.setPointSizeF(4*lblFont.pointSizeF())
 
         # Preview Label
-        self.previewLabel = QLabel(current)
+        self.previewLabel = QLabel(current, self)
         self.previewLabel.setFont(lblFont)
         self.previewLabel.setFixedSize(QSize(pxW, pxH))
-        self.previewLabel.setAlignment(Qt.AlignCenter)
-        self.previewLabel.setFrameStyle(QFrame.Box | QFrame.Plain)
+        self.previewLabel.setAlignment(QtAlignCenter)
+        self.previewLabel.setFrameStyle(QFrame.Shape.Box | QFrame.Shadow.Plain)
 
         # Quote Symbols
-        self.listBox = QListWidget()
+        self.listBox = QListWidget(self)
         self.listBox.itemSelectionChanged.connect(self._selectedSymbol)
 
         minSize = 100
@@ -89,12 +90,12 @@ class GuiQuoteSelect(QDialog):
         self.listBox.setMinimumHeight(CONFIG.pxInt(150))
 
         # 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.labelBox.addWidget(self.previewLabel, 0, Qt.AlignTop)
+        self.labelBox.addWidget(self.previewLabel, 0, QtAlignTop)
         self.labelBox.addStretch(1)
 
         self.innerBox.addLayout(self.labelBox)
@@ -122,7 +123,7 @@ class GuiQuoteSelect(QDialog):
     def getQuote(cls, parent: QWidget, current: str = "") -> tuple[str, bool]:
         """Pop the dialog and return the result."""
         cls = GuiQuoteSelect(parent, current=current)
-        cls.exec_()
+        cls.exec()
         quote = cls._selected
         accepted = cls.result() == QDialog.DialogCode.Accepted
         cls.deleteLater()

novelwriter/dialogs/wordlist.py

@@ -28,17 +28,19 @@ import logging
 from typing import TYPE_CHECKING
 from pathlib import Path
 
-from PyQt5.QtGui import QCloseEvent
 from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QCloseEvent
 from PyQt5.QtWidgets import (
-    QAbstractItemView, QDialog, QDialogButtonBox, QFileDialog, QHBoxLayout,
-    QLineEdit, QListWidget, QPushButton, QVBoxLayout, qApp
+    QAbstractItemView, QApplication, QDialog, QDialogButtonBox, QFileDialog,
+    QHBoxLayout, QLineEdit, QListWidget, QVBoxLayout
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatFileFilter
 from novelwriter.core.spellcheck import UserDictionary
 from novelwriter.extensions.configlayout import NColourLabel
+from novelwriter.extensions.modified import NIconToolButton
+from novelwriter.types import QtDialogClose, QtDialogSave
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -57,6 +59,7 @@ class GuiWordList(QDialog):
         self.setObjectName("GuiWordList")
         self.setWindowTitle(self.tr("Project Word List"))
 
+        iSz = SHARED.theme.baseIconSize
         mS = CONFIG.pxInt(250)
         wW = CONFIG.pxInt(320)
         wH = CONFIG.pxInt(340)
@@ -70,15 +73,15 @@ class GuiWordList(QDialog):
 
         # Header
         self.headLabel = NColourLabel(
-            "Project Word List", SHARED.theme.helpText, parent=self,
+            self.tr("Project Word List"), SHARED.theme.helpText, parent=self,
             scale=NColourLabel.HEADER_SCALE
         )
 
-        self.importButton = QPushButton(SHARED.theme.getIcon("import"), "", self)
+        self.importButton = NIconToolButton(self, iSz, "import")
         self.importButton.setToolTip(self.tr("Import words from text file"))
         self.importButton.clicked.connect(self._importWords)
 
-        self.exportButton = QPushButton(SHARED.theme.getIcon("export"), "", self)
+        self.exportButton = NIconToolButton(self, iSz, "export")
         self.exportButton.setToolTip(self.tr("Export words to text file"))
         self.exportButton.clicked.connect(self._exportWords)
 
@@ -89,17 +92,17 @@ class GuiWordList(QDialog):
 
         # List Box
         self.listBox = QListWidget(self)
-        self.listBox.setDragDropMode(QAbstractItemView.NoDragDrop)
+        self.listBox.setDragDropMode(QAbstractItemView.DragDropMode.NoDragDrop)
         self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
         self.listBox.setSortingEnabled(True)
 
         # Add/Remove Form
         self.newEntry = QLineEdit(self)
 
-        self.addButton = QPushButton(SHARED.theme.getIcon("add"), "", self)
+        self.addButton = NIconToolButton(self, iSz, "add")
         self.addButton.clicked.connect(self._doAdd)
 
-        self.delButton = QPushButton(SHARED.theme.getIcon("remove"), "", self)
+        self.delButton = NIconToolButton(self, iSz, "remove")
         self.delButton.clicked.connect(self._doDelete)
 
         self.editBox = QHBoxLayout()
@@ -108,7 +111,7 @@ class GuiWordList(QDialog):
         self.editBox.addWidget(self.delButton, 0)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QDialogButtonBox.Save | QDialogButtonBox.Close)
+        self.buttonBox = QDialogButtonBox(QtDialogSave | QtDialogClose, self)
         self.buttonBox.accepted.connect(self._doSave)
         self.buttonBox.rejected.connect(self.close)
 
@@ -155,7 +158,7 @@ class GuiWordList(QDialog):
         self.newEntry.setText("")
         self.listBox.clearSelection()
         self._addWord(word)
-        if items := self.listBox.findItems(word, Qt.MatchExactly):
+        if items := self.listBox.findItems(word, Qt.MatchFlag.MatchExactly):
             self.listBox.setCurrentItem(items[0])
             self.listBox.scrollToItem(items[0], QAbstractItemView.ScrollHint.PositionAtCenter)
         return
@@ -175,7 +178,7 @@ class GuiWordList(QDialog):
             userDict.add(word)
         userDict.save()
         self.newWordListReady.emit()
-        qApp.processEvents()
+        QApplication.processEvents()
         self.close()
         return
 
@@ -187,7 +190,7 @@ class GuiWordList(QDialog):
         ))
         ffilter = formatFileFilter(["*.txt", "*"])
         path, _ = QFileDialog.getOpenFileName(
-            self, self.tr("Import File"), str(Path.home()), filter=ffilter
+            self, self.tr("Import File"), str(CONFIG.homePath()), filter=ffilter
         )
         if path:
             try:
@@ -204,7 +207,7 @@ class GuiWordList(QDialog):
     def _exportWords(self) -> None:
         """Export words to file."""
         path, _ = QFileDialog.getSaveFileName(
-            self, self.tr("Export File"), str(Path.home())
+            self, self.tr("Export File"), str(CONFIG.homePath())
         )
         if path:
             try:
@@ -242,7 +245,7 @@ class GuiWordList(QDialog):
 
     def _addWord(self, word: str) -> None:
         """Add a single word to the list."""
-        if word and not self.listBox.findItems(word, Qt.MatchExactly):
+        if word and not self.listBox.findItems(word, Qt.MatchFlag.MatchExactly):
             self.listBox.addItem(word)
             self._changed = True
         return

novelwriter/enum.py

@@ -112,20 +112,22 @@ class nwDocAction(Enum):
     BLOCK_TXT = 19
     BLOCK_TTL = 20
     BLOCK_UNN = 21
-    REPL_SNG  = 22
-    REPL_DBL  = 23
-    RM_BREAKS = 24
-    ALIGN_L   = 25
-    ALIGN_C   = 26
-    ALIGN_R   = 27
-    INDENT_L  = 28
-    INDENT_R  = 29
-    SC_ITALIC = 30
-    SC_BOLD   = 31
-    SC_STRIKE = 32
-    SC_ULINE  = 33
-    SC_SUP    = 34
-    SC_SUB    = 35
+    BLOCK_HSC = 22
+    REPL_SNG  = 23
+    REPL_DBL  = 24
+    RM_BREAKS = 25
+    ALIGN_L   = 26
+    ALIGN_C   = 27
+    ALIGN_R   = 28
+    INDENT_L  = 29
+    INDENT_R  = 30
+    SC_ITALIC = 31
+    SC_BOLD   = 32
+    SC_STRIKE = 33
+    SC_ULINE  = 34
+    SC_MARK   = 35
+    SC_SUP    = 36
+    SC_SUB    = 37
 
 # END Enum nwDocAction
 
@@ -153,6 +155,7 @@ class nwView(Enum):
     PROJECT = 1
     NOVEL   = 2
     OUTLINE = 3
+    SEARCH  = 4
 
 # END Enum nwView
 

novelwriter/error.py

@@ -29,11 +29,11 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtGui import QFont, QFontDatabase
 from PyQt5.QtCore import Qt, pyqtSlot
+from PyQt5.QtGui import QFont, QFontDatabase
 from PyQt5.QtWidgets import (
-    QWidget, qApp, QDialog, QGridLayout, QStyle, QPlainTextEdit, QLabel,
-    QDialogButtonBox
+    QApplication, QWidget, QDialog, QGridLayout, QStyle, QPlainTextEdit,
+    QLabel, QDialogButtonBox
 )
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -54,7 +54,7 @@ def logException() -> None:
     return
 
 
-def formatException(exc) -> str:
+def formatException(exc: BaseException) -> str:
     """Format an exception as a string the same way the default
     exception handler does.
     """
@@ -74,7 +74,9 @@ class NWErrorMessage(QDialog):
         # Widgets
         self.msgIcon = QLabel()
         self.msgIcon.setPixmap(
-            qApp.style().standardIcon(QStyle.SP_MessageBoxCritical).pixmap(64, 64)
+            QApplication.style().standardIcon(
+                QStyle.StandardPixmap.SP_MessageBoxCritical
+            ).pixmap(64, 64)
         )
         self.msgHead = QLabel()
         self.msgHead.setOpenExternalLinks(True)
@@ -88,13 +90,13 @@ class NWErrorMessage(QDialog):
         self.msgBody.setFont(font)
         self.msgBody.setReadOnly(True)
 
-        self.btnBox = QDialogButtonBox(QDialogButtonBox.Close)
+        self.btnBox = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
         self.btnBox.rejected.connect(self._doClose)
 
         # Assemble
         self.mainBox = QGridLayout()
-        self.mainBox.addWidget(self.msgIcon, 0, 0, 2, 1, Qt.AlignTop)
-        self.mainBox.addWidget(self.msgHead, 0, 1, 1, 1, Qt.AlignTop)
+        self.mainBox.addWidget(self.msgIcon, 0, 0, 2, 1, Qt.AlignmentFlag.AlignTop)
+        self.mainBox.addWidget(self.msgHead, 0, 1, 1, 1, Qt.AlignmentFlag.AlignTop)
         self.mainBox.addWidget(self.msgBody, 1, 1, 1, 1)
         self.mainBox.addWidget(self.btnBox,  2, 0, 1, 2)
         self.mainBox.setSpacing(16)
@@ -179,14 +181,14 @@ class NWErrorMessage(QDialog):
 def exceptionHandler(exType: type, exValue: BaseException, exTrace: TracebackType) -> None:
     """Function to catch unhandled global exceptions."""
     from traceback import print_tb
-    from PyQt5.QtWidgets import qApp
+    from PyQt5.QtWidgets import QApplication
 
     logger.critical("%s: %s", exType.__name__, str(exValue))
     print_tb(exTrace)
 
     try:
         nwGUI = None
-        for qWin in qApp.topLevelWidgets():
+        for qWin in QApplication.topLevelWidgets():
             if qWin.objectName() == "GuiMain":
                 nwGUI = qWin
                 break
@@ -197,7 +199,7 @@ def exceptionHandler(exType: type, exValue: BaseException, exTrace: TracebackTyp
 
         errMsg = NWErrorMessage(nwGUI)
         errMsg.setMessage(exType, exValue, exTrace)
-        errMsg.exec_()
+        errMsg.exec()
 
         try:
             # Try a controlled shutdown
@@ -209,7 +211,7 @@ def exceptionHandler(exType: type, exValue: BaseException, exTrace: TracebackTyp
             logger.critical("Could not close the project before exiting")
             logger.critical(formatException(exc))
 
-        qApp.exit(1)
+        QApplication.exit(1)
 
     except Exception as exc:
         logger.critical(formatException(exc))

novelwriter/extensions/circularprogress.py

@@ -25,10 +25,14 @@ from __future__ import annotations
 
 from math import ceil
 
+from PyQt5.QtCore import QRect
 from PyQt5.QtGui import QBrush, QColor, QPaintEvent, QPainter, QPen
-from PyQt5.QtCore import QRect, Qt
 from PyQt5.QtWidgets import QProgressBar, QSizePolicy, QWidget
 
+from novelwriter.types import (
+    QtPaintAnitAlias, QtAlignCenter, QtRoundCap, QtSolidLine, QtTransparent
+)
+
 
 class NProgressCircle(QProgressBar):
     """Extension: Circular Progress Widget
@@ -48,14 +52,14 @@ class NProgressCircle(QProgressBar):
         self._point = point
         self._dRect = QRect(0, 0, size, size)
         self._cRect = QRect(point, point, size - 2*point, size - 2*point)
-        self._dPen = QPen(Qt.transparent)
-        self._dBrush = QBrush(Qt.transparent)
+        self._dPen = QPen(QtTransparent)
+        self._dBrush = QBrush(QtTransparent)
         self.setColours(
             track=self.palette().alternateBase().color(),
             bar=self.palette().highlight().color(),
             text=self.palette().text().color()
         )
-        self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
         self.setFixedWidth(size)
         self.setFixedHeight(size)
         return
@@ -67,9 +71,9 @@ class NProgressCircle(QProgressBar):
             self._dPen = QPen(back)
             self._dBrush = QBrush(back)
         if isinstance(bar, QColor):
-            self._cPen = QPen(QBrush(bar), self._point, Qt.SolidLine, Qt.RoundCap)
+            self._cPen = QPen(QBrush(bar), self._point, QtSolidLine, QtRoundCap)
         if isinstance(track, QColor):
-            self._bPen = QPen(QBrush(track), self._point, Qt.SolidLine, Qt.RoundCap)
+            self._bPen = QPen(QBrush(track), self._point, QtSolidLine, QtRoundCap)
         if isinstance(text, QColor):
             self._tColor = text
         return
@@ -85,7 +89,7 @@ class NProgressCircle(QProgressBar):
         progress = 100.0*self.value()/self.maximum()
         angle = ceil(16*3.6*progress)
         painter = QPainter(self)
-        painter.setRenderHint(QPainter.Antialiasing, True)
+        painter.setRenderHint(QtPaintAnitAlias, True)
         painter.setPen(self._dPen)
         painter.setBrush(self._dBrush)
         painter.drawEllipse(self._dRect)
@@ -94,7 +98,7 @@ class NProgressCircle(QProgressBar):
         painter.setPen(self._cPen)
         painter.drawArc(self._cRect, 90*16, -angle)
         painter.setPen(self._tColor)
-        painter.drawText(self._cRect, Qt.AlignCenter, self._text or f"{progress:.1f} %")
+        painter.drawText(self._cRect, QtAlignCenter, self._text or f"{progress:.1f} %")
         return
 
 # END Class NProgressCircle

novelwriter/extensions/configlayout.py

@@ -7,6 +7,7 @@ Created: 2020-05-03 [0.4.5] NColourLabel
 Created: 2024-01-08 [2.3b1] NScrollableForm
 Created: 2024-01-26 [2.3b1] NScrollablePage
 Created: 2024-01-26 [2.3b1] NFixedPage
+Created: 2024-03-12 [2.4b1] NWrappedWidgetBox
 
 This file is a part of novelWriter
 Copyright 2018–2024, Veronica Berglyd Olsen
@@ -36,8 +37,6 @@ from PyQt5.QtWidgets import (
 from novelwriter import CONFIG
 
 DEFAULT_SCALE = 0.9
-RIGHT_TOP = Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignTop
-LEFT_TOP = Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignTop
 
 
 class NFixedPage(QFrame):
@@ -259,7 +258,7 @@ class NColourLabel(QLabel):
         font.setWeight(QFont.Weight.Bold if bold else QFont.Weight.Normal)
         if color:
             colour = self.palette()
-            colour.setColor(QPalette.WindowText, color)
+            colour.setColor(QPalette.ColorRole.WindowText, color)
             self.setPalette(colour)
 
         self.setFont(font)
@@ -269,3 +268,24 @@ class NColourLabel(QLabel):
         return
 
 # END Class NColourLabel
+
+
+class NWrappedWidgetBox(QHBoxLayout):
+    """Extension: A Text-Wrapped Widget Box
+
+    A custom layout box where a widget is wrapped in text labels on
+    either side within a layout box. The widget is inserted at the {0}
+    position so that it can be used for translation strings.
+    """
+
+    def __init__(self, text: str, widget: QWidget) -> None:
+        super().__init__()
+        before, _, after  = text.partition(r"{0}")
+        if before:
+            self.addWidget(QLabel(before.rstrip()))
+        self.addWidget(widget)
+        if after:
+            self.addWidget(QLabel(after.lstrip()))
+        return
+
+# END Class NWrappedWidgetBox

novelwriter/extensions/modified.py

@@ -25,9 +25,11 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtCore import Qt
+from PyQt5.QtCore import QSize, Qt
 from PyQt5.QtGui import QWheelEvent
-from PyQt5.QtWidgets import QComboBox, QDoubleSpinBox, QSpinBox, QWidget
+from PyQt5.QtWidgets import QComboBox, QDoubleSpinBox, QSpinBox, QToolButton, QWidget
+
+from novelwriter import SHARED
 
 
 class NComboBox(QComboBox):
@@ -44,6 +46,12 @@ class NComboBox(QComboBox):
             event.ignore()
         return
 
+    def setCurrentData(self, data: str, default: str) -> None:
+        """Set the current index from data, with a fallback."""
+        idx = self.findData(data)
+        self.setCurrentIndex(self.findData(default) if idx < 0 else idx)
+        return
+
 # END Class NComboBox
 
 
@@ -79,3 +87,44 @@ class NDoubleSpinBox(QDoubleSpinBox):
         return
 
 # END Class NDoubleSpinBox
+
+
+class NIconToolButton(QToolButton):
+
+    def __init__(self, parent: QWidget, iconSize: QSize, icon: str | None = None) -> None:
+        super().__init__(parent=parent)
+        self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.setIconSize(iconSize)
+        self.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
+        if icon:
+            self.setThemeIcon(icon)
+        return
+
+    def setThemeIcon(self, iconKey: str) -> None:
+        """Set an icon from the current theme."""
+        self.setIcon(SHARED.theme.getIcon(iconKey))
+        return
+
+# END Class NIconToolButton
+
+
+class NIconToggleButton(QToolButton):
+
+    def __init__(self, parent: QWidget, iconSize: QSize, icon: str | None = None) -> None:
+        super().__init__(parent=parent)
+        self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.setIconSize(iconSize)
+        self.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
+        self.setCheckable(True)
+        self.setStyleSheet("border: none; background: transparent;")
+        if icon:
+            self.setThemeIcon(icon)
+        return
+
+    def setThemeIcon(self, iconKey: str) -> None:
+        """Set an icon from the current theme."""
+        iconSize = self.iconSize()
+        self.setIcon(SHARED.theme.getToggleIcon(iconKey, (iconSize.width(), iconSize.height())))
+        return
+
+# END Class NUnfoldButton