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

novelwriter/tools/manussettings.py

@@ -27,25 +27,29 @@ import logging
 
 from typing import TYPE_CHECKING
 
+from PyQt5.QtCore import QEvent, Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
-from PyQt5.QtCore import QEvent, QSize, Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
-    QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox,
-    QFontDialog, QFrame, QGridLayout, QHBoxLayout, QHeaderView, QLabel,
-    QLineEdit, QMenu, QPlainTextEdit, QPushButton, QSplitter, QStackedWidget,
-    QToolButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
+    QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox, QFontDialog,
+    QFrame, QGridLayout, QHBoxLayout, QHeaderView, QLabel, QLineEdit, QMenu,
+    QPlainTextEdit, QPushButton, QSplitter, QStackedWidget, QTreeWidget,
+    QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, trConst
 from novelwriter.core.buildsettings import BuildSettings, FilterMode
-from novelwriter.extensions.switch import NSwitch
-from novelwriter.extensions.modified import NComboBox, NDoubleSpinBox, NSpinBox
-from novelwriter.extensions.switchbox import NSwitchBox
 from novelwriter.extensions.configlayout import (
     NColourLabel, NFixedPage, NScrollableForm, NScrollablePage
 )
+from novelwriter.extensions.modified import NComboBox, NDoubleSpinBox, NIconToolButton, NSpinBox
 from novelwriter.extensions.pagedsidebar import NPagedSideBar
+from novelwriter.extensions.switch import NSwitch
+from novelwriter.extensions.switchbox import NSwitchBox
+from novelwriter.types import (
+    QtAlignLeft, QtDialogApply, QtDialogClose, QtDialogSave, QtRoleAccept,
+    QtRoleApply, QtRoleReject, QtUserRole
+)
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -98,7 +102,7 @@ class GuiBuildSettings(QDialog):
         )
 
         # Settings Name
-        self.lblBuildName = QLabel(self.tr("Name"))
+        self.lblBuildName = QLabel(self.tr("Name"), self)
         self.editBuildName = QLineEdit(self)
 
         # SideBar
@@ -130,11 +134,7 @@ class GuiBuildSettings(QDialog):
         self.toolStack.addWidget(self.optTabOutput)
 
         # 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
@@ -225,12 +225,12 @@ class GuiBuildSettings(QDialog):
     def _dialogButtonClicked(self, button: QAbstractButton) -> None:
         """Handle button clicks from the dialog button box."""
         role = self.buttonBox.buttonRole(button)
-        if role == QDialogButtonBox.ApplyRole:
+        if role == QtRoleApply:
             self._emitBuildData()
-        elif role == QDialogButtonBox.AcceptRole:
+        elif role == QtRoleAccept:
             self._emitBuildData()
             self.close()
-        elif role == QDialogButtonBox.RejectRole:
+        elif role == QtRoleReject:
             self.close()
         return
 
@@ -288,8 +288,8 @@ class _FilterTab(NFixedPage):
     C_ACTIVE = 1
     C_STATUS = 2
 
-    D_HANDLE = Qt.ItemDataRole.UserRole
-    D_FILE   = Qt.ItemDataRole.UserRole + 1
+    D_HANDLE = QtUserRole
+    D_FILE   = QtUserRole + 1
 
     F_NONE     = 0
     F_FILTERED = 1
@@ -315,13 +315,13 @@ class _FilterTab(NFixedPage):
         # Project Tree
         # ============
 
-        # Tree Settings
-        iPx = SHARED.theme.baseIconSize
+        iSz = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
         cMg = CONFIG.pxInt(6)
 
         # Tree Widget
         self.optTree = QTreeWidget(self)
-        self.optTree.setIconSize(QSize(iPx, iPx))
+        self.optTree.setIconSize(iSz)
         self.optTree.setUniformRowHeights(True)
         self.optTree.setAllColumnsShowFocus(True)
         self.optTree.setHeaderHidden(True)
@@ -331,36 +331,35 @@ class _FilterTab(NFixedPage):
         treeHeader = self.optTree.header()
         treeHeader.setStretchLastSection(False)
         treeHeader.setMinimumSectionSize(iPx + cMg)  # See Issue #1551
