Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up button types

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-10-25 23:52:56 +02:00
parent c9c2b35455
commit ce939a4053
14 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/tools/dictionaries.py
+2 -2
View File
@@ -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
from novelwriter.types import QtHexArgb, QtRoleReject
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, QDialogButtonBox.ButtonRole.AcceptRole)
self.btnBox.addButton(self.btnClose, QtRoleReject)
# Assemble
self.outerBox = QVBoxLayout()
novelwriter/tools/lipsum.py
+3 -3
View File
@@ -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
from novelwriter.types import QtAlignLeft, QtAlignRight, QtRoleApply, QtRoleReject
logger = logging.getLogger(__name__)
@@ -101,8 +101,8 @@ class GuiLipsum(NDialog):
self.btnClose.setAutoDefault(False)
self.btnBox = QDialogButtonBox(self)
self.btnBox.addButton(self.btnInsert, QDialogButtonBox.ButtonRole.ApplyRole)
self.btnBox.addButton(self.btnClose, QDialogButtonBox.ButtonRole.RejectRole)
self.btnBox.addButton(self.btnInsert, QtRoleApply)
self.btnBox.addButton(self.btnClose, QtRoleReject)
# Assemble
self.outerBox = QVBoxLayout()
novelwriter/tools/manussettings.py
+4 -4
View File
@@ -127,12 +127,12 @@ class GuiBuildSettings(NToolDialog):
# Buttons
self.btnApply = SHARED.theme.getStandardButton(nwStandardButton.APPLY, self)
self.btnSave = SHARED.theme.getStandardButton(nwStandardButton.SAVE, self)
self.btnCancel = SHARED.theme.getStandardButton(nwStandardButton.CANCEL, self)
self.btnClose = SHARED.theme.getStandardButton(nwStandardButton.CLOSE, self)
self.btnBox = QDialogButtonBox(self)
self.btnBox.addButton(self.btnApply, QDialogButtonBox.ButtonRole.ApplyRole)
self.btnBox.addButton(self.btnSave, QDialogButtonBox.ButtonRole.AcceptRole)
self.btnBox.addButton(self.btnCancel, QDialogButtonBox.ButtonRole.RejectRole)
self.btnBox.addButton(self.btnApply, QtRoleApply)
self.btnBox.addButton(self.btnSave, QtRoleAccept)
self.btnBox.addButton(self.btnClose, QtRoleReject)
self.btnBox.clicked.connect(self._dialogButtonClicked)
# Assemble
novelwriter/tools/noveldetails.py
+2 -2
View File
@@ -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
from novelwriter.types import QtAlignRight, QtDecoration, QtRoleReject
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, QDialogButtonBox.ButtonRole.RejectRole)
self.btnBox.addButton(self.btnClose, QtRoleReject)
# Assemble
self.topBox = QHBoxLayout()
novelwriter/tools/writingstats.py
+6 -3
View File
@@ -43,7 +43,10 @@ from novelwriter.enum import nwStandardButton
from novelwriter.error import formatException
from novelwriter.extensions.modified import NPushButton, NToolDialog
from novelwriter.extensions.switch import NSwitch
from novelwriter.types import QtAlignLeftMiddle, QtAlignRight, QtAlignRightMiddle, QtDecoration
from novelwriter.types import (
QtAlignLeftMiddle, QtAlignRight, QtAlignRightMiddle, QtDecoration,
QtRoleAction, QtRoleReject
)
if TYPE_CHECKING:
from novelwriter.guimain import GuiMain
@@ -294,8 +297,8 @@ class GuiWritingStats(NToolDialog):
self.btnSave.setMenu(self.saveMenu)
self.btnBox = QDialogButtonBox(self)
self.btnBox.addButton(self.btnClose, QDialogButtonBox.ButtonRole.RejectRole)
self.btnBox.addButton(self.btnSave, QDialogButtonBox.ButtonRole.ActionRole)
self.btnBox.addButton(self.btnSave, QtRoleAction)
self.btnBox.addButton(self.btnClose, QtRoleReject)
# Assemble
self.outerBox = QGridLayout()