novelWriter 2.7.4__py3-none-any.whl → 2.8b1__py3-none-any.whl

novelwriter/tools/noveldetails.py

@@ -20,7 +20,7 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
-"""
+"""  # noqa
 from __future__ import annotations
 
 import logging
@@ -38,12 +38,13 @@ from PyQt6.QtWidgets import (
 from novelwriter import SHARED
 from novelwriter.common import formatTime, numberToRoman
 from novelwriter.constants import nwUnicode
+from novelwriter.enum import nwStandardButton
 from novelwriter.extensions.configlayout import NColorLabel, NFixedPage, NScrollablePage
 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, QtDialogClose
+from novelwriter.types import QtAlignRight, QtDecoration, QtRoleDestruct
 
 if TYPE_CHECKING:
     from PyQt6.QtGui import QCloseEvent
@@ -52,6 +53,7 @@ logger = logging.getLogger(__name__)
 
 
 class GuiNovelDetails(NNonBlockingDialog):
+    """GUI: Novel Details Tool."""
 
     PAGE_OVERVIEW = 1
     PAGE_CONTENTS = 2
@@ -101,8 +103,11 @@ class GuiNovelDetails(NNonBlockingDialog):
         self.mainStack.addWidget(self.contentsPage)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QtDialogClose, self)
-        self.buttonBox.rejected.connect(self.reject)
+        self.btnClose = SHARED.theme.getStandardButton(nwStandardButton.CLOSE, self)
+        self.btnClose.clicked.connect(self.reject)
+
+        self.btnBox = QDialogButtonBox(self)
+        self.btnBox.addButton(self.btnClose, QtRoleDestruct)
 
         # Assemble
         self.topBox = QHBoxLayout()
@@ -118,7 +123,7 @@ class GuiNovelDetails(NNonBlockingDialog):
         self.outerBox = QVBoxLayout()
         self.outerBox.addLayout(self.topBox)
         self.outerBox.addLayout(self.mainBox)
-        self.outerBox.addWidget(self.buttonBox)
+        self.outerBox.addWidget(self.btnBox)
         self.outerBox.setSpacing(8)
 
         self.setLayout(self.outerBox)
@@ -130,11 +135,8 @@ class GuiNovelDetails(NNonBlockingDialog):
 
         logger.debug("Ready: GuiNovelDetails")
 
-        return
-
     def __del__(self) -> None:  # pragma: no cover
         logger.debug("Delete: GuiNovelDetails")
-        return
 
     ##
     #  Methods
@@ -146,7 +148,6 @@ class GuiNovelDetails(NNonBlockingDialog):
             self.overviewPage.updateProjectData()
             self.overviewPage.novelValueChanged(handle)
             self.contentsPage.novelValueChanged(handle)
-        return
 
     ##
     #  Events
@@ -157,7 +158,6 @@ class GuiNovelDetails(NNonBlockingDialog):
         self._saveSettings()
         event.accept()
         self.softDelete()
-        return
 
     ##
     #  Private Slots
@@ -170,7 +170,6 @@ class GuiNovelDetails(NNonBlockingDialog):
             self.mainStack.setCurrentWidget(self.overviewPage)
         elif pageId == self.PAGE_CONTENTS:
             self.mainStack.setCurrentWidget(self.contentsPage)
-        return
 
     ##
     #  Internal Functions
@@ -185,7 +184,6 @@ class GuiNovelDetails(NNonBlockingDialog):
         options.setValue("GuiNovelDetails", "winHeight", self.height())
         options.setValue("GuiNovelDetails", "novelRoot", novelRoot)
         self.contentsPage.saveSettings()
-        return
 
 
 class _OverviewPage(NScrollablePage):
@@ -248,8 +246,6 @@ class _OverviewPage(NScrollablePage):
 
         self.setCentralLayout(self.outerBox)
 
-        return
-
     ##
     #  Methods
     ##
