novelWriter 2.2.1__py3-none-any.whl → 2.3b1__py3-none-any.whl

novelwriter/tools/manussettings.py

@@ -27,24 +27,24 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtGui import (
-    QColor, QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
-)
+from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
 from PyQt5.QtCore import QEvent, QSize, Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
-    QAbstractButton, QAbstractItemView, QComboBox, QDialog, QDialogButtonBox,
-    QDoubleSpinBox, QFontDialog, QFrame, QGridLayout, QHBoxLayout, QHeaderView,
-    QLabel, QLineEdit, QMenu, QPlainTextEdit, QPushButton, QSpinBox, QSplitter,
-    QStackedWidget, QToolButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout,
-    QWidget
+    QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox,
+    QFontDialog, QFrame, QGridLayout, QHBoxLayout, QHeaderView, QLabel,
+    QLineEdit, QMenu, QPlainTextEdit, QPushButton, QSplitter, QStackedWidget,
+    QToolButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.constants import nwHeadFmt, 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 NConfigLayout, NSimpleLayout
+from novelwriter.extensions.configlayout import (
+    NColourLabel, NFixedPage, NScrollableForm, NScrollablePage
+)
 from novelwriter.extensions.pagedsidebar import NPagedSideBar
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -79,47 +79,49 @@ class GuiBuildSettings(QDialog):
         self._build = build
 
         self.setWindowTitle(self.tr("Manuscript Build Settings"))
-        self.setMinimumWidth(CONFIG.pxInt(700))
-        self.setMinimumHeight(CONFIG.pxInt(400))
+        self.setMinimumSize(CONFIG.pxInt(700), CONFIG.pxInt(400))
 
         mPx = CONFIG.pxInt(150)
         wWin = CONFIG.pxInt(750)
         hWin = CONFIG.pxInt(550)
 
-        pOptions = SHARED.project.options
+        options = SHARED.project.options
         self.resize(
-            CONFIG.pxInt(pOptions.getInt("GuiBuildSettings", "winWidth", wWin)),
-            CONFIG.pxInt(pOptions.getInt("GuiBuildSettings", "winHeight", hWin))
+            CONFIG.pxInt(options.getInt("GuiBuildSettings", "winWidth", wWin)),
+            CONFIG.pxInt(options.getInt("GuiBuildSettings", "winHeight", hWin))
         )
 
-        # Options SideBar
-        # ===============
+        # Title
+        self.titleLabel = NColourLabel(
+            self.tr("Manuscript Build Settings"), SHARED.theme.helpText,
+            parent=self, scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
+        )
 
-        self.optSideBar = NPagedSideBar(self)
-        self.optSideBar.setMinimumWidth(mPx)
-        self.optSideBar.setMaximumWidth(mPx)
-        self.optSideBar.setLabelColor(SHARED.theme.helpText)
+        # Settings Name
+        self.lblBuildName = QLabel(self.tr("Name"))
+        self.editBuildName = QLineEdit(self)
 
-        self.optSideBar.addLabel(self.tr("Options"))
-        self.optSideBar.addButton(self.tr("Selection"), self.OPT_FILTERS)
-        self.optSideBar.addButton(self.tr("Headings"), self.OPT_HEADINGS)
-        self.optSideBar.addButton(self.tr("Content"), self.OPT_CONTENT)
-        self.optSideBar.addButton(self.tr("Format"), self.OPT_FORMAT)
-        self.optSideBar.addButton(self.tr("Output"), self.OPT_OUTPUT)
+        # SideBar
+        self.sidebar = NPagedSideBar(self)
+        self.sidebar.setMinimumWidth(mPx)
+        self.sidebar.setMaximumWidth(mPx)
+        self.sidebar.setLabelColor(SHARED.theme.helpText)
 
-        self.optSideBar.buttonClicked.connect(self._stackPageSelected)
+        self.sidebar.addButton(self.tr("Selection"), self.OPT_FILTERS)
+        self.sidebar.addButton(self.tr("Headings"), self.OPT_HEADINGS)
+        self.sidebar.addButton(self.tr("Content"), self.OPT_CONTENT)
+        self.sidebar.addButton(self.tr("Format"), self.OPT_FORMAT)
+        self.sidebar.addButton(self.tr("Output"), self.OPT_OUTPUT)
 
