novelWriter 2.4.3__py3-none-any.whl → 2.5__py3-none-any.whl

novelwriter/dialogs/editlabel.py

@@ -25,18 +25,16 @@ from __future__ import annotations
 
 import logging
 
-from PyQt5.QtWidgets import (
-    QDialog, QDialogButtonBox, QHBoxLayout, QLabel, QLineEdit, QVBoxLayout,
-    QWidget
-)
+from PyQt5.QtWidgets import QDialogButtonBox, QHBoxLayout, QLabel, QLineEdit, QVBoxLayout, QWidget
 
 from novelwriter import CONFIG
-from novelwriter.types import QtDialogCancel, QtDialogOk
+from novelwriter.extensions.modified import NDialog
+from novelwriter.types import QtAccepted, QtDialogCancel, QtDialogOk
 
 logger = logging.getLogger(__name__)
 
 
-class GuiEditLabel(QDialog):
+class GuiEditLabel(NDialog):
 
     def __init__(self, parent: QWidget, text: str = "") -> None:
         super().__init__(parent=parent)
@@ -91,8 +89,6 @@ class GuiEditLabel(QDialog):
         cls = GuiEditLabel(parent, text=text)
         cls.exec()
         label = cls.itemLabel
-        accepted = cls.result() == QDialog.DialogCode.Accepted
-        cls.deleteLater()
+        accepted = cls.result() == QtAccepted
+        cls.softDelete()
         return label, accepted
-
-# END Class GuiEditLabel

novelwriter/dialogs/preferences.py

@@ -27,29 +27,28 @@ from __future__ import annotations
 import logging
 
 from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
-from PyQt5.QtGui import QCloseEvent, QFont, QKeyEvent, QKeySequence
+from PyQt5.QtGui import QCloseEvent, QKeyEvent, QKeySequence
 from PyQt5.QtWidgets import (
-    QAbstractButton, QApplication, QCompleter, QDialog, QDialogButtonBox,
-    QFileDialog, QFontDialog, QHBoxLayout, QLineEdit, QPushButton, QVBoxLayout,
-    QWidget
+    QCompleter, QDialogButtonBox, QFileDialog, QHBoxLayout, QLineEdit,
+    QPushButton, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.constants import nwConst, nwUnicode
+from novelwriter.common import describeFont
+from novelwriter.constants import nwUnicode
 from novelwriter.dialogs.quotes import GuiQuoteSelect
 from novelwriter.extensions.configlayout import NColourLabel, NScrollableForm
-from novelwriter.extensions.modified import NComboBox, NDoubleSpinBox, NIconToolButton, NSpinBox
+from novelwriter.extensions.modified import (
+    NComboBox, NDialog, NDoubleSpinBox, NIconToolButton, NSpinBox
+)
 from novelwriter.extensions.pagedsidebar import NPagedSideBar
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.types import (
-    QtAlignCenter, QtDialogApply, QtDialogClose, QtDialogSave, QtRoleAccept,
-    QtRoleApply, QtRoleReject
-)
+from novelwriter.types import QtAlignCenter, QtDialogCancel, QtDialogSave
 
 logger = logging.getLogger(__name__)
 
 
-class GuiPreferences(QDialog):
+class GuiPreferences(NDialog):
 
     newPreferencesReady = pyqtSignal(bool, bool, bool, bool)
 
@@ -64,8 +63,8 @@ class GuiPreferences(QDialog):
 
         # Title
         self.titleLabel = NColourLabel(
-            self.tr("Preferences"), SHARED.theme.helpText,
-            parent=self, scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
+            self.tr("Preferences"), self, color=SHARED.theme.helpText,
+            scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
         )
 
         # Search Box
@@ -87,8 +86,9 @@ class GuiPreferences(QDialog):
         self.mainForm.setHelpTextStyle(SHARED.theme.helpText)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QtDialogApply | QtDialogSave | QtDialogClose, self)
-        self.buttonBox.clicked.connect(self._dialogButtonClicked)
+        self.buttonBox = QDialogButtonBox(QtDialogSave | QtDialogCancel, self)
+        self.buttonBox.accepted.connect(self._doSave)
+        self.buttonBox.rejected.connect(self.reject)
 
         # Assemble
         self.searchBox = QHBoxLayout()
@@ -133,7 +133,13 @@ class GuiPreferences(QDialog):
         """Build the settings form."""
         section = 0
         iSz = SHARED.theme.baseIconSize