@@ -266,7 +262,6 @@ class _OverviewPage(NScrollablePage):
         self.projWords.setText(f"{wcNovel + wcNotes:n}")
         self.projNovels.setText(f"{wcNovel:n}")
         self.projNotes.setText(f"{wcNotes:n}")
-        return
 
     ##
     #  Public Slots
@@ -286,8 +281,6 @@ class _OverviewPage(NScrollablePage):
         self.novelChapters.setText(f"{hCounts[2]:n}")
         self.novelScenes.setText(f"{hCounts[3]:n}")
 
-        return
-
 
 class _ContentsPage(NFixedPage):
 
@@ -400,8 +393,6 @@ class _ContentsPage(NFixedPage):
 
         self.setCentralLayout(self.outerBox)
 
-        return
-
     def saveSettings(self) -> None:
         """Save the user GUI settings."""
         options = SHARED.project.options
@@ -413,7 +404,6 @@ class _ContentsPage(NFixedPage):
         options.setValue("GuiNovelDetails", "wordsPerPage", self.wpValue.value())
         options.setValue("GuiNovelDetails", "countFrom",    self.poValue.value())
         options.setValue("GuiNovelDetails", "clearDouble",  self.dblValue.isChecked())
-        return
 
     ##
     #  Public Slots
@@ -426,7 +416,6 @@ class _ContentsPage(NFixedPage):
             self._prepareData(tHandle)
             self._populateTree()
             self._currentRoot = tHandle
-        return
 
     ##
     #  Private Slots
@@ -496,8 +485,6 @@ class _ContentsPage(NFixedPage):
 
             self.tocTree.addTopLevelItem(newItem)
 
-        return
-
     ##
     #  Internal Functions
     ##
@@ -507,4 +494,3 @@ class _ContentsPage(NFixedPage):
         logger.debug("Populating ToC from handle '%s'", rootHandle)
         self._data = SHARED.project.index.getTableOfContents(rootHandle, 2)
         self._data.append(("", 0, self.tr("END"), 0))
-        return

novelwriter/tools/welcome.py

@@ -20,7 +20,7 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
-"""
+"""  # noqa
 from __future__ import annotations
 
 import logging
@@ -32,18 +32,18 @@ from PyQt6.QtCore import (
     QAbstractListModel, QModelIndex, QObject, QPoint, QSize, Qt, pyqtSignal,
     pyqtSlot
 )
