novelWriter 2.2rc1__py3-none-any.whl → 2.3b1__py3-none-any.whl

novelwriter/dialogs/preferences.py

@@ -3,10 +3,11 @@ novelWriter – GUI Preferences
 =============================
 
 File History:
-Created: 2019-06-10 [0.1.5]
+Created:   2019-06-10 [0.1.5] GuiPreferences
+Rewritten: 2024-01-08 [2.3b1] GuiPreferences
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -25,23 +26,28 @@ from __future__ import annotations
 
 import logging
 
-from PyQt5.QtGui import QFont
-from PyQt5.QtCore import Qt, pyqtSlot
+from PyQt5.QtGui import QCloseEvent, QFont, QKeyEvent, QKeySequence
+from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
-    QDialog, QWidget, QComboBox, QSpinBox, QPushButton, QDialogButtonBox,
-    QLineEdit, QFileDialog, QFontDialog, QDoubleSpinBox
+    QAbstractButton, QCompleter, QDialog, QDialogButtonBox, QFileDialog,
+    QFontDialog, QHBoxLayout, QLineEdit, QPushButton, QToolButton, QVBoxLayout,
+    QWidget, qApp
 )
 
 from novelwriter import CONFIG, SHARED
+from novelwriter.constants import nwConst, nwUnicode
 from novelwriter.dialogs.quotes import GuiQuoteSelect
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.extensions.pageddialog import NPagedDialog
-from novelwriter.extensions.configlayout import NConfigLayout
+from novelwriter.extensions.modified import NComboBox, NDoubleSpinBox, NSpinBox
+from novelwriter.extensions.configlayout import NColourLabel, NScrollableForm
+from novelwriter.extensions.pagedsidebar import NPagedSideBar
 
 logger = logging.getLogger(__name__)
 
 
-class GuiPreferences(NPagedDialog):
+class GuiPreferences(QDialog):
+
+    newPreferencesReady = pyqtSignal(bool, bool, bool, bool)
 
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
@@ -49,1089 +55,920 @@ class GuiPreferences(NPagedDialog):
         logger.debug("Create: GuiPreferences")
         self.setObjectName("GuiPreferences")
         self.setWindowTitle(self.tr("Preferences"))
-
-        self.tabGeneral  = GuiPreferencesGeneral(self)
-        self.tabProjects = GuiPreferencesProjects(self)
-        self.tabDocs     = GuiPreferencesDocuments(self)
-        self.tabEditor   = GuiPreferencesEditor(self)
-        self.tabSyntax   = GuiPreferencesSyntax(self)
-        self.tabAuto     = GuiPreferencesAutomation(self)
-        self.tabQuote    = GuiPreferencesQuotes(self)
-
-        self.addTab(self.tabGeneral,  self.tr("General"))
-        self.addTab(self.tabProjects, self.tr("Projects"))
-        self.addTab(self.tabDocs,     self.tr("Documents"))
-        self.addTab(self.tabEditor,   self.tr("Editor"))
-        self.addTab(self.tabSyntax,   self.tr("Highlighting"))
-        self.addTab(self.tabAuto,     self.tr("Automation"))
-        self.addTab(self.tabQuote,    self.tr("Quotes"))
-
-        self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
-        self.buttonBox.accepted.connect(self._doSave)
-        self.buttonBox.rejected.connect(self._doClose)
-        self.addControls(self.buttonBox)
-
+        self.setMinimumSize(CONFIG.pxInt(600), CONFIG.pxInt(500))
         self.resize(*CONFIG.preferencesWinSize)
 
-        # Settings
-        self._updateTheme = False
-        self._updateSyntax = False
-        self._needsRestart = False
-        self._refreshTree = False
+        # Title
+        self.titleLabel = NColourLabel(
+            self.tr("Preferences"), SHARED.theme.helpText,
+            parent=self, scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
+        )
 
-        logger.debug("Ready: GuiPreferences")
+        # Search Box
+        self.searchText = QLineEdit(self)
+        self.searchText.setPlaceholderText(self.tr("Search"))
+        self.searchText.setMinimumWidth(CONFIG.pxInt(200))
+        self.searchAction = self.searchText.addAction(
+            SHARED.theme.getIcon("search"), QLineEdit.ActionPosition.TrailingPosition
+        )
+        self.searchAction.triggered.connect(self._gotoSearch)
 
-        return
+        # SideBar
+        self.sidebar = NPagedSideBar(self)
+        self.sidebar.setLabelColor(SHARED.theme.helpText)
+        self.sidebar.buttonClicked.connect(self._sidebarClicked)
 
-    def __del__(self):  # pragma: no cover
-        logger.debug("Delete: GuiPreferences")
-        return
+        # Form
+        self.mainForm = NScrollableForm(self)
+        self.mainForm.setHelpTextStyle(SHARED.theme.helpText)
 
-    ##
-    #  Properties
-    ##
+        # Buttons
+        self.buttonBox = QDialogButtonBox(
+            QDialogButtonBox.StandardButton.Apply
+            | QDialogButtonBox.StandardButton.Save
+            | QDialogButtonBox.StandardButton.Close
+        )
+        self.buttonBox.clicked.connect(self._dialogButtonClicked)
 
-    @property
-    def updateTheme(self) -> bool:
-        return self._updateTheme
+        # Assemble
+        self.searchBox = QHBoxLayout()
+        self.searchBox.addWidget(self.titleLabel)
+        self.searchBox.addStretch(1)
+        self.searchBox.addWidget(self.searchText, 1)
 
-    @property
-    def updateSyntax(self) -> bool:
-        return self._updateSyntax
+        self.mainBox = QHBoxLayout()
+        self.mainBox.addWidget(self.sidebar)
+        self.mainBox.addWidget(self.mainForm)
+        self.mainBox.setContentsMargins(0, 0, 0, 0)
 
-    @property
-    def needsRestart(self) -> bool:
-        return self._needsRestart
+        self.outerBox = QVBoxLayout()
+        self.outerBox.addLayout(self.searchBox)
+        self.outerBox.addLayout(self.mainBox)
+        self.outerBox.addWidget(self.buttonBox)
+        self.outerBox.setSpacing(CONFIG.pxInt(8))
 
-    @property
-    def refreshTree(self) -> bool:
-        return self._refreshTree
+        self.setLayout(self.outerBox)
+        self.setSizeGripEnabled(True)
 
-    ##
-    #  Private Slots
-    ##
+        # Build Form
+        self.buildForm()
 
-    @pyqtSlot()
-    def _doSave(self) -> None:
-        """Trigger all the save functions in the tabs, and collect the
-        status of the saves.
-        """
-        logger.debug("Saving new preferences")
-
-        self.tabGeneral.saveValues()
-        self.tabProjects.saveValues()
-        self.tabDocs.saveValues()
-        self.tabEditor.saveValues()
-        self.tabSyntax.saveValues()
-        self.tabAuto.saveValues()
-        self.tabQuote.saveValues()
+        # Populate Search
+        self.searchCompleter = QCompleter(self.mainForm.labels, self)
+        self.searchCompleter.setCaseSensitivity(Qt.CaseSensitivity.CaseInsensitive)
+        self.searchCompleter.setFilterMode(Qt.MatchFlag.MatchContains)
+        self.searchCompleter.activated.connect(self._gotoSearch)
 
-        self._saveWindowSize()
-        CONFIG.saveConfig()
-        self.accept()
+        self.searchText.setCompleter(self.searchCompleter)
 
-        return
+        logger.debug("Ready: GuiPreferences")
 
-    @pyqtSlot()
-    def _doClose(self) -> None:
-        """Close the preferences without saving the changes."""
-        self._saveWindowSize()
-        self.reject()
         return
 
-    ##
-    #  Internal Functions
-    ##
-
-    def _saveWindowSize(self) -> None:
-        """Save the dialog window size."""
-        CONFIG.setPreferencesWinSize(self.width(), self.height())
+    def __del__(self) -> None:  # pragma: no cover
+        logger.debug("Delete: GuiPreferences")
         return
 
-# END Class GuiPreferences
-
-
-class GuiPreferencesGeneral(QWidget):
+    def buildForm(self) -> None:
+        """Build the settings form."""
+        section = 0
+        minWidth = CONFIG.pxInt(200)
+        mIcon = SHARED.theme.getIcon("more")
 
-    def __init__(self, prefsGui: GuiPreferences) -> None:
-        super().__init__(parent=prefsGui)
+        # Label
+        self.sidebar.addLabel(self.tr("General"))
 
-        self.prefsGui = prefsGui
+        # Appearance
+        # ==========
 
-        # The Form
-        self.mainForm = NConfigLayout()
-        self.mainForm.setHelpTextStyle(SHARED.theme.helpText)
-        self.setLayout(self.mainForm)
+        title = self.tr("Appearance")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
 
-        # Look and Feel
-        # =============
-        self.mainForm.addGroupLabel(self.tr("Look and Feel"))
-        minWidth = CONFIG.pxInt(200)
-
-        # Select Locale
-        self.guiLocale = QComboBox()
+        # Display Language
+        self.guiLocale = NComboBox(self)
         self.guiLocale.setMinimumWidth(minWidth)
-        theLangs = CONFIG.listLanguages(CONFIG.LANG_NW)
-        for lang, langName in theLangs:
-            self.guiLocale.addItem(langName, lang)
-        langIdx = self.guiLocale.findData(CONFIG.guiLocale)
-        if langIdx < 0:
-            langIdx = self.guiLocale.findData("en_GB")
-        if langIdx != -1:
-            self.guiLocale.setCurrentIndex(langIdx)
+        for lang, name in CONFIG.listLanguages(CONFIG.LANG_NW):
+            self.guiLocale.addItem(name, lang)
+        if (idx := self.guiLocale.findData(CONFIG.guiLocale)) != -1:
+            self.guiLocale.setCurrentIndex(idx)
 
         self.mainForm.addRow(
-            self.tr("Main GUI language"),
-            self.guiLocale,
-            self.tr("Requires restart to take effect.")
+            self.tr("Display language"), self.guiLocale,
+            self.tr("Requires restart to take effect."), stretch=(3, 2)
         )
 
-        # Select Theme
-        self.guiTheme = QComboBox()
+        # Colour Theme
+        self.guiTheme = NComboBox(self)
         self.guiTheme.setMinimumWidth(minWidth)
-        self.theThemes = SHARED.theme.listThemes()
-        for themeDir, themeName in self.theThemes:
-            self.guiTheme.addItem(themeName, themeDir)
-        themeIdx = self.guiTheme.findData(CONFIG.guiTheme)
-        if themeIdx != -1:
-            self.guiTheme.setCurrentIndex(themeIdx)
+        for theme, name in SHARED.theme.listThemes():
+            self.guiTheme.addItem(name, theme)
+        if (idx := self.guiTheme.findData(CONFIG.guiTheme)) != -1:
+            self.guiTheme.setCurrentIndex(idx)
 
         self.mainForm.addRow(
-            self.tr("Main GUI theme"),
-            self.guiTheme,
-            self.tr("General colour theme and icons.")
+            self.tr("Colour theme"), self.guiTheme,
+            self.tr("General colour theme and icons."), stretch=(3, 2)
         )
 
-        # Editor Theme
-        self.guiSyntax = QComboBox()
-        self.guiSyntax.setMinimumWidth(CONFIG.pxInt(200))
-        self.theSyntaxes = SHARED.theme.listSyntax()
-        for syntaxFile, syntaxName in self.theSyntaxes:
-            self.guiSyntax.addItem(syntaxName, syntaxFile)
-        syntaxIdx = self.guiSyntax.findData(CONFIG.guiSyntax)
-        if syntaxIdx != -1:
-            self.guiSyntax.setCurrentIndex(syntaxIdx)
-
-        self.mainForm.addRow(
-            self.tr("Editor theme"),
-            self.guiSyntax,
-            self.tr("Colour theme for the editor and viewer.")
-        )
-
-        # Font Family
-        self.guiFont = QLineEdit()
+        # Application Font Family
+        self.guiFont = QLineEdit(self)
         self.guiFont.setReadOnly(True)
-        self.guiFont.setFixedWidth(CONFIG.pxInt(162))
+        self.guiFont.setMinimumWidth(CONFIG.pxInt(162))
         self.guiFont.setText(CONFIG.guiFont)
-        self.fontButton = QPushButton("...")
-        self.fontButton.setMaximumWidth(int(2.5*SHARED.theme.getTextWidth("...")))
-        self.fontButton.clicked.connect(self._selectFont)
+        self.guiFontButton = QToolButton(self)
+        self.guiFontButton.setIcon(mIcon)
+        self.guiFontButton.clicked.connect(self._selectGuiFont)
         self.mainForm.addRow(
-            self.tr("Font family"),
-            self.guiFont,
-            self.tr("Requires restart to take effect."),
-            button=self.fontButton
+            self.tr("Application font family"), self.guiFont,
+            self.tr("Requires restart to take effect."), stretch=(3, 2),
+            button=self.guiFontButton
         )
 
-        # Font Size
-        self.guiFontSize = QSpinBox(self)
+        # Application Font Size
+        self.guiFontSize = NSpinBox(self)
         self.guiFontSize.setMinimum(8)
         self.guiFontSize.setMaximum(60)
         self.guiFontSize.setSingleStep(1)
         self.guiFontSize.setValue(CONFIG.guiFontSize)
         self.mainForm.addRow(
-            self.tr("Font size"),
-            self.guiFontSize,
-            self.tr("Requires restart to take effect."),
-            unit=self.tr("pt")
+            self.tr("Application font size"), self.guiFontSize,
+            self.tr("Requires restart to take effect."), unit=self.tr("pt")
         )
 
-        # GUI Settings
-        # ============
-        self.mainForm.addGroupLabel(self.tr("GUI Settings"))
-
-        self.emphLabels = NSwitch()
-        self.emphLabels.setChecked(CONFIG.emphLabels)
-        self.mainForm.addRow(
-            self.tr("Emphasise partition and chapter labels"),
-            self.emphLabels,
-            self.tr("Makes them stand out in the project tree."),
-        )
-
-        self.showFullPath = NSwitch()
-        self.showFullPath.setChecked(CONFIG.showFullPath)
-        self.mainForm.addRow(
-            self.tr("Show full path in document header"),
-            self.showFullPath,
-            self.tr("Add the parent folder names to the header.")
-        )
-
-        self.hideVScroll = NSwitch()
+        # Vertical Scrollbars
+        self.hideVScroll = NSwitch(self)
         self.hideVScroll.setChecked(CONFIG.hideVScroll)
         self.mainForm.addRow(
-            self.tr("Hide vertical scroll bars in main windows"),
-            self.hideVScroll,
+            self.tr("Hide vertical scroll bars in main windows"), self.hideVScroll,
             self.tr("Scrolling available with mouse wheel and keys only.")
         )
 
-        self.hideHScroll = NSwitch()
+        # Horizontal Scrollbars
+        self.hideHScroll = NSwitch(self)
         self.hideHScroll.setChecked(CONFIG.hideHScroll)
         self.mainForm.addRow(
-            self.tr("Hide horizontal scroll bars in main windows"),
-            self.hideHScroll,
+            self.tr("Hide horizontal scroll bars in main windows"), self.hideHScroll,
             self.tr("Scrolling available with mouse wheel and keys only.")
         )
 
-        return
+        # Document Style
+        # ==============
 
-    def saveValues(self) -> None:
-        """Save the values set for this tab."""
-        guiLocale   = self.guiLocale.currentData()
-        guiTheme    = self.guiTheme.currentData()
-        guiSyntax   = self.guiSyntax.currentData()
-        guiFont     = self.guiFont.text()
-        guiFontSize = self.guiFontSize.value()
-        emphLabels  = self.emphLabels.isChecked()
-
-        # Update Flags
-        self.prefsGui._updateTheme |= CONFIG.guiTheme != guiTheme
-        self.prefsGui._updateSyntax |= CONFIG.guiSyntax != guiSyntax
-        self.prefsGui._needsRestart |= CONFIG.guiLocale != guiLocale
-        self.prefsGui._needsRestart |= CONFIG.guiFont != guiFont
-        self.prefsGui._needsRestart |= CONFIG.guiFontSize != guiFontSize
-        self.prefsGui._refreshTree |= CONFIG.emphLabels != emphLabels
-
-        CONFIG.guiLocale    = guiLocale
-        CONFIG.guiTheme     = guiTheme
-        CONFIG.guiSyntax    = guiSyntax
-        CONFIG.guiFont      = guiFont
-        CONFIG.guiFontSize  = guiFontSize
-        CONFIG.emphLabels   = emphLabels
-        CONFIG.showFullPath = self.showFullPath.isChecked()
-        CONFIG.hideVScroll  = self.hideVScroll.isChecked()
-        CONFIG.hideHScroll  = self.hideHScroll.isChecked()
+        title = self.tr("Document Style")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
 
-        return
+        # Document Colour Theme
+        self.guiSyntax = NComboBox(self)
+        self.guiSyntax.setMinimumWidth(CONFIG.pxInt(200))
+        for syntax, name in SHARED.theme.listSyntax():
+            self.guiSyntax.addItem(name, syntax)
+        if (idx := self.guiSyntax.findData(CONFIG.guiSyntax)) != -1:
+            self.guiSyntax.setCurrentIndex(idx)
 
-    ##
-    #  Private Slots
-    ##
+        self.mainForm.addRow(
+            self.tr("Document colour theme"), self.guiSyntax,
+            self.tr("Colour theme for the editor and viewer."), stretch=(3, 2)
+        )
 
-    @pyqtSlot()
-    def _selectFont(self) -> None:
-        """Open the QFontDialog and set a font for the font style."""
-        currFont = QFont()
-        currFont.setFamily(CONFIG.guiFont)
-        currFont.setPointSize(CONFIG.guiFontSize)
-        theFont, theStatus = QFontDialog.getFont(currFont, self)
-        if theStatus:
-            self.guiFont.setText(theFont.family())
-            self.guiFontSize.setValue(theFont.pointSize())
-        return
+        # Document Font Family
+        self.textFont = QLineEdit(self)
+        self.textFont.setReadOnly(True)
+        self.textFont.setMinimumWidth(CONFIG.pxInt(162))
+        self.textFont.setText(CONFIG.textFont)
+        self.textFontButton = QToolButton(self)
+        self.textFontButton.setIcon(mIcon)
+        self.textFontButton.clicked.connect(self._selectTextFont)
+        self.mainForm.addRow(
+            self.tr("Document font family"), self.textFont,
+            self.tr("Applies to both document editor and viewer."), stretch=(3, 2),
+            button=self.textFontButton
+        )
 
-# END Class GuiPreferencesGeneral
+        # Document Font Size
+        self.textSize = NSpinBox(self)
+        self.textSize.setMinimum(8)
+        self.textSize.setMaximum(60)
+        self.textSize.setSingleStep(1)
+        self.textSize.setValue(CONFIG.textSize)
+        self.mainForm.addRow(
+            self.tr("Document font size"), self.textSize,
+            self.tr("Applies to both document editor and viewer."), unit=self.tr("pt")
+        )
 
+        # Emphasise Labels
+        self.emphLabels = NSwitch(self)
+        self.emphLabels.setChecked(CONFIG.emphLabels)
+        self.mainForm.addRow(
+            self.tr("Emphasise partition and chapter labels"), self.emphLabels,
+            self.tr("Makes them stand out in the project tree."),
+        )
 
-class GuiPreferencesProjects(QWidget):
+        # Document Path
+        self.showFullPath = NSwitch(self)
+        self.showFullPath.setChecked(CONFIG.showFullPath)
+        self.mainForm.addRow(
+            self.tr("Show full path in document header"), self.showFullPath,
+            self.tr("Add the parent folder names to the header.")
+        )
 
-    def __init__(self, prefsGui: GuiPreferences) -> None:
-        super().__init__(parent=prefsGui)
+        # Include Notes in Word Count
+        self.incNotesWCount = NSwitch(self)
+        self.incNotesWCount.setChecked(CONFIG.incNotesWCount)
+        self.mainForm.addRow(
+            self.tr("Include project notes in status bar word count"), self.incNotesWCount
+        )
 
-        # The Form
-        self.mainForm = NConfigLayout()
-        self.mainForm.setHelpTextStyle(SHARED.theme.helpText)
-        self.setLayout(self.mainForm)
+        # Auto Save
+        # =========
 
-        # Automatic Save
-        # ==============
-        self.mainForm.addGroupLabel(self.tr("Automatic Save"))
+        title = self.tr("Auto Save")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
 
         # Document Save Timer
-        self.autoSaveDoc = QSpinBox(self)
+        self.autoSaveDoc = NSpinBox(self)
         self.autoSaveDoc.setMinimum(5)
         self.autoSaveDoc.setMaximum(600)
         self.autoSaveDoc.setSingleStep(1)
         self.autoSaveDoc.setValue(CONFIG.autoSaveDoc)
         self.mainForm.addRow(
-            self.tr("Save document interval"),
-            self.autoSaveDoc,
-            self.tr("How often the document is automatically saved."),
-            unit=self.tr("seconds")
+            self.tr("Save document interval"), self.autoSaveDoc,
+            self.tr("How often the document is automatically saved."), unit=self.tr("seconds")
         )
 
         # Project Save Timer
-        self.autoSaveProj = QSpinBox(self)
+        self.autoSaveProj = NSpinBox(self)
         self.autoSaveProj.setMinimum(5)
         self.autoSaveProj.setMaximum(600)
         self.autoSaveProj.setSingleStep(1)
         self.autoSaveProj.setValue(CONFIG.autoSaveProj)
         self.mainForm.addRow(
-            self.tr("Save project interval"),
-            self.autoSaveProj,
-            self.tr("How often the project is automatically saved."),
-            unit=self.tr("seconds")
+            self.tr("Save project interval"), self.autoSaveProj,
+            self.tr("How often the project is automatically saved."), unit=self.tr("seconds")
         )
 
         # Project Backup
         # ==============
-        self.mainForm.addGroupLabel(self.tr("Project Backup"))
+
+        title = self.tr("Project Backup")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
 
         # Backup Path
         self.backupPath = CONFIG.backupPath()
-        self.backupGetPath = QPushButton(self.tr("Browse"))
+        self.backupGetPath = QPushButton(SHARED.theme.getIcon("browse"), self.tr("Browse"), self)
         self.backupGetPath.clicked.connect(self._backupFolder)