-        # Options Area
-        # ============
+        self.sidebar.buttonClicked.connect(self._stackPageSelected)
 
-        # Create Tabs
+        # Content
         self.optTabSelect = _FilterTab(self, self._build)
         self.optTabHeadings = _HeadingsTab(self, self._build)
         self.optTabContent = _ContentTab(self, self._build)
         self.optTabFormat = _FormatTab(self, self._build)
         self.optTabOutput = _OutputTab(self, self._build)
 
-        # Add Tabs
         self.toolStack = QStackedWidget(self)
         self.toolStack.addWidget(self.optTabSelect)
         self.toolStack.addWidget(self.optTabHeadings)
@@ -127,38 +129,36 @@ class GuiBuildSettings(QDialog):
         self.toolStack.addWidget(self.optTabContent)
         self.toolStack.addWidget(self.optTabOutput)
 
-        # Main Settings + Buttons
-        # =======================
-
-        self.lblBuildName = QLabel(self.tr("Name"))
-        self.editBuildName = QLineEdit()
-        self.dlgButtons = QDialogButtonBox(
-            QDialogButtonBox.Apply | QDialogButtonBox.Save | QDialogButtonBox.Close
+        # Buttons
+        self.buttonBox = QDialogButtonBox(
+            QDialogButtonBox.StandardButton.Apply
+            | QDialogButtonBox.StandardButton.Save
+            | QDialogButtonBox.StandardButton.Close
         )
-        self.dlgButtons.clicked.connect(self._dialogButtonClicked)
+        self.buttonBox.clicked.connect(self._dialogButtonClicked)
 
-        self.buttonBox = QHBoxLayout()
-        self.buttonBox.addWidget(self.lblBuildName)
-        self.buttonBox.addWidget(self.editBuildName)
-        self.buttonBox.addWidget(self.dlgButtons)
-
-        # Assemble GUI
-        # ============
+        # Assemble
+        self.topBox = QHBoxLayout()
+        self.topBox.addWidget(self.titleLabel)
+        self.topBox.addStretch(1)
+        self.topBox.addWidget(self.lblBuildName)
+        self.topBox.addWidget(self.editBuildName, 1)
 
         self.mainBox = QHBoxLayout()
-        self.mainBox.addWidget(self.optSideBar)
+        self.mainBox.addWidget(self.sidebar)
         self.mainBox.addWidget(self.toolStack)
         self.mainBox.setContentsMargins(0, 0, 0, 0)
 
         self.outerBox = QVBoxLayout()
+        self.outerBox.addLayout(self.topBox)
         self.outerBox.addLayout(self.mainBox)
-        self.outerBox.addLayout(self.buttonBox)
+        self.outerBox.addWidget(self.buttonBox)
         self.outerBox.setSpacing(CONFIG.pxInt(12))
 
         self.setLayout(self.outerBox)
 
         # Set Default Tab
-        self.optSideBar.setSelected(self.OPT_FILTERS)
+        self.sidebar.setSelected(self.OPT_FILTERS)
 
         logger.debug("Ready: GuiBuildSettings")
 
@@ -187,6 +187,21 @@ class GuiBuildSettings(QDialog):
         """The build ID of the build of the dialog."""
         return self._build.buildID
 
+    ##
+    #  Events
+    ##
+
+    def closeEvent(self, event: QEvent) -> None:
+        """Capture the user closing the window so we can save
+        settings.
+        """
+        logger.debug("Closing: GuiBuildSettings")
+        self._askToSaveBuild()
+        self._saveSettings()
+        event.accept()
+        self.deleteLater()
+        return
+
     ##
     #  Private Slots
     ##
@@ -209,7 +224,7 @@ class GuiBuildSettings(QDialog):
     @pyqtSlot("QAbstractButton*")
     def _dialogButtonClicked(self, button: QAbstractButton) -> None:
         """Handle button clicks from the dialog button box."""
-        role = self.dlgButtons.buttonRole(button)
+        role = self.buttonBox.buttonRole(button)
         if role == QDialogButtonBox.ApplyRole:
             self._emitBuildData()
         elif role == QDialogButtonBox.AcceptRole:
@@ -219,21 +234,6 @@ class GuiBuildSettings(QDialog):
             self.close()
         return
 
-    ##
-    #  Events
-    ##
-
-    def closeEvent(self, event: QEvent) -> None:
-        """Capture the user closing the window so we can save
-        settings.
-        """
-        logger.debug("Closing: GuiBuildSettings")
-        self._askToSaveBuild()
-        self._saveSettings()
-        event.accept()
-        self.deleteLater()
-        return
-
     ##
     #  Internal Functions
     ##
@@ -281,7 +281,7 @@ class GuiBuildSettings(QDialog):
 # END Class GuiBuildSettings
 
 
-class _FilterTab(QWidget):
+class _FilterTab(NFixedPage):
 
     C_DATA   = 0
     C_NAME   = 0
@@ -397,11 +397,7 @@ class _FilterTab(QWidget):
             CONFIG.pxInt(pOptions.getInt("GuiBuildSettings", "filterWidth", 300))
         ])
 
