novelWriter 2.5b1__py3-none-any.whl → 2.5rc1__py3-none-any.whl

novelwriter/core/toqdoc.py

@@ -45,16 +45,18 @@ T_TextStyle = tuple[QTextBlockFormat, QTextCharFormat]
 
 
 class TextDocumentTheme:
-    text: QColor = QtBlack
+    text:      QColor = QtBlack
     highlight: QColor = QtTransparent
-    head: QColor = QtBlack
-    comment: QColor = QtBlack
-    note: QColor = QtBlack
-    code: QColor = QtBlack
-    modifier: QColor = QtBlack
-    keyword: QColor = QtBlack
-    tag: QColor = QtBlack
-    optional: QColor = QtBlack
+    head:      QColor = QtBlack
+    comment:   QColor = QtBlack
+    note:      QColor = QtBlack
+    code:      QColor = QtBlack
+    modifier:  QColor = QtBlack
+    keyword:   QColor = QtBlack
+    tag:       QColor = QtBlack
+    optional:  QColor = QtBlack
+    dialog:    QColor = QtBlack
+    altdialog: QColor = QtBlack
 
 
 def newBlock(cursor: QTextCursor, bFmt: QTextBlockFormat) -> None:
@@ -125,6 +127,7 @@ class ToQTextDocument(Tokenizer):
         self._mSep  = (mScale * self._marginSep[0], mScale * self._marginSep[1])
 
         self._mIndent = mScale * 2.0
+        self._tIndent = mScale * self._firstWidth
 
         # Block Format
         # ============
@@ -133,6 +136,9 @@ class ToQTextDocument(Tokenizer):
         self._blockFmt.setTopMargin(self._mText[0])
         self._blockFmt.setBottomMargin(self._mText[1])
         self._blockFmt.setAlignment(QtAlignJustify if self._doJustify else QtAlignAbsolute)
+        self._blockFmt.setLineHeight(
+            100*self._lineHeight, QTextBlockFormat.LineHeightTypes.ProportionalHeight
+        )
 
         # Character Formats
         # =================
@@ -224,6 +230,8 @@ class ToQTextDocument(Tokenizer):
                     bFmt.setLeftMargin(self._mIndent)
                 if tStyle & self.A_IND_R:
                     bFmt.setRightMargin(self._mIndent)
+                if tStyle & self.A_IND_T:
+                    bFmt.setTextIndent(self._tIndent)
 
             if tType == self.T_TEXT:
                 newBlock(cursor, bFmt)
@@ -337,6 +345,14 @@ class ToQTextDocument(Tokenizer):
                 cFmt.setVerticalAlignment(QtVAlignSub)
             elif fmt == self.FMT_SUB_E:
                 cFmt.setVerticalAlignment(QtVAlignNormal)
+            elif fmt == self.FMT_DL_B:
+                cFmt.setForeground(self._theme.dialog)
+            elif fmt == self.FMT_DL_E:
+                cFmt.setForeground(self._theme.text)
+            elif fmt == self.FMT_ADL_B:
+                cFmt.setForeground(self._theme.altdialog)
+            elif fmt == self.FMT_ADL_E:
+                cFmt.setForeground(self._theme.text)
             elif fmt == self.FMT_FNOTE:
                 xFmt = QTextCharFormat(self._cCode)
                 xFmt.setVerticalAlignment(QtVAlignSuper)

novelwriter/dialogs/about.py

@@ -33,14 +33,14 @@ from PyQt5.QtWidgets import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import cssCol, readTextFile
 from novelwriter.extensions.configlayout import NColourLabel
-from novelwriter.extensions.modified import NNonBlockingDialog
+from novelwriter.extensions.modified import NDialog
 from novelwriter.extensions.versioninfo import VersionInfoWidget
 from novelwriter.types import QtAlignRightTop, QtDialogClose
 
 logger = logging.getLogger(__name__)
 
 
-class GuiAbout(NNonBlockingDialog):
+class GuiAbout(NDialog):
 
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
@@ -75,7 +75,7 @@ class GuiAbout(NNonBlockingDialog):
 
         # Credits
         self.lblCredits = NColourLabel(
-            self.tr("Credits"), scale=1.6, parent=self, bold=True
+            self.tr("Credits"), self, scale=1.6, bold=True
         )
 
         self.txtCredits = QTextBrowser(self)
@@ -85,7 +85,7 @@ class GuiAbout(NNonBlockingDialog):
 
         # Buttons
         self.btnBox = QDialogButtonBox(QtDialogClose, self)
-        self.btnBox.rejected.connect(self.close)
+        self.btnBox.rejected.connect(self.reject)
 
         # Assemble
         self.innerBox = QVBoxLayout()
