novelWriter 2.4b1__py3-none-any.whl → 2.4rc1__py3-none-any.whl

novelwriter/guimain.py

@@ -30,11 +30,11 @@ from time import time
 from pathlib import Path
 from datetime import datetime
 
-from PyQt5.QtGui import QCloseEvent, QCursor, QIcon
 from PyQt5.QtCore import Qt, QTimer, pyqtSlot
+from PyQt5.QtGui import QCloseEvent, QCursor, QIcon
 from PyQt5.QtWidgets import (
-    QFileDialog, QHBoxLayout, QMainWindow, QMessageBox, QShortcut, QSplitter,
-    QStackedWidget, QVBoxLayout, QWidget, qApp
+    QApplication, QFileDialog, QHBoxLayout, QMainWindow, QMessageBox, QShortcut, QSplitter,
+    QStackedWidget, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED, __hexversion__, __version__
@@ -109,7 +109,7 @@ class GuiMain(QMainWindow):
         nwIcon = CONFIG.assetPath("icons") / "novelwriter.svg"
         self.nwIcon = QIcon(str(nwIcon)) if nwIcon.is_file() else QIcon()
         self.setWindowIcon(self.nwIcon)
-        qApp.setWindowIcon(self.nwIcon)
+        QApplication.setWindowIcon(self.nwIcon)
 
         # Build the GUI
         # =============
@@ -148,7 +148,7 @@ class GuiMain(QMainWindow):
         self.treePane.setLayout(self.treeBox)
 
         # Splitter : Document Viewer / Document Meta
-        self.splitView = QSplitter(Qt.Vertical, self)
+        self.splitView = QSplitter(Qt.Orientation.Vertical, self)
         self.splitView.addWidget(self.docViewer)
         self.splitView.addWidget(self.docViewerPanel)
         self.splitView.setHandleWidth(hWd)
@@ -158,7 +158,7 @@ class GuiMain(QMainWindow):
         self.splitView.setCollapsible(1, False)
 
         # Splitter : Document Editor / Document Viewer
-        self.splitDocs = QSplitter(Qt.Horizontal, self)
+        self.splitDocs = QSplitter(Qt.Orientation.Horizontal, self)
         self.splitDocs.addWidget(self.docEditor)
         self.splitDocs.addWidget(self.splitView)
         self.splitDocs.setOpaqueResize(False)
@@ -167,7 +167,7 @@ class GuiMain(QMainWindow):
         self.splitDocs.setCollapsible(1, False)
 
         # Splitter : Project Tree / Document Area
-        self.splitMain = QSplitter(Qt.Horizontal)
+        self.splitMain = QSplitter(Qt.Orientation.Horizontal)
         self.splitMain.setContentsMargins(0, 0, 0, 0)
         self.splitMain.addWidget(self.treePane)
         self.splitMain.addWidget(self.splitDocs)
@@ -205,7 +205,7 @@ class GuiMain(QMainWindow):
         self.setMenuBar(self.mainMenu)
         self.setCentralWidget(self.mainWidget)
         self.setStatusBar(self.mainStatus)
-        self.setContextMenuPolicy(Qt.NoContextMenu)  # Issue #1147
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.NoContextMenu)  # Issue #1147
 
         # Connect Signals
         # ===============
@@ -262,6 +262,7 @@ class GuiMain(QMainWindow):
         self.docEditor.requestProjectItemSelected.connect(self.projView.setSelectedHandle)
         self.docEditor.requestProjectItemRenamed.connect(self.projView.renameTreeItem)
         self.docEditor.requestNewNoteCreation.connect(self.projView.createNewNote)
+        self.docEditor.docTextChanged.connect(self.projSearch.textChanged)
 
         self.docViewer.documentLoaded.connect(self.docViewerPanel.updateHandle)
         self.docViewer.loadDocumentTagRequest.connect(self._followTag)
@@ -327,7 +328,7 @@ class GuiMain(QMainWindow):
     def postLaunchTasks(self, cmdOpen: str | None) -> None:
         """Process tasks after the main window has been created."""
         if cmdOpen:
-            qApp.processEvents()
+            QApplication.processEvents()
             logger.info("Command line path: %s", cmdOpen)
             self.openProject(cmdOpen)
 
