Use the reject slot for dialogs since close is not actually a slot

This commit is contained in:
Veronica Berglyd Olsen
2024-06-10 01:04:10 +02:00
parent 29b61c07b0
commit 811db81a86
6 changed files with 8 additions and 19 deletions
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -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()
+1 -7
View File
@@ -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
##
+3 -8
View File
@@ -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)
+1 -1
View File
@@ -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()