-from PyQt6.QtGui import QAction, QCloseEvent, QColor, QFont, QPainter, QPaintEvent, QPen, QShortcut
+from PyQt6.QtGui import QAction, QCloseEvent, QFont, QPainter, QPaintEvent, QPen, QShortcut
 from PyQt6.QtWidgets import (
     QApplication, QFileDialog, QFormLayout, QHBoxLayout, QLabel, QLineEdit,
-    QListView, QMenu, QPushButton, QScrollArea, QStackedWidget,
-    QStyledItemDelegate, QStyleOptionViewItem, QVBoxLayout, QWidget
+    QListView, QMenu, QScrollArea, QStackedWidget, QStyledItemDelegate,
+    QStyleOptionViewItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatInt, makeFileNameSafe, qtAddAction, qtLambda
 from novelwriter.constants import nwFiles
 from novelwriter.core.coretools import ProjectBuilder
-from novelwriter.enum import nwItemClass
+from novelwriter.enum import nwItemClass, nwStandardButton
 from novelwriter.extensions.configlayout import NWrappedWidgetBox
 from novelwriter.extensions.modified import NDialog, NIconToolButton, NSpinBox
 from novelwriter.extensions.switch import NSwitch
@@ -56,6 +56,11 @@ PANEL_ALPHA = 178
 
 
 class GuiWelcome(NDialog):
+    """GUI: Welcome Dialog.
+
+    This is the main dialog shown when novelWriter launches or when the
+    user wants to create or open another project.
+    """
 
     openProjectRequest = pyqtSignal(Path)
 
@@ -70,14 +75,11 @@ class GuiWelcome(NDialog):
         self.setMinimumHeight(450)
         self.resize(*CONFIG.welcomeWinSize)
 
-        btnIconSize = SHARED.theme.buttonIconSize
-
         # Elements
         # ========
 
         self.bgImage = SHARED.theme.getDecoration("welcome")
         self.nwImage = SHARED.theme.getDecoration("nw-text", h=36)
-        self.bgColor = QColor(54, 54, 54) if SHARED.theme.isDarkTheme else QColor(255, 255, 255)
 
         self.nwLogo = QLabel(self)
         self.nwLogo.setPixmap(SHARED.theme.getPixmap("novelwriter", (128, 128)))
@@ -100,34 +102,22 @@ class GuiWelcome(NDialog):
         # Buttons
         # =======
 
-        self.btnList = QPushButton(self.tr("List"), self)
-        self.btnList.setIcon(SHARED.theme.getIcon("list", "blue"))
-        self.btnList.setIconSize(btnIconSize)
+        self.btnList = SHARED.theme.getStandardButton(nwStandardButton.LIST, self)
         self.btnList.clicked.connect(self._showOpenProjectPage)
 
-        self.btnNew = QPushButton(self.tr("New"), self)
-        self.btnNew.setIcon(SHARED.theme.getIcon("add", "green"))
-        self.btnNew.setIconSize(btnIconSize)
+        self.btnNew = SHARED.theme.getStandardButton(nwStandardButton.NEW, self)
         self.btnNew.clicked.connect(self._showNewProjectPage)
 
-        self.btnBrowse = QPushButton(self.tr("Browse"), self)
-        self.btnBrowse.setIcon(SHARED.theme.getIcon("browse", "yellow"))
-        self.btnBrowse.setIconSize(btnIconSize)
+        self.btnBrowse = SHARED.theme.getStandardButton(nwStandardButton.BROWSE, self)
         self.btnBrowse.clicked.connect(self._browseForProject)
 
-        self.btnCancel = QPushButton(self.tr("Cancel"), self)
-        self.btnCancel.setIcon(SHARED.theme.getIcon("cancel", "red"))
-        self.btnCancel.setIconSize(btnIconSize)
+        self.btnCancel = SHARED.theme.getStandardButton(nwStandardButton.CANCEL, self)
         self.btnCancel.clicked.connect(qtLambda(self.close))
 
-        self.btnCreate = QPushButton(self.tr("Create"), self)
-        self.btnCreate.setIcon(SHARED.theme.getIcon("star", "yellow"))
-        self.btnCreate.setIconSize(btnIconSize)
+        self.btnCreate = SHARED.theme.getStandardButton(nwStandardButton.CREATE, self)
         self.btnCreate.clicked.connect(self.tabNew.createNewProject)
 
-        self.btnOpen = QPushButton(self.tr("Open"), self)
-        self.btnOpen.setIcon(SHARED.theme.getIcon("open", "blue"))
-        self.btnOpen.setIconSize(btnIconSize)
+        self.btnOpen = SHARED.theme.getStandardButton(nwStandardButton.OPEN, self)
         self.btnOpen.clicked.connect(self._openSelectedItem)
 
         self.btnBox = QHBoxLayout()
@@ -162,11 +152,8 @@ class GuiWelcome(NDialog):
 
         logger.debug("Ready: GuiWelcome")
 
-        return
-
     def __del__(self) -> None:  # pragma: no cover
         logger.debug("Delete: GuiWelcome")
-        return
 
     ##
     #  Events
@@ -178,17 +165,15 @@ class GuiWelcome(NDialog):
         hPix = min(hWin, 600)
         tMode = Qt.TransformationMode.SmoothTransformation
         painter = QPainter(self)
-        painter.fillRect(self.rect(), self.bgColor)
         painter.drawPixmap(0, hWin - hPix, self.bgImage.scaledToHeight(hPix, tMode))
+        painter.end()
         super().paintEvent(event)
-        return
 
     def closeEvent(self, event: QCloseEvent) -> None:
         """Capture the user closing the window and save settings."""
         self._saveSettings()
         event.accept()
         self.softDelete()
-        return
 
     ##
     #  Private Slots
@@ -200,28 +185,24 @@ class GuiWelcome(NDialog):
         self.mainStack.setCurrentWidget(self.tabNew)
         self._setButtonVisibility()
         self.tabNew.enterForm()
-        return
 
     @pyqtSlot()
     def _showOpenProjectPage(self) -> None:
         """Show the open exiting project page."""
         self.mainStack.setCurrentWidget(self.tabOpen)
         self._setButtonVisibility()
-        return
 
     @pyqtSlot()
     def _browseForProject(self) -> None:
         """Browse for a project to open."""
         if path := SHARED.getProjectPath(self, path=CONFIG.homePath(), allowZip=False):
             self._openProjectPath(path)
-        return
 
     @pyqtSlot()
     def _openSelectedItem(self) -> None:
         """Open the currently selected project item."""
         if self.mainStack.currentWidget() == self.tabOpen:
             self.tabOpen.openSelectedItem()
-        return
 
     @pyqtSlot(Path)
     def _openProjectPath(self, path: Path) -> None:
@@ -232,7 +213,6 @@ class GuiWelcome(NDialog):
             self.hide()
             self.openProjectRequest.emit(path)
         self.close()
-        return
 
     ##
     #  Internal Functions
@@ -242,7 +222,6 @@ class GuiWelcome(NDialog):
         """Save the user GUI settings."""
         logger.debug("Saving State: GuiWelcome")
         CONFIG.setWelcomeWinSize(self.width(), self.height())
-        return
 
     def _setButtonVisibility(self) -> None:
         """Change the visibility of the dialog buttons."""
@@ -256,7 +235,6 @@ class GuiWelcome(NDialog):
             self.btnOpen.setFocus()
         else:
             self.btnCreate.setFocus()
-        return
 
 
 class _OpenProjectPage(QWidget):
@@ -280,7 +258,7 @@ class _OpenProjectPage(QWidget):
 
         # Info / Tool
         self.aMissing = QAction(self)
-        self.aMissing.setIcon(SHARED.theme.getIcon("alert_warn", "orange"))
+        self.aMissing.setIcon(SHARED.theme.getIcon("alert_warn", "warning"))
         self.aMissing.setToolTip(self.tr("The project path is not reachable."))
 
         self.selectedPath = QLineEdit(self)
@@ -309,8 +287,6 @@ class _OpenProjectPage(QWidget):
             f"QLineEdit {{border: none; background: {baseCol}; padding: 4px;}} "
         )
 