@@ -473,12 +474,12 @@ class GuiMain(QMainWindow):
                     break
 
         if lastEdited is not None:
-            qApp.processEvents()
+            QApplication.processEvents()
             self.openDocument(lastEdited, doScroll=True)
 
         lastViewed = SHARED.project.data.getLastHandle("viewer")
         if lastViewed is not None:
-            qApp.processEvents()
+            QApplication.processEvents()
             self.viewDocument(lastViewed)
 
         # Check if we need to rebuild the index
@@ -487,7 +488,7 @@ class GuiMain(QMainWindow):
             self.rebuildIndex()
 
         # Make sure the changed status is set to false on things opened
-        qApp.processEvents()
+        QApplication.processEvents()
         self.docEditor.setDocumentChanged(False)
         SHARED.project.setProjectChanged(False)
 
@@ -737,7 +738,7 @@ class GuiMain(QMainWindow):
         """Rebuild the entire index."""
         if SHARED.hasProject:
             logger.info("Rebuilding index ...")
-            qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
+            QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
             tStart = time()
 
             self.projView.saveProjectTasks()
@@ -751,7 +752,7 @@ class GuiMain(QMainWindow):
             )
             self.docEditor.updateTagHighLighting()
             self._updateStatusWordCount()
-            qApp.restoreOverrideCursor()
+            QApplication.restoreOverrideCursor()
 
             if not beQuiet:
                 SHARED.info(self.tr("The project index has been successfully rebuilt."))
@@ -767,7 +768,7 @@ class GuiMain(QMainWindow):
         """Open the welcome dialog."""
         dialog = GuiWelcome(self)
         dialog.openProjectRequest.connect(self._openProjectFromWelcome)
-        dialog.exec_()
+        dialog.exec()
         return
 
     @pyqtSlot()
@@ -775,7 +776,7 @@ class GuiMain(QMainWindow):
         """Open the preferences dialog."""
         dialog = GuiPreferences(self)
         dialog.newPreferencesReady.connect(self._processConfigChanges)
-        dialog.exec_()
+        dialog.exec()
         return
 
     @pyqtSlot()
@@ -785,7 +786,7 @@ class GuiMain(QMainWindow):
         if SHARED.hasProject:
             dialog = GuiProjectSettings(self, gotoPage=focusTab)
             dialog.newProjectSettingsReady.connect(self._processProjectSettingsChanges)
-            dialog.exec_()
+            dialog.exec()
         return
 
     @pyqtSlot()
@@ -796,7 +797,7 @@ class GuiMain(QMainWindow):
             dialog.setModal(True)
             dialog.show()
             dialog.raise_()
-            qApp.processEvents()
+            QApplication.processEvents()
             dialog.updateValues()
         return
 
@@ -809,7 +810,7 @@ class GuiMain(QMainWindow):
             dialog.setModal(False)
             dialog.show()
             dialog.raise_()
-            qApp.processEvents()
+            QApplication.processEvents()
             dialog.loadContent()
         return
 
@@ -819,7 +820,7 @@ class GuiMain(QMainWindow):
         if SHARED.hasProject:
             dialog = GuiWordList(self)
             dialog.newWordListReady.connect(self._processWordListChanges)
-            dialog.exec_()
+            dialog.exec()
         return
 
     @pyqtSlot()
@@ -831,7 +832,7 @@ class GuiMain(QMainWindow):
             dialog.setModal(False)
             dialog.show()
             dialog.raise_()
-            qApp.processEvents()
+            QApplication.processEvents()
             dialog.populateGUI()
         return
 
@@ -842,7 +843,7 @@ class GuiMain(QMainWindow):
         dialog.setModal(True)
         dialog.show()
         dialog.raise_()
-        qApp.processEvents()
+        QApplication.processEvents()
         dialog.populateGUI()
         return
 
@@ -860,7 +861,7 @@ class GuiMain(QMainWindow):
         dialog.setModal(True)
         dialog.show()
         dialog.raise_()
-        qApp.processEvents()
+        QApplication.processEvents()
         if not dialog.initDialog():
             dialog.close()
             SHARED.error(self.tr("Could not initialise the dialog."))
@@ -898,7 +899,8 @@ class GuiMain(QMainWindow):
                 CONFIG.setViewPanePos(self.splitView.sizes())
 
         CONFIG.showViewerPanel = self.docViewerPanel.isVisible()