-        treeHeader.setSectionResizeMode(self.C_NAME, QHeaderView.Stretch)
-        treeHeader.setSectionResizeMode(self.C_ACTIVE, QHeaderView.Fixed)
-        treeHeader.setSectionResizeMode(self.C_STATUS, QHeaderView.Fixed)
+        treeHeader.setSectionResizeMode(self.C_NAME, QHeaderView.ResizeMode.Stretch)
+        treeHeader.setSectionResizeMode(self.C_ACTIVE, QHeaderView.ResizeMode.Fixed)
+        treeHeader.setSectionResizeMode(self.C_STATUS, QHeaderView.ResizeMode.Fixed)
         treeHeader.resizeSection(self.C_ACTIVE, iPx + cMg)
         treeHeader.resizeSection(self.C_STATUS, iPx + cMg)
 
-        self.optTree.setDragDropMode(QAbstractItemView.NoDragDrop)
-        self.optTree.setSelectionMode(QAbstractItemView.ExtendedSelection)
-        self.optTree.setSelectionBehavior(QAbstractItemView.SelectRows)
+        self.optTree.setDragDropMode(QAbstractItemView.DragDropMode.NoDragDrop)
+        self.optTree.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
+        self.optTree.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
 
         # Filters
         # =======
 
-        self.includedButton = QToolButton(self)
+        self.includedButton = NIconToolButton(self, iSz)
         self.includedButton.setToolTip(self.tr("Always included"))
         self.includedButton.setIcon(self._statusFlags[self.F_INCLUDED])
         self.includedButton.clicked.connect(lambda: self._setSelectedMode(self.F_INCLUDED))
 
-        self.excludedButton = QToolButton(self)
+        self.excludedButton = NIconToolButton(self, iSz)
         self.excludedButton.setToolTip(self.tr("Always excluded"))
         self.excludedButton.setIcon(self._statusFlags[self.F_EXCLUDED])
         self.excludedButton.clicked.connect(lambda: self._setSelectedMode(self.F_EXCLUDED))
 
-        self.resetButton = QToolButton(self)
+        self.resetButton = NIconToolButton(self, iSz, "revert")
         self.resetButton.setToolTip(self.tr("Reset to default"))
-        self.resetButton.setIcon(SHARED.theme.getIcon("revert"))
         self.resetButton.clicked.connect(lambda: self._setSelectedMode(self.F_FILTERED))
 
         self.modeBox = QHBoxLayout()
-        self.modeBox.addWidget(QLabel(self.tr("Mark selection as")))
+        self.modeBox.addWidget(QLabel(self.tr("Mark selection as"), self))
         self.modeBox.addStretch(1)
         self.modeBox.addWidget(self.includedButton)
         self.modeBox.addWidget(self.excludedButton)
@@ -370,7 +369,7 @@ class _FilterTab(NFixedPage):
         # Filer Options
         self.filterOpt = NSwitchBox(self, iPx)
         self.filterOpt.switchToggled.connect(self._applyFilterSwitch)
-        self.filterOpt.setFrameStyle(QFrame.NoFrame)
+        self.filterOpt.setFrameStyle(QFrame.Shape.NoFrame)
 
         # Assemble GUI
         # ============
@@ -382,10 +381,10 @@ class _FilterTab(NFixedPage):
         self.selectionBox.addLayout(self.modeBox)
         self.selectionBox.setContentsMargins(0, 0, 0, 0)
 
-        self.selectionWidget = QWidget()
+        self.selectionWidget = QWidget(self)
         self.selectionWidget.setLayout(self.selectionBox)
 
-        self.mainSplit = QSplitter()
+        self.mainSplit = QSplitter(self)
         self.mainSplit.addWidget(self.selectionWidget)
         self.mainSplit.addWidget(self.filterOpt)
         self.mainSplit.setCollapsible(0, False)
@@ -469,7 +468,7 @@ class _FilterTab(NFixedPage):
             trItem.setData(self.C_DATA, self.D_FILE, isFile)
             trItem.setIcon(self.C_ACTIVE, SHARED.theme.getIcon(iconName))
 
-            trItem.setTextAlignment(self.C_NAME, Qt.AlignLeft)
+            trItem.setTextAlignment(self.C_NAME, QtAlignLeft)
 
             if pHandle is None and nwItem.isRootType():
                 self.optTree.addTopLevelItem(trItem)
@@ -593,10 +592,12 @@ class _HeadingsTab(NScrollablePage):
         self._build = build
         self._editing = 0
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         sSp = CONFIG.pxInt(16)
         vSp = CONFIG.pxInt(12)
         bSp = CONFIG.pxInt(6)