-        return
-
     ##
     #  Public Slots
     ##
@@ -320,7 +296,6 @@ class _OpenProjectPage(QWidget):
         """Open the currently selected project item."""
         if (selection := self.listWidget.selectedIndexes()) and (index := selection[0]).isValid():
             self.openProjectRequest.emit(Path(str(index.data()[1])))
-        return
 
     ##
     #  Private Slots
@@ -336,14 +311,12 @@ class _OpenProjectPage(QWidget):
         self.selectedPath.setToolTip(text)
         self.selectedPath.setCursorPosition(0)
         self.aMissing.setVisible(not (Path(value) / nwFiles.PROJ_FILE).is_file())
-        return
 
     @pyqtSlot(QModelIndex)
     def _projectDoubleClicked(self, index: QModelIndex) -> None:
         """Process double click on project item."""
         if index.isValid():
             self.openProjectRequest.emit(Path(str(index.data()[1])))
-        return
 
     @pyqtSlot()
     def _deleteSelectedItem(self) -> None:
@@ -356,7 +329,6 @@ class _OpenProjectPage(QWidget):
             if SHARED.question(text):
                 self.listModel.removeEntry(index)
             self._selectFirstItem()
-        return
 
     @pyqtSlot("QPoint")
     def _openContextMenu(self, pos: QPoint) -> None:
