Update dialog handling of all dialogs

novelwriter/dialogs/preferences.py

@@ -25,11 +25,11 @@ from __future__ import annotations
 
 import logging
 
-from PyQt5.QtGui import QFont
-from PyQt5.QtCore import Qt, pyqtSlot
+from PyQt5.QtGui import QCloseEvent, QFont
+from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
     QDialog, QWidget, QComboBox, QSpinBox, QPushButton, QDialogButtonBox,
-    QLineEdit, QFileDialog, QFontDialog, QDoubleSpinBox
+    QLineEdit, QFileDialog, QFontDialog, QDoubleSpinBox, qApp
 )
 
 from novelwriter import CONFIG, SHARED
@@ -43,6 +43,8 @@ logger = logging.getLogger(__name__)
 
 class GuiPreferences(NPagedDialog):
 
+    newPreferencesReady = pyqtSignal(bool, bool, bool, bool)
+
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
 
@@ -68,7 +70,8 @@ class GuiPreferences(NPagedDialog):
 
         self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, self)
         self.buttonBox.accepted.connect(self._doSave)
-        self.buttonBox.rejected.connect(self._doClose)
+        self.buttonBox.rejected.connect(self.close)
+        self.rejected.connect(self.close)
         self.addControls(self.buttonBox)
 
         self.resize(*CONFIG.preferencesWinSize)
@@ -88,24 +91,16 @@ class GuiPreferences(NPagedDialog):
         return
 
     ##
-    #  Properties
+    #  Events
     ##
 
-    @property
-    def updateTheme(self) -> bool:
-        return self._updateTheme
-
-    @property
-    def updateSyntax(self) -> bool:
-        return self._updateSyntax
-
-    @property
-    def needsRestart(self) -> bool:
-        return self._needsRestart
-
-    @property
-    def refreshTree(self) -> bool:
-        return self._refreshTree
+    def closeEvent(self, event: QCloseEvent) -> None:
+        """Capture the close event and perform cleanup."""
+        logger.debug("Close: GuiPreferences")
+        self._saveWindowSize()
+        event.accept()
+        self.deleteLater()
+        return
 
     ##
     #  Private Slots
@@ -113,11 +108,7 @@ class GuiPreferences(NPagedDialog):
 
     @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")
-
+        """Trigger save functions in the tabs and emit ready signal."""
         self.tabGeneral.saveValues()
         self.tabProjects.saveValues()
         self.tabDocs.saveValues()
@@ -126,19 +117,15 @@ class GuiPreferences(NPagedDialog):
         self.tabAuto.saveValues()
         self.tabQuote.saveValues()
 
-        self._saveWindowSize()
         CONFIG.saveConfig()
-        self.accept()
+        self.newPreferencesReady.emit(
+            self._needsRestart, self._refreshTree, self._updateTheme, self._updateSyntax
+        )
+        qApp.processEvents()
+        self.close()
 
         return
 
-    @pyqtSlot()
-    def _doClose(self) -> None:
-        """Close the preferences without saving the changes."""
-        self._saveWindowSize()
-        self.reject()
-        return
-
     ##
     #  Internal Functions
     ##

novelwriter/dialogs/projdetails.py

@@ -71,8 +71,8 @@ class GuiProjectDetails(NPagedDialog):
         self.addTab(self.tabContents, self.tr("Contents"))
 
         self.buttonBox = QDialogButtonBox(QDialogButtonBox.Close)
-        self.buttonBox.button(QDialogButtonBox.Close)
-        self.buttonBox.rejected.connect(self._doClose)
+        self.buttonBox.rejected.connect(self.close)
+        self.rejected.connect(self.close)
         self.addControls(self.buttonBox)
 
         logger.debug("Ready: GuiProjectDetails")
@@ -95,21 +95,11 @@ class GuiProjectDetails(NPagedDialog):
 
     def closeEvent(self, event: QCloseEvent) -> None:
         """Capture the close event and perform cleanup."""
+        self._saveGuiSettings()
         event.accept()
         self.deleteLater()
         return
 
-    ##
-    #  Private Slots
-    ##
-
-    @pyqtSlot()
-    def _doClose(self) -> None:
-        """Save settings and close the dialog."""
-        self._saveGuiSettings()
-        self.close()
-        return
-
     ##
     #  Internal Functions
     ##

novelwriter/dialogs/projsettings.py

@@ -27,11 +27,11 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtGui import QIcon, QPixmap, QColor
-from PyQt5.QtCore import Qt, pyqtSlot
+from PyQt5.QtGui import QCloseEvent, QIcon, QPixmap, QColor
+from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
     QColorDialog, QComboBox, QDialogButtonBox, QHBoxLayout, QLabel, QLineEdit,
-    QPushButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
+    QPushButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget, qApp
 )
 
 from novelwriter import CONFIG, SHARED
@@ -53,6 +53,8 @@ class GuiProjectSettings(NPagedDialog):
     TAB_IMPORT  = 2
     TAB_REPLACE = 3
 
+    newProjectSettingsReady = pyqtSignal()
+
     def __init__(self, mainGui: GuiMain, focusTab: int = TAB_MAIN) -> None:
         super().__init__(parent=mainGui)
 
@@ -86,7 +88,8 @@ class GuiProjectSettings(NPagedDialog):
 
         self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         self.buttonBox.accepted.connect(self._doSave)
-        self.buttonBox.rejected.connect(self._doClose)
+        self.buttonBox.rejected.connect(self.close)
+        self.rejected.connect(self.close)
         self.addControls(self.buttonBox)
 
         # Focus Tab
@@ -100,6 +103,13 @@ class GuiProjectSettings(NPagedDialog):
         logger.debug("Delete: GuiProjectSettings")
         return
 
+    def closeEvent(self, event: QCloseEvent) -> None:
+        """Capture the close event and perform cleanup."""
+        self._saveGuiSettings()
+        event.accept()
+        self.deleteLater()
+        return
+
     ##
     #  Private Slots
     ##
@@ -137,18 +147,12 @@ class GuiProjectSettings(NPagedDialog):
             newList = self.tabReplace.getNewList()
             project.data.setAutoReplace(newList)
 
-        self._saveGuiSettings()
-        self.accept()
+        self.newProjectSettingsReady.emit()
+        qApp.processEvents()
+        self.close()
 
         return
 
-    @pyqtSlot()
-    def _doClose(self) -> None:
-        """Save settings and close the dialog."""
-        self._saveGuiSettings()
-        self.reject()
-        return
-
     ##
     #  Internal Functions
     ##

novelwriter/dialogs/wordlist.py

@@ -27,11 +27,11 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import Qt, pyqtSlot
 from PyQt5.QtGui import QCloseEvent
+from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QDialog, QDialogButtonBox, QHBoxLayout, QLabel,
-    QLineEdit, QListWidget, QListWidgetItem, QPushButton, QVBoxLayout
+    QLineEdit, QListWidget, QListWidgetItem, QPushButton, QVBoxLayout, qApp
 )
 
 from novelwriter import CONFIG, SHARED
@@ -45,6 +45,8 @@ logger = logging.getLogger(__name__)
 
 class GuiWordList(QDialog):
 
+    newWordListReady = pyqtSignal()
+
     def __init__(self, mainGui: GuiMain) -> None:
         super().__init__(parent=mainGui)
 
@@ -166,6 +168,8 @@ class GuiWordList(QDialog):
                 if word:
                     userDict.add(word)
         userDict.save()
+        self.newWordListReady.emit()
+        qApp.processEvents()
         self.close()
         return