+        trHide = self.tr("Hide")
 
         # Format Boxes
         # ============
@@ -607,10 +608,9 @@ class _HeadingsTab(NScrollablePage):
         self.lblTitle = QLabel(self._build.getLabel("headings.fmtTitle"), self)
         self.fmtTitle = QLineEdit("", self)
         self.fmtTitle.setReadOnly(True)
-        self.btnTitle = QToolButton(self)
-        self.btnTitle.setIcon(SHARED.theme.getIcon("edit"))
+        self.btnTitle = NIconToolButton(self, iSz, "edit")
         self.btnTitle.clicked.connect(lambda: self._editHeading(self.EDIT_TITLE))
-        self.hdeTitle = QLabel(self.tr("Hide"), self)
+        self.hdeTitle = QLabel(trHide, self)
         self.hdeTitle.setIndent(bSp)
         self.swtTitle = NSwitch(self, height=iPx)
 
@@ -624,10 +624,9 @@ class _HeadingsTab(NScrollablePage):
         self.lblChapter = QLabel(self._build.getLabel("headings.fmtChapter"), self)
         self.fmtChapter = QLineEdit("", self)
         self.fmtChapter.setReadOnly(True)
-        self.btnChapter = QToolButton(self)
-        self.btnChapter.setIcon(SHARED.theme.getIcon("edit"))
+        self.btnChapter = NIconToolButton(self, iSz, "edit")
         self.btnChapter.clicked.connect(lambda: self._editHeading(self.EDIT_CHAPTER))
-        self.hdeChapter = QLabel(self.tr("Hide"), self)
+        self.hdeChapter = QLabel(trHide, self)
         self.hdeChapter.setIndent(bSp)
         self.swtChapter = NSwitch(self, height=iPx)
 
@@ -641,10 +640,9 @@ class _HeadingsTab(NScrollablePage):
         self.lblUnnumbered = QLabel(self._build.getLabel("headings.fmtUnnumbered"), self)
         self.fmtUnnumbered = QLineEdit("", self)
         self.fmtUnnumbered.setReadOnly(True)
-        self.btnUnnumbered = QToolButton(self)
-        self.btnUnnumbered.setIcon(SHARED.theme.getIcon("edit"))
+        self.btnUnnumbered = NIconToolButton(self, iSz, "edit")
         self.btnUnnumbered.clicked.connect(lambda: self._editHeading(self.EDIT_UNNUM))
-        self.hdeUnnumbered = QLabel(self.tr("Hide"), self)
+        self.hdeUnnumbered = QLabel(trHide, self)
         self.hdeUnnumbered.setIndent(bSp)
         self.swtUnnumbered = NSwitch(self, height=iPx)
 
@@ -658,10 +656,9 @@ class _HeadingsTab(NScrollablePage):
         self.lblScene = QLabel(self._build.getLabel("headings.fmtScene"), self)
         self.fmtScene = QLineEdit("", self)
         self.fmtScene.setReadOnly(True)
-        self.btnScene = QToolButton(self)
-        self.btnScene.setIcon(SHARED.theme.getIcon("edit"))
+        self.btnScene = NIconToolButton(self, iSz, "edit")
         self.btnScene.clicked.connect(lambda: self._editHeading(self.EDIT_SCENE))
-        self.hdeScene = QLabel(self.tr("Hide"), self)
+        self.hdeScene = QLabel(trHide, self)
         self.hdeScene.setIndent(bSp)
         self.swtScene = NSwitch(self, height=iPx)
 
@@ -672,30 +669,28 @@ class _HeadingsTab(NScrollablePage):
         self.formatBox.addWidget(self.swtScene, 3, 4)
 
         # Alt Scene Heading
