Fix role for close buttons

novelwriter/dialogs/about.py

@@ -37,7 +37,7 @@ from novelwriter.enum import nwStandardButton
 from novelwriter.extensions.configlayout import NColorLabel
 from novelwriter.extensions.modified import NDialog
 from novelwriter.extensions.versioninfo import VersionInfoWidget
-from novelwriter.types import QtAlignRightTop, QtHexArgb, QtRoleReject
+from novelwriter.types import QtAlignRightTop, QtHexArgb, QtRoleDestruct
 
 if TYPE_CHECKING:
     from PyQt6.QtGui import QCloseEvent
@@ -87,7 +87,7 @@ class GuiAbout(NDialog):
         self.btnClose.clicked.connect(self.reject)
 
         self.btnBox = QDialogButtonBox(self)
-        self.btnBox.addButton(self.btnClose, QtRoleReject)
+        self.btnBox.addButton(self.btnClose, QtRoleDestruct)
 
         # Assemble
         self.innerBox = QVBoxLayout()

novelwriter/dialogs/wordlist.py

@@ -40,7 +40,7 @@ from novelwriter.core.spellcheck import UserDictionary
 from novelwriter.enum import nwStandardButton
 from novelwriter.extensions.configlayout import NColorLabel
 from novelwriter.extensions.modified import NDialog, NIconToolButton
-from novelwriter.types import QtRoleAccept, QtRoleReject
+from novelwriter.types import QtRoleAccept, QtRoleDestruct
 
 if TYPE_CHECKING:
     from PyQt6.QtGui import QCloseEvent
@@ -119,7 +119,7 @@ class GuiWordList(NDialog):
 
         self.btnBox = QDialogButtonBox(self)
         self.btnBox.addButton(self.btnSave, QtRoleAccept)
-        self.btnBox.addButton(self.btnClose, QtRoleReject)
+        self.btnBox.addButton(self.btnClose, QtRoleDestruct)
 
         # Assemble
         self.outerBox = QVBoxLayout()

novelwriter/tools/dictionaries.py

@@ -40,7 +40,7 @@ from novelwriter.common import formatFileFilter, formatInt, getFileSize, openExt
 from novelwriter.enum import nwStandardButton
 from novelwriter.error import formatException
 from novelwriter.extensions.modified import NIconToolButton, NNonBlockingDialog
-from novelwriter.types import QtHexArgb, QtRoleReject
+from novelwriter.types import QtHexArgb, QtRoleDestruct
 
 logger = logging.getLogger(__name__)
 
@@ -115,7 +115,7 @@ class GuiDictionaries(NNonBlockingDialog):
         self.btnClose.clicked.connect(self.reject)
 
         self.btnBox = QDialogButtonBox(self)
-        self.btnBox.addButton(self.btnClose, QtRoleReject)
+        self.btnBox.addButton(self.btnClose, QtRoleDestruct)
 
         # Assemble
         self.outerBox = QVBoxLayout()

novelwriter/tools/lipsum.py

@@ -37,7 +37,7 @@ from novelwriter.common import readTextFile
 from novelwriter.enum import nwStandardButton
 from novelwriter.extensions.modified import NDialog
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.types import QtAlignLeft, QtAlignRight, QtRoleApply, QtRoleReject
+from novelwriter.types import QtAlignLeft, QtAlignRight, QtRoleApply, QtRoleDestruct
 
 logger = logging.getLogger(__name__)
 
@@ -102,7 +102,7 @@ class GuiLipsum(NDialog):
 
         self.btnBox = QDialogButtonBox(self)
         self.btnBox.addButton(self.btnInsert, QtRoleApply)
-        self.btnBox.addButton(self.btnClose, QtRoleReject)
+        self.btnBox.addButton(self.btnClose, QtRoleDestruct)
 
         # Assemble
         self.outerBox = QVBoxLayout()

novelwriter/tools/manusbuild.py

@@ -43,7 +43,7 @@ from novelwriter.core.item import NWItem
 from novelwriter.enum import nwBuildFmt, nwStandardButton
 from novelwriter.extensions.modified import NDialog, NIconToolButton, NPushButton
 from novelwriter.extensions.progressbars import NProgressSimple