+        boxFixed = 5*SHARED.theme.textNWidth
         minWidth = CONFIG.pxInt(200)
+        fontWidth = CONFIG.pxInt(162)
+
+        # Temporary Variables
+        self._guiFont = CONFIG.guiFont
+        self._textFont = CONFIG.textFont
 
         # Label
         self.sidebar.addLabel(self.tr("General"))
@@ -173,27 +179,17 @@ class GuiPreferences(QDialog):
         # Application Font Family
         self.guiFont = QLineEdit(self)
         self.guiFont.setReadOnly(True)
-        self.guiFont.setMinimumWidth(CONFIG.pxInt(162))
-        self.guiFont.setText(CONFIG.guiFont)
-        self.guiFontButton = NIconToolButton(self, iSz, "more")
+        self.guiFont.setMinimumWidth(fontWidth)
+        self.guiFont.setText(describeFont(self._guiFont))
+        self.guiFont.setCursorPosition(0)
+        self.guiFontButton = NIconToolButton(self, iSz, "font")
         self.guiFontButton.clicked.connect(self._selectGuiFont)
         self.mainForm.addRow(
-            self.tr("Application font family"), self.guiFont,
+            self.tr("Application font"), self.guiFont,
             self.tr("Requires restart to take effect."), stretch=(3, 2),
             button=self.guiFontButton
         )
 
-        # 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("Application font size"), self.guiFontSize,
-            self.tr("Requires restart to take effect."), unit=self.tr("pt")
-        )
-
         # Vertical Scrollbars
         self.hideVScroll = NSwitch(self)
         self.hideVScroll.setChecked(CONFIG.hideVScroll)
@@ -210,6 +206,14 @@ class GuiPreferences(QDialog):
             self.tr("Scrolling available with mouse wheel and keys only.")
         )
 
+        # Native Font Dialog
+        self.nativeFont = NSwitch(self)
+        self.nativeFont.setChecked(CONFIG.nativeFont)
+        self.mainForm.addRow(
+            self.tr("Use the system's font selection dialog"), self.nativeFont,
+            self.tr("Turn off to use the Qt font dialog, which may have more options.")
+        )
+
         # Document Style
         # ==============
 
@@ -233,27 +237,17 @@ class GuiPreferences(QDialog):
         # Document Font Family
         self.textFont = QLineEdit(self)
         self.textFont.setReadOnly(True)
-        self.textFont.setMinimumWidth(CONFIG.pxInt(162))
-        self.textFont.setText(CONFIG.textFont)
-        self.textFontButton = NIconToolButton(self, iSz, "more")
+        self.textFont.setMinimumWidth(fontWidth)
+        self.textFont.setText(describeFont(CONFIG.textFont))
+        self.textFont.setCursorPosition(0)
+        self.textFontButton = NIconToolButton(self, iSz, "font")
         self.textFontButton.clicked.connect(self._selectTextFont)
         self.mainForm.addRow(
-            self.tr("Document font family"), self.textFont,
+            self.tr("Document font"), self.textFont,
             self.tr("Applies to both document editor and viewer."), stretch=(3, 2),
             button=self.textFontButton
         )
 
-        # 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)
@@ -538,26 +532,59 @@ class GuiPreferences(QDialog):
         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.dialogStyle = NComboBox(self)
+        self.dialogStyle.addItem(self.tr("None"), 0)
+        self.dialogStyle.addItem(self.tr("Single Quotes"), 1)
+        self.dialogStyle.addItem(self.tr("Double Quotes"), 2)
+        self.dialogStyle.addItem(self.tr("Both"), 3)
+        self.dialogStyle.setCurrentData(CONFIG.dialogStyle, 2)
         self.mainForm.addRow(
-            self.tr("Highlight text wrapped in quotes"), self.highlightQuotes,
-            self.tr("Applies to the document editor only.")
+            self.tr("Highlight dialogue"), self.dialogStyle,
+            self.tr("Applies to the selected quote styles.")
+        )
+
+        self.allowOpenDial = NSwitch(self)
+        self.allowOpenDial.setChecked(CONFIG.allowOpenDial)
+        self.mainForm.addRow(
+            self.tr("Allow open-ended dialogue"), self.allowOpenDial,
+            self.tr("Highlight dialogue line with no closing quote.")
         )
 
-        self.allowOpenSQuote = NSwitch(self)
-        self.allowOpenSQuote.setChecked(CONFIG.allowOpenSQuote)
+        self.narratorBreak = QLineEdit(self)
+        self.narratorBreak.setMaxLength(1)
+        self.narratorBreak.setFixedWidth(boxFixed)
+        self.narratorBreak.setAlignment(QtAlignCenter)
+        self.narratorBreak.setText(CONFIG.narratorBreak)
         self.mainForm.addRow(
-            self.tr("Allow open-ended single quotes"), self.allowOpenSQuote,
-            self.tr("Highlight single-quoted line with no closing quote.")
+            self.tr("Dialogue narrator break symbol"), self.narratorBreak,
+            self.tr("Symbol to indicate injected narrator break.")
         )
 
-        self.allowOpenDQuote = NSwitch(self)
-        self.allowOpenDQuote.setChecked(CONFIG.allowOpenDQuote)
+        self.dialogLine = QLineEdit(self)
+        self.dialogLine.setMaxLength(1)
+        self.dialogLine.setFixedWidth(boxFixed)
+        self.dialogLine.setAlignment(QtAlignCenter)
+        self.dialogLine.setText(CONFIG.dialogLine)
         self.mainForm.addRow(
-            self.tr("Allow open-ended double quotes"), self.allowOpenDQuote,
-            self.tr("Highlight double-quoted line with no closing quote.")
+            self.tr("Dialogue line symbol"), self.dialogLine,
+            self.tr("Lines starting with this symbol are dialogue.")
+        )
+
+        self.altDialogOpen = QLineEdit(self)
+        self.altDialogOpen.setMaxLength(4)
+        self.altDialogOpen.setFixedWidth(boxFixed)
+        self.altDialogOpen.setAlignment(QtAlignCenter)
+        self.altDialogOpen.setText(CONFIG.altDialogOpen)
+
+        self.altDialogClose = QLineEdit(self)
+        self.altDialogClose.setMaxLength(4)
+        self.altDialogClose.setFixedWidth(boxFixed)
+        self.altDialogClose.setAlignment(QtAlignCenter)
+        self.altDialogClose.setText(CONFIG.altDialogClose)
+
+        self.mainForm.addRow(
+            self.tr("Alternative dialogue symbols"), [self.altDialogOpen, self.altDialogClose],
+            self.tr("Custom highlighting of dialogue text.")
         )
 
         self.highlightEmph = NSwitch(self)
@@ -666,65 +693,62 @@ class GuiPreferences(QDialog):
         self.sidebar.addButton(title, section)
         self.mainForm.addGroupLabel(title, section)
 
-        self.quoteSym = {}
-        qWidth = CONFIG.pxInt(40)
-
         # Single Quote Style
-        self.quoteSym["SO"] = QLineEdit(self)
-        self.quoteSym["SO"].setMaxLength(1)
-        self.quoteSym["SO"].setReadOnly(True)
-        self.quoteSym["SO"].setFixedWidth(qWidth)
-        self.quoteSym["SO"].setAlignment(QtAlignCenter)
-        self.quoteSym["SO"].setText(CONFIG.fmtSQuoteOpen)
-        self.btnSingleStyleO = NIconToolButton(self, iSz, "more")
-        self.btnSingleStyleO.clicked.connect(lambda: self._getQuote("SO"))
-        self.mainForm.addRow(
-            self.tr("Single quote open style"), self.quoteSym["SO"],
+        self.fmtSQuoteOpen = QLineEdit(self)
+        self.fmtSQuoteOpen.setMaxLength(1)
+        self.fmtSQuoteOpen.setReadOnly(True)
+        self.fmtSQuoteOpen.setFixedWidth(boxFixed)
+        self.fmtSQuoteOpen.setAlignment(QtAlignCenter)
+        self.fmtSQuoteOpen.setText(CONFIG.fmtSQuoteOpen)
+        self.btnSQuoteOpen = NIconToolButton(self, iSz, "quote")
+        self.btnSQuoteOpen.clicked.connect(self._changeSingleQuoteOpen)
+        self.mainForm.addRow(
+            self.tr("Single quote open style"), self.fmtSQuoteOpen,
             self.tr("The symbol to use for a leading single quote."),
-            button=self.btnSingleStyleO
+            button=self.btnSQuoteOpen
         )
 
-        self.quoteSym["SC"] = QLineEdit(self)
-        self.quoteSym["SC"].setMaxLength(1)
-        self.quoteSym["SC"].setReadOnly(True)
-        self.quoteSym["SC"].setFixedWidth(qWidth)
-        self.quoteSym["SC"].setAlignment(QtAlignCenter)
-        self.quoteSym["SC"].setText(CONFIG.fmtSQuoteClose)
-        self.btnSingleStyleC = NIconToolButton(self, iSz, "more")
-        self.btnSingleStyleC.clicked.connect(lambda: self._getQuote("SC"))
+        self.fmtSQuoteClose = QLineEdit(self)
+        self.fmtSQuoteClose.setMaxLength(1)
+        self.fmtSQuoteClose.setReadOnly(True)
+        self.fmtSQuoteClose.setFixedWidth(boxFixed)
+        self.fmtSQuoteClose.setAlignment(QtAlignCenter)
+        self.fmtSQuoteClose.setText(CONFIG.fmtSQuoteClose)
+        self.btnSQuoteClose = NIconToolButton(self, iSz, "quote")
+        self.btnSQuoteClose.clicked.connect(self._changeSingleQuoteClose)
         self.mainForm.addRow(
-            self.tr("Single quote close style"), self.quoteSym["SC"],
+            self.tr("Single quote close style"), self.fmtSQuoteClose,
             self.tr("The symbol to use for a trailing single quote."),
-            button=self.btnSingleStyleC
+            button=self.btnSQuoteClose
         )
 
         # Double Quote Style
-        self.quoteSym["DO"] = QLineEdit(self)
-        self.quoteSym["DO"].setMaxLength(1)
-        self.quoteSym["DO"].setReadOnly(True)
-        self.quoteSym["DO"].setFixedWidth(qWidth)
-        self.quoteSym["DO"].setAlignment(QtAlignCenter)
-        self.quoteSym["DO"].setText(CONFIG.fmtDQuoteOpen)
-        self.btnDoubleStyleO = NIconToolButton(self, iSz, "more")
-        self.btnDoubleStyleO.clicked.connect(lambda: self._getQuote("DO"))
-        self.mainForm.addRow(
-            self.tr("Double quote open style"), self.quoteSym["DO"],
+        self.fmtDQuoteOpen = QLineEdit(self)
+        self.fmtDQuoteOpen.setMaxLength(1)
+        self.fmtDQuoteOpen.setReadOnly(True)
+        self.fmtDQuoteOpen.setFixedWidth(boxFixed)
+        self.fmtDQuoteOpen.setAlignment(QtAlignCenter)
+        self.fmtDQuoteOpen.setText(CONFIG.fmtDQuoteOpen)
+        self.btnDQuoteOpen = NIconToolButton(self, iSz, "quote")
+        self.btnDQuoteOpen.clicked.connect(self._changeDoubleQuoteOpen)
+        self.mainForm.addRow(
+            self.tr("Double quote open style"), self.fmtDQuoteOpen,
             self.tr("The symbol to use for a leading double quote."),
-            button=self.btnDoubleStyleO
+            button=self.btnDQuoteOpen
         )
 
-        self.quoteSym["DC"] = QLineEdit(self)
-        self.quoteSym["DC"].setMaxLength(1)
-        self.quoteSym["DC"].setReadOnly(True)
-        self.quoteSym["DC"].setFixedWidth(qWidth)
-        self.quoteSym["DC"].setAlignment(QtAlignCenter)
-        self.quoteSym["DC"].setText(CONFIG.fmtDQuoteClose)
-        self.btnDoubleStyleC = NIconToolButton(self, iSz, "more")
-        self.btnDoubleStyleC.clicked.connect(lambda: self._getQuote("DC"))
+        self.fmtDQuoteClose = QLineEdit(self)
+        self.fmtDQuoteClose.setMaxLength(1)
+        self.fmtDQuoteClose.setReadOnly(True)
+        self.fmtDQuoteClose.setFixedWidth(boxFixed)
+        self.fmtDQuoteClose.setAlignment(QtAlignCenter)
+        self.fmtDQuoteClose.setText(CONFIG.fmtDQuoteClose)
+        self.btnDQuoteClose = NIconToolButton(self, iSz, "quote")
+        self.btnDQuoteClose.clicked.connect(self._changeDoubleQuoteClose)
         self.mainForm.addRow(
-            self.tr("Double quote close style"), self.quoteSym["DC"],
+            self.tr("Double quote close style"), self.fmtDQuoteClose,
             self.tr("The symbol to use for a trailing double quote."),
-            button=self.btnDoubleStyleC
+            button=self.btnDQuoteClose
         )
 
         self.mainForm.finalise()
@@ -741,13 +765,14 @@ class GuiPreferences(QDialog):
         logger.debug("Close: GuiPreferences")
         self._saveWindowSize()
         event.accept()
-        QApplication.processEvents()
-        self.done(nwConst.DLG_FINISHED)
-        self.deleteLater()
+        self.softDelete()
         return
 
     def keyPressEvent(self, event: QKeyEvent) -> None:
-        """Overload keyPressEvent to block enter key to save."""
+        """Overload keyPressEvent and only accept escape. The main
+        purpose here is to prevent Enter/Return from closing the dialog
+        as it is used for the search box.
+        """
         if event.matches(QKeySequence.StandardKey.Cancel):
             self.close()
         event.ignore()
@@ -757,19 +782,6 @@ class GuiPreferences(QDialog):
     #  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 == QtRoleApply:
-            self._saveValues()
-        elif role == QtRoleAccept:
-            self._saveValues()
-            self.close()
-        elif role == QtRoleReject:
-            self.close()
-        return
-
     @pyqtSlot(int)
     def _sidebarClicked(self, section: int) -> None:
         """Process a user request to switch page."""
@@ -785,25 +797,21 @@ class GuiPreferences(QDialog):
     @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)
+        font, status = SHARED.getFont(self._guiFont, self.nativeFont.isChecked())
         if status:
-            self.guiFont.setText(font.family())
-            self.guiFontSize.setValue(font.pointSize())
+            self.guiFont.setText(describeFont(font))
+            self.guiFont.setCursorPosition(0)
+            self._guiFont = font
         return
 
     @pyqtSlot()
     def _selectTextFont(self) -> None:
         """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)
+        font, status = SHARED.getFont(self._textFont, self.nativeFont.isChecked())
         if status:
-            self.textFont.setText(font.family())
-            self.textSize.setValue(font.pointSize())
+            self.textFont.setText(describeFont(font))
+            self.textFont.setCursorPosition(0)
+            self._textFont = font
         return
 
     @pyqtSlot()
@@ -823,13 +831,6 @@ class GuiPreferences(QDialog):
         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."""
@@ -840,11 +841,36 @@ class GuiPreferences(QDialog):
         self.fmtPadThin.setEnabled(state)
         return
 
-    def _getQuote(self, qType: str) -> None:
-        """Dialog for single quote open."""
-        quote, status = GuiQuoteSelect.getQuote(self, current=self.quoteSym[qType].text())
+    @pyqtSlot()
+    def _changeSingleQuoteOpen(self) -> None:
+        """Change single quote open style."""
+        quote, status = GuiQuoteSelect.getQuote(self, current=self.fmtSQuoteOpen.text())
+        if status:
+            self.fmtSQuoteOpen.setText(quote)
+        return
+
+    @pyqtSlot()
+    def _changeSingleQuoteClose(self) -> None:
+        """Change single quote close style."""
+        quote, status = GuiQuoteSelect.getQuote(self, current=self.fmtSQuoteClose.text())
+        if status:
+            self.fmtSQuoteClose.setText(quote)
+        return
+
+    @pyqtSlot()
+    def _changeDoubleQuoteOpen(self) -> None:
+        """Change double quote open style."""
+        quote, status = GuiQuoteSelect.getQuote(self, current=self.fmtDQuoteOpen.text())
         if status:
-            self.quoteSym[qType].setText(quote)
+            self.fmtDQuoteOpen.setText(quote)
+        return
+
+    @pyqtSlot()
+    def _changeDoubleQuoteClose(self) -> None:
+        """Change double quote close style."""
+        quote, status = GuiQuoteSelect.getQuote(self, current=self.fmtDQuoteClose.text())
+        if status:
+            self.fmtDQuoteClose.setText(quote)
         return
 
     ##
@@ -856,7 +882,7 @@ class GuiPreferences(QDialog):
         CONFIG.setPreferencesWinSize(self.width(), self.height())
         return
 
-    def _saveValues(self) -> None:
+    def _doSave(self) -> None:
         """Save the values set in the form."""
         updateTheme  = False
         needsRestart = False
@@ -864,22 +890,19 @@ class GuiPreferences(QDialog):
         refreshTree  = False
 
         # Appearance
-        guiLocale   = self.guiLocale.currentData()
-        guiTheme    = self.guiTheme.currentData()
-        guiFont     = self.guiFont.text()
-        guiFontSize = self.guiFontSize.value()
+        guiLocale = self.guiLocale.currentData()
+        guiTheme  = self.guiTheme.currentData()
 
         updateTheme  |= CONFIG.guiTheme != guiTheme
         needsRestart |= CONFIG.guiLocale != guiLocale
-        needsRestart |= CONFIG.guiFont != guiFont
-        needsRestart |= CONFIG.guiFontSize != guiFontSize
+        needsRestart |= CONFIG.guiFont != self._guiFont
 
         CONFIG.guiLocale   = guiLocale
         CONFIG.guiTheme    = guiTheme
-        CONFIG.guiFont     = guiFont
-        CONFIG.guiFontSize = guiFontSize
         CONFIG.hideVScroll = self.hideVScroll.isChecked()
         CONFIG.hideHScroll = self.hideHScroll.isChecked()
+        CONFIG.nativeFont  = self.nativeFont.isChecked()
+        CONFIG.setGuiFont(self._guiFont)
 
         # Document Style
         guiSyntax  = self.guiSyntax.currentData()
@@ -892,7 +915,7 @@ class GuiPreferences(QDialog):
         CONFIG.emphLabels     = emphLabels
         CONFIG.showFullPath   = self.showFullPath.isChecked()
         CONFIG.incNotesWCount = self.incNotesWCount.isChecked()
-        CONFIG.setTextFont(self.textFont.text(), self.textSize.value())
+        CONFIG.setTextFont(self._textFont)
 
         # Auto Save
         CONFIG.autoSaveDoc  = self.autoSaveDoc.value()
@@ -927,19 +950,32 @@ class GuiPreferences(QDialog):
         CONFIG.scrollPastEnd = self.scrollPastEnd.isChecked()
 
         # Text Highlighting
-        highlightQuotes = self.highlightQuotes.isChecked()
+        dialogueStyle   = self.dialogStyle.currentData()
+        allowOpenDial   = self.allowOpenDial.isChecked()
+        narratorBreak   = self.narratorBreak.text()
+        dialogueLine    = self.dialogLine.text()
+        altDialogOpen   = self.altDialogOpen.text()
+        altDialogClose  = self.altDialogClose.text()
         highlightEmph   = self.highlightEmph.isChecked()
         showMultiSpaces = self.showMultiSpaces.isChecked()
 
-        updateSyntax |= CONFIG.highlightQuotes != highlightQuotes
+        updateSyntax |= CONFIG.dialogStyle != dialogueStyle
+        updateSyntax |= CONFIG.allowOpenDial != allowOpenDial
+        updateSyntax |= CONFIG.narratorBreak != narratorBreak
+        updateSyntax |= CONFIG.dialogLine != dialogueLine
+        updateSyntax |= CONFIG.altDialogOpen != altDialogOpen
+        updateSyntax |= CONFIG.altDialogClose != altDialogClose
         updateSyntax |= CONFIG.highlightEmph != highlightEmph
         updateSyntax |= CONFIG.showMultiSpaces != showMultiSpaces
 
-        CONFIG.highlightQuotes = highlightQuotes
+        CONFIG.dialogStyle     = dialogueStyle
+        CONFIG.allowOpenDial   = allowOpenDial
+        CONFIG.narratorBreak   = narratorBreak
+        CONFIG.dialogLine      = dialogueLine
+        CONFIG.altDialogOpen   = altDialogOpen
+        CONFIG.altDialogClose  = altDialogClose
         CONFIG.highlightEmph   = highlightEmph
         CONFIG.showMultiSpaces = showMultiSpaces
-        CONFIG.allowOpenSQuote = self.allowOpenSQuote.isChecked()
-        CONFIG.allowOpenDQuote = self.allowOpenDQuote.isChecked()
 
         # Text Automation
         CONFIG.doReplace       = self.doReplace.isChecked()
@@ -952,15 +988,15 @@ class GuiPreferences(QDialog):
         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()
+        CONFIG.fmtSQuoteOpen  = self.fmtSQuoteOpen.text()
+        CONFIG.fmtSQuoteClose = self.fmtSQuoteClose.text()
+        CONFIG.fmtDQuoteOpen  = self.fmtDQuoteOpen.text()
+        CONFIG.fmtDQuoteClose = self.fmtDQuoteClose.text()
 
         # Finalise
         CONFIG.saveConfig()
         self.newPreferencesReady.emit(needsRestart, refreshTree, updateTheme, updateSyntax)
 
-        return
+        self.close()
 
-# END Class GuiPreferences
+        return