From 811db81a86b47988b20233fb83589c5ef32b0189 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Mon, 10 Jun 2024 01:04:10 +0200
Subject: [PATCH] Use the reject slot for dialogs since close is not actually a
 slot

---
 novelwriter/dialogs/about.py           |  2 +-
 novelwriter/dialogs/projectsettings.py |  2 +-
 novelwriter/dialogs/wordlist.py        |  2 +-
 novelwriter/tools/dictionaries.py      |  8 +-------
 novelwriter/tools/lipsum.py            | 11 +++--------
 novelwriter/tools/noveldetails.py      |  2 +-
 6 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/novelwriter/dialogs/about.py b/novelwriter/dialogs/about.py
index 226d0054..628c4e4e 100644
--- a/novelwriter/dialogs/about.py
+++ b/novelwriter/dialogs/about.py
@@ -85,7 +85,7 @@ class GuiAbout(NDialog):
 
         # Buttons
         self.btnBox = QDialogButtonBox(QtDialogClose, self)
-        self.btnBox.rejected.connect(self.close)
+        self.btnBox.rejected.connect(self.reject)
 
         # Assemble
         self.innerBox = QVBoxLayout()
diff --git a/novelwriter/dialogs/projectsettings.py b/novelwriter/dialogs/projectsettings.py
index 010f50e1..c8d72d88 100644
--- a/novelwriter/dialogs/projectsettings.py
+++ b/novelwriter/dialogs/projectsettings.py
@@ -92,7 +92,7 @@ class GuiProjectSettings(NDialog):
         # 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()
diff --git a/novelwriter/dialogs/wordlist.py b/novelwriter/dialogs/wordlist.py
index 51ce49b6..8f3f53f5 100644
--- a/novelwriter/dialogs/wordlist.py
+++ b/novelwriter/dialogs/wordlist.py
@@ -109,7 +109,7 @@ class GuiWordList(NDialog):
         # Buttons
         self.buttonBox = QDialogButtonBox(QtDialogSave | QtDialogClose, self)
         self.buttonBox.accepted.connect(self._doSave)
-        self.buttonBox.rejected.connect(self.close)
+        self.buttonBox.rejected.connect(self.reject)
 
         # Assemble
         self.outerBox = QVBoxLayout()
diff --git a/novelwriter/tools/dictionaries.py b/novelwriter/tools/dictionaries.py
index f56e5761..b495ea31 100644
--- a/novelwriter/tools/dictionaries.py
+++ b/novelwriter/tools/dictionaries.py
@@ -109,7 +109,7 @@ class GuiDictionaries(NNonBlockingDialog):
 
         # Buttons
         self.buttonBox = QDialogButtonBox(QtDialogClose, self)
-        self.buttonBox.rejected.connect(self._doClose)
+        self.buttonBox.rejected.connect(self.reject)
 
         # Assemble
         self.innerBox = QVBoxLayout()
@@ -220,12 +220,6 @@ class GuiDictionaries(NNonBlockingDialog):
             SHARED.error("Path not found.")
         return
 
-    @pyqtSlot()
-    def _doClose(self) -> None:
-        """Close the dialog."""
-        self.close()
-        return
-
     ##
     #  Internal Functions
     ##
diff --git a/novelwriter/tools/lipsum.py b/novelwriter/tools/lipsum.py
index 9296d5b8..9d05c51c 100644
--- a/novelwriter/tools/lipsum.py
+++ b/novelwriter/tools/lipsum.py
@@ -26,7 +26,7 @@ from __future__ import annotations
 import logging
 import random
 
-from PyQt5.QtCore import Qt, pyqtSlot
+from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtWidgets import (
     QDialogButtonBox, QGridLayout, QHBoxLayout, QLabel, QSpinBox, QVBoxLayout,
     QWidget
@@ -48,13 +48,10 @@ class GuiLipsum(NDialog):
 
         logger.debug("Create: GuiLipsum")
         self.setObjectName("GuiLipsum")
-        if CONFIG.osDarwin:
-            self.setWindowFlag(Qt.WindowType.Tool)
+        self.setWindowTitle(self.tr("Insert Placeholder Text"))
 
         self._lipsumText = ""
 
-        self.setWindowTitle(self.tr("Insert Placeholder Text"))
-
         vSp = CONFIG.pxInt(4)
         nPx = CONFIG.pxInt(64)
 
@@ -96,7 +93,7 @@ class GuiLipsum(NDialog):
 
         # Buttons
         self.buttonBox = QDialogButtonBox(self)
-        self.buttonBox.rejected.connect(self.close)
+        self.buttonBox.rejected.connect(self.reject)
 
         self.btnClose = self.buttonBox.addButton(QtDialogClose)
         self.btnClose.setAutoDefault(False)
@@ -105,8 +102,6 @@ class GuiLipsum(NDialog):
         self.btnInsert.clicked.connect(self._doInsert)
         self.btnInsert.setAutoDefault(False)
 
-        self.rejected.connect(self.close)
-
         # Assemble
         self.outerBox = QVBoxLayout()
         self.outerBox.addLayout(self.innerBox)
diff --git a/novelwriter/tools/noveldetails.py b/novelwriter/tools/noveldetails.py
index 9362c640..cd7f5f38 100644
--- a/novelwriter/tools/noveldetails.py
+++ b/novelwriter/tools/noveldetails.py
@@ -97,7 +97,7 @@ class GuiNovelDetails(NNonBlockingDialog):
 
         # Buttons
         self.buttonBox = QDialogButtonBox(QtDialogClose, self)
-        self.buttonBox.rejected.connect(self.close)
+        self.buttonBox.rejected.connect(self.reject)
 
         # Assemble
         self.topBox = QHBoxLayout()