-        self.lblHScene = QLabel(self._build.getLabel("headings.fmtHardScene"), self)
-        self.fmtHScene = QLineEdit("", self)
-        self.fmtHScene.setReadOnly(True)
-        self.btnHScene = QToolButton(self)
-        self.btnHScene.setIcon(SHARED.theme.getIcon("edit"))
-        self.btnHScene.clicked.connect(lambda: self._editHeading(self.EDIT_HSCENE))
-        self.hdeHScene = QLabel(self.tr("Hide"), self)
-        self.hdeHScene.setIndent(bSp)
-        self.swtHScene = NSwitch(self, height=iPx)
-
-        self.formatBox.addWidget(self.lblHScene, 4, 0)
-        self.formatBox.addWidget(self.fmtHScene, 4, 1)
-        self.formatBox.addWidget(self.btnHScene, 4, 2)
-        self.formatBox.addWidget(self.hdeHScene, 4, 3)
-        self.formatBox.addWidget(self.swtHScene, 4, 4)
+        self.lblAScene = QLabel(self._build.getLabel("headings.fmtAltScene"), self)
+        self.fmtAScene = QLineEdit("", self)
+        self.fmtAScene.setReadOnly(True)
+        self.btnAScene = NIconToolButton(self, iSz, "edit")
+        self.btnAScene.clicked.connect(lambda: self._editHeading(self.EDIT_HSCENE))
+        self.hdeAScene = QLabel(trHide, self)
+        self.hdeAScene.setIndent(bSp)
+        self.swtAScene = NSwitch(self, height=iPx)
+
+        self.formatBox.addWidget(self.lblAScene, 4, 0)
+        self.formatBox.addWidget(self.fmtAScene, 4, 1)
+        self.formatBox.addWidget(self.btnAScene, 4, 2)
+        self.formatBox.addWidget(self.hdeAScene, 4, 3)
+        self.formatBox.addWidget(self.swtAScene, 4, 4)
 
         # Section Heading
         self.lblSection = QLabel(self._build.getLabel("headings.fmtSection"), self)
         self.fmtSection = QLineEdit("", self)
         self.fmtSection.setReadOnly(True)
-        self.btnSection = QToolButton(self)
-        self.btnSection.setIcon(SHARED.theme.getIcon("edit"))
+        self.btnSection = NIconToolButton(self, iSz, "edit")
         self.btnSection.clicked.connect(lambda: self._editHeading(self.EDIT_SECTION))
-        self.hdeSection = QLabel(self.tr("Hide"), self)
+        self.hdeSection = QLabel(trHide, self)
         self.hdeSection.setIndent(bSp)
         self.swtSection = NSwitch(self, height=iPx)
 
@@ -708,7 +703,7 @@ class _HeadingsTab(NScrollablePage):
         # Edit Form
         # =========
 
-        self.lblEditForm = QLabel(self.tr("Editing: {0}").format(self.tr("None")))
+        self.lblEditForm = QLabel(self.tr("Editing: {0}").format(self.tr("None")), self)
 
         self.editTextBox = QPlainTextEdit(self)
         self.editTextBox.setFixedHeight(5*iPx)
@@ -764,12 +759,12 @@ class _HeadingsTab(NScrollablePage):
         self.layoutMatrix.addWidget(self.layoutHeading, 0, 0, 1, 5)
 
         # Title Layout
-        self.mtxTitle = QLabel(self._build.getLabel("headings.fmtTitle"))
+        self.mtxTitle = QLabel(self._build.getLabel("headings.fmtTitle"), self)
         self.centerTitle = NSwitch(self, height=iPx)
         self.breakTitle = NSwitch(self, height=iPx)
-        lblCenterT = QLabel(self.tr("Centre"))
+        lblCenterT = QLabel(self.tr("Centre"), self)
         lblCenterT.setIndent(sSp)
-        lblBreakT = QLabel(self.tr("Page Break"))
+        lblBreakT = QLabel(self.tr("Page Break"), self)
         lblBreakT.setIndent(sSp)
 
         self.layoutMatrix.addWidget(self.mtxTitle,    1, 0)
@@ -779,12 +774,12 @@ class _HeadingsTab(NScrollablePage):
         self.layoutMatrix.addWidget(self.breakTitle,  1, 4)
 
         # Chapter Layout
-        self.mtxChapter = QLabel(self._build.getLabel("headings.fmtChapter"))
+        self.mtxChapter = QLabel(self._build.getLabel("headings.fmtChapter"), self)
         self.centerChapter = NSwitch(self, height=iPx)
         self.breakChapter = NSwitch(self, height=iPx)
-        lblCenterC = QLabel(self.tr("Centre"))
+        lblCenterC = QLabel(self.tr("Centre"), self)
         lblCenterC.setIndent(sSp)
-        lblBreakC = QLabel(self.tr("Page Break"))
+        lblBreakC = QLabel(self.tr("Page Break"), self)
         lblBreakC.setIndent(sSp)
 
         self.layoutMatrix.addWidget(self.mtxChapter,    2, 0)