-        self.outerBox = QHBoxLayout()
-        self.outerBox.addWidget(self.mainSplit)
-        self.outerBox.setContentsMargins(0, 0, 0, 0)
-
-        self.setLayout(self.outerBox)
+        self.setCentralWidget(self.mainSplit)
 
         return
 
@@ -582,7 +578,7 @@ class _FilterTab(QWidget):
 # END Class _FilterTab
 
 
-class _HeadingsTab(QWidget):
+class _HeadingsTab(NScrollablePage):
 
     EDIT_TITLE   = 1
     EDIT_CHAPTER = 2
@@ -607,9 +603,9 @@ class _HeadingsTab(QWidget):
 
         # Title Heading
         self.lblTitle = QLabel(self._build.getLabel("headings.fmtTitle"))
-        self.fmtTitle = QLineEdit("")
+        self.fmtTitle = QLineEdit("", self)
         self.fmtTitle.setReadOnly(True)
-        self.btnTitle = QToolButton()
+        self.btnTitle = QToolButton(self)
         self.btnTitle.setIcon(SHARED.theme.getIcon("edit"))
         self.btnTitle.clicked.connect(lambda: self._editHeading(self.EDIT_TITLE))
 
@@ -623,9 +619,9 @@ class _HeadingsTab(QWidget):
 
         # Chapter Heading
         self.lblChapter = QLabel(self._build.getLabel("headings.fmtChapter"))
-        self.fmtChapter = QLineEdit("")
+        self.fmtChapter = QLineEdit("", self)
         self.fmtChapter.setReadOnly(True)
-        self.btnChapter = QToolButton()
+        self.btnChapter = QToolButton(self)
         self.btnChapter.setIcon(SHARED.theme.getIcon("edit"))
         self.btnChapter.clicked.connect(lambda: self._editHeading(self.EDIT_CHAPTER))
 
@@ -639,9 +635,9 @@ class _HeadingsTab(QWidget):
 
         # Unnumbered Chapter Heading
         self.lblUnnumbered = QLabel(self._build.getLabel("headings.fmtUnnumbered"))
-        self.fmtUnnumbered = QLineEdit("")
+        self.fmtUnnumbered = QLineEdit("", self)
         self.fmtUnnumbered.setReadOnly(True)
-        self.btnUnnumbered = QToolButton()
+        self.btnUnnumbered = QToolButton(self)
         self.btnUnnumbered.setIcon(SHARED.theme.getIcon("edit"))
         self.btnUnnumbered.clicked.connect(lambda: self._editHeading(self.EDIT_UNNUM))
 
@@ -656,14 +652,14 @@ class _HeadingsTab(QWidget):
         # Scene Heading
         sceneHideTip = self._build.getLabel("headings.hideScene")
         self.lblScene = QLabel(self._build.getLabel("headings.fmtScene"))