@@ -369,7 +341,6 @@ class _OpenProjectPage(QWidget):
         action.triggered.connect(self._deleteSelectedItem)
         ctxMenu.exec(self.mapToGlobal(pos))
         ctxMenu.setParent(None)
-        return
 
     ##
     #  Internal Functions
@@ -380,7 +351,6 @@ class _OpenProjectPage(QWidget):
         index = self.listModel.index(0)
         self.listWidget.setCurrentIndex(index)
         self._projectClicked(index)
-        return
 
 
 class _ProjectListItem(QStyledItemDelegate):
@@ -408,8 +378,6 @@ class _ProjectListItem(QStyledItemDelegate):
 
         self._icon = SHARED.theme.getPixmap("proj_nwx", (iPx, iPx))
 
-        return
-
     def paint(self, painter: QPainter, opt: QStyleOptionViewItem, index: QModelIndex) -> None:
         """Paint a project entry on the canvas."""
         rect = opt.rect
@@ -420,7 +388,7 @@ class _ProjectListItem(QStyledItemDelegate):
         painter.save()
         if opt.state & QtSelected == QtSelected:
             painter.setOpacity(0.25)
-            painter.fillRect(rect, QApplication.palette().highlight())
+            painter.fillRect(rect, QApplication.palette().text())
             painter.setOpacity(1.0)
 
         painter.drawPixmap(2, rect.top() + 6, self._icon)
@@ -431,8 +399,6 @@ class _ProjectListItem(QStyledItemDelegate):
         painter.drawText(rect.adjusted(x, y, 0, 0), tFlag, details)
         painter.restore()
 
-        return
-
     def sizeHint(self, opt: QStyleOptionViewItem, index: QModelIndex) -> QSize:
         """Set the size hint to fixed height."""
         return QSize(opt.rect.width(), self._hPx)
@@ -450,7 +416,6 @@ class _ProjectListModel(QAbstractListModel):
             when = CONFIG.localDate(datetime.fromtimestamp(time))
             data.append((title, path, f"{opened}: {when}, {words}: {formatInt(count)}"))
         self._data = data
-        return
 
     def rowCount(self, parent: QModelIndex | None = None) -> int:
         """Return the size of the model."""
@@ -517,8 +482,6 @@ class _NewProjectPage(QWidget):
             f"_NewProjectForm {{border: none; background: {baseCol};}} "
         )
 
-        return
-
     ##
     #  Public Slots
     ##
@@ -571,7 +534,7 @@ class _NewProjectForm(QWidget):
         self.projPath = QLineEdit(self)
         self.projPath.setReadOnly(True)
 
-        self.browsePath = NIconToolButton(self, iSz, "browse")
+        self.browsePath = NIconToolButton(self, iSz, "browse", "systemio")
         self.browsePath.clicked.connect(self._doBrowse)
 
         self.pathBox = QHBoxLayout()
@@ -582,20 +545,20 @@ class _NewProjectForm(QWidget):
         self.projFill = QLineEdit(self)
         self.projFill.setReadOnly(True)
 
-        self.browseFill = NIconToolButton(self, iSz, "document_add", "blue")
+        self.browseFill = NIconToolButton(self, iSz, "document_add", "add")
 
         self.fillMenu = QMenu(self.browseFill)
 
         self.fillBlank = qtAddAction(self.fillMenu, self.tr("Create a fresh project"))
-        self.fillBlank.setIcon(SHARED.theme.getIcon("document"))
+        self.fillBlank.setIcon(SHARED.theme.getIcon("document", "file"))
         self.fillBlank.triggered.connect(self._setFillBlank)
 
         self.fillSample = qtAddAction(self.fillMenu, self.tr("Create an example project"))