@@ -794,12 +789,12 @@ class _HeadingsTab(NScrollablePage):
         self.layoutMatrix.addWidget(self.breakChapter,  2, 4)
 
         # Scene Layout
-        self.mtxScene = QLabel(self._build.getLabel("headings.fmtScene"))
+        self.mtxScene = QLabel(self._build.getLabel("headings.fmtScene"), self)
         self.centerScene = NSwitch(self, height=iPx)
         self.breakScene = NSwitch(self, height=iPx)
-        lblCenterS = QLabel(self.tr("Centre"))
+        lblCenterS = QLabel(self.tr("Centre"), self)
         lblCenterS.setIndent(sSp)
-        lblBreakS = QLabel(self.tr("Page Break"))
+        lblBreakS = QLabel(self.tr("Page Break"), self)
         lblBreakS.setIndent(sSp)
 
         self.layoutMatrix.addWidget(self.mtxScene,    3, 0)
@@ -831,14 +826,14 @@ class _HeadingsTab(NScrollablePage):
         self.fmtChapter.setText(self._build.getStr("headings.fmtChapter"))
         self.fmtUnnumbered.setText(self._build.getStr("headings.fmtUnnumbered"))
         self.fmtScene.setText(self._build.getStr("headings.fmtScene"))
-        self.fmtHScene.setText(self._build.getStr("headings.fmtHardScene"))
+        self.fmtAScene.setText(self._build.getStr("headings.fmtAltScene"))
         self.fmtSection.setText(self._build.getStr("headings.fmtSection"))
 
         self.swtTitle.setChecked(self._build.getBool("headings.hideTitle"))
         self.swtChapter.setChecked(self._build.getBool("headings.hideChapter"))
         self.swtUnnumbered.setChecked(self._build.getBool("headings.hideUnnumbered"))
         self.swtScene.setChecked(self._build.getBool("headings.hideScene"))
-        self.swtHScene.setChecked(self._build.getBool("headings.hideHardScene"))
+        self.swtAScene.setChecked(self._build.getBool("headings.hideAltScene"))
         self.swtSection.setChecked(self._build.getBool("headings.hideSection"))
 
         self.centerTitle.setChecked(self._build.getBool("headings.centerTitle"))
@@ -855,7 +850,7 @@ class _HeadingsTab(NScrollablePage):
         self._build.setValue("headings.hideChapter", self.swtChapter.isChecked())
         self._build.setValue("headings.hideUnnumbered", self.swtUnnumbered.isChecked())
         self._build.setValue("headings.hideScene", self.swtScene.isChecked())
-        self._build.setValue("headings.hideHardScene", self.swtHScene.isChecked())
+        self._build.setValue("headings.hideAltScene", self.swtAScene.isChecked())
         self._build.setValue("headings.hideSection", self.swtSection.isChecked())
 
         self._build.setValue("headings.centerTitle", self.centerTitle.isChecked())
@@ -895,8 +890,8 @@ class _HeadingsTab(NScrollablePage):
             text = self.fmtScene.text()
             label = self._build.getLabel("headings.fmtScene")
         elif heading == self.EDIT_HSCENE:
-            text = self.fmtHScene.text()
-            label = self._build.getLabel("headings.fmtHardScene")
+            text = self.fmtAScene.text()
+            label = self._build.getLabel("headings.fmtAltScene")
         elif heading == self.EDIT_SECTION:
             text = self.fmtSection.text()
             label = self._build.getLabel("headings.fmtSection")
@@ -933,8 +928,8 @@ class _HeadingsTab(NScrollablePage):
             self.fmtScene.setText(text)
             self._build.setValue("headings.fmtScene", text)
         elif heading == self.EDIT_HSCENE:
-            self.fmtHScene.setText(text)
-            self._build.setValue("headings.fmtHardScene", text)
+            self.fmtAScene.setText(text)
+            self._build.setValue("headings.fmtAltScene", text)
         elif heading == self.EDIT_SECTION:
             self.fmtSection.setText(text)
             self._build.setValue("headings.fmtSection", text)
@@ -982,7 +977,8 @@ class _ContentTab(NScrollableForm):
 
         self._build = build
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
 
         # Text Content
         self.incBodyText = NSwitch(self, height=iPx)
@@ -999,10 +995,8 @@ class _ContentTab(NScrollableForm):
                 lambda keyword=keyword: self._updateIgnoredKeywords(keyword)
             )
 