-        self.fmtScene = QLineEdit("")
+        self.fmtScene = QLineEdit("", self)
         self.fmtScene.setReadOnly(True)
-        self.btnScene = QToolButton()
+        self.btnScene = QToolButton(self)
         self.btnScene.setIcon(SHARED.theme.getIcon("edit"))
         self.btnScene.clicked.connect(lambda: self._editHeading(self.EDIT_SCENE))
         self.hdeScene = QLabel(self.tr("Hide"))
         self.hdeScene.setToolTip(sceneHideTip)
-        self.swtScene = NSwitch(self, width=2*iPx, height=iPx)
+        self.swtScene = NSwitch(self, height=iPx)
         self.swtScene.setToolTip(sceneHideTip)
 
         wrapScene = QHBoxLayout()
@@ -683,14 +679,14 @@ class _HeadingsTab(QWidget):
         # Section Heading
         sectionHideTip = self._build.getLabel("headings.hideSection")
         self.lblSection = QLabel(self._build.getLabel("headings.fmtSection"))
-        self.fmtSection = QLineEdit("")
+        self.fmtSection = QLineEdit("", self)
         self.fmtSection.setReadOnly(True)
-        self.btnSection = QToolButton()
+        self.btnSection = QToolButton(self)
         self.btnSection.setIcon(SHARED.theme.getIcon("edit"))
         self.btnSection.clicked.connect(lambda: self._editHeading(self.EDIT_SECTION))
         self.hdeSection = QLabel(self.tr("Hide"))
         self.hdeSection.setToolTip(sectionHideTip)
-        self.swtSection = NSwitch(self, width=2*iPx, height=iPx)
+        self.swtSection = NSwitch(self, height=iPx)
         self.swtSection.setToolTip(sectionHideTip)
 
         wrapSection = QHBoxLayout()
@@ -726,6 +722,8 @@ class _HeadingsTab(QWidget):
         self.aInsChRomL = self.menuInsert.addAction(self.tr("Chapter Number (Lower Case Roman)"))
         self.aInsScNum = self.menuInsert.addAction(self.tr("Scene Number (In Chapter)"))
         self.aInsScAbs = self.menuInsert.addAction(self.tr("Scene Number (Absolute)"))
+        self.aInsCharPOV = self.menuInsert.addAction(self.tr("Point of View Character"))
+        self.aInsCharFocus = self.menuInsert.addAction(self.tr("Focus Character"))
 
         self.aInsTitle.triggered.connect(lambda: self._insertIntoForm(nwHeadFmt.TITLE))
         self.aInsChNum.triggered.connect(lambda: self._insertIntoForm(nwHeadFmt.CH_NUM))
@@ -734,6 +732,8 @@ class _HeadingsTab(QWidget):
         self.aInsChRomL.triggered.connect(lambda: self._insertIntoForm(nwHeadFmt.CH_ROML))
         self.aInsScNum.triggered.connect(lambda: self._insertIntoForm(nwHeadFmt.SC_NUM))
         self.aInsScAbs.triggered.connect(lambda: self._insertIntoForm(nwHeadFmt.SC_ABS))
+        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.setMenu(self.menuInsert)
@@ -760,7 +760,7 @@ class _HeadingsTab(QWidget):
         self.outerBox.addLayout(self.editFormBox)
         self.outerBox.addStretch(1)
 
-        self.setLayout(self.outerBox)
+        self.setCentralLayout(self.outerBox)
 
         return
 
@@ -827,6 +827,7 @@ class _HeadingsTab(QWidget):
     #  Private Slots
     ##
 
+    @pyqtSlot()
     def _saveFormat(self) -> None:
         """Save the format from the edit text box."""
         heading = self._editing
@@ -862,14 +863,14 @@ class _HeadingSyntaxHighlighter(QSyntaxHighlighter):
     def __init__(self, document: QTextDocument) -> None:
         super().__init__(document)
         self._fmtSymbol = QTextCharFormat()
-        self._fmtSymbol.setForeground(QColor(*SHARED.theme.colHead))
+        self._fmtSymbol.setForeground(SHARED.theme.colHead)
         self._fmtFormat = QTextCharFormat()
-        self._fmtFormat.setForeground(QColor(*SHARED.theme.colEmph))
+        self._fmtFormat.setForeground(SHARED.theme.colEmph)
         return
 
     def highlightBlock(self, text: str) -> None:
         """Add syntax highlighting to the text block."""
-        for heading in nwHeadFmt.ALL:
+        for heading in nwHeadFmt.PAGE_HEADERS:
             pos = text.find(heading)
             if pos >= 0:
                 chars = len(heading)
@@ -883,7 +884,7 @@ class _HeadingSyntaxHighlighter(QSyntaxHighlighter):
 # END Class _HeadingSyntaxHighlighter
 
 
-class _ContentTab(QWidget):
+class _ContentTab(NScrollableForm):
 
     def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
         super().__init__(parent=buildMain)
@@ -892,42 +893,26 @@ class _ContentTab(QWidget):
 
         iPx = SHARED.theme.baseIconSize
 
-        # Left Form
-        # =========
-
-        self.formLeft = NSimpleLayout()
-        self.formLeft.addGroupLabel(self._build.getLabel("text.grpContent"))
-
-        self.incSynopsis = NSwitch(self, width=2*iPx, height=iPx)
-        self.incComments = NSwitch(self, width=2*iPx, height=iPx)
-        self.incKeywords = NSwitch(self, width=2*iPx, height=iPx)
-        self.incBodyText = NSwitch(self, width=2*iPx, height=iPx)
-
-        self.formLeft.addRow(self._build.getLabel("text.includeSynopsis"), self.incSynopsis)
-        self.formLeft.addRow(self._build.getLabel("text.includeComments"), self.incComments)
-        self.formLeft.addRow(self._build.getLabel("text.includeKeywords"), self.incKeywords)
-        self.formLeft.addRow(self._build.getLabel("text.includeBodyText"), self.incBodyText)
+        # Text Content
+        self.incSynopsis = NSwitch(self, height=iPx)
+        self.incComments = NSwitch(self, height=iPx)
+        self.incKeywords = NSwitch(self, height=iPx)
+        self.incBodyText = NSwitch(self, height=iPx)
 
-        # Right Form
-        # ==========
+        self.addGroupLabel(self._build.getLabel("text.grpContent"))
+        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.formRight = NSimpleLayout()
-        self.formRight.addGroupLabel(self._build.getLabel("text.grpInsert"))
+        # Insert Content
+        self.addNoteHead = NSwitch(self, height=iPx)
 
-        self.addNoteHead = NSwitch(self, width=2*iPx, height=iPx)
+        self.addGroupLabel(self._build.getLabel("text.grpInsert"))
+        self.addRow(self._build.getLabel("text.addNoteHeadings"), self.addNoteHead)
 
-        self.formRight.addRow(self._build.getLabel("text.addNoteHeadings"), self.addNoteHead)
-
-        # Assemble GUI
-        # ============
-
-        self.outerBox = QHBoxLayout()
-        self.outerBox.addLayout(self.formLeft, 1)
-        self.outerBox.addLayout(self.formRight, 1)
-        self.outerBox.setContentsMargins(0, 0, 0, 0)
-        self.outerBox.setSpacing(CONFIG.pxInt(16))
-
-        self.setLayout(self.outerBox)
+        # Finalise
+        self.finalise()
 
         return
 
@@ -952,7 +937,7 @@ class _ContentTab(QWidget):
 # END Class _ContentTab
 
 
-class _FormatTab(QWidget):
+class _FormatTab(NScrollableForm):
 
     def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
         super().__init__(parent=buildMain)
@@ -966,127 +951,98 @@ class _FormatTab(QWidget):
         spW = 6*SHARED.theme.textNWidth
         dbW = 8*SHARED.theme.textNWidth
 
-        # Text Format Form
-        # ================
+        # Text Format
+        # ===========
 
-        self.formFormat = NConfigLayout()
-        self.formFormat.addGroupLabel(self._build.getLabel("format.grpFormat"))
+        self.addGroupLabel(self._build.getLabel("format.grpFormat"))
 
         # Font Family