-        if self.windowState() & Qt.WindowFullScreen != Qt.WindowFullScreen:
+        wFull = Qt.WindowState.WindowFullScreen
+        if self.windowState() & wFull != wFull:
             # Ignore window size if in full screen mode
             CONFIG.setMainWinSize(self.width(), self.height())
 
@@ -908,7 +910,7 @@ class GuiMain(QMainWindow):
         CONFIG.saveConfig()
         self.reportConfErr()
 
-        qApp.quit()
+        QApplication.quit()
 
         return True
 
@@ -935,7 +937,7 @@ class GuiMain(QMainWindow):
 
     def toggleFullScreenMode(self) -> None:
         """Toggle full screen mode"""
-        self.setWindowState(self.windowState() ^ Qt.WindowFullScreen)
+        self.setWindowState(self.windowState() ^ Qt.WindowState.WindowFullScreen)
         return
 
     ##
@@ -1055,7 +1057,7 @@ class GuiMain(QMainWindow):
 
         if theme:
             # We are doing this manually instead of connecting to
-            # qApp.paletteChanged since the processing order matters
+            # paletteChanged since the processing order matters
             SHARED.theme.loadTheme()
             self.docEditor.updateTheme()
             self.docViewer.updateTheme()
@@ -1114,7 +1116,7 @@ class GuiMain(QMainWindow):
     @pyqtSlot(Path)
     def _openProjectFromWelcome(self, path: Path) -> None:
         """Handle an open project request from the welcome dialog."""
-        qApp.processEvents()
+        QApplication.processEvents()
         self.openProject(path)
         if not SHARED.hasProject:
             self.showWelcomeDialog()
@@ -1167,7 +1169,9 @@ class GuiMain(QMainWindow):
         elif view == nwView.SEARCH:
             self.mainStack.setCurrentWidget(self.splitMain)
             self.projStack.setCurrentWidget(self.projSearch)
-            self.projSearch.beginSearch()
+            self.projSearch.beginSearch(
+                self.docEditor.getSelectedText() if self.docEditor.anyFocus() else ""
+            )
         elif view == nwView.OUTLINE:
             self.mainStack.setCurrentWidget(self.outlineView)
         return
@@ -1209,7 +1213,7 @@ class GuiMain(QMainWindow):
         if SHARED.hasProject:
             currTime = time()
             editIdle = currTime - self.docEditor.lastActive > CONFIG.userIdleTime
-            userIdle = qApp.applicationState() != Qt.ApplicationActive
+            userIdle = QApplication.applicationState() != Qt.ApplicationState.ApplicationActive
             self.mainStatus.setUserIdle(editIdle or userIdle)
             SHARED.updateIdleTime(currTime, editIdle or userIdle)
             self.mainStatus.updateTime(idleTime=SHARED.projectIdleTime)
@@ -1266,7 +1270,7 @@ class GuiMain(QMainWindow):
     @pyqtSlot()
     def _keyPressEscape(self) -> None:
         """Process an escape keypress in the main window."""
-        if self.docEditor.docSearch.isVisible():
+        if self.docEditor.searchVisible():
             self.docEditor.closeSearch()
         elif SHARED.focusMode:
             SHARED.setFocusMode(False)

novelwriter/shared.py

@@ -292,7 +292,7 @@ class SharedData(QObject):
         self._lastAlert = alert.logMessage
         if log:
             logger.info(self._lastAlert, stacklevel=2)
-        alert.exec_()
+        alert.exec()
         alert.deleteLater()
         return
 
@@ -304,7 +304,7 @@ class SharedData(QObject):
         self._lastAlert = alert.logMessage
         if log:
             logger.warning(self._lastAlert, stacklevel=2)
-        alert.exec_()
+        alert.exec()
         alert.deleteLater()
         return
 
@@ -319,7 +319,7 @@ class SharedData(QObject):
         self._lastAlert = alert.logMessage
         if log:
             logger.error(self._lastAlert, stacklevel=2)
-        alert.exec_()
+        alert.exec()
         alert.deleteLater()
         return
 
@@ -329,7 +329,7 @@ class SharedData(QObject):
         alert.setMessage(text, info, details)
         alert.setAlertType(_GuiAlert.WARN if warn else _GuiAlert.ASK, True)
         self._lastAlert = alert.logMessage
-        alert.exec_()
+        alert.exec()
         isYes = alert.result() == QMessageBox.StandardButton.Yes
         alert.deleteLater()
         return isYes
@@ -404,7 +404,7 @@ class _GuiAlert(QMessageBox):
             self.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
         else:
             self.setStandardButtons(QMessageBox.Ok)
-        pSz = 2*self._theme.baseIconSize
+        pSz = 2*self._theme.baseIconHeight
         if level == self.INFO:
             self.setIconPixmap(self._theme.getPixmap("alert_info", (pSz, pSz)))
             self.setWindowTitle(self.tr("Information"))

novelwriter/tools/dictionaries.py

@@ -28,16 +28,18 @@ import logging
 from pathlib import Path
 from zipfile import ZipFile
 
-from PyQt5.QtGui import QCloseEvent, QTextCursor
 from PyQt5.QtCore import pyqtSlot
+from PyQt5.QtGui import QCloseEvent, QTextCursor
 from PyQt5.QtWidgets import (
-    QDialog, QDialogButtonBox, QFileDialog, QFrame, QHBoxLayout, QLabel,
-    QLineEdit, QPlainTextEdit, QPushButton, QVBoxLayout, QWidget, qApp
+    QApplication, QDialog, QDialogButtonBox, QFileDialog, QFrame, QHBoxLayout,
+    QLabel, QLineEdit, QPlainTextEdit, QPushButton, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.error import formatException
 from novelwriter.common import formatFileFilter, openExternalPath, formatInt, getFileSize
+from novelwriter.error import formatException
+from novelwriter.extensions.modified import NIconToolButton
+from novelwriter.types import QtDialogClose
 
 logger = logging.getLogger(__name__)
 
@@ -54,6 +56,7 @@ class GuiDictionaries(QDialog):
         self._installPath = None
         self._currDicts = set()
 
+        iSz = SHARED.theme.baseIconSize
         iPx = CONFIG.pxInt(4)
         mPx = CONFIG.pxInt(8)
         sPx = CONFIG.pxInt(16)
@@ -68,12 +71,11 @@ class GuiDictionaries(QDialog):
             self.tr("Download a dictionary from one of the links, and add it below."),
             f"&nbsp;\u203a <a href='{foUrl}'>{foUrl}</a>",
             f"&nbsp;\u203a <a href='{loUrl}'>{loUrl}</a>",
-        ]))
+        ]), self)
         self.huInfo.setOpenExternalLinks(True)
         self.huInfo.setWordWrap(True)
         self.huInput = QLineEdit(self)
-        self.huBrowse = QPushButton(self)
-        self.huBrowse.setIcon(SHARED.theme.getIcon("browse"))
+        self.huBrowse = NIconToolButton(self, iSz, "browse")
         self.huBrowse.clicked.connect(self._doBrowseHunspell)
         self.huImport = QPushButton(self.tr("Add Dictionary"), self)
         self.huImport.setIcon(SHARED.theme.getIcon("add"))
@@ -88,11 +90,10 @@ class GuiDictionaries(QDialog):
         self.huAddBox.addWidget(self.huImport)
 
         # Install Path
-        self.inInfo = QLabel(self.tr("Dictionary install location"))
+        self.inInfo = QLabel(self.tr("Dictionary install location"), self)
         self.inPath = QLineEdit(self)
         self.inPath.setReadOnly(True)
-        self.inBrowse = QPushButton(self)
-        self.inBrowse.setIcon(SHARED.theme.getIcon("browse"))
+        self.inBrowse = NIconToolButton(self, iSz, "browse")
         self.inBrowse.clicked.connect(self._doOpenInstallLocation)
 
         self.inBox = QHBoxLayout()
@@ -107,7 +108,7 @@ class GuiDictionaries(QDialog):
         self.infoBox.setFrameStyle(QFrame.Shape.NoFrame)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QDialogButtonBox.Close)
+        self.buttonBox = QDialogButtonBox(QtDialogClose, self)
         self.buttonBox.rejected.connect(self._doClose)
 
         # Assemble
@@ -158,7 +159,7 @@ class GuiDictionaries(QDialog):
                 "Additional dictionaries found: {0}"
             ).format(len(self._currDicts)))
 
-        qApp.processEvents()
+        QApplication.processEvents()
         self.adjustSize()
 
         return True

novelwriter/tools/lipsum.py

@@ -35,6 +35,7 @@ from PyQt5.QtWidgets import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import readTextFile
 from novelwriter.extensions.switch import NSwitch
+from novelwriter.types import QtAlignLeft, QtAlignRight, QtRoleAction, QtDialogClose
 
 logger = logging.getLogger(__name__)
 
@@ -53,13 +54,14 @@ class GuiLipsum(QDialog):
 
         self.setWindowTitle(self.tr("Insert Placeholder Text"))
 
+        vSp = CONFIG.pxInt(4)
+        nPx = CONFIG.pxInt(64)
+
         self.innerBox = QHBoxLayout()
         self.innerBox.setSpacing(CONFIG.pxInt(16))
 
         # Icon
-        nPx = CONFIG.pxInt(64)
-        vSp = CONFIG.pxInt(4)
-        self.docIcon = QLabel()
+        self.docIcon = QLabel(self)
         self.docIcon.setPixmap(SHARED.theme.getPixmap("proj_document", (nPx, nPx)))
 
         self.leftBox = QVBoxLayout()
@@ -69,35 +71,36 @@ class GuiLipsum(QDialog):
         self.innerBox.addLayout(self.leftBox)
 
         # Form
-        self.headLabel = QLabel("<b>{0}</b>".format(self.tr("Insert Lorem Ipsum Text")))
+        self.headLabel = QLabel(self.tr("Insert Lorem Ipsum Text"))
+        self.headLabel.setFont(SHARED.theme.guiFontB)
 
-        self.paraLabel = QLabel(self.tr("Number of paragraphs"))
-        self.paraCount = QSpinBox()
+        self.paraLabel = QLabel(self.tr("Number of paragraphs"), self)
+        self.paraCount = QSpinBox(self)
         self.paraCount.setMinimum(1)
         self.paraCount.setMaximum(100)
         self.paraCount.setValue(5)
 
-        self.randLabel = QLabel(self.tr("Randomise order"))
-        self.randSwitch = NSwitch()
+        self.randLabel = QLabel(self.tr("Randomise order"), self)
+        self.randSwitch = NSwitch(self)
 
         self.formBox = QGridLayout()
-        self.formBox.addWidget(self.headLabel, 0, 0, 1, 2, Qt.AlignLeft)
-        self.formBox.addWidget(self.paraLabel, 1, 0, 1, 1, Qt.AlignLeft)
-        self.formBox.addWidget(self.paraCount, 1, 1, 1, 1, Qt.AlignRight)
-        self.formBox.addWidget(self.randLabel, 2, 0, 1, 1, Qt.AlignLeft)
-        self.formBox.addWidget(self.randSwitch, 2, 1, 1, 1, Qt.AlignRight)
+        self.formBox.addWidget(self.headLabel, 0, 0, 1, 2, QtAlignLeft)
+        self.formBox.addWidget(self.paraLabel, 1, 0, 1, 1, QtAlignLeft)
+        self.formBox.addWidget(self.paraCount, 1, 1, 1, 1, QtAlignRight)
+        self.formBox.addWidget(self.randLabel, 2, 0, 1, 1, QtAlignLeft)
+        self.formBox.addWidget(self.randSwitch, 2, 1, 1, 1, QtAlignRight)
         self.formBox.setVerticalSpacing(vSp)
         self.formBox.setRowStretch(3, 1)
         self.innerBox.addLayout(self.formBox)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox()
+        self.buttonBox = QDialogButtonBox(self)
         self.buttonBox.rejected.connect(self.close)
 
-        self.btnClose = self.buttonBox.addButton(QDialogButtonBox.Close)
+        self.btnClose = self.buttonBox.addButton(QtDialogClose)
         self.btnClose.setAutoDefault(False)
 
-        self.btnInsert = self.buttonBox.addButton(self.tr("Insert"), QDialogButtonBox.ActionRole)
+        self.btnInsert = self.buttonBox.addButton(self.tr("Insert"), QtRoleAction)
         self.btnInsert.clicked.connect(self._doInsert)
         self.btnInsert.setAutoDefault(False)
 