@@ -106,7 +106,9 @@ class GuiAbout(NNonBlockingDialog):
 
         self.setLayout(self.outerBox)
         self.setSizeGripEnabled(True)
+
         self._setStyleSheet()
+        self._fillCreditsPage()
 
         logger.debug("Ready: GuiAbout")
 
@@ -116,11 +118,6 @@ class GuiAbout(NNonBlockingDialog):
         logger.debug("Delete: GuiAbout")
         return
 
-    def populateGUI(self) -> None:
-        """Populate tabs with text."""
-        self._fillCreditsPage()
-        return
-
     ##
     #  Events
     ##
@@ -128,7 +125,7 @@ class GuiAbout(NNonBlockingDialog):
     def closeEvent(self, event: QCloseEvent) -> None:
         """Capture the close event and perform cleanup."""
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -137,16 +134,14 @@ class GuiAbout(NNonBlockingDialog):
 
     def _fillCreditsPage(self) -> None:
         """Load the content for the Credits page."""
-        docPath = CONFIG.assetPath("text") / "credits_en.htm"
-        docText = readTextFile(docPath)
-        if docText:
-            self.txtCredits.setHtml(docText)
+        if html := readTextFile(CONFIG.assetPath("text") / "credits_en.htm"):
+            self.txtCredits.setHtml(html)
         else:
             self.txtCredits.setHtml("Error loading credits text ...")
         return
 
     def _setStyleSheet(self) -> None:
-        """Set stylesheet for all browser tabs."""
+        """Set stylesheet text document."""
         baseCol = cssCol(self.palette().window().color())
         self.txtCredits.setStyleSheet(
             f"QTextBrowser {{border: none; background: {baseCol};}} "

novelwriter/dialogs/docmerge.py

@@ -27,21 +27,21 @@ from __future__ import annotations
 import logging
 
 from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtGui import QCloseEvent
 from PyQt5.QtWidgets import (
-    QAbstractItemView, QDialog, QDialogButtonBox, QGridLayout, QLabel,
-    QListWidget, QListWidgetItem, QVBoxLayout, QWidget
+    QAbstractItemView, QDialogButtonBox, QGridLayout, QLabel, QListWidget,
+    QListWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.extensions.configlayout import NColourLabel
+from novelwriter.extensions.modified import NDialog
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.types import QtDialogCancel, QtDialogOk, QtDialogReset, QtUserRole
+from novelwriter.types import QtAccepted, QtDialogCancel, QtDialogOk, QtDialogReset, QtUserRole
 
 logger = logging.getLogger(__name__)
 
 
-class GuiDocMerge(QDialog):
+class GuiDocMerge(NDialog):
 
     D_HANDLE = QtUserRole
 
@@ -58,7 +58,7 @@ class GuiDocMerge(QDialog):
         self.headLabel.setFont(SHARED.theme.guiFontB)
         self.helpLabel = NColourLabel(
             self.tr("Drag and drop items to change the order, or uncheck to exclude."),
-            SHARED.theme.helpText, parent=self, wrap=True
+            self, color=SHARED.theme.helpText, wrap=True
         )
 
         iPx = SHARED.theme.baseIconHeight
@@ -117,7 +117,7 @@ class GuiDocMerge(QDialog):
         logger.debug("Delete: GuiDocMerge")
         return
 
-    def getData(self) -> dict:
+    def data(self) -> dict:
         """Return the user's choices."""
         finalItems = []
         for i in range(self.listBox.count()):
@@ -130,15 +130,15 @@ class GuiDocMerge(QDialog):
 
         return self._data
 
-    ##
-    #  Events
-    ##
-
-    def closeEvent(self, event: QCloseEvent) -> None:
-        """Capture the close event and perform cleanup."""
-        event.accept()
-        self.deleteLater()
-        return
+    @classmethod
+    def getData(cls, parent: QWidget, handle: str, items: list[str]) -> tuple[dict, bool]:
+        """Pop the dialog and return the result."""
+        cls = GuiDocMerge(parent, handle, items)
+        cls.exec()
+        data = cls.data()
+        accepted = cls.result() == QtAccepted
+        cls.softDelete()
+        return data, accepted
 
     ##
     #  Private Slots

novelwriter/dialogs/docsplit.py

@@ -27,21 +27,21 @@ from __future__ import annotations
 import logging
 
 from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QCloseEvent
 from PyQt5.QtWidgets import (
-    QAbstractItemView, QComboBox, QDialog, QDialogButtonBox, QGridLayout,
-    QLabel, QListWidget, QListWidgetItem, QVBoxLayout, QWidget
+    QAbstractItemView, QComboBox, QDialogButtonBox, QGridLayout, QLabel,
+    QListWidget, QListWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.extensions.configlayout import NColourLabel
+from novelwriter.extensions.modified import NDialog
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.types import QtDialogCancel, QtDialogOk, QtUserRole
+from novelwriter.types import QtAccepted, QtDialogCancel, QtDialogOk, QtUserRole
 
 logger = logging.getLogger(__name__)
 
 
-class GuiDocSplit(QDialog):
+class GuiDocSplit(NDialog):
 
     LINE_ROLE  = QtUserRole
     LEVEL_ROLE = QtUserRole + 1
@@ -62,7 +62,7 @@ class GuiDocSplit(QDialog):
         self.headLabel.setFont(SHARED.theme.guiFontB)
         self.helpLabel = NColourLabel(
             self.tr("Select the maximum level to split into files."),
-            SHARED.theme.helpText, parent=self, wrap=True
+            self, color=SHARED.theme.helpText, wrap=True
         )
 
         # Values
@@ -145,7 +145,7 @@ class GuiDocSplit(QDialog):
         logger.debug("Delete: GuiDocSplit")
         return
 
-    def getData(self) -> tuple[dict, list]:
+    def data(self) -> tuple[dict, list[str]]:
         """Return the user's choices. Also save the users options for
         the next time the dialog is used.
         """
@@ -178,15 +178,15 @@ class GuiDocSplit(QDialog):
 
         return self._data, self._text
 
-    ##
-    #  Events
-    ##
-
-    def closeEvent(self, event: QCloseEvent) -> None:
-        """Capture the close event and perform cleanup."""
-        event.accept()
-        self.deleteLater()
-        return
+    @classmethod
+    def getData(cls, parent: QWidget, handle: str) -> tuple[dict, list[str], bool]:
+        """Pop the dialog and return the result."""
+        cls = GuiDocSplit(parent, handle)
+        cls.exec()
+        data, text = cls.data()
+        accepted = cls.result() == QtAccepted
+        cls.softDelete()
+        return data, text, accepted
 
     ##
     #  Private Slots

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,6 +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

novelwriter/dialogs/preferences.py

@@ -29,16 +29,18 @@ import logging
 from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import QCloseEvent, QKeyEvent, QKeySequence
 from PyQt5.QtWidgets import (
-    QAbstractButton, QApplication, QCompleter, QDialog, QDialogButtonBox,
-    QFileDialog, QHBoxLayout, QLineEdit, QPushButton, QVBoxLayout, QWidget
+    QAbstractButton, QCompleter, QDialogButtonBox, QFileDialog, QHBoxLayout,
+    QLineEdit, QPushButton, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import describeFont
-from novelwriter.constants import nwConst, nwUnicode
+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 (
@@ -49,7 +51,7 @@ from novelwriter.types import (
 logger = logging.getLogger(__name__)
 
 
-class GuiPreferences(QDialog):
+class GuiPreferences(NDialog):
 
     newPreferencesReady = pyqtSignal(bool, bool, bool, bool)
 
@@ -64,8 +66,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
@@ -546,7 +548,7 @@ class GuiPreferences(QDialog):
         self.allowOpenDial = NSwitch(self)
         self.allowOpenDial.setChecked(CONFIG.allowOpenDial)
         self.mainForm.addRow(
-            self.tr("Allow open-ended sialogue"), self.allowOpenDial,
+            self.tr("Allow open-ended dialogue"), self.allowOpenDial,
             self.tr("Highlight dialogue line with no closing quote.")
         )
 
@@ -583,8 +585,8 @@ class GuiPreferences(QDialog):
         self.altDialogClose.setText(CONFIG.altDialogClose)
 
         self.mainForm.addRow(
-            self.tr("Alternative dialog symbols"), [self.altDialogOpen, self.altDialogClose],
-            self.tr("Custom highlighting of dialog text.")
+            self.tr("Alternative dialogue symbols"), [self.altDialogOpen, self.altDialogClose],
+            self.tr("Custom highlighting of dialogue text.")
         )
 
         self.highlightEmph = NSwitch(self)
@@ -693,64 +695,62 @@ class GuiPreferences(QDialog):
         self.sidebar.addButton(title, section)
         self.mainForm.addGroupLabel(title, section)
 
-        self.quoteSym = {}
-
         # Single Quote Style
-        self.quoteSym["SO"] = QLineEdit(self)
-        self.quoteSym["SO"].setMaxLength(1)
-        self.quoteSym["SO"].setReadOnly(True)
-        self.quoteSym["SO"].setFixedWidth(boxFixed)
-        self.quoteSym["SO"].setAlignment(QtAlignCenter)
-        self.quoteSym["SO"].setText(CONFIG.fmtSQuoteOpen)
-        self.btnSingleStyleO = NIconToolButton(self, iSz, "quote")
-        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(boxFixed)
-        self.quoteSym["SC"].setAlignment(QtAlignCenter)
-        self.quoteSym["SC"].setText(CONFIG.fmtSQuoteClose)
-        self.btnSingleStyleC = NIconToolButton(self, iSz, "quote")
-        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(boxFixed)
-        self.quoteSym["DO"].setAlignment(QtAlignCenter)
-        self.quoteSym["DO"].setText(CONFIG.fmtDQuoteOpen)
-        self.btnDoubleStyleO = NIconToolButton(self, iSz, "quote")
-        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(boxFixed)
-        self.quoteSym["DC"].setAlignment(QtAlignCenter)
-        self.quoteSym["DC"].setText(CONFIG.fmtDQuoteClose)
-        self.btnDoubleStyleC = NIconToolButton(self, iSz, "quote")
-        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()
@@ -767,13 +767,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()
@@ -855,11 +856,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.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.quoteSym[qType].setText(quote)
+            self.fmtDQuoteClose.setText(quote)
         return
 
     ##
@@ -879,8 +905,8 @@ class GuiPreferences(QDialog):
         refreshTree  = False
 
         # Appearance
-        guiLocale   = self.guiLocale.currentData()
-        guiTheme    = self.guiTheme.currentData()
+        guiLocale = self.guiLocale.currentData()
+        guiTheme  = self.guiTheme.currentData()
 
         updateTheme  |= CONFIG.guiTheme != guiTheme
         needsRestart |= CONFIG.guiLocale != guiLocale
@@ -977,10 +1003,10 @@ 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()

novelwriter/dialogs/projectsettings.py

@@ -29,7 +29,7 @@ import logging
 from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import QCloseEvent, QColor
 from PyQt5.QtWidgets import (
-    QAbstractItemView, QApplication, QColorDialog, QDialog, QDialogButtonBox,
+    QAbstractItemView, QApplication, QColorDialog, QDialogButtonBox,
     QHBoxLayout, QLineEdit, QMenu, QStackedWidget, QToolButton, QTreeWidget,
     QTreeWidgetItem, QVBoxLayout, QWidget
 )
@@ -40,7 +40,7 @@ from novelwriter.constants import nwLabels, trConst
 from novelwriter.core.status import NWStatus, StatusEntry
 from novelwriter.enum import nwStatusShape
 from novelwriter.extensions.configlayout import NColourLabel, NFixedPage, NScrollableForm
-from novelwriter.extensions.modified import NComboBox, NIconToolButton
+from novelwriter.extensions.modified import NComboBox, NDialog, NIconToolButton
 from novelwriter.extensions.pagedsidebar import NPagedSideBar
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.types import (
@@ -51,7 +51,7 @@ from novelwriter.types import (
 logger = logging.getLogger(__name__)
 
 
-class GuiProjectSettings(QDialog):
+class GuiProjectSettings(NDialog):
 
     PAGE_SETTINGS = 0
     PAGE_STATUS   = 1
@@ -76,8 +76,8 @@ class GuiProjectSettings(QDialog):
 
         # Title
         self.titleLabel = NColourLabel(
-            self.tr("Project Settings"), SHARED.theme.helpText,
-            parent=self, scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
+            self.tr("Project Settings"), self, color=SHARED.theme.helpText,
+            scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
         )
 
         # SideBar
@@ -92,7 +92,7 @@ class GuiProjectSettings(QDialog):
         # Buttons
         self.buttonBox = QDialogButtonBox(QtDialogSave | QtDialogCancel, self)
         self.buttonBox.accepted.connect(self._doSave)
-        self.buttonBox.rejected.connect(self.close)
+        self.buttonBox.rejected.connect(self.reject)
 
         # Content
         SHARED.project.countStatus()
@@ -147,7 +147,7 @@ class GuiProjectSettings(QDialog):
         """Capture the user closing the window and save settings."""
         self._saveSettings()
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -345,7 +345,7 @@ class _StatusPage(NFixedPage):
 
         # Title
         self.pageTitle = NColourLabel(
-            pageLabel, SHARED.theme.helpText, parent=self,
+            pageLabel, self, color=SHARED.theme.helpText,
             scale=NColourLabel.HEADER_SCALE
         )
 
@@ -637,8 +637,8 @@ class _ReplacePage(NFixedPage):
 
         # Title
         self.pageTitle = NColourLabel(
-            self.tr("Text Auto-Replace for Preview and Build"),
-            SHARED.theme.helpText, parent=self, scale=NColourLabel.HEADER_SCALE
+            self.tr("Text Auto-Replace for Preview and Build"), self,
+            color=SHARED.theme.helpText, scale=NColourLabel.HEADER_SCALE
         )
 
         # List Box