-        self.textFont = QLineEdit()
+        self.textFont = QLineEdit(self)
         self.textFont.setReadOnly(True)
         self.btnTextFont = QPushButton("...")
         self.btnTextFont.setMaximumWidth(int(2.5*SHARED.theme.getTextWidth("...")))
         self.btnTextFont.clicked.connect(self._selectFont)
-        self.formFormat.addRow(
-            self._build.getLabel("format.textFont"), self.textFont, button=self.btnTextFont
+        self.addRow(
+            self._build.getLabel("format.textFont"), self.textFont,
+            button=self.btnTextFont, stretch=(3, 2)
         )
 
         # Font Size
-        self.textSize = QSpinBox(self)
+        self.textSize = NSpinBox(self)
         self.textSize.setMinimum(8)
         self.textSize.setMaximum(60)
         self.textSize.setSingleStep(1)
         self.textSize.setMinimumWidth(spW)
-        self.formFormat.addRow(
-            self._build.getLabel("format.textSize"), self.textSize, unit="pt"
-        )
+        self.addRow(self._build.getLabel("format.textSize"), self.textSize, unit="pt")
 
         # Line Height
-        self.lineHeight = QDoubleSpinBox(self)
+        self.lineHeight = NDoubleSpinBox(self)
         self.lineHeight.setFixedWidth(spW)
         self.lineHeight.setMinimum(0.75)
         self.lineHeight.setMaximum(3.0)
         self.lineHeight.setSingleStep(0.05)
         self.lineHeight.setDecimals(2)
-        self.formFormat.addRow(
-            self._build.getLabel("format.lineHeight"), self.lineHeight, unit="em"
-        )
+        self.addRow(self._build.getLabel("format.lineHeight"), self.lineHeight, unit="em")
 
-        # Text Options Form
-        # =================
+        # Text Options
+        # ============
 
-        self.formOptions = NSimpleLayout()
-        self.formOptions.addGroupLabel(self._build.getLabel("format.grpOptions"))
-        self.formOptions.setContentsMargins(0, 0, 0, 0)
+        self.addGroupLabel(self._build.getLabel("format.grpOptions"))
 
-        self.justifyText = NSwitch(self, width=2*iPx, height=iPx)
-        self.stripUnicode = NSwitch(self, width=2*iPx, height=iPx)
-        self.replaceTabs = NSwitch(self, width=2*iPx, height=iPx)
+        self.justifyText = NSwitch(self, height=iPx)
+        self.stripUnicode = NSwitch(self, height=iPx)
+        self.replaceTabs = NSwitch(self, height=iPx)
 
-        self.formOptions.addRow(self._build.getLabel("format.justifyText"), self.justifyText)
-        self.formOptions.addRow(self._build.getLabel("format.stripUnicode"), self.stripUnicode)
-        self.formOptions.addRow(self._build.getLabel("format.replaceTabs"), self.replaceTabs)
+        self.addRow(self._build.getLabel("format.justifyText"), self.justifyText)
+        self.addRow(self._build.getLabel("format.stripUnicode"), self.stripUnicode)
+        self.addRow(self._build.getLabel("format.replaceTabs"), self.replaceTabs)
 
-        # Page Layout Form
-        # ================
+        # Page Layout
+        # ===========
 
-        self.formLayout = NSimpleLayout()
-        self.formLayout.addGroupLabel(self._build.getLabel("format.grpPage"))
-        self.formLayout.setContentsMargins(0, 0, 0, 0)
+        self.addGroupLabel(self._build.getLabel("format.grpPage"))
 
-        self.pageUnit = QComboBox(self)
+        self.pageUnit = NComboBox(self)
         for key, name in nwLabels.UNIT_NAME.items():
             self.pageUnit.addItem(trConst(name), key)
 
-        self.pageSize = QComboBox(self)
+        self.pageSize = NComboBox(self)
         for key, name in nwLabels.PAPER_NAME.items():
             self.pageSize.addItem(trConst(name), key)
 
-        self.pageWidth = QDoubleSpinBox(self)
+        self.pageWidth = NDoubleSpinBox(self)
         self.pageWidth.setFixedWidth(dbW)
         self.pageWidth.setMaximum(500.0)
         self.pageWidth.valueChanged.connect(self._pageSizeValueChanged)
 
-        self.pageHeight = QDoubleSpinBox(self)
+        self.pageHeight = NDoubleSpinBox(self)
         self.pageHeight.setFixedWidth(dbW)
         self.pageHeight.setMaximum(500.0)
         self.pageHeight.valueChanged.connect(self._pageSizeValueChanged)
 
-        self.topMargin = QDoubleSpinBox(self)
+        self.topMargin = NDoubleSpinBox(self)
         self.topMargin.setFixedWidth(dbW)
 
-        self.bottomMargin = QDoubleSpinBox(self)
+        self.bottomMargin = NDoubleSpinBox(self)
         self.bottomMargin.setFixedWidth(dbW)
 
-        self.leftMargin = QDoubleSpinBox(self)
+        self.leftMargin = NDoubleSpinBox(self)
         self.leftMargin.setFixedWidth(dbW)
 
-        self.rightMargin = QDoubleSpinBox(self)
+        self.rightMargin = NDoubleSpinBox(self)
         self.rightMargin.setFixedWidth(dbW)
 
-        self.formLayout.addRow(self._build.getLabel("format.pageUnit"), self.pageUnit)
-        self.formLayout.addRow(self._build.getLabel("format.pageSize"), self.pageSize)
-        self.formLayout.addRow(self._build.getLabel("format.pageWidth"), self.pageWidth)
-        self.formLayout.addRow(self._build.getLabel("format.pageHeight"), self.pageHeight)
-        self.formLayout.addRow(self._build.getLabel("format.topMargin"), self.topMargin)
-        self.formLayout.addRow(self._build.getLabel("format.bottomMargin"), self.bottomMargin)
-        self.formLayout.addRow(self._build.getLabel("format.leftMargin"), self.leftMargin)
-        self.formLayout.addRow(self._build.getLabel("format.rightMargin"), self.rightMargin)
-
-        # Assemble GUI
-        # ============
+        self.addRow(self._build.getLabel("format.pageUnit"), self.pageUnit)
+        self.addRow(self._build.getLabel("format.pageSize"), self.pageSize)
+        self.addRow(self._build.getLabel("format.pageWidth"), self.pageWidth)
+        self.addRow(self._build.getLabel("format.pageHeight"), self.pageHeight)
+        self.addRow(self._build.getLabel("format.topMargin"), self.topMargin)
+        self.addRow(self._build.getLabel("format.bottomMargin"), self.bottomMargin)
+        self.addRow(self._build.getLabel("format.leftMargin"), self.leftMargin)
+        self.addRow(self._build.getLabel("format.rightMargin"), self.rightMargin)
 
-        self.formLeft = QVBoxLayout()
-        self.formLeft.addLayout(self.formFormat)
-        self.formLeft.addLayout(self.formOptions)
-        self.formLeft.addStretch(1)
-        self.formLeft.setContentsMargins(0, 0, 0, 0)
-        self.formLeft.setSpacing(CONFIG.pxInt(8))
-
-        self.formRight = QVBoxLayout()
-        self.formRight.addLayout(self.formLayout)
-        self.formRight.addStretch(1)
-        self.formRight.setContentsMargins(0, 0, 0, 0)
-        self.formRight.setSpacing(CONFIG.pxInt(8))
-
-        self.outerBox = QHBoxLayout()
-        self.outerBox.addLayout(self.formLeft, 1)
-        self.outerBox.addLayout(self.formRight, 1)
-        self.outerBox.setContentsMargins(0, 0, 0, 0)
-        self.outerBox.setSpacing(CONFIG.pxInt(16))
-
-        self.setLayout(self.outerBox)
+        # Finalise
+        self.finalise()
 
         return
 
@@ -1159,10 +1115,10 @@ class _FormatTab(QWidget):
         currFont = QFont()
         currFont.setFamily(self.textFont.text())
         currFont.setPointSize(self.textSize.value())
-        theFont, theStatus = QFontDialog.getFont(currFont, self)
-        if theStatus:
-            self.textFont.setText(theFont.family())
-            self.textSize.setValue(theFont.pointSize())
+        newFont, status = QFontDialog.getFont(currFont, self)
+        if status:
+            self.textFont.setText(newFont.family())
+            self.textSize.setValue(newFont.pointSize())
         return
 
     @pyqtSlot(int)
@@ -1250,7 +1206,7 @@ class _FormatTab(QWidget):
 # END Class _FormatTab
 
 
-class _OutputTab(QWidget):
+class _OutputTab(NScrollableForm):
 
     def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
         super().__init__(parent=buildMain)
@@ -1258,50 +1214,65 @@ class _OutputTab(QWidget):
         self._build = build
 
         iPx = SHARED.theme.baseIconSize
+        spW = 6*SHARED.theme.textNWidth
 
-        # Left Form
-        # =========
-
-        self.formLeft = NSimpleLayout()
-        self.formLeft.addGroupLabel(self._build.getLabel("odt"))
-
-        self.odtAddColours = NSwitch(self, width=2*iPx, height=iPx)
-
-        self.formLeft.addRow(self._build.getLabel("odt.addColours"), self.odtAddColours)
-
-        # Right Form
-        # ==========
+        # Open Document
+        self.addGroupLabel(self._build.getLabel("odt"))
 
-        self.formRight = NSimpleLayout()
-        self.formRight.addGroupLabel(self._build.getLabel("html"))
+        self.odtAddColours = NSwitch(self, height=iPx)
+        self.addRow(self._build.getLabel("odt.addColours"), self.odtAddColours)
 
-        self.htmlAddStyles = NSwitch(self, width=2*iPx, height=iPx)
+        self.odtPageHeader = QLineEdit(self)
+        self.odtPageHeader.setMinimumWidth(CONFIG.pxInt(200))
+        self.btnPageHeader = QToolButton(self)
+        self.btnPageHeader.setIcon(SHARED.theme.getIcon("revert"))
+        self.btnPageHeader.clicked.connect(self._resetPageHeader)
+        self.addRow(
+            self._build.getLabel("odt.pageHeader"), self.odtPageHeader,
+            button=self.btnPageHeader, stretch=(1, 1)
+        )
 
-        self.formRight.addRow(self._build.getLabel("html.addStyles"), self.htmlAddStyles)
+        self.odtPageCountOffset = NSpinBox(self)
+        self.odtPageCountOffset.setMinimum(0)
+        self.odtPageCountOffset.setMaximum(999)
+        self.odtPageCountOffset.setSingleStep(1)
+        self.odtPageCountOffset.setMinimumWidth(spW)
+        self.addRow(self._build.getLabel("odt.pageCountOffset"), self.odtPageCountOffset)
 
-        # Assemble GUI
-        # ============
+        # HTML Document
+        self.addGroupLabel(self._build.getLabel("html"))
 
-        self.outerBox = QHBoxLayout()
-        self.outerBox.addLayout(self.formLeft, 1)
-        self.outerBox.addLayout(self.formRight, 1)
-        self.outerBox.setContentsMargins(0, 0, 0, 0)
-        self.outerBox.setSpacing(CONFIG.pxInt(16))
+        self.htmlAddStyles = NSwitch(self, height=iPx)
+        self.addRow(self._build.getLabel("html.addStyles"), self.htmlAddStyles)
 
-        self.setLayout(self.outerBox)
+        # Finalise
+        self.finalise()
 
         return
 
     def loadContent(self) -> None:
         """Populate the widgets."""
         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.htmlAddStyles.setChecked(self._build.getBool("html.addStyles"))
         return
 
     def saveContent(self) -> None:
         """Save choices back into build object."""
         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("html.addStyles", self.htmlAddStyles.isChecked())
         return
 
+    ##
+    #  Private Slots
+    ##
+
+    def _resetPageHeader(self) -> None:
+        """Reset the ODT header format to default."""
+        self.odtPageHeader.setText(nwHeadFmt.ODT_AUTO)
+        return
+
 # END Class _OutputTab