-        self.ignoredKeywordsButton = QToolButton(self)
-        self.ignoredKeywordsButton.setIcon(SHARED.theme.getIcon("add"))
+        self.ignoredKeywordsButton = NIconToolButton(self, iSz, "add")
         self.ignoredKeywordsButton.setMenu(self.mnKeywords)
-        self.ignoredKeywordsButton.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
 
         self.addGroupLabel(self._build.getLabel("text.grpContent"))
         self.addRow(self._build.getLabel("text.includeBodyText"), self.incBodyText)
@@ -1066,12 +1060,11 @@ class _FormatTab(NScrollableForm):
     def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
         super().__init__(parent=buildMain)
 
-        self.buildMain = buildMain
-
         self._build = build
         self._unitScale = 1.0
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         spW = 6*SHARED.theme.textNWidth
         dbW = 8*SHARED.theme.textNWidth
 
@@ -1083,8 +1076,7 @@ class _FormatTab(NScrollableForm):
         # Font Family
         self.textFont = QLineEdit(self)
         self.textFont.setReadOnly(True)
-        self.btnTextFont = QPushButton("...")
-        self.btnTextFont.setMaximumWidth(int(2.5*SHARED.theme.getTextWidth("...")))
+        self.btnTextFont = NIconToolButton(self, iSz, "more")
         self.btnTextFont.clicked.connect(self._selectFont)
         self.addRow(
             self._build.getLabel("format.textFont"), self.textFont,
@@ -1318,7 +1310,7 @@ class _FormatTab(NScrollableForm):
         return
 
     @pyqtSlot()
-    def _pageSizeValueChanged(self):
+    def _pageSizeValueChanged(self) -> None:
         """The user has changed the page size spin boxes, so we flip
         the page size box to Custom.
         """
@@ -1337,7 +1329,8 @@ class _OutputTab(NScrollableForm):
 
         self._build = build
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         spW = 6*SHARED.theme.textNWidth
 
         # Open Document
@@ -1348,8 +1341,7 @@ class _OutputTab(NScrollableForm):
 
         self.odtPageHeader = QLineEdit(self)
         self.odtPageHeader.setMinimumWidth(CONFIG.pxInt(200))
-        self.btnPageHeader = QToolButton(self)
-        self.btnPageHeader.setIcon(SHARED.theme.getIcon("revert"))
+        self.btnPageHeader = NIconToolButton(self, iSz, "revert")
         self.btnPageHeader.clicked.connect(self._resetPageHeader)
         self.addRow(
             self._build.getLabel("odt.pageHeader"), self.odtPageHeader,
@@ -1395,6 +1387,7 @@ class _OutputTab(NScrollableForm):
         self.htmlAddStyles.setChecked(self._build.getBool("html.addStyles"))
         self.htmlPreserveTabs.setChecked(self._build.getBool("html.preserveTabs"))
         self.mdPreserveBreaks.setChecked(self._build.getBool("md.preserveBreaks"))
+        self.odtPageHeader.setCursorPosition(0)
         return
 
     def saveContent(self) -> None:

novelwriter/tools/noveldetails.py

@@ -26,8 +26,8 @@ from __future__ import annotations
 import math
 import logging
 
+from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtGui import QCloseEvent
-from PyQt5.QtCore import QSize, Qt, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QDialog, QDialogButtonBox, QFormLayout, QGridLayout,
     QHBoxLayout, QLabel, QSpinBox, QStackedWidget, QTreeWidget,
@@ -37,10 +37,11 @@ from PyQt5.QtWidgets import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatTime, numberToRoman
 from novelwriter.constants import nwUnicode
-from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.configlayout import NColourLabel, NFixedPage, NScrollablePage
-from novelwriter.extensions.pagedsidebar import NPagedSideBar
 from novelwriter.extensions.novelselector import NovelSelector
+from novelwriter.extensions.pagedsidebar import NPagedSideBar
+from novelwriter.extensions.switch import NSwitch
+from novelwriter.types import QtAlignRight, QtDecoration, QtDialogClose
 
 logger = logging.getLogger(__name__)
 
@@ -94,7 +95,7 @@ class GuiNovelDetails(QDialog):
         self.mainStack.addWidget(self.contentsPage)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
+        self.buttonBox = QDialogButtonBox(QtDialogClose, self)
         self.buttonBox.rejected.connect(self.close)
 
         # Assemble
@@ -309,7 +310,8 @@ class _ContentsPage(NFixedPage):
         self._data = []
         self._currentRoot = None
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         hPx = CONFIG.pxInt(12)
         vPx = CONFIG.pxInt(4)
         options = SHARED.project.options
@@ -322,7 +324,7 @@ class _ContentsPage(NFixedPage):
 
         # Contents Tree
         self.tocTree = QTreeWidget(self)
-        self.tocTree.setIconSize(QSize(iPx, iPx))
+        self.tocTree.setIconSize(iSz)
         self.tocTree.setIndentation(0)
         self.tocTree.setColumnCount(6)
         self.tocTree.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
@@ -337,10 +339,10 @@ class _ContentsPage(NFixedPage):
 
         treeHeadItem = self.tocTree.headerItem()
         if treeHeadItem:
-            treeHeadItem.setTextAlignment(self.C_WORDS, Qt.AlignmentFlag.AlignRight)
-            treeHeadItem.setTextAlignment(self.C_PAGES, Qt.AlignmentFlag.AlignRight)
-            treeHeadItem.setTextAlignment(self.C_PAGE,  Qt.AlignmentFlag.AlignRight)
-            treeHeadItem.setTextAlignment(self.C_PROG,  Qt.AlignmentFlag.AlignRight)
+            treeHeadItem.setTextAlignment(self.C_WORDS, QtAlignRight)
+            treeHeadItem.setTextAlignment(self.C_PAGES, QtAlignRight)
+            treeHeadItem.setTextAlignment(self.C_PAGE,  QtAlignRight)
+            treeHeadItem.setTextAlignment(self.C_PROG,  QtAlignRight)
 
         treeHeader = self.tocTree.header()
         treeHeader.setStretchLastSection(True)
@@ -364,7 +366,7 @@ class _ContentsPage(NFixedPage):
         countFrom    = options.getInt("GuiNovelDetails", "countFrom", 1)
         clearDouble  = options.getBool("GuiNovelDetails", "clearDouble", True)
 
-        self.wpLabel = QLabel(self.tr("Words per page"))
+        self.wpLabel = QLabel(self.tr("Words per page"), self)
 
         self.wpValue = QSpinBox(self)
         self.wpValue.setMinimum(10)
@@ -373,7 +375,7 @@ class _ContentsPage(NFixedPage):
         self.wpValue.setValue(wordsPerPage)
         self.wpValue.valueChanged.connect(self._populateTree)
 
-        self.poLabel = QLabel(self.tr("First page offset"))
+        self.poLabel = QLabel(self.tr("First page offset"), self)
 
         self.poValue = QSpinBox(self)
         self.poValue.setMinimum(1)
@@ -382,7 +384,7 @@ class _ContentsPage(NFixedPage):
         self.poValue.setValue(countFrom)
         self.poValue.valueChanged.connect(self._populateTree)
 
-        self.dblLabel = QLabel(self.tr("Chapters on odd pages"))
+        self.dblLabel = QLabel(self.tr("Chapters on odd pages"), self)
 
         self.dblValue = NSwitch(self, height=iPx)
         self.dblValue.setChecked(clearDouble)
@@ -483,17 +485,17 @@ class _ContentsPage(NFixedPage):
             if tTitle.strip() == "":
                 tTitle = self.tr("Untitled")
 
-            newItem.setData(self.C_TITLE, Qt.DecorationRole, hDec)
+            newItem.setData(self.C_TITLE, QtDecoration, hDec)
             newItem.setText(self.C_TITLE, tTitle)
             newItem.setText(self.C_WORDS, f"{wCount:n}")
             newItem.setText(self.C_PAGES, f"{pCount:n}")
             newItem.setText(self.C_PAGE,  progPage)
             newItem.setText(self.C_PROG,  progText)
 
-            newItem.setTextAlignment(self.C_WORDS, Qt.AlignRight)
-            newItem.setTextAlignment(self.C_PAGES, Qt.AlignRight)
-            newItem.setTextAlignment(self.C_PAGE,  Qt.AlignRight)
-            newItem.setTextAlignment(self.C_PROG,  Qt.AlignRight)
+            newItem.setTextAlignment(self.C_WORDS, QtAlignRight)
+            newItem.setTextAlignment(self.C_PAGES, QtAlignRight)
+            newItem.setTextAlignment(self.C_PAGE,  QtAlignRight)
+            newItem.setTextAlignment(self.C_PROG,  QtAlignRight)
 
             # Make pages and titles/partitions stand out
             if tLevel < 2: