novelWriter 2.3.1__py3-none-any.whl → 2.4__py3-none-any.whl

novelwriter/tools/manussettings.py

@@ -28,24 +28,28 @@ import logging
 from typing import TYPE_CHECKING
 
 from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
-from PyQt5.QtCore import QEvent, QSize, Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtCore import QEvent, 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
+    QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.constants import nwHeadFmt, nwLabels, trConst
+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)
@@ -584,7 +583,8 @@ class _HeadingsTab(NScrollablePage):
     EDIT_CHAPTER = 2
     EDIT_UNNUM   = 3
     EDIT_SCENE   = 4
-    EDIT_SECTION = 5
+    EDIT_HSCENE  = 5
+    EDIT_SECTION = 6
 
     def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
         super().__init__(parent=buildMain)
@@ -592,123 +592,120 @@ 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
         # ============
         self.formatBox = QGridLayout()
-        self.formatBox.setHorizontalSpacing(vSp)
+        self.formatBox.setHorizontalSpacing(bSp)
 
         # Title Heading
-        self.lblTitle = QLabel(self._build.getLabel("headings.fmtTitle"))
+        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(trHide, self)
+        self.hdeTitle.setIndent(bSp)
+        self.swtTitle = NSwitch(self, height=iPx)
 
-        wrapTitle = QHBoxLayout()
-        wrapTitle.addWidget(self.fmtTitle)
-        wrapTitle.addWidget(self.btnTitle)
-        wrapTitle.setSpacing(bSp)
-
-        self.formatBox.addWidget(self.lblTitle, 0, 0, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapTitle,     0, 1, Qt.AlignLeft)
+        self.formatBox.addWidget(self.lblTitle, 0, 0)
+        self.formatBox.addWidget(self.fmtTitle, 0, 1)
+        self.formatBox.addWidget(self.btnTitle, 0, 2)
+        self.formatBox.addWidget(self.hdeTitle, 0, 3)
+        self.formatBox.addWidget(self.swtTitle, 0, 4)
 
         # Chapter Heading
-        self.lblChapter = QLabel(self._build.getLabel("headings.fmtChapter"))
+        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(trHide, self)
+        self.hdeChapter.setIndent(bSp)
+        self.swtChapter = NSwitch(self, height=iPx)
 
-        wrapChapter = QHBoxLayout()
-        wrapChapter.addWidget(self.fmtChapter)
-        wrapChapter.addWidget(self.btnChapter)
-        wrapChapter.setSpacing(bSp)
-
-        self.formatBox.addWidget(self.lblChapter, 1, 0, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapChapter,     1, 1, Qt.AlignLeft)
+        self.formatBox.addWidget(self.lblChapter, 1, 0)
+        self.formatBox.addWidget(self.fmtChapter, 1, 1)
+        self.formatBox.addWidget(self.btnChapter, 1, 2)
+        self.formatBox.addWidget(self.hdeChapter, 1, 3)
+        self.formatBox.addWidget(self.swtChapter, 1, 4)
 
         # Unnumbered Chapter Heading
-        self.lblUnnumbered = QLabel(self._build.getLabel("headings.fmtUnnumbered"))
+        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(trHide, self)
+        self.hdeUnnumbered.setIndent(bSp)
+        self.swtUnnumbered = NSwitch(self, height=iPx)
 
-        wrapUnnumbered = QHBoxLayout()
-        wrapUnnumbered.addWidget(self.fmtUnnumbered)
-        wrapUnnumbered.addWidget(self.btnUnnumbered)
-        wrapUnnumbered.setSpacing(bSp)
-
-        self.formatBox.addWidget(self.lblUnnumbered, 2, 0, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapUnnumbered,     2, 1, Qt.AlignLeft)
+        self.formatBox.addWidget(self.lblUnnumbered, 2, 0)
+        self.formatBox.addWidget(self.fmtUnnumbered, 2, 1)
+        self.formatBox.addWidget(self.btnUnnumbered, 2, 2)
+        self.formatBox.addWidget(self.hdeUnnumbered, 2, 3)
+        self.formatBox.addWidget(self.swtUnnumbered, 2, 4)
 
         # Scene Heading
-        sceneHideTip = self._build.getLabel("headings.hideScene")
-        self.lblScene = QLabel(self._build.getLabel("headings.fmtScene"))
+        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.hdeScene.setToolTip(sceneHideTip)
+        self.hdeScene = QLabel(trHide, self)
+        self.hdeScene.setIndent(bSp)
         self.swtScene = NSwitch(self, height=iPx)
-        self.swtScene.setToolTip(sceneHideTip)
-
-        wrapScene = QHBoxLayout()
-        wrapScene.addWidget(self.fmtScene)
-        wrapScene.addWidget(self.btnScene)
-        wrapScene.setSpacing(bSp)
 
-        wrapSceneHide = QHBoxLayout()
-        wrapSceneHide.addWidget(self.hdeScene)
-        wrapSceneHide.addWidget(self.swtScene)
-        wrapSceneHide.setSpacing(bSp)
-
-        self.formatBox.addWidget(self.lblScene, 3, 0, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapScene,     3, 1, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapSceneHide, 3, 2, Qt.AlignLeft)
+        self.formatBox.addWidget(self.lblScene, 3, 0)
+        self.formatBox.addWidget(self.fmtScene, 3, 1)
+        self.formatBox.addWidget(self.btnScene, 3, 2)
+        self.formatBox.addWidget(self.hdeScene, 3, 3)
+        self.formatBox.addWidget(self.swtScene, 3, 4)
+
+        # Alt Scene Heading
+        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
-        sectionHideTip = self._build.getLabel("headings.hideSection")
-        self.lblSection = QLabel(self._build.getLabel("headings.fmtSection"))
+        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.hdeSection.setToolTip(sectionHideTip)
+        self.hdeSection = QLabel(trHide, self)
+        self.hdeSection.setIndent(bSp)
         self.swtSection = NSwitch(self, height=iPx)
-        self.swtSection.setToolTip(sectionHideTip)
-
-        wrapSection = QHBoxLayout()
-        wrapSection.addWidget(self.fmtSection)
-        wrapSection.addWidget(self.btnSection)
-        wrapSection.setSpacing(bSp)
-
-        wrapSectionHide = QHBoxLayout()
-        wrapSectionHide.addWidget(self.hdeSection)
-        wrapSectionHide.addWidget(self.swtSection)
-        wrapSectionHide.setSpacing(bSp)
 
-        self.formatBox.addWidget(self.lblSection, 4, 0, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapSection,     4, 1, Qt.AlignLeft)
-        self.formatBox.addLayout(wrapSectionHide, 4, 2, Qt.AlignLeft)
+        self.formatBox.addWidget(self.lblSection, 5, 0)
+        self.formatBox.addWidget(self.fmtSection, 5, 1)
+        self.formatBox.addWidget(self.btnSection, 5, 2)
+        self.formatBox.addWidget(self.hdeSection, 5, 3)
+        self.formatBox.addWidget(self.swtSection, 5, 4)
 
         # 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.editTextBox = QPlainTextEdit(self)
         self.editTextBox.setFixedHeight(5*iPx)
         self.editTextBox.setEnabled(False)
 
@@ -735,10 +732,10 @@ class _HeadingsTab(NScrollablePage):
         self.aInsCharPOV.triggered.connect(lambda: self._insertIntoForm(nwHeadFmt.CHAR_POV))
         self.aInsCharFocus.triggered.connect(lambda: self._insertIntoForm(nwHeadFmt.CHAR_FOCUS))
 
-        self.btnInsert = QPushButton(self.tr("Insert"))
+        self.btnInsert = QPushButton(self.tr("Insert"), self)
         self.btnInsert.setMenu(self.menuInsert)
 
-        self.btnApply = QPushButton(self.tr("Apply"))
+        self.btnApply = QPushButton(self.tr("Apply"), self)
         self.btnApply.clicked.connect(self._saveFormat)
 
         self.formButtonBox = QHBoxLayout()
@@ -751,13 +748,72 @@ class _HeadingsTab(NScrollablePage):
         self.editFormBox.addWidget(self.editTextBox)
         self.editFormBox.addLayout(self.formButtonBox)
 
+        # Layout Matrix
+        # =============
+        self.layoutMatrix = QGridLayout()
+        self.layoutMatrix.setVerticalSpacing(vSp)
+        self.layoutMatrix.setHorizontalSpacing(vSp)
+
+        # Heading
+        self.layoutHeading = QLabel("<b>{0}</b>".format(self.tr("Additional Styling")), self)
+        self.layoutMatrix.addWidget(self.layoutHeading, 0, 0, 1, 5)
+
+        # Title Layout
+        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"), self)
+        lblCenterT.setIndent(sSp)
+        lblBreakT = QLabel(self.tr("Page Break"), self)
+        lblBreakT.setIndent(sSp)
+
+        self.layoutMatrix.addWidget(self.mtxTitle,    1, 0)
+        self.layoutMatrix.addWidget(lblCenterT,       1, 1)
+        self.layoutMatrix.addWidget(self.centerTitle, 1, 2)
+        self.layoutMatrix.addWidget(lblBreakT,        1, 3)
+        self.layoutMatrix.addWidget(self.breakTitle,  1, 4)
+
+        # Chapter Layout
+        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"), self)
+        lblCenterC.setIndent(sSp)
+        lblBreakC = QLabel(self.tr("Page Break"), self)
+        lblBreakC.setIndent(sSp)
+
+        self.layoutMatrix.addWidget(self.mtxChapter,    2, 0)
+        self.layoutMatrix.addWidget(lblCenterC,         2, 1)
+        self.layoutMatrix.addWidget(self.centerChapter, 2, 2)
+        self.layoutMatrix.addWidget(lblBreakC,          2, 3)
+        self.layoutMatrix.addWidget(self.breakChapter,  2, 4)
+
+        # Scene Layout
+        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"), self)
+        lblCenterS.setIndent(sSp)
+        lblBreakS = QLabel(self.tr("Page Break"), self)
+        lblBreakS.setIndent(sSp)
+
+        self.layoutMatrix.addWidget(self.mtxScene,    3, 0)
+        self.layoutMatrix.addWidget(lblCenterS,       3, 1)
+        self.layoutMatrix.addWidget(self.centerScene, 3, 2)
+        self.layoutMatrix.addWidget(lblBreakS,        3, 3)
+        self.layoutMatrix.addWidget(self.breakScene,  3, 4)
+
+        self.layoutMatrix.setColumnStretch(5, 1)
+
         # Assemble
         # ========
 
         self.outerBox = QVBoxLayout()
         self.outerBox.addLayout(self.formatBox)
-        self.outerBox.addSpacing(CONFIG.pxInt(16))
+        self.outerBox.addSpacing(sSp)
         self.outerBox.addLayout(self.editFormBox)
+        self.outerBox.addSpacing(sSp)
+        self.outerBox.addLayout(self.layoutMatrix)
         self.outerBox.addStretch(1)
 
         self.setCentralLayout(self.outerBox)
@@ -770,15 +826,39 @@ 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.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.swtAScene.setChecked(self._build.getBool("headings.hideAltScene"))
         self.swtSection.setChecked(self._build.getBool("headings.hideSection"))
+
+        self.centerTitle.setChecked(self._build.getBool("headings.centerTitle"))
+        self.centerChapter.setChecked(self._build.getBool("headings.centerChapter"))
+        self.centerScene.setChecked(self._build.getBool("headings.centerScene"))
+        self.breakTitle.setChecked(self._build.getBool("headings.breakTitle"))
+        self.breakChapter.setChecked(self._build.getBool("headings.breakChapter"))
+        self.breakScene.setChecked(self._build.getBool("headings.breakScene"))
         return
 
     def saveContent(self) -> None:
         """Save choices back into build object."""
+        self._build.setValue("headings.hideTitle", self.swtTitle.isChecked())
+        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.hideAltScene", self.swtAScene.isChecked())
         self._build.setValue("headings.hideSection", self.swtSection.isChecked())
+
+        self._build.setValue("headings.centerTitle", self.centerTitle.isChecked())
+        self._build.setValue("headings.centerChapter", self.centerChapter.isChecked())
+        self._build.setValue("headings.centerScene", self.centerScene.isChecked())
+        self._build.setValue("headings.breakTitle", self.breakTitle.isChecked())
+        self._build.setValue("headings.breakChapter", self.breakChapter.isChecked())
+        self._build.setValue("headings.breakScene", self.breakScene.isChecked())
         return
 
     ##
@@ -809,6 +889,9 @@ class _HeadingsTab(NScrollablePage):
         elif heading == self.EDIT_SCENE:
             text = self.fmtScene.text()
             label = self._build.getLabel("headings.fmtScene")
+        elif heading == self.EDIT_HSCENE:
+            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")
@@ -844,6 +927,9 @@ class _HeadingsTab(NScrollablePage):
         elif heading == self.EDIT_SCENE:
             self.fmtScene.setText(text)
             self._build.setValue("headings.fmtScene", text)
+        elif heading == self.EDIT_HSCENE:
+            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)
@@ -891,19 +977,34 @@ 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)
         self.incSynopsis = NSwitch(self, height=iPx)
         self.incComments = NSwitch(self, height=iPx)
         self.incKeywords = NSwitch(self, height=iPx)
-        self.incBodyText = NSwitch(self, height=iPx)
+
+        self.ignoredKeywords = QLineEdit(self)
+
+        self.mnKeywords = QMenu(self)
+        for keyword in nwKeyWords.VALID_KEYS:
+            self.mnKeywords.addAction(
+                trConst(nwLabels.KEY_NAME[keyword]),
+                lambda keyword=keyword: self._updateIgnoredKeywords(keyword)
+            )
+
+        self.ignoredKeywordsButton = NIconToolButton(self, iSz, "add")
+        self.ignoredKeywordsButton.setMenu(self.mnKeywords)
 
         self.addGroupLabel(self._build.getLabel("text.grpContent"))
+        self.addRow(self._build.getLabel("text.includeBodyText"), self.incBodyText)
         self.addRow(self._build.getLabel("text.includeSynopsis"), self.incSynopsis)
         self.addRow(self._build.getLabel("text.includeComments"), self.incComments)
         self.addRow(self._build.getLabel("text.includeKeywords"), self.incKeywords)
-        self.addRow(self._build.getLabel("text.includeBodyText"), self.incBodyText)
+        self.addRow(self._build.getLabel("text.ignoredKeywords"), self.ignoredKeywords,
+                    button=self.ignoredKeywordsButton, stretch=(1, 1))
 
         # Insert Content
         self.addNoteHead = NSwitch(self, height=iPx)
@@ -918,22 +1019,39 @@ class _ContentTab(NScrollableForm):
 
     def loadContent(self) -> None:
         """Populate the widgets."""
+        self.incBodyText.setChecked(self._build.getBool("text.includeBodyText"))
         self.incSynopsis.setChecked(self._build.getBool("text.includeSynopsis"))
         self.incComments.setChecked(self._build.getBool("text.includeComments"))
         self.incKeywords.setChecked(self._build.getBool("text.includeKeywords"))
-        self.incBodyText.setChecked(self._build.getBool("text.includeBodyText"))
+        self.ignoredKeywords.setText(self._build.getStr("text.ignoredKeywords"))
         self.addNoteHead.setChecked(self._build.getBool("text.addNoteHeadings"))
+        self._updateIgnoredKeywords()
         return
 
     def saveContent(self) -> None:
         """Save choices back into build object."""
+        self._updateIgnoredKeywords()
+        self._build.setValue("text.includeBodyText", self.incBodyText.isChecked())
         self._build.setValue("text.includeSynopsis", self.incSynopsis.isChecked())
         self._build.setValue("text.includeComments", self.incComments.isChecked())
         self._build.setValue("text.includeKeywords", self.incKeywords.isChecked())
-        self._build.setValue("text.includeBodyText", self.incBodyText.isChecked())
+        self._build.setValue("text.ignoredKeywords", self.ignoredKeywords.text())
         self._build.setValue("text.addNoteHeadings", self.addNoteHead.isChecked())
         return
 
+    ##
+    #  Internal Functions
+    ##
+
+    def _updateIgnoredKeywords(self, keyword: str | None = None) -> None:
+        """Update the ignored keywords list."""
+        current = [x.lower().strip() for x in self.ignoredKeywords.text().split(",")]
+        if keyword:
+            current.append(keyword)
+        verified = set(x for x in current if x in nwKeyWords.VALID_KEYS)
+        self.ignoredKeywords.setText(", ".join(verified))
+        return
+
 # END Class _ContentTab
 
 
@@ -947,7 +1065,8 @@ class _FormatTab(NScrollableForm):
         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
 
@@ -959,8 +1078,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,
@@ -1194,7 +1312,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.
         """
@@ -1213,7 +1331,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
@@ -1224,8 +1343,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,
@@ -1239,12 +1357,24 @@ class _OutputTab(NScrollableForm):
         self.odtPageCountOffset.setMinimumWidth(spW)
         self.addRow(self._build.getLabel("odt.pageCountOffset"), self.odtPageCountOffset)
 
+        self.odtFirstLineIndent = NSwitch(self, height=iPx)
+        self.addRow(self._build.getLabel("odt.firstLineIndent"), self.odtFirstLineIndent)
+
         # HTML Document
         self.addGroupLabel(self._build.getLabel("html"))
 
         self.htmlAddStyles = NSwitch(self, height=iPx)
         self.addRow(self._build.getLabel("html.addStyles"), self.htmlAddStyles)
 
+        self.htmlPreserveTabs = NSwitch(self, height=iPx)
+        self.addRow(self._build.getLabel("html.preserveTabs"), self.htmlPreserveTabs)
+
+        # Markdown Document
+        self.addGroupLabel(self._build.getLabel("md"))
+
+        self.mdPreserveBreaks = NSwitch(self, height=iPx)
+        self.addRow(self._build.getLabel("md.preserveBreaks"), self.mdPreserveBreaks)
+
         # Finalise
         self.finalise()
 
@@ -1255,7 +1385,11 @@ class _OutputTab(NScrollableForm):
         self.odtAddColours.setChecked(self._build.getBool("odt.addColours"))
         self.odtPageHeader.setText(self._build.getStr("odt.pageHeader"))
         self.odtPageCountOffset.setValue(self._build.getInt("odt.pageCountOffset"))
+        self.odtFirstLineIndent.setChecked(self._build.getBool("odt.firstLineIndent"))
         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:
@@ -1263,7 +1397,10 @@ class _OutputTab(NScrollableForm):
         self._build.setValue("odt.addColours", self.odtAddColours.isChecked())
         self._build.setValue("odt.pageHeader", self.odtPageHeader.text())
         self._build.setValue("odt.pageCountOffset", self.odtPageCountOffset.value())
+        self._build.setValue("odt.firstLineIndent", self.odtFirstLineIndent.isChecked())
         self._build.setValue("html.addStyles", self.htmlAddStyles.isChecked())
+        self._build.setValue("html.preserveTabs", self.htmlPreserveTabs.isChecked())
+        self._build.setValue("md.preserveBreaks", self.mdPreserveBreaks.isChecked())
         return
 
     ##