-        self.fillSample.setIcon(SHARED.theme.getIcon("document_add", "blue"))
+        self.fillSample.setIcon(SHARED.theme.getIcon("document_add", "add"))
         self.fillSample.triggered.connect(self._setFillSample)
 
         self.fillCopy = qtAddAction(self.fillMenu, self.tr("Copy an existing project"))
-        self.fillCopy.setIcon(SHARED.theme.getIcon("project_copy", "green"))
+        self.fillCopy.setIcon(SHARED.theme.getIcon("project_copy", "action"))
         self.fillCopy.triggered.connect(self._setFillCopy)
 
         self.browseFill.setMenu(self.fillMenu)
@@ -690,13 +653,10 @@ class _NewProjectForm(QWidget):
         self._updateProjPath()
         self._updateFillInfo()
 
-        return
-
     def enterForm(self) -> None:
         """Focus the project name field when entering the form."""
         self.projName.setFocus()
         self.projName.selectAll()
-        return
 
     def getProjectData(self) -> dict:
         """Collect form data and return it as a dictionary."""
@@ -734,14 +694,12 @@ class _NewProjectForm(QWidget):
             self._basePath = Path(path)
             self._updateProjPath()
             CONFIG.setLastPath("project", path)
-        return
 
     @pyqtSlot()
     def _updateProjPath(self) -> None:
         """Update the path box to show the full project path."""
         projName = makeFileNameSafe(self.projName.text().strip())
         self.projPath.setText(str(self._basePath / projName))
-        return
 
     @pyqtSlot()
     def _syncSwitches(self) -> None:
@@ -751,21 +709,18 @@ class _NewProjectForm(QWidget):
         addWorld = self.addWorld.isChecked()
         if not (addPlot or addChar or addWorld):
             self.addNotes.setChecked(False)
-        return
 
     @pyqtSlot()
     def _setFillBlank(self) -> None:
         """Set fill mode to blank project."""
         self._fillMode = self.FILL_BLANK
         self._updateFillInfo()
-        return
 
     @pyqtSlot()
     def _setFillSample(self) -> None:
         """Set fill mode to sample project."""
         self._fillMode = self.FILL_SAMPLE
         self._updateFillInfo()
-        return
 
     @pyqtSlot()
     def _setFillCopy(self) -> None:
@@ -774,7 +729,6 @@ class _NewProjectForm(QWidget):
             self._fillMode = self.FILL_COPY
             self._copyPath = copyPath
             self._updateFillInfo()
-        return
 
     ##
     #  Internal Functions
@@ -794,5 +748,3 @@ class _NewProjectForm(QWidget):
         self.projFill.setToolTip(text)
         self.projFill.setCursorPosition(0)
         self.extraWidget.setVisible(self._fillMode == self.FILL_BLANK)
-
-        return

novelwriter/tools/writingstats.py

@@ -20,7 +20,7 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
-"""
+"""  # noqa
 from __future__ import annotations
 
 import json
@@ -39,12 +39,13 @@ from PyQt6.QtWidgets import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import checkInt, checkIntTuple, formatTime, minmax, qtLambda
 from novelwriter.constants import nwConst
+from novelwriter.enum import nwStandardButton
 from novelwriter.error import formatException
-from novelwriter.extensions.modified import NToolDialog
+from novelwriter.extensions.modified import NPushButton, NToolDialog
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.types import (
     QtAlignLeftMiddle, QtAlignRight, QtAlignRightMiddle, QtDecoration,
-    QtDialogClose, QtRoleAction
+    QtRoleAction, QtRoleDestruct
 )
 
 if TYPE_CHECKING:
@@ -54,7 +55,7 @@ logger = logging.getLogger(__name__)
 
 
 class GuiWritingStats(NToolDialog):