-        self.backupPathRow = self.mainForm.addRow(
-            self.tr("Backup storage location"),
-            self.backupGetPath,
-            self.tr("Path: {0}").format(self.backupPath)
+        self.mainForm.addRow(
+            self.tr("Backup storage location"), self.backupGetPath,
+            self.tr("Path: {0}").format(self.backupPath), editable="backupPath"
         )
 
-        # Run when closing
-        self.backupOnClose = NSwitch()
+        # Run When Closing
+        self.backupOnClose = NSwitch(self)
         self.backupOnClose.setChecked(CONFIG.backupOnClose)
         self.backupOnClose.toggled.connect(self._toggledBackupOnClose)
         self.mainForm.addRow(
-            self.tr("Run backup when the project is closed"),
-            self.backupOnClose,
+            self.tr("Run backup when the project is closed"), self.backupOnClose,
             self.tr("Can be overridden for individual projects in Project Settings.")
         )
 
-        # Ask before backup
+        # Ask Before Backup
         # Only enabled when "Run when closing" is checked
-        self.askBeforeBackup = NSwitch()
+        self.askBeforeBackup = NSwitch(self)
         self.askBeforeBackup.setChecked(CONFIG.askBeforeBackup)
         self.askBeforeBackup.setEnabled(CONFIG.backupOnClose)
         self.mainForm.addRow(
-            self.tr("Ask before running backup"),
-            self.askBeforeBackup,
+            self.tr("Ask before running backup"), self.askBeforeBackup,
             self.tr("If off, backups will run in the background.")
         )
 
         # Session Timer
         # =============
-        self.mainForm.addGroupLabel(self.tr("Session Timer"))
 
-        # Pause when idle
-        self.stopWhenIdle = NSwitch()
+        title = self.tr("Session Timer")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
+
+        # Pause When Idle
+        self.stopWhenIdle = NSwitch(self)
         self.stopWhenIdle.setChecked(CONFIG.stopWhenIdle)
         self.mainForm.addRow(
-            self.tr("Pause the session timer when not writing"),
-            self.stopWhenIdle,
+            self.tr("Pause the session timer when not writing"), self.stopWhenIdle,
             self.tr("Also pauses when the application window does not have focus.")
         )
 
-        # Inactive time for idle
-        self.userIdleTime = QDoubleSpinBox()
+        # Inactive Time for Idle
+        self.userIdleTime = NDoubleSpinBox(self)
         self.userIdleTime.setMinimum(0.5)
         self.userIdleTime.setMaximum(600.0)
         self.userIdleTime.setSingleStep(0.5)
         self.userIdleTime.setDecimals(1)
         self.userIdleTime.setValue(CONFIG.userIdleTime/60.0)
         self.mainForm.addRow(
-            self.tr("Editor inactive time before pausing timer"),
-            self.userIdleTime,
+            self.tr("Editor inactive time before pausing timer"), self.userIdleTime,
             self.tr("User activity includes typing and changing the content."),
             unit=self.tr("minutes")
         )
 
-        return
-
-    def saveValues(self) -> None:
-        """Save the values set for this tab."""
-        # Automatic Save
-        CONFIG.autoSaveDoc  = self.autoSaveDoc.value()
-        CONFIG.autoSaveProj = self.autoSaveProj.value()
-
-        # Project Backup
-        CONFIG.setBackupPath(self.backupPath)
-        CONFIG.backupOnClose   = self.backupOnClose.isChecked()
-        CONFIG.askBeforeBackup = self.askBeforeBackup.isChecked()
-
-        # Session Timer
-        CONFIG.stopWhenIdle = self.stopWhenIdle.isChecked()
-        CONFIG.userIdleTime = round(self.userIdleTime.value() * 60)
-
-        return
-
-    ##
-    #  Private Slots
-    ##
-
-    @pyqtSlot()
-    def _backupFolder(self) -> None:
-        """Open a dialog to select the backup folder."""
-        currDir = self.backupPath or ""
-        newDir = QFileDialog.getExistingDirectory(
-            self, self.tr("Backup Directory"), str(currDir), options=QFileDialog.ShowDirsOnly
-        )
-        if newDir:
-            self.backupPath = newDir
-            self.mainForm.setHelpText(
-                self.backupPathRow, self.tr("Path: {0}").format(self.backupPath)
-            )
-            return
-        return
-
-    @pyqtSlot(bool)
-    def _toggledBackupOnClose(self, state: bool) -> None:
-        """Toggle switch that depends on the backup on close switch."""
-        self.askBeforeBackup.setEnabled(state)
-        return
-
-# END Class GuiPreferencesProjects
-
-
-class GuiPreferencesDocuments(QWidget):
-
-    def __init__(self, prefsGui: GuiPreferences)  -> None:
-        super().__init__(parent=prefsGui)
-
-        # The Form
-        self.mainForm = NConfigLayout()
-        self.mainForm.setHelpTextStyle(SHARED.theme.helpText)
-        self.setLayout(self.mainForm)
-
-        # Text Style
-        # ==========
-        self.mainForm.addGroupLabel(self.tr("Text Style"))
-
-        # Font Family
-        self.textFont = QLineEdit()
-        self.textFont.setReadOnly(True)
-        self.textFont.setFixedWidth(CONFIG.pxInt(162))
-        self.textFont.setText(CONFIG.textFont)
-        self.fontButton = QPushButton("...")
-        self.fontButton.setMaximumWidth(int(2.5*SHARED.theme.getTextWidth("...")))
-        self.fontButton.clicked.connect(self._selectFont)
-        self.mainForm.addRow(
-            self.tr("Font family"),
-            self.textFont,
-            self.tr("Applies to both document editor and viewer."),
-            button=self.fontButton
-        )
-
-        # Font Size
-        self.textSize = QSpinBox(self)
-        self.textSize.setMinimum(8)
-        self.textSize.setMaximum(60)
-        self.textSize.setSingleStep(1)
-        self.textSize.setValue(CONFIG.textSize)
-        self.mainForm.addRow(
-            self.tr("Font size"),
-            self.textSize,
-            self.tr("Applies to both document editor and viewer."),
-            unit=self.tr("pt")
-        )
+        # Label
+        self.sidebar.addLabel(self.tr("Writing"))
 
         # Text Flow
         # =========
-        self.mainForm.addGroupLabel(self.tr("Text Flow"))
+
+        title = self.tr("Text Flow")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
 
         # Max Text Width in Normal Mode
-        self.textWidth = QSpinBox(self)
+        self.textWidth = NSpinBox(self)
         self.textWidth.setMinimum(0)
         self.textWidth.setMaximum(10000)
         self.textWidth.setSingleStep(10)
         self.textWidth.setValue(CONFIG.textWidth)
         self.mainForm.addRow(
-            self.tr("Maximum text width in \"Normal Mode\""),
-            self.textWidth,
-            self.tr("Set to 0 to disable this feature."),
-            unit=self.tr("px")
+            self.tr("Maximum text width in \"Normal Mode\""), self.textWidth,
+            self.tr("Set to 0 to disable this feature."), unit=self.tr("px")
         )
 
         # Max Text Width in Focus Mode
-        self.focusWidth = QSpinBox(self)
+        self.focusWidth = NSpinBox(self)
         self.focusWidth.setMinimum(200)
         self.focusWidth.setMaximum(10000)
         self.focusWidth.setSingleStep(10)
         self.focusWidth.setValue(CONFIG.focusWidth)
         self.mainForm.addRow(
-            self.tr("Maximum text width in \"Focus Mode\""),
-            self.focusWidth,
-            self.tr("The maximum width cannot be disabled."),
-            unit=self.tr("px")
+            self.tr("Maximum text width in \"Focus Mode\""), self.focusWidth,
+            self.tr("The maximum width cannot be disabled."), unit=self.tr("px")
         )
 
         # Focus Mode Footer
-        self.hideFocusFooter = NSwitch()
+        self.hideFocusFooter = NSwitch(self)
         self.hideFocusFooter.setChecked(CONFIG.hideFocusFooter)
         self.mainForm.addRow(
-            self.tr("Hide document footer in \"Focus Mode\""),
-            self.hideFocusFooter,
+            self.tr("Hide document footer in \"Focus Mode\""), self.hideFocusFooter,
             self.tr("Hide the information bar in the document editor.")
         )
 
         # Justify Text
-        self.doJustify = NSwitch()
+        self.doJustify = NSwitch(self)
         self.doJustify.setChecked(CONFIG.doJustify)
         self.mainForm.addRow(
-            self.tr("Justify the text margins"),
-            self.doJustify,
+            self.tr("Justify the text margins"), self.doJustify,
             self.tr("Applies to both document editor and viewer."),
         )
 
         # Document Margins
-        self.textMargin = QSpinBox(self)
+        self.textMargin = NSpinBox(self)
         self.textMargin.setMinimum(0)
         self.textMargin.setMaximum(900)
         self.textMargin.setSingleStep(1)
         self.textMargin.setValue(CONFIG.textMargin)
         self.mainForm.addRow(
-            self.tr("Minimum text margin"),
-            self.textMargin,
+            self.tr("Minimum text margin"), self.textMargin,
             self.tr("Applies to both document editor and viewer."),
             unit=self.tr("px")
         )
 
         # Tab Width
-        self.tabWidth = QSpinBox(self)
+        self.tabWidth = NSpinBox(self)
         self.tabWidth.setMinimum(0)
         self.tabWidth.setMaximum(200)
         self.tabWidth.setSingleStep(1)
         self.tabWidth.setValue(CONFIG.tabWidth)
         self.mainForm.addRow(
-            self.tr("Tab width"),
-            self.tabWidth,
+            self.tr("Tab width"), self.tabWidth,
             self.tr("The width of a tab key press in the editor and viewer."),
             unit=self.tr("px")
         )
 
-        return
-
-    def saveValues(self) -> None:
-        """Save the values set for this tab."""
-        # Text Style
-        CONFIG.setTextFont(self.textFont.text(), self.textSize.value())
-
-        # Text Flow
-        CONFIG.textWidth       = self.textWidth.value()
-        CONFIG.focusWidth      = self.focusWidth.value()
-        CONFIG.hideFocusFooter = self.hideFocusFooter.isChecked()
-        CONFIG.doJustify       = self.doJustify.isChecked()
-        CONFIG.textMargin      = self.textMargin.value()
-        CONFIG.tabWidth        = self.tabWidth.value()
-
-        return
-
-    ##
-    #  Private Slots
-    ##
-
-    @pyqtSlot()
-    def _selectFont(self):
-        """Open the QFontDialog and set a font for the font style."""
-        currFont = QFont()
-        currFont.setFamily(CONFIG.textFont)
-        currFont.setPointSize(CONFIG.textSize)
-        theFont, theStatus = QFontDialog.getFont(currFont, self)
-        if theStatus:
-            self.textFont.setText(theFont.family())
-            self.textSize.setValue(theFont.pointSize())
-
-        return
-
-# END Class GuiPreferencesDocuments
-
-
-class GuiPreferencesEditor(QWidget):
-
-    def __init__(self, prefsGui: GuiPreferences) -> None:
-        super().__init__(parent=prefsGui)
-
-        # The Form
-        self.mainForm = NConfigLayout()
-        self.mainForm.setHelpTextStyle(SHARED.theme.helpText)
-        self.setLayout(self.mainForm)
+        # Text Editing
+        # ============
 
-        mW = CONFIG.pxInt(250)
+        title = self.tr("Text Editing")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
 
         # Spell Checking
-        # ==============
-        self.mainForm.addGroupLabel(self.tr("Spell Checking"))
-
-        # Spell Check Provider and Language
-        self.spellLanguage = QComboBox(self)
-        self.spellLanguage.setMaximumWidth(mW)
+        self.spellLanguage = NComboBox(self)
+        self.spellLanguage.setMinimumWidth(minWidth)
 
         if CONFIG.hasEnchant:
             for tag, language in SHARED.spelling.listDictionaries():
                 self.spellLanguage.addItem(language, tag)
         else:
-            self.spellLanguage.addItem(self.tr("None"), "")
+            self.spellLanguage.addItem(nwUnicode.U_EMDASH, "")
             self.spellLanguage.setEnabled(False)
 
-        spellIdx = self.spellLanguage.findData(CONFIG.spellLanguage)
-        if spellIdx != -1:
-            self.spellLanguage.setCurrentIndex(spellIdx)
+        if (idx := self.spellLanguage.findData(CONFIG.spellLanguage)) != -1:
+            self.spellLanguage.setCurrentIndex(idx)
 
         self.mainForm.addRow(
-            self.tr("Spell check language"),
-            self.spellLanguage,
-            self.tr("Available languages are determined by your system.")
+            self.tr("Spell check language"), self.spellLanguage,
+            self.tr("Available languages are determined by your system."), stretch=(3, 2)
         )
 
-        # Word Count
-        # ==========
-        self.mainForm.addGroupLabel(self.tr("Word Count"))
-
-        # Word Count Timer
-        self.wordCountTimer = QDoubleSpinBox(self)
-        self.wordCountTimer.setDecimals(1)
-        self.wordCountTimer.setMinimum(2.0)
-        self.wordCountTimer.setMaximum(600.0)
-        self.wordCountTimer.setSingleStep(0.1)
-        self.wordCountTimer.setValue(CONFIG.wordCountTimer)
-        self.mainForm.addRow(
-            self.tr("Word count interval"),
-            self.wordCountTimer,
-            unit=self.tr("seconds")
-        )
-
-        # Include Notes in Word Count
-        self.incNotesWCount = NSwitch()
-        self.incNotesWCount.setChecked(CONFIG.incNotesWCount)
+        # Auto-Select Word Under Cursor
+        self.autoSelect = NSwitch(self)
+        self.autoSelect.setChecked(CONFIG.autoSelect)
         self.mainForm.addRow(
-            self.tr("Include project notes in status bar word count"),
-            self.incNotesWCount
+            self.tr("Auto-select word under cursor"), self.autoSelect,
+            self.tr("Apply formatting to word under cursor if no selection is made.")
         )
 
-        # Writing Guides
-        # ==============
-        self.mainForm.addGroupLabel(self.tr("Writing Guides"))
-
         # Show Tabs and Spaces
-        self.showTabsNSpaces = NSwitch()
+        self.showTabsNSpaces = NSwitch(self)
         self.showTabsNSpaces.setChecked(CONFIG.showTabsNSpaces)
         self.mainForm.addRow(
-            self.tr("Show tabs and spaces"),
-            self.showTabsNSpaces
+            self.tr("Show tabs and spaces"), self.showTabsNSpaces
         )
 
         # Show Line Endings
-        self.showLineEndings = NSwitch()
+        self.showLineEndings = NSwitch(self)
         self.showLineEndings.setChecked(CONFIG.showLineEndings)
         self.mainForm.addRow(
-            self.tr("Show line endings"),
-            self.showLineEndings
+            self.tr("Show line endings"), self.showLineEndings
         )
 
-        # Scroll Behaviour
+        # Editor Scrolling
         # ================
-        self.mainForm.addGroupLabel(self.tr("Scroll Behaviour"))
+
+        title = self.tr("Editor Scrolling")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
 
         # Scroll Past End
-        self.scrollPastEnd = NSwitch()
+        self.scrollPastEnd = NSwitch(self)
         self.scrollPastEnd.setChecked(CONFIG.scrollPastEnd)
         self.mainForm.addRow(
-            self.tr("Scroll past end of the document"),
-            self.scrollPastEnd,
+            self.tr("Scroll past end of the document"), self.scrollPastEnd,
             self.tr("Also centres the cursor when scrolling.")
         )
 
         # Typewriter Scrolling
-        self.autoScroll = NSwitch()
+        self.autoScroll = NSwitch(self)
         self.autoScroll.setChecked(CONFIG.autoScroll)
         self.mainForm.addRow(
-            self.tr("Typewriter style scrolling when you type"),
-            self.autoScroll,
+            self.tr("Typewriter style scrolling when you type"), self.autoScroll,
             self.tr("Keeps the cursor at a fixed vertical position.")
         )
 
         # Typewriter Position
-        self.autoScrollPos = QSpinBox(self)
+        self.autoScrollPos = NSpinBox(self)
         self.autoScrollPos.setMinimum(10)
         self.autoScrollPos.setMaximum(90)
         self.autoScrollPos.setSingleStep(1)
         self.autoScrollPos.setValue(int(CONFIG.autoScrollPos))
         self.mainForm.addRow(
-            self.tr("Minimum position for Typewriter scrolling"),
-            self.autoScrollPos,
-            self.tr("Percentage of the editor height from the top."),
-            unit="%"
+            self.tr("Minimum position for Typewriter scrolling"), self.autoScrollPos,
+            self.tr("Percentage of the editor height from the top."), unit="%"
         )
 
-        return
-
-    def saveValues(self) -> None:
-        """Save the values set for this tab."""
-        # Spell Checking
-        CONFIG.spellLanguage = self.spellLanguage.currentData()
-
-        # Word Count
-        CONFIG.wordCountTimer = self.wordCountTimer.value()
-        CONFIG.incNotesWCount = self.incNotesWCount.isChecked()
-
-        # Writing Guides
-        CONFIG.showTabsNSpaces = self.showTabsNSpaces.isChecked()
-        CONFIG.showLineEndings = self.showLineEndings.isChecked()
-
-        # Scroll Behaviour
-        CONFIG.autoScroll    = self.autoScroll.isChecked()
-        CONFIG.autoScrollPos = self.autoScrollPos.value()
-        CONFIG.scrollPastEnd = self.scrollPastEnd.isChecked()
-
-        return
-
-# END Class GuiPreferencesEditor
-
-
-class GuiPreferencesSyntax(QWidget):
-
-    def __init__(self, prefsGui: GuiPreferences) -> None:
-        super().__init__(parent=prefsGui)
-
-        self.prefsGui = prefsGui
-
-        # The Form
-        self.mainForm = NConfigLayout()
-        self.mainForm.setHelpTextStyle(SHARED.theme.helpText)
-        self.setLayout(self.mainForm)
-
-        # Quotes & Dialogue
+        # Text Highlighting
         # =================
-        self.mainForm.addGroupLabel(self.tr("Quotes & Dialogue"))
 
-        self.highlightQuotes = NSwitch()
+        title = self.tr("Text Highlighting")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
+
+        self.highlightQuotes = NSwitch(self)
         self.highlightQuotes.setChecked(CONFIG.highlightQuotes)
         self.highlightQuotes.toggled.connect(self._toggleHighlightQuotes)
         self.mainForm.addRow(
-            self.tr("Highlight text wrapped in quotes"),
-            self.highlightQuotes,
+            self.tr("Highlight text wrapped in quotes"), self.highlightQuotes,
             self.tr("Applies to the document editor only.")
         )
 
-        self.allowOpenSQuote = NSwitch()
+        self.allowOpenSQuote = NSwitch(self)
         self.allowOpenSQuote.setChecked(CONFIG.allowOpenSQuote)
         self.mainForm.addRow(
-            self.tr("Allow open-ended single quotes"),
-            self.allowOpenSQuote,
+            self.tr("Allow open-ended single quotes"), self.allowOpenSQuote,
             self.tr("Highlight single-quoted line with no closing quote.")
         )
 
-        self.allowOpenDQuote = NSwitch()
+        self.allowOpenDQuote = NSwitch(self)
         self.allowOpenDQuote.setChecked(CONFIG.allowOpenDQuote)
         self.mainForm.addRow(
-            self.tr("Allow open-ended double quotes"),
-            self.allowOpenDQuote,
+            self.tr("Allow open-ended double quotes"), self.allowOpenDQuote,
             self.tr("Highlight double-quoted line with no closing quote.")
         )
 
-        # Text Emphasis
-        # =============
-        self.mainForm.addGroupLabel(self.tr("Text Emphasis"))
-
-        self.highlightEmph = NSwitch()
+        self.highlightEmph = NSwitch(self)
         self.highlightEmph.setChecked(CONFIG.highlightEmph)
         self.mainForm.addRow(
-            self.tr("Add highlight colour to emphasised text"),
-            self.highlightEmph,
+            self.tr("Add highlight colour to emphasised text"), self.highlightEmph,
             self.tr("Applies to the document editor only.")
         )
 
-        # Text Errors
-        # ===========
-
-        self.mainForm.addGroupLabel(self.tr("Text Errors"))
-
-        self.showMultiSpaces = NSwitch()
+        self.showMultiSpaces = NSwitch(self)
         self.showMultiSpaces.setChecked(CONFIG.showMultiSpaces)
         self.mainForm.addRow(
-            self.tr("Highlight multiple or trailing spaces"),
-            self.showMultiSpaces,
+            self.tr("Highlight multiple or trailing spaces"), self.showMultiSpaces,
             self.tr("Applies to the document editor only.")
         )
 
-        return
-
-    def saveValues(self) -> None:
-        """Save the values set for this tab."""
-        highlightQuotes = self.highlightQuotes.isChecked()
-        allowOpenSQuote = self.allowOpenSQuote.isChecked()
-        allowOpenDQuote = self.allowOpenDQuote.isChecked()
-        highlightEmph   = self.highlightEmph.isChecked()
-        showMultiSpaces = self.showMultiSpaces.isChecked()
-
-        self.prefsGui._updateSyntax |= CONFIG.highlightQuotes != highlightQuotes
-        self.prefsGui._updateSyntax |= CONFIG.highlightEmph != highlightEmph
-        self.prefsGui._updateSyntax |= CONFIG.showMultiSpaces != showMultiSpaces
-
-        CONFIG.highlightQuotes = highlightQuotes
-        CONFIG.allowOpenSQuote = allowOpenSQuote
-        CONFIG.allowOpenDQuote = allowOpenDQuote
-        CONFIG.highlightEmph   = highlightEmph
-        CONFIG.showMultiSpaces = showMultiSpaces
-
-        return
-
-    ##
-    #  Private Slots
-    ##
-
-    @pyqtSlot(bool)
-    def _toggleHighlightQuotes(self, state: bool) -> None:
-        """Toggle switches controlled by the highlight quotes switch."""
-        self.allowOpenSQuote.setEnabled(state)
-        self.allowOpenDQuote.setEnabled(state)
-        return
-
-# END Class GuiPreferencesSyntax
-
-
-class GuiPreferencesAutomation(QWidget):
-
-    def __init__(self, prefsGui: GuiPreferences) -> None:
-        super().__init__(parent=prefsGui)
+        # Text Automation
+        # ===============
 
-        # The Form
-        self.mainForm = NConfigLayout()
-        self.mainForm.setHelpTextStyle(SHARED.theme.helpText)
-        self.setLayout(self.mainForm)
+        title = self.tr("Text Automation")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
 
-        # Automatic Features
-        # ==================
-        self.mainForm.addGroupLabel(self.tr("Automatic Features"))
-
-        # Auto-Select Word Under Cursor
-        self.autoSelect = NSwitch()
-        self.autoSelect.setChecked(CONFIG.autoSelect)
-        self.mainForm.addRow(
-            self.tr("Auto-select word under cursor"),
-            self.autoSelect,
-            self.tr("Apply formatting to word under cursor if no selection is made.")
-        )
+        boxWidth = CONFIG.pxInt(150)
 
         # Auto-Replace as You Type Main Switch
-        self.doReplace = NSwitch()
+        self.doReplace = NSwitch(self)
         self.doReplace.setChecked(CONFIG.doReplace)
         self.doReplace.toggled.connect(self._toggleAutoReplaceMain)
         self.mainForm.addRow(
-            self.tr("Auto-replace text as you type"),
-            self.doReplace,
+            self.tr("Auto-replace text as you type"), self.doReplace,
             self.tr("Allow the editor to replace symbols as you type.")
         )
 
-        # Replace as You Type
-        # ===================
-        self.mainForm.addGroupLabel(self.tr("Replace as You Type"))
-
         # Auto-Replace Single Quotes
-        self.doReplaceSQuote = NSwitch()
+        self.doReplaceSQuote = NSwitch(self)
         self.doReplaceSQuote.setChecked(CONFIG.doReplaceSQuote)
         self.doReplaceSQuote.setEnabled(CONFIG.doReplace)
         self.mainForm.addRow(
-            self.tr("Auto-replace single quotes"),
-            self.doReplaceSQuote,
+            self.tr("Auto-replace single quotes"), self.doReplaceSQuote,
             self.tr("Try to guess which is an opening or a closing quote.")
         )
 
         # Auto-Replace Double Quotes
-        self.doReplaceDQuote = NSwitch()
+        self.doReplaceDQuote = NSwitch(self)
         self.doReplaceDQuote.setChecked(CONFIG.doReplaceDQuote)
         self.doReplaceDQuote.setEnabled(CONFIG.doReplace)
         self.mainForm.addRow(
-            self.tr("Auto-replace double quotes"),
-            self.doReplaceDQuote,
+            self.tr("Auto-replace double quotes"), self.doReplaceDQuote,
             self.tr("Try to guess which is an opening or a closing quote.")
         )
 
         # Auto-Replace Hyphens
-        self.doReplaceDash = NSwitch()
+        self.doReplaceDash = NSwitch(self)
         self.doReplaceDash.setChecked(CONFIG.doReplaceDash)
         self.doReplaceDash.setEnabled(CONFIG.doReplace)
         self.mainForm.addRow(
-            self.tr("Auto-replace dashes"),
-            self.doReplaceDash,
+            self.tr("Auto-replace dashes"), self.doReplaceDash,
             self.tr("Double and triple hyphens become short and long dashes.")
         )
 
         # Auto-Replace Dots
-        self.doReplaceDots = NSwitch()
+        self.doReplaceDots = NSwitch(self)
         self.doReplaceDots.setChecked(CONFIG.doReplaceDots)
         self.doReplaceDots.setEnabled(CONFIG.doReplace)
         self.mainForm.addRow(
-            self.tr("Auto-replace dots"),
-            self.doReplaceDots,
+            self.tr("Auto-replace dots"), self.doReplaceDots,
             self.tr("Three consecutive dots become ellipsis.")
         )
 
-        # Automatic Padding
-        # =================
-        self.mainForm.addGroupLabel(self.tr("Automatic Padding"))
-
         # Pad Before
-        self.fmtPadBefore = QLineEdit()
+        self.fmtPadBefore = QLineEdit(self)
         self.fmtPadBefore.setMaxLength(32)
+        self.fmtPadBefore.setMinimumWidth(boxWidth)
         self.fmtPadBefore.setText(CONFIG.fmtPadBefore)
         self.mainForm.addRow(
-            self.tr("Insert non-breaking space before"),
-            self.fmtPadBefore,
-            self.tr("Automatically add space before any of these symbols."),
+            self.tr("Insert non-breaking space before"), self.fmtPadBefore,
+            self.tr("Automatically add space before any of these symbols."), stretch=(2, 1)
         )
 
         # Pad After
-        self.fmtPadAfter = QLineEdit()
+        self.fmtPadAfter = QLineEdit(self)
         self.fmtPadAfter.setMaxLength(32)
+        self.fmtPadAfter.setMinimumWidth(boxWidth)
         self.fmtPadAfter.setText(CONFIG.fmtPadAfter)
         self.mainForm.addRow(
-            self.tr("Insert non-breaking space after"),
-            self.fmtPadAfter,
-            self.tr("Automatically add space after any of these symbols."),
+            self.tr("Insert non-breaking space after"), self.fmtPadAfter,
+            self.tr("Automatically add space after any of these symbols."), stretch=(2, 1)
         )
 
         # Use Thin Space
-        self.fmtPadThin = NSwitch()
+        self.fmtPadThin = NSwitch(self)
         self.fmtPadThin.setChecked(CONFIG.fmtPadThin)
         self.fmtPadThin.setEnabled(CONFIG.doReplace)
         self.mainForm.addRow(
-            self.tr("Use thin space instead"),
-            self.fmtPadThin,
+            self.tr("Use thin space instead"), self.fmtPadThin,
             self.tr("Inserts a thin space instead of a regular space.")
         )
 
-        return
-
-    def saveValues(self) -> None:
-        """Save the values set for this tab."""
-        # Automatic Features
-        CONFIG.autoSelect = self.autoSelect.isChecked()
-        CONFIG.doReplace  = self.doReplace.isChecked()
-
-        # Replace as You Type
-        CONFIG.doReplaceSQuote = self.doReplaceSQuote.isChecked()
-        CONFIG.doReplaceDQuote = self.doReplaceDQuote.isChecked()
-        CONFIG.doReplaceDash   = self.doReplaceDash.isChecked()
-        CONFIG.doReplaceDots   = self.doReplaceDots.isChecked()
-
-        # Automatic Padding
-        CONFIG.fmtPadBefore = self.fmtPadBefore.text().strip()
-        CONFIG.fmtPadAfter  = self.fmtPadAfter.text().strip()
-        CONFIG.fmtPadThin   = self.fmtPadThin.isChecked()
-
-        return
-
-    ##
-    #  Private Slots
-    ##
-
-    @pyqtSlot(bool)
-    def _toggleAutoReplaceMain(self, state: bool) -> None:
-        """Toggle switches controlled by the auto replace switch."""
-        self.doReplaceSQuote.setEnabled(state)
-        self.doReplaceDQuote.setEnabled(state)
-        self.doReplaceDash.setEnabled(state)
-        self.doReplaceDots.setEnabled(state)
-        self.fmtPadThin.setEnabled(state)
-        return
-
-# END Class GuiPreferencesAutomation
-
-
-class GuiPreferencesQuotes(QWidget):
-
-    def __init__(self, prefsGui: GuiPreferences) -> None:
-        super().__init__(parent=prefsGui)
-
-        # The Form
-        self.mainForm = NConfigLayout()
-        self.mainForm.setHelpTextStyle(SHARED.theme.helpText)
-        self.setLayout(self.mainForm)
-
         # Quotation Style
         # ===============
-        self.mainForm.addGroupLabel(self.tr("Quotation Style"))
 
-        qWidth = CONFIG.pxInt(40)
-        bWidth = int(2.5*SHARED.theme.getTextWidth("..."))
+        title = self.tr("Quotation Style")
+        section += 1
+        self.sidebar.addButton(title, section)
+        self.mainForm.addGroupLabel(title, section)
+
         self.quoteSym = {}
+        qWidth = CONFIG.pxInt(40)
 
         # Single Quote Style
-        self.quoteSym["SO"] = QLineEdit()
+        self.quoteSym["SO"] = QLineEdit(self)
         self.quoteSym["SO"].setMaxLength(1)
         self.quoteSym["SO"].setReadOnly(True)
         self.quoteSym["SO"].setFixedWidth(qWidth)
         self.quoteSym["SO"].setAlignment(Qt.AlignCenter)
         self.quoteSym["SO"].setText(CONFIG.fmtSQuoteOpen)
-        self.btnSingleStyleO = QPushButton("...")
-        self.btnSingleStyleO.setMaximumWidth(bWidth)
+        self.btnSingleStyleO = QToolButton(self)
+        self.btnSingleStyleO.setIcon(mIcon)
         self.btnSingleStyleO.clicked.connect(lambda: self._getQuote("SO"))
         self.mainForm.addRow(
-            self.tr("Single quote open style"),
-            self.quoteSym["SO"],
+            self.tr("Single quote open style"), self.quoteSym["SO"],
             self.tr("The symbol to use for a leading single quote."),
             button=self.btnSingleStyleO
         )
 
-        self.quoteSym["SC"] = QLineEdit()
+        self.quoteSym["SC"] = QLineEdit(self)
         self.quoteSym["SC"].setMaxLength(1)
         self.quoteSym["SC"].setReadOnly(True)
         self.quoteSym["SC"].setFixedWidth(qWidth)
         self.quoteSym["SC"].setAlignment(Qt.AlignCenter)
         self.quoteSym["SC"].setText(CONFIG.fmtSQuoteClose)
-        self.btnSingleStyleC = QPushButton("...")
-        self.btnSingleStyleC.setMaximumWidth(bWidth)
+        self.btnSingleStyleC = QToolButton(self)
+        self.btnSingleStyleC.setIcon(mIcon)
         self.btnSingleStyleC.clicked.connect(lambda: self._getQuote("SC"))
         self.mainForm.addRow(
-            self.tr("Single quote close style"),
-            self.quoteSym["SC"],
+            self.tr("Single quote close style"), self.quoteSym["SC"],
             self.tr("The symbol to use for a trailing single quote."),
             button=self.btnSingleStyleC
         )
 
         # Double Quote Style
-        self.quoteSym["DO"] = QLineEdit()
+        self.quoteSym["DO"] = QLineEdit(self)
         self.quoteSym["DO"].setMaxLength(1)
         self.quoteSym["DO"].setReadOnly(True)
         self.quoteSym["DO"].setFixedWidth(qWidth)
         self.quoteSym["DO"].setAlignment(Qt.AlignCenter)
         self.quoteSym["DO"].setText(CONFIG.fmtDQuoteOpen)
-        self.btnDoubleStyleO = QPushButton("...")
-        self.btnDoubleStyleO.setMaximumWidth(bWidth)
+        self.btnDoubleStyleO = QToolButton(self)
+        self.btnDoubleStyleO.setIcon(mIcon)
         self.btnDoubleStyleO.clicked.connect(lambda: self._getQuote("DO"))
         self.mainForm.addRow(
-            self.tr("Double quote open style"),
-            self.quoteSym["DO"],
+            self.tr("Double quote open style"), self.quoteSym["DO"],
             self.tr("The symbol to use for a leading double quote."),
             button=self.btnDoubleStyleO
         )
 
-        self.quoteSym["DC"] = QLineEdit()
+        self.quoteSym["DC"] = QLineEdit(self)
         self.quoteSym["DC"].setMaxLength(1)
         self.quoteSym["DC"].setReadOnly(True)
         self.quoteSym["DC"].setFixedWidth(qWidth)
         self.quoteSym["DC"].setAlignment(Qt.AlignCenter)
         self.quoteSym["DC"].setText(CONFIG.fmtDQuoteClose)
-        self.btnDoubleStyleC = QPushButton("...")
-        self.btnDoubleStyleC.setMaximumWidth(bWidth)
+        self.btnDoubleStyleC = QToolButton(self)
+        self.btnDoubleStyleC.setIcon(mIcon)
         self.btnDoubleStyleC.clicked.connect(lambda: self._getQuote("DC"))
         self.mainForm.addRow(
-            self.tr("Double quote close style"),
-            self.quoteSym["DC"],
+            self.tr("Double quote close style"), self.quoteSym["DC"],
             self.tr("The symbol to use for a trailing double quote."),
             button=self.btnDoubleStyleC
         )
 
+        self.mainForm.finalise()
+        self.sidebar.setSelected(1)
+
         return
 
-    def saveValues(self) -> None:
-        """Save the values set for this tab."""
-        # Quotation Style
-        CONFIG.fmtSQuoteOpen = self.quoteSym["SO"].text()
-        CONFIG.fmtSQuoteClose = self.quoteSym["SC"].text()
-        CONFIG.fmtDQuoteOpen = self.quoteSym["DO"].text()
-        CONFIG.fmtDQuoteClose = self.quoteSym["DC"].text()
+    ##
+    #  Events
+    ##
+
+    def closeEvent(self, event: QCloseEvent) -> None:
+        """Capture the close event and perform cleanup."""
+        logger.debug("Close: GuiPreferences")
+        self._saveWindowSize()
+        event.accept()
+        qApp.processEvents()
+        self.done(nwConst.DLG_FINISHED)
+        self.deleteLater()
+        return
+
+    def keyPressEvent(self, event: QKeyEvent) -> None:
+        """Overload keyPressEvent to block enter key to save."""
+        if event.matches(QKeySequence.StandardKey.Cancel):
+            self.close()
+        event.ignore()
         return
 
     ##
-    #  Internal Functions
+    #  Private Slots
     ##
 
+    @pyqtSlot("QAbstractButton*")
+    def _dialogButtonClicked(self, button: QAbstractButton) -> None:
+        """Handle button clicks from the dialog button box."""
+        role = self.buttonBox.buttonRole(button)
+        if role == QDialogButtonBox.ButtonRole.ApplyRole:
+            self._saveValues()
+        elif role == QDialogButtonBox.ButtonRole.AcceptRole:
+            self._saveValues()
+            self.close()
+        elif role == QDialogButtonBox.ButtonRole.RejectRole:
+            self.close()
+        return
+
+    @pyqtSlot(int)
+    def _sidebarClicked(self, section: int) -> None:
+        """Process a user request to switch page."""
+        self.mainForm.scrollToSection(section)
+        return
+
+    @pyqtSlot()
+    def _gotoSearch(self) -> None:
+        """Go to the setting indicated by the search text."""
+        self.mainForm.scrollToLabel(self.searchText.text().strip())
+        return
+
+    @pyqtSlot()
+    def _selectGuiFont(self) -> None:
+        """Open the QFontDialog and set a font for the font style."""
+        current = QFont()
+        current.setFamily(CONFIG.guiFont)
+        current.setPointSize(CONFIG.guiFontSize)
+        font, status = QFontDialog.getFont(current, self)
+        if status:
+            self.guiFont.setText(font.family())
+            self.guiFontSize.setValue(font.pointSize())
+        return
+
+    @pyqtSlot()
+    def _selectTextFont(self):
+        """Open the QFontDialog and set a font for the font style."""
+        current = QFont()
+        current.setFamily(CONFIG.textFont)
+        current.setPointSize(CONFIG.textSize)
+        font, status = QFontDialog.getFont(current, self)
+        if status:
+            self.textFont.setText(font.family())
+            self.textSize.setValue(font.pointSize())
+        return
+
+    @pyqtSlot()
+    def _backupFolder(self) -> None:
+        """Open a dialog to select the backup folder."""
+        if path := QFileDialog.getExistingDirectory(
+            self, self.tr("Backup Directory"), str(self.backupPath) or "",
+            options=QFileDialog.ShowDirsOnly
+        ):
+            self.backupPath = path
+            self.mainForm.setHelpText("backupPath", self.tr("Path: {0}").format(path))
+        return
+
+    @pyqtSlot(bool)
+    def _toggledBackupOnClose(self, state: bool) -> None:
+        """Toggle switch that depends on the backup on close switch."""
+        self.askBeforeBackup.setEnabled(state)
+        return
+
+    @pyqtSlot(bool)
+    def _toggleHighlightQuotes(self, state: bool) -> None:
+        """Toggle switches controlled by the highlight quotes switch."""
+        self.allowOpenSQuote.setEnabled(state)
+        self.allowOpenDQuote.setEnabled(state)
+        return
+
+    @pyqtSlot(bool)
+    def _toggleAutoReplaceMain(self, state: bool) -> None:
+        """Toggle switches controlled by the auto replace switch."""
+        self.doReplaceSQuote.setEnabled(state)
+        self.doReplaceDQuote.setEnabled(state)
+        self.doReplaceDash.setEnabled(state)
+        self.doReplaceDots.setEnabled(state)
+        self.fmtPadThin.setEnabled(state)
+        return
+
     def _getQuote(self, qType: str) -> None:
         """Dialog for single quote open."""
-        qtBox = GuiQuoteSelect(self, currentQuote=self.quoteSym[qType].text())
-        if qtBox.exec_() == QDialog.Accepted:
-            self.quoteSym[qType].setText(qtBox.selectedQuote)
+        quote, status = GuiQuoteSelect.getQuote(self, current=self.quoteSym[qType].text())
+        if status:
+            self.quoteSym[qType].setText(quote)
+        return
+
+    ##
+    #  Internal Functions
+    ##
+
+    def _saveWindowSize(self) -> None:
+        """Save the dialog window size."""
+        CONFIG.setPreferencesWinSize(self.width(), self.height())
+        return
+
+    def _saveValues(self) -> None:
+        """Save the values set in the form."""
+        updateTheme  = False
+        needsRestart = False
+        updateSyntax = False
+        refreshTree  = False
+
+        # Appearance
+        guiLocale   = self.guiLocale.currentData()
+        guiTheme    = self.guiTheme.currentData()
+        guiFont     = self.guiFont.text()
+        guiFontSize = self.guiFontSize.value()
+
+        updateTheme  |= CONFIG.guiTheme != guiTheme
+        needsRestart |= CONFIG.guiLocale != guiLocale
+        needsRestart |= CONFIG.guiFont != guiFont
+        needsRestart |= CONFIG.guiFontSize != guiFontSize
+
+        CONFIG.guiLocale   = guiLocale
+        CONFIG.guiTheme    = guiTheme
+        CONFIG.guiFont     = guiFont
+        CONFIG.guiFontSize = guiFontSize
+        CONFIG.hideVScroll = self.hideVScroll.isChecked()
+        CONFIG.hideHScroll = self.hideHScroll.isChecked()
+
+        # Document Style
+        guiSyntax  = self.guiSyntax.currentData()
+        emphLabels = self.emphLabels.isChecked()
+
+        updateSyntax |= CONFIG.guiSyntax != guiSyntax
+        refreshTree  |= CONFIG.emphLabels != emphLabels
+
+        CONFIG.guiSyntax      = guiSyntax
+        CONFIG.emphLabels     = emphLabels
+        CONFIG.showFullPath   = self.showFullPath.isChecked()
+        CONFIG.incNotesWCount = self.incNotesWCount.isChecked()
+        CONFIG.setTextFont(self.textFont.text(), self.textSize.value())
+
+        # Auto Save
+        CONFIG.autoSaveDoc  = self.autoSaveDoc.value()
+        CONFIG.autoSaveProj = self.autoSaveProj.value()
+
+        # Project Backup
+        CONFIG.setBackupPath(self.backupPath)
+        CONFIG.backupOnClose   = self.backupOnClose.isChecked()
+        CONFIG.askBeforeBackup = self.askBeforeBackup.isChecked()
+
+        # Session Timer
+        CONFIG.stopWhenIdle = self.stopWhenIdle.isChecked()
+        CONFIG.userIdleTime = round(self.userIdleTime.value() * 60)
+
+        # Text Flow
+        CONFIG.textWidth       = self.textWidth.value()
+        CONFIG.focusWidth      = self.focusWidth.value()
+        CONFIG.hideFocusFooter = self.hideFocusFooter.isChecked()
+        CONFIG.doJustify       = self.doJustify.isChecked()
+        CONFIG.textMargin      = self.textMargin.value()
+        CONFIG.tabWidth        = self.tabWidth.value()
+
+        # Text Editing
+        CONFIG.spellLanguage   = self.spellLanguage.currentData()
+        CONFIG.autoSelect      = self.autoSelect.isChecked()
+        CONFIG.showTabsNSpaces = self.showTabsNSpaces.isChecked()
+        CONFIG.showLineEndings = self.showLineEndings.isChecked()
+
+        # Editor Scrolling
+        CONFIG.autoScroll    = self.autoScroll.isChecked()
+        CONFIG.autoScrollPos = self.autoScrollPos.value()
+        CONFIG.scrollPastEnd = self.scrollPastEnd.isChecked()
+
+        # Text Highlighting
+        highlightQuotes = self.highlightQuotes.isChecked()
+        highlightEmph   = self.highlightEmph.isChecked()
+        showMultiSpaces = self.showMultiSpaces.isChecked()
+
+        updateSyntax |= CONFIG.highlightQuotes != highlightQuotes
+        updateSyntax |= CONFIG.highlightEmph != highlightEmph
+        updateSyntax |= CONFIG.showMultiSpaces != showMultiSpaces
+
+        CONFIG.highlightQuotes = highlightQuotes
+        CONFIG.highlightEmph   = highlightEmph
+        CONFIG.showMultiSpaces = showMultiSpaces
+        CONFIG.allowOpenSQuote = self.allowOpenSQuote.isChecked()
+        CONFIG.allowOpenDQuote = self.allowOpenDQuote.isChecked()
+
+        # Text Automation
+        CONFIG.doReplace       = self.doReplace.isChecked()
+        CONFIG.doReplaceSQuote = self.doReplaceSQuote.isChecked()
+        CONFIG.doReplaceDQuote = self.doReplaceDQuote.isChecked()
+        CONFIG.doReplaceDash   = self.doReplaceDash.isChecked()
+        CONFIG.doReplaceDots   = self.doReplaceDots.isChecked()
+        CONFIG.fmtPadBefore    = self.fmtPadBefore.text().strip()
+        CONFIG.fmtPadAfter     = self.fmtPadAfter.text().strip()
+        CONFIG.fmtPadThin      = self.fmtPadThin.isChecked()
+
+        # Quotation Style
+        CONFIG.fmtSQuoteOpen  = self.quoteSym["SO"].text()
+        CONFIG.fmtSQuoteClose = self.quoteSym["SC"].text()
+        CONFIG.fmtDQuoteOpen  = self.quoteSym["DO"].text()
+        CONFIG.fmtDQuoteClose = self.quoteSym["DC"].text()
+
+        # Finalise
+        CONFIG.saveConfig()
+        self.newPreferencesReady.emit(needsRestart, refreshTree, updateTheme, updateSyntax)
 
         return
 
-# END Class GuiPreferencesQuotes
+# END Class GuiPreferences