@@ -127,7 +130,7 @@ class GuiLipsum(QDialog):
     def getLipsum(cls, parent: QWidget) -> str:
         """Pop the dialog and return the lipsum text."""
         cls = GuiLipsum(parent)
-        cls.exec_()
+        cls.exec()
         text = cls.lipsumText
         cls.deleteLater()
         return text

novelwriter/tools/manusbuild.py

@@ -27,8 +27,8 @@ import logging
 
 from pathlib import Path
 
+from PyQt5.QtCore import QTimer, pyqtSlot
 from PyQt5.QtGui import QCloseEvent
-from PyQt5.QtCore import QSize, QTimer, Qt, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox, QFileDialog,
     QGridLayout, QHBoxLayout, QLabel, QLineEdit, QListWidget, QListWidgetItem,
@@ -36,13 +36,17 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.enum import nwBuildFmt
 from novelwriter.common import makeFileNameSafe, openExternalPath
 from novelwriter.constants import nwLabels
-from novelwriter.core.item import NWItem
-from novelwriter.core.docbuild import NWBuildDocument
 from novelwriter.core.buildsettings import BuildSettings
+from novelwriter.core.docbuild import NWBuildDocument
+from novelwriter.core.item import NWItem
+from novelwriter.enum import nwBuildFmt
+from novelwriter.extensions.modified import NIconToolButton
 from novelwriter.extensions.simpleprogress import NProgressSimple
+from novelwriter.types import (
+    QtAlignCenter, QtDialogClose, QtRoleAction, QtRoleReject, QtUserRole
+)
 
 logger = logging.getLogger(__name__)
 