-from novelwriter.types import QtAlignCenter, QtRoleAction, QtRoleReject, QtUserRole
+from novelwriter.types import QtAlignCenter, QtRoleAction, QtRoleDestruct, QtRoleReject, QtUserRole
 
 if TYPE_CHECKING:
     from PyQt6.QtGui import QCloseEvent
@@ -190,7 +190,7 @@ class GuiManuscriptBuild(NDialog):
         self.btnBox = QDialogButtonBox(self)
         self.btnBox.addButton(self.btnOpen, QtRoleAction)
         self.btnBox.addButton(self.btnBuild, QtRoleAction)
-        self.btnBox.addButton(self.btnClose, QtRoleReject)
+        self.btnBox.addButton(self.btnClose, QtRoleDestruct)
 
         # Assemble GUI
         # ============

novelwriter/tools/manussettings.py

@@ -52,7 +52,7 @@ from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.switchbox import NSwitchBox
 from novelwriter.types import (
     QtAlignCenter, QtAlignLeft, QtHeaderFixed, QtHeaderStretch, QtRoleAccept,
-    QtRoleApply, QtRoleReject, QtUserRole
+    QtRoleApply, QtRoleDestruct, QtRoleReject, QtUserRole
 )
 
 if TYPE_CHECKING:
@@ -132,7 +132,7 @@ class GuiBuildSettings(NToolDialog):
         self.btnBox = QDialogButtonBox(self)
         self.btnBox.addButton(self.btnApply, QtRoleApply)
         self.btnBox.addButton(self.btnSave, QtRoleAccept)
-        self.btnBox.addButton(self.btnClose, QtRoleReject)
+        self.btnBox.addButton(self.btnClose, QtRoleDestruct)
         self.btnBox.clicked.connect(self._dialogButtonClicked)
 
         # Assemble

novelwriter/tools/noveldetails.py

@@ -44,7 +44,7 @@ from novelwriter.extensions.modified import NNonBlockingDialog
 from novelwriter.extensions.novelselector import NovelSelector
 from novelwriter.extensions.pagedsidebar import NPagedSideBar
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.types import QtAlignRight, QtDecoration, QtRoleReject
+from novelwriter.types import QtAlignRight, QtDecoration, QtRoleDestruct
 
 if TYPE_CHECKING:
     from PyQt6.QtGui import QCloseEvent
@@ -107,7 +107,7 @@ class GuiNovelDetails(NNonBlockingDialog):
         self.btnClose.clicked.connect(self.reject)
 
         self.btnBox = QDialogButtonBox(self)
-        self.btnBox.addButton(self.btnClose, QtRoleReject)
+        self.btnBox.addButton(self.btnClose, QtRoleDestruct)
 
         # Assemble
         self.topBox = QHBoxLayout()

novelwriter/tools/writingstats.py

@@ -45,7 +45,7 @@ from novelwriter.extensions.modified import NPushButton, NToolDialog
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.types import (
     QtAlignLeftMiddle, QtAlignRight, QtAlignRightMiddle, QtDecoration,
-    QtRoleAction, QtRoleReject
+    QtRoleAction, QtRoleDestruct
 )
 
 if TYPE_CHECKING:
@@ -298,7 +298,7 @@ class GuiWritingStats(NToolDialog):
 
         self.btnBox = QDialogButtonBox(self)
         self.btnBox.addButton(self.btnSave, QtRoleAction)
-        self.btnBox.addButton(self.btnClose, QtRoleReject)
+        self.btnBox.addButton(self.btnClose, QtRoleDestruct)
 
         # Assemble
         self.outerBox = QGridLayout()

novelwriter/types.py

@@ -96,6 +96,7 @@ QtRejected = QDialog.DialogCode.Rejected
 QtRoleAccept = QDialogButtonBox.ButtonRole.AcceptRole
 QtRoleAction = QDialogButtonBox.ButtonRole.ActionRole
 QtRoleApply = QDialogButtonBox.ButtonRole.ApplyRole
+QtRoleDestruct = QDialogButtonBox.ButtonRole.DestructiveRole
 QtRoleReject = QDialogButtonBox.ButtonRole.RejectRole
 QtRoleReset = QDialogButtonBox.ButtonRole.ResetRole