-    """GUI Tools: Writing Statistics
+    """GUI Tools: Writing Statistics.
 
     Displays data from the NWSessionLog object.
     """
@@ -182,6 +183,7 @@ class GuiWritingStats(NToolDialog):
 
         # Filter Options
         iPx = SHARED.theme.baseIconHeight
+        bSz = SHARED.theme.toolButtonIconSize
 
         self.filterForm = QGridLayout(self)
         self.filterForm.setRowStretch(6, 1)
@@ -276,6 +278,10 @@ class GuiWritingStats(NToolDialog):
         self.optsBox.addWidget(self.histMax, 0)
 
         # Buttons
+        self.btnClose = SHARED.theme.getStandardButton(nwStandardButton.CLOSE, self)
+        self.btnClose.clicked.connect(self._doClose)
+        self.btnClose.setAutoDefault(False)
+
         self.saveJSON = QAction(self.tr("JSON Data File (.json)"), self)
         self.saveJSON.triggered.connect(qtLambda(self._saveData, self.FMT_JSON))
 
@@ -286,17 +292,13 @@ class GuiWritingStats(NToolDialog):
         self.saveMenu.addAction(self.saveJSON)
         self.saveMenu.addAction(self.saveCSV)
 
-        self.buttonBox = QDialogButtonBox(self)
-        self.buttonBox.rejected.connect(self._doClose)
+        self.btnSave = NPushButton(self, self.tr("Save As"), bSz, "btn_save", "action")
+        self.btnSave.setAutoDefault(False)
+        self.btnSave.setMenu(self.saveMenu)
 
-        self.btnClose = self.buttonBox.addButton(QtDialogClose)
-        if self.btnClose:
-            self.btnClose.setAutoDefault(False)
-
-        self.btnSave = self.buttonBox.addButton(self.tr("Save As"), QtRoleAction)
-        if self.btnSave:
-            self.btnSave.setAutoDefault(False)
-            self.btnSave.setMenu(self.saveMenu)
+        self.btnBox = QDialogButtonBox(self)
+        self.btnBox.addButton(self.btnSave, QtRoleAction)
+        self.btnBox.addButton(self.btnClose, QtRoleDestruct)
 
         # Assemble
         self.outerBox = QGridLayout()
@@ -304,18 +306,15 @@ class GuiWritingStats(NToolDialog):
         self.outerBox.addLayout(self.optsBox,   1, 0, 1, 2)
         self.outerBox.addWidget(self.infoBox,   2, 0)
         self.outerBox.addWidget(self.filterBox, 2, 1)
-        self.outerBox.addWidget(self.buttonBox, 3, 0, 1, 2)
+        self.outerBox.addWidget(self.btnBox,    3, 0, 1, 2)
         self.outerBox.setRowStretch(0, 1)
 
         self.setLayout(self.outerBox)
 
         logger.debug("Ready: GuiWritingStats")
 
-        return
-
     def __del__(self) -> None:  # pragma: no cover
         logger.debug("Delete: GuiWritingStats")
-        return
 
     def populateGUI(self) -> None:
         """Populate list box with data from the log file."""
@@ -323,7 +322,6 @@ class GuiWritingStats(NToolDialog):
         self._loadLogFile()
         self._updateListBox()
         QApplication.restoreOverrideCursor()
-        return
 
     ##
     #  Events
@@ -333,7 +331,6 @@ class GuiWritingStats(NToolDialog):
         """Capture the user closing the window."""
         event.accept()
         self.softDelete()
-        return
 
     ##
     #  Private Slots
@@ -377,8 +374,6 @@ class GuiWritingStats(NToolDialog):
 
         self.close()
 
-        return
-
     def _saveData(self, dataFmt: int) -> bool:
         """Save the content of the list box to a file."""
         fileExt = ""
@@ -498,8 +493,6 @@ class GuiWritingStats(NToolDialog):
         self.notesWords.setText(f"{ttNotes:n}")
         self.totalWords.setText(f"{ttWords:n}")
 
-        return
-
     ##
     #  Private Slots
     ##
@@ -622,5 +615,3 @@ class GuiWritingStats(NToolDialog):
             self.timeFilter += sDiff
 
         self.labelFilter.setText(formatTime(round(self.timeFilter)))
-
-        return