@@ -54,7 +58,7 @@ class GuiManuscriptBuild(QDialog):
     independently of the Manuscript Build Tool.
     """
 
-    D_KEY = Qt.ItemDataRole.UserRole
+    D_KEY = QtUserRole
 
     def __init__(self, parent: QWidget, build: BuildSettings):
         super().__init__(parent=parent)
@@ -69,7 +73,8 @@ class GuiManuscriptBuild(QDialog):
         self.setMinimumWidth(CONFIG.pxInt(500))
         self.setMinimumHeight(CONFIG.pxInt(300))
 
-        iPx = SHARED.theme.baseIconSize
+        iSz = SHARED.theme.baseIconSize
+        bSz = SHARED.theme.buttonIconSize
         sp4 = CONFIG.pxInt(4)
         sp8 = CONFIG.pxInt(8)
         sp16 = CONFIG.pxInt(16)
@@ -85,9 +90,9 @@ class GuiManuscriptBuild(QDialog):
         # Output Format
         # =============
 
-        self.lblFormat = QLabel(self.tr("Output Format"))
-        self.listFormats = QListWidget()
-        self.listFormats.setIconSize(QSize(iPx, iPx))
+        self.lblFormat = QLabel(self.tr("Output Format"), self)
+        self.listFormats = QListWidget(self)
+        self.listFormats.setIconSize(iSz)
         current = None
         for key in nwBuildFmt:
             item = QListWidgetItem()
@@ -104,17 +109,17 @@ class GuiManuscriptBuild(QDialog):
         self.formatBox.addWidget(self.listFormats, 1)
         self.formatBox.setContentsMargins(0, 0, 0, 0)
 
-        self.formatWidget = QWidget()
+        self.formatWidget = QWidget(self)
         self.formatWidget.setLayout(self.formatBox)
         self.formatWidget.setContentsMargins(0, 0, 0, 0)
 
         # Table of Contents
         # =================
 
-        self.lblContent = QLabel(self.tr("Table of Contents"))
+        self.lblContent = QLabel(self.tr("Table of Contents"), self)
 
         self.listContent = QListWidget(self)
-        self.listContent.setIconSize(QSize(iPx, iPx))
+        self.listContent.setIconSize(iSz)
         self.listContent.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
 
         self.contentBox = QVBoxLayout()
@@ -122,7 +127,7 @@ class GuiManuscriptBuild(QDialog):
         self.contentBox.addWidget(self.listContent, 0)
         self.contentBox.setContentsMargins(0, 0, 0, 0)
 
-        self.contentWidget = QWidget()
+        self.contentWidget = QWidget(self)
         self.contentWidget.setLayout(self.contentBox)
         self.contentWidget.setContentsMargins(0, 0, 0, 0)
 
@@ -134,14 +139,14 @@ class GuiManuscriptBuild(QDialog):
         font.setUnderline(True)
         font.setPointSizeF(1.5*font.pointSizeF())
 
-        self.lblMain = QLabel(self._build.name)
+        self.lblMain = QLabel(self._build.name, self)
         self.lblMain.setWordWrap(True)
         self.lblMain.setFont(font)
 
         # Build Path
-        self.lblPath = QLabel(self.tr("Path"))
+        self.lblPath = QLabel(self.tr("Path"), self)
         self.buildPath = QLineEdit(self)
-        self.btnBrowse = QPushButton(SHARED.theme.getIcon("browse"), "")
+        self.btnBrowse = NIconToolButton(self, iSz, "browse")
 
         self.pathBox = QHBoxLayout()
         self.pathBox.addWidget(self.buildPath)
@@ -149,9 +154,9 @@ class GuiManuscriptBuild(QDialog):
         self.pathBox.setSpacing(sp8)
 
         # Build Name
-        self.lblName = QLabel(self.tr("File Name"))
+        self.lblName = QLabel(self.tr("File Name"), self)
         self.buildName = QLineEdit(self)
-        self.btnReset = QPushButton(SHARED.theme.getIcon("revert"), "")
+        self.btnReset = NIconToolButton(self, iSz, "revert")
         self.btnReset.setToolTip(self.tr("Reset file name to default"))
 
         self.nameBox = QHBoxLayout()
@@ -176,16 +181,19 @@ class GuiManuscriptBuild(QDialog):
         self.buildBox.setVerticalSpacing(sp4)
 
         # Dialog Buttons
-        self.btnOpen = QPushButton(SHARED.theme.getIcon("browse"), self.tr("Open Folder"))
-        self.btnBuild = QPushButton(SHARED.theme.getIcon("export"), self.tr("&Build"))
-        self.dlgButtons = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
-        self.dlgButtons.addButton(self.btnOpen, QDialogButtonBox.ButtonRole.ActionRole)
-        self.dlgButtons.addButton(self.btnBuild, QDialogButtonBox.ButtonRole.ActionRole)
+        self.btnOpen = QPushButton(SHARED.theme.getIcon("browse"), self.tr("Open Folder"), self)
+        self.btnOpen.setIconSize(bSz)
+        self.btnBuild = QPushButton(SHARED.theme.getIcon("export"), self.tr("&Build"), self)
+        self.btnBuild.setIconSize(bSz)
+
+        self.dlgButtons = QDialogButtonBox(QtDialogClose, self)
+        self.dlgButtons.addButton(self.btnOpen, QtRoleAction)
+        self.dlgButtons.addButton(self.btnBuild, QtRoleAction)
 
         # Assemble GUI
         # ============
 
-        self.mainSplit = QSplitter()
+        self.mainSplit = QSplitter(self)
         self.mainSplit.addWidget(self.formatWidget)
         self.mainSplit.addWidget(self.contentWidget)
         self.mainSplit.setHandleWidth(sp16)
@@ -199,7 +207,7 @@ class GuiManuscriptBuild(QDialog):
         ])
 
         self.outerBox = QVBoxLayout()
-        self.outerBox.addWidget(self.lblMain, 0, Qt.AlignCenter)
+        self.outerBox.addWidget(self.lblMain, 0, QtAlignCenter)
         self.outerBox.addSpacing(sp16)
         self.outerBox.addWidget(self.mainSplit, 1)
         self.outerBox.addSpacing(sp4)
@@ -255,12 +263,12 @@ class GuiManuscriptBuild(QDialog):
     def _dialogButtonClicked(self, button: QAbstractButton):
         """Handle button clicks from the dialog button box."""
         role = self.dlgButtons.buttonRole(button)
-        if role == QDialogButtonBox.ActionRole:
+        if role == QtRoleAction:
             if button == self.btnBuild:
                 self._runBuild()
             elif button == self.btnOpen:
                 self._openOutputFolder()
-        elif role == QDialogButtonBox.RejectRole:
+        elif role == QtRoleReject:
             self.close()
         return