novelWriter 2.3.1__py3-none-any.whl → 2.4__py3-none-any.whl

novelwriter/tools/noveldetails.py

@@ -26,8 +26,8 @@ from __future__ import annotations
 import math
 import logging
 
+from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtGui import QCloseEvent
-from PyQt5.QtCore import QSize, Qt, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QDialog, QDialogButtonBox, QFormLayout, QGridLayout,
     QHBoxLayout, QLabel, QSpinBox, QStackedWidget, QTreeWidget,
@@ -37,10 +37,11 @@ from PyQt5.QtWidgets import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatTime, numberToRoman
 from novelwriter.constants import nwUnicode
-from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.configlayout import NColourLabel, NFixedPage, NScrollablePage
-from novelwriter.extensions.pagedsidebar import NPagedSideBar
 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
 
 logger = logging.getLogger(__name__)
 
@@ -94,7 +95,7 @@ class GuiNovelDetails(QDialog):
         self.mainStack.addWidget(self.contentsPage)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
+        self.buttonBox = QDialogButtonBox(QtDialogClose, self)
         self.buttonBox.rejected.connect(self.close)
 
         # Assemble
@@ -309,7 +310,8 @@ class _ContentsPage(NFixedPage):
         self._data = []
         self._currentRoot = None
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         hPx = CONFIG.pxInt(12)
         vPx = CONFIG.pxInt(4)
         options = SHARED.project.options
@@ -322,7 +324,7 @@ class _ContentsPage(NFixedPage):
 
         # Contents Tree
         self.tocTree = QTreeWidget(self)
-        self.tocTree.setIconSize(QSize(iPx, iPx))
+        self.tocTree.setIconSize(iSz)
         self.tocTree.setIndentation(0)
         self.tocTree.setColumnCount(6)
         self.tocTree.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
@@ -337,10 +339,10 @@ class _ContentsPage(NFixedPage):
 
         treeHeadItem = self.tocTree.headerItem()
         if treeHeadItem:
-            treeHeadItem.setTextAlignment(self.C_WORDS, Qt.AlignmentFlag.AlignRight)
-            treeHeadItem.setTextAlignment(self.C_PAGES, Qt.AlignmentFlag.AlignRight)
-            treeHeadItem.setTextAlignment(self.C_PAGE,  Qt.AlignmentFlag.AlignRight)
-            treeHeadItem.setTextAlignment(self.C_PROG,  Qt.AlignmentFlag.AlignRight)
+            treeHeadItem.setTextAlignment(self.C_WORDS, QtAlignRight)
+            treeHeadItem.setTextAlignment(self.C_PAGES, QtAlignRight)
+            treeHeadItem.setTextAlignment(self.C_PAGE,  QtAlignRight)
+            treeHeadItem.setTextAlignment(self.C_PROG,  QtAlignRight)
 
         treeHeader = self.tocTree.header()
         treeHeader.setStretchLastSection(True)
@@ -364,7 +366,7 @@ class _ContentsPage(NFixedPage):
         countFrom    = options.getInt("GuiNovelDetails", "countFrom", 1)
         clearDouble  = options.getBool("GuiNovelDetails", "clearDouble", True)
 
-        self.wpLabel = QLabel(self.tr("Words per page"))
+        self.wpLabel = QLabel(self.tr("Words per page"), self)
 
         self.wpValue = QSpinBox(self)
         self.wpValue.setMinimum(10)
@@ -373,7 +375,7 @@ class _ContentsPage(NFixedPage):
         self.wpValue.setValue(wordsPerPage)
         self.wpValue.valueChanged.connect(self._populateTree)
 
-        self.poLabel = QLabel(self.tr("First page offset"))
+        self.poLabel = QLabel(self.tr("First page offset"), self)
 
         self.poValue = QSpinBox(self)
         self.poValue.setMinimum(1)
@@ -382,7 +384,7 @@ class _ContentsPage(NFixedPage):
         self.poValue.setValue(countFrom)
         self.poValue.valueChanged.connect(self._populateTree)
 
-        self.dblLabel = QLabel(self.tr("Chapters on odd pages"))
+        self.dblLabel = QLabel(self.tr("Chapters on odd pages"), self)
 
         self.dblValue = NSwitch(self, height=iPx)
         self.dblValue.setChecked(clearDouble)
@@ -483,17 +485,17 @@ class _ContentsPage(NFixedPage):
             if tTitle.strip() == "":
                 tTitle = self.tr("Untitled")
 
-            newItem.setData(self.C_TITLE, Qt.DecorationRole, hDec)
+            newItem.setData(self.C_TITLE, QtDecoration, hDec)
             newItem.setText(self.C_TITLE, tTitle)
             newItem.setText(self.C_WORDS, f"{wCount:n}")
             newItem.setText(self.C_PAGES, f"{pCount:n}")
             newItem.setText(self.C_PAGE,  progPage)
             newItem.setText(self.C_PROG,  progText)
 
-            newItem.setTextAlignment(self.C_WORDS, Qt.AlignRight)
-            newItem.setTextAlignment(self.C_PAGES, Qt.AlignRight)
-            newItem.setTextAlignment(self.C_PAGE,  Qt.AlignRight)
-            newItem.setTextAlignment(self.C_PROG,  Qt.AlignRight)
+            newItem.setTextAlignment(self.C_WORDS, QtAlignRight)
+            newItem.setTextAlignment(self.C_PAGES, QtAlignRight)
+            newItem.setTextAlignment(self.C_PAGE,  QtAlignRight)
+            newItem.setTextAlignment(self.C_PROG,  QtAlignRight)
 
             # Make pages and titles/partitions stand out
             if tLevel < 2:

novelwriter/tools/welcome.py

@@ -25,34 +25,35 @@ from __future__ import annotations
 
 import logging
 
-from pathlib import Path
 from datetime import datetime
+from pathlib import Path
 
-from PyQt5.QtGui import QCloseEvent, QColor, QFont, QPaintEvent, QPainter, QPen
 from PyQt5.QtCore import (
     QAbstractListModel, QEvent, QModelIndex, QObject, QPoint, QSize, Qt,
     pyqtSignal, pyqtSlot
 )
+from PyQt5.QtGui import QCloseEvent, QColor, QFont, QPaintEvent, QPainter, QPen
 from PyQt5.QtWidgets import (
-    QAction, QDialog, QFileDialog, QFormLayout, QHBoxLayout, QLabel, QLineEdit,
-    QListView, QMenu, QPushButton, QScrollArea, QShortcut, QStackedWidget,
-    QStyle, QStyleOptionViewItem, QStyledItemDelegate, QToolButton,
-    QVBoxLayout, QWidget, qApp
+    QAction, QApplication, QDialog, QFileDialog, QFormLayout, QHBoxLayout,
+    QLabel, QLineEdit, QListView, QMenu, QPushButton, QScrollArea, QShortcut,
+    QStackedWidget, QStyleOptionViewItem, QStyledItemDelegate, QVBoxLayout,
+    QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.enum import nwItemClass
-from novelwriter.common import formatInt, makeFileNameSafe
+from novelwriter.common import cssCol, formatInt, makeFileNameSafe
 from novelwriter.constants import nwFiles
 from novelwriter.core.coretools import ProjectBuilder
+from novelwriter.enum import nwItemClass
 from novelwriter.extensions.configlayout import NWrappedWidgetBox
+from novelwriter.extensions.modified import NIconToolButton, NSpinBox
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.extensions.modified import NSpinBox
 from novelwriter.extensions.versioninfo import VersionInfoWidget
+from novelwriter.types import QtAlignLeft, QtAlignRightTop, QtSelected
 
 logger = logging.getLogger(__name__)
 
-PANEL_ALPHA = 0.7
+PANEL_ALPHA = 178
 
 
 class GuiWelcome(QDialog):
@@ -75,8 +76,9 @@ class GuiWelcome(QDialog):
         hD = CONFIG.pxInt(36)
         hE = CONFIG.pxInt(48)
         hF = CONFIG.pxInt(128)
-        self._hPx = CONFIG.pxInt(600)
+        btnIconSize = SHARED.theme.buttonIconSize
 
+        self._hPx = CONFIG.pxInt(600)
         self.resize(*CONFIG.welcomeWinSize)
 
         # Elements
@@ -109,26 +111,32 @@ class GuiWelcome(QDialog):
 
         self.btnList = QPushButton(self.tr("List"), self)
         self.btnList.setIcon(SHARED.theme.getIcon("list"))
+        self.btnList.setIconSize(btnIconSize)
         self.btnList.clicked.connect(self._showOpenProjectPage)
 
         self.btnNew = QPushButton(self.tr("New"), self)
         self.btnNew.setIcon(SHARED.theme.getIcon("add"))
+        self.btnNew.setIconSize(btnIconSize)
         self.btnNew.clicked.connect(self._showNewProjectPage)
 
         self.btnBrowse = QPushButton(self.tr("Browse"), self)
         self.btnBrowse.setIcon(SHARED.theme.getIcon("browse"))
+        self.btnBrowse.setIconSize(btnIconSize)
         self.btnBrowse.clicked.connect(self._browseForProject)
 
         self.btnCancel = QPushButton(self.tr("Cancel"), self)
         self.btnCancel.setIcon(SHARED.theme.getIcon("cross"))
+        self.btnCancel.setIconSize(btnIconSize)
         self.btnCancel.clicked.connect(self.close)
 
         self.btnCreate = QPushButton(self.tr("Create"), self)
         self.btnCreate.setIcon(SHARED.theme.getIcon("star"))
+        self.btnCreate.setIconSize(btnIconSize)
         self.btnCreate.clicked.connect(self.tabNew.createNewProject)
 
         self.btnOpen = QPushButton(self.tr("Open"), self)
         self.btnOpen.setIcon(SHARED.theme.getIcon("open"))
+        self.btnOpen.setIconSize(btnIconSize)
         self.btnOpen.clicked.connect(self._openSelectedItem)
 
         self.btnBox = QHBoxLayout()
@@ -153,10 +161,8 @@ class GuiWelcome(QDialog):
         self.innerBox.addSpacing(hB)
         self.innerBox.addLayout(self.btnBox)
 
-        topRight = Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignRight
-
         self.outerBox = QHBoxLayout()
-        self.outerBox.addWidget(self.nwLogo, 3, topRight)
+        self.outerBox.addWidget(self.nwLogo, 3, QtAlignRightTop)
         self.outerBox.addLayout(self.innerBox, 9)
         self.outerBox.setContentsMargins(hF, hE, hC, hE)
 
@@ -306,12 +312,12 @@ class _OpenProjectPage(QWidget):
 
         self._selectFirstItem()
 
-        baseCol = self.palette().base().color()
-        self.setStyleSheet((
-            "QListView {{border: none; background: rgba({r},{g},{b},{a});}} "
-            "QLineEdit {{border: none; background: rgba({r},{g},{b},{a}); padding: {m}px;}} "
-        ).format(r=baseCol.red(), g=baseCol.green(), b=baseCol.blue(),
-                 a=PANEL_ALPHA, m=CONFIG.pxInt(4)))
+        mPx = CONFIG.pxInt(4)
+        baseCol = cssCol(self.palette().base().color(), PANEL_ALPHA)
+        self.setStyleSheet(
+            f"QListView {{border: none; background: {baseCol};}} "
+            f"QLineEdit {{border: none; background: {baseCol}; padding: {mPx}px;}} "
+        )
 
         return
 
@@ -371,7 +377,7 @@ class _OpenProjectPage(QWidget):
         action.triggered.connect(self.openSelectedItem)
         action = ctxMenu.addAction(self.tr("Remove Project"))
         action.triggered.connect(self._deleteSelectedItem)
-        ctxMenu.exec_(self.mapToGlobal(pos))
+        ctxMenu.exec(self.mapToGlobal(pos))
         ctxMenu.deleteLater()
         return
 
@@ -405,11 +411,11 @@ class _ProjectListItem(QStyledItemDelegate):
         self._pPx = (mPx//2, 3*mPx//2, iPx + mPx, mPx, mPx + tPx)  # Painter coordinates
         self._hPx = 2*mPx + tPx + fPx  # Fixed height
 
-        self._tFont = qApp.font()
+        self._tFont = QApplication.font()
         self._tFont.setPointSizeF(1.2*fPt)
         self._tFont.setWeight(QFont.Weight.Bold)
 
-        self._dFont = qApp.font()
+        self._dFont = QApplication.font()
         self._dFont.setPointSizeF(fPt)
         self._dPen = QPen(SHARED.theme.helpText)
 
@@ -425,9 +431,9 @@ class _ProjectListItem(QStyledItemDelegate):
         ix, iy, x, y1, y2 = self._pPx
 
         painter.save()
-        if opt.state & QStyle.StateFlag.State_Selected == QStyle.StateFlag.State_Selected:
+        if opt.state & QtSelected == QtSelected:
             painter.setOpacity(0.25)
-            painter.fillRect(rect, qApp.palette().highlight())
+            painter.fillRect(rect, QApplication.palette().highlight())
             painter.setOpacity(1.0)
 
         painter.drawPixmap(ix, rect.top() + iy, self._icon)
@@ -456,7 +462,7 @@ class _ProjectListModel(QAbstractListModel):
         opened = self.tr("Last Opened")
         records = sorted(CONFIG.recentProjects.listEntries(), key=lambda x: x[3], reverse=True)
         for path, title, count, time in records:
-            when = datetime.fromtimestamp(time).strftime("%x")
+            when = CONFIG.localDate(datetime.fromtimestamp(time))
             data.append((title, path, f"{opened}: {when}, {words}: {formatInt(count)}"))
         self._data = data
         return
@@ -518,11 +524,11 @@ class _NewProjectPage(QWidget):
         # Styles
         # ======
 
-        baseCol = self.palette().base().color()
-        self.setStyleSheet((
-            "QScrollArea {{border: none; background: rgba({r},{g},{b},{a});}} "
-            "_NewProjectForm {{border: none; background: rgba({r},{g},{b},{a});}} "
-        ).format(r=baseCol.red(), g=baseCol.green(), b=baseCol.blue(), a=PANEL_ALPHA))
+        baseCol = cssCol(self.palette().base().color(), PANEL_ALPHA)
+        self.setStyleSheet(
+            f"QScrollArea {{border: none; background: {baseCol};}} "
+            f"_NewProjectForm {{border: none; background: {baseCol};}} "
+        )
 
         return
 
@@ -554,11 +560,12 @@ class _NewProjectForm(QWidget):
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
 
-        self._basePath = CONFIG.lastPath()
+        self._basePath = CONFIG.homePath()
         self._fillMode = self.FILL_BLANK
         self._copyPath = None
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         sPx = CONFIG.pxInt(16)
 
         # Project Settings
@@ -579,8 +586,7 @@ class _NewProjectForm(QWidget):
         self.projPath = QLineEdit(self)
         self.projPath.setReadOnly(True)
 
-        self.browsePath = QToolButton(self)
-        self.browsePath.setIcon(SHARED.theme.getIcon("browse"))
+        self.browsePath = NIconToolButton(self, iSz, "browse")
         self.browsePath.clicked.connect(self._doBrowse)
 
         self.pathBox = QHBoxLayout()
@@ -591,8 +597,7 @@ class _NewProjectForm(QWidget):
         self.projFill = QLineEdit(self)
         self.projFill.setReadOnly(True)
 
-        self.browseFill = QToolButton(self)
-        self.browseFill.setIcon(SHARED.theme.getIcon("add_document"))
+        self.browseFill = NIconToolButton(self, iSz, "add_document")
 
         self.fillMenu = _PopLeftDirectionMenu(self.browseFill)
 
@@ -609,7 +614,6 @@ class _NewProjectForm(QWidget):
         self.fillCopy.triggered.connect(self._setFillCopy)
 
         self.browseFill.setMenu(self.fillMenu)
-        self.browseFill.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
 
         self.fillBox = QHBoxLayout()
         self.fillBox.addWidget(self.projFill)
@@ -617,7 +621,7 @@ class _NewProjectForm(QWidget):
 
         # Project Form
         self.projectForm = QFormLayout()
-        self.projectForm.setAlignment(Qt.AlignmentFlag.AlignLeft)
+        self.projectForm.setAlignment(QtAlignLeft)
         self.projectForm.addRow(self.tr("Project Name"), self.projName)
         self.projectForm.addRow(self.tr("Author"), self.projAuthor)
         self.projectForm.addRow(self.tr("Project Path"), self.pathBox)
@@ -628,7 +632,7 @@ class _NewProjectForm(QWidget):
 
         self.numChapters = NSpinBox(self)
         self.numChapters.setRange(0, 200)
-        self.numChapters.setValue(5)
+        self.numChapters.setValue(0)
         self.numChapters.setToolTip(self.tr("Set to 0 to only add scenes"))
 
         self.chapterBox = NWrappedWidgetBox(
@@ -638,7 +642,7 @@ class _NewProjectForm(QWidget):
 
         self.numScenes = NSpinBox(self)
         self.numScenes.setRange(0, 200)
-        self.numScenes.setValue(5)
+        self.numScenes.setValue(0)
 
         self.sceneBox = NWrappedWidgetBox(
             self.tr("Add {0} scene documents (to each chapter)"), self.numScenes
@@ -668,7 +672,7 @@ class _NewProjectForm(QWidget):
         self.addNotes.setChecked(False)
 
         self.notesForm = QFormLayout()
-        self.notesForm.setAlignment(Qt.AlignmentFlag.AlignLeft)
+        self.notesForm.setAlignment(QtAlignLeft)
         self.notesForm.addRow(self.tr("Add a folder for plot notes"), self.addPlot)
         self.notesForm.addRow(self.tr("Add a folder for character notes"), self.addChar)
         self.notesForm.addRow(self.tr("Add a folder for location notes"), self.addWorld)
@@ -678,10 +682,10 @@ class _NewProjectForm(QWidget):
         # ========
 
         self.extraBox = QVBoxLayout()
-        self.extraBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Chapters and Scenes"))))
+        self.extraBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Chapters and Scenes")), self))
         self.extraBox.addLayout(self.novelForm)
         self.extraBox.addSpacing(sPx)
-        self.extraBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Project Notes"))))
+        self.extraBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Project Notes")), self))
         self.extraBox.addLayout(self.notesForm)
         self.extraBox.setContentsMargins(0, 0, 0, 0)
 
@@ -690,7 +694,7 @@ class _NewProjectForm(QWidget):
         self.extraWidget.setContentsMargins(0, 0, 0, 0)
 
         self.formBox = QVBoxLayout()
-        self.formBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Create New Project"))))
+        self.formBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Create New Project")), self))
         self.formBox.addLayout(self.projectForm)
         self.formBox.addSpacing(sPx)
         self.formBox.addWidget(self.extraWidget)
@@ -734,11 +738,10 @@ class _NewProjectForm(QWidget):
         """Select a project folder."""
         if projDir := QFileDialog.getExistingDirectory(
             self, self.tr("Select Project Folder"),
-            str(self._basePath), options=QFileDialog.ShowDirsOnly
+            str(self._basePath), options=QFileDialog.Option.ShowDirsOnly
         ):
             self._basePath = Path(projDir)
             self._updateProjPath()
-            CONFIG.setLastPath(self._basePath)
         return
 
     @pyqtSlot()
@@ -749,7 +752,7 @@ class _NewProjectForm(QWidget):
         return
 
     @pyqtSlot()
-    def _syncSwitches(self):
+    def _syncSwitches(self) -> None:
         """Check if the add notes option should also be switched off."""
         addPlot = self.addPlot.isChecked()
         addChar = self.addChar.isChecked()
@@ -809,7 +812,7 @@ class _PopLeftDirectionMenu(QMenu):
 
     def event(self, event: QEvent) -> bool:
         """Overload the show event and move the menu popup location."""
-        if event.type() == QEvent.Show:
+        if event.type() == QEvent.Type.Show:
             if isinstance(parent := self.parent(), QWidget):
                 offset = QPoint(parent.width() - self.width(), parent.height())
                 self.move(parent.mapToGlobal(offset))

novelwriter/tools/writingstats.py

@@ -29,18 +29,23 @@ import logging
 from datetime import datetime
 from typing import TYPE_CHECKING
 
-from PyQt5.QtGui import QCloseEvent, QPixmap, QCursor
 from PyQt5.QtCore import Qt, pyqtSlot
+from PyQt5.QtGui import QCloseEvent, QCursor, QPixmap
 from PyQt5.QtWidgets import (
-    qApp, QDialog, QTreeWidget, QTreeWidgetItem, QDialogButtonBox, QGridLayout,
-    QLabel, QGroupBox, QMenu, QAction, QFileDialog, QSpinBox, QHBoxLayout
+    QAction, QApplication, QDialog, QDialogButtonBox, QFileDialog, QGridLayout,
+    QGroupBox, QHBoxLayout, QLabel, QMenu, QSpinBox, QTreeWidget,
+    QTreeWidgetItem
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.error import formatException
 from novelwriter.common import formatTime, checkInt, checkIntTuple, minmax
 from novelwriter.constants import nwConst
+from novelwriter.error import formatException
 from novelwriter.extensions.switch import NSwitch
+from novelwriter.types import (
+    QtAlignLeftMiddle, QtAlignRight, QtAlignRightMiddle, QtDecoration,
+    QtDialogClose, QtRoleAction
+)
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -100,7 +105,7 @@ class GuiWritingStats(QDialog):
             pOptions.getInt("GuiWritingStats", "widthCol3", 80)
         )
 
-        self.listBox = QTreeWidget()
+        self.listBox = QTreeWidget(self)
         self.listBox.setHeaderLabels([
             self.tr("Session Start"),
             self.tr("Length"),
@@ -116,14 +121,15 @@ class GuiWritingStats(QDialog):
 
         hHeader = self.listBox.headerItem()
         if hHeader is not None:
-            hHeader.setTextAlignment(self.C_LENGTH, Qt.AlignRight)
-            hHeader.setTextAlignment(self.C_IDLE, Qt.AlignRight)
-            hHeader.setTextAlignment(self.C_COUNT, Qt.AlignRight)
+            hHeader.setTextAlignment(self.C_LENGTH, QtAlignRight)
+            hHeader.setTextAlignment(self.C_IDLE, QtAlignRight)
+            hHeader.setTextAlignment(self.C_COUNT, QtAlignRight)
 
+        sDec = Qt.SortOrder.DescendingOrder
+        sAsc = Qt.SortOrder.AscendingOrder
         sortCol = minmax(pOptions.getInt("GuiWritingStats", "sortCol", 0), 0, 2)
         sortOrder = checkIntTuple(
-            pOptions.getInt("GuiWritingStats", "sortOrder", Qt.DescendingOrder),
-            (Qt.AscendingOrder, Qt.DescendingOrder), Qt.DescendingOrder
+            pOptions.getInt("GuiWritingStats", "sortOrder", sDec), (sAsc, sDec), sDec
         )
         self.listBox.sortByColumn(sortCol, sortOrder)  # type: ignore
         self.listBox.setSortingEnabled(True)
@@ -139,36 +145,36 @@ class GuiWritingStats(QDialog):
         self.infoForm = QGridLayout(self)
         self.infoBox.setLayout(self.infoForm)
 
-        self.labelTotal = QLabel(formatTime(0))
+        self.labelTotal = QLabel(formatTime(0), self)
         self.labelTotal.setFont(SHARED.theme.guiFontFixed)
-        self.labelTotal.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
+        self.labelTotal.setAlignment(QtAlignRightMiddle)
 
-        self.labelIdleT = QLabel(formatTime(0))
+        self.labelIdleT = QLabel(formatTime(0), self)
         self.labelIdleT.setFont(SHARED.theme.guiFontFixed)
-        self.labelIdleT.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
+        self.labelIdleT.setAlignment(QtAlignRightMiddle)
 
-        self.labelFilter = QLabel(formatTime(0))
+        self.labelFilter = QLabel(formatTime(0), self)
         self.labelFilter.setFont(SHARED.theme.guiFontFixed)
-        self.labelFilter.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
+        self.labelFilter.setAlignment(QtAlignRightMiddle)
 
-        self.novelWords = QLabel("0")
+        self.novelWords = QLabel("0", self)
         self.novelWords.setFont(SHARED.theme.guiFontFixed)
-        self.novelWords.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
+        self.novelWords.setAlignment(QtAlignRightMiddle)
 
-        self.notesWords = QLabel("0")
+        self.notesWords = QLabel("0", self)
         self.notesWords.setFont(SHARED.theme.guiFontFixed)
-        self.notesWords.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
+        self.notesWords.setAlignment(QtAlignRightMiddle)
 
-        self.totalWords = QLabel("0")
+        self.totalWords = QLabel("0", self)
         self.totalWords.setFont(SHARED.theme.guiFontFixed)
-        self.totalWords.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
+        self.totalWords.setAlignment(QtAlignRightMiddle)
 
-        lblTTime   = QLabel(self.tr("Total Time:"))
-        lblITime   = QLabel(self.tr("Idle Time:"))
-        lblFTime   = QLabel(self.tr("Filtered Time:"))
-        lblNvCount = QLabel(self.tr("Novel Word Count:"))
-        lblNtCount = QLabel(self.tr("Notes Word Count:"))
-        lblTtCount = QLabel(self.tr("Total Word Count:"))
+        lblTTime   = QLabel(self.tr("Total Time:"), self)
+        lblITime   = QLabel(self.tr("Idle Time:"), self)
+        lblFTime   = QLabel(self.tr("Filtered Time:"), self)
+        lblNvCount = QLabel(self.tr("Novel Word Count:"), self)
+        lblNtCount = QLabel(self.tr("Notes Word Count:"), self)
+        lblTtCount = QLabel(self.tr("Total Word Count:"), self)
 
         self.infoForm.addWidget(lblTTime,   0, 0)
         self.infoForm.addWidget(lblITime,   1, 0)
@@ -187,54 +193,54 @@ class GuiWritingStats(QDialog):
         self.infoForm.setRowStretch(6, 1)
 
         # Filter Options
-        sPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
 
         self.filterBox = QGroupBox(self.tr("Filters"), self)
         self.filterForm = QGridLayout(self)
         self.filterBox.setLayout(self.filterForm)
 
-        self.incNovel = NSwitch(self, height=sPx)
+        self.incNovel = NSwitch(self, height=iPx)
         self.incNovel.setChecked(
             pOptions.getBool("GuiWritingStats", "incNovel", True)
         )
         self.incNovel.clicked.connect(self._updateListBox)
 
-        self.incNotes = NSwitch(self, height=sPx)
+        self.incNotes = NSwitch(self, height=iPx)
         self.incNotes.setChecked(
             pOptions.getBool("GuiWritingStats", "incNotes", True)
         )
         self.incNotes.clicked.connect(self._updateListBox)
 
-        self.hideZeros = NSwitch(self, height=sPx)
+        self.hideZeros = NSwitch(self, height=iPx)
         self.hideZeros.setChecked(
             pOptions.getBool("GuiWritingStats", "hideZeros", True)
         )
         self.hideZeros.clicked.connect(self._updateListBox)
 
-        self.hideNegative = NSwitch(self, height=sPx)
+        self.hideNegative = NSwitch(self, height=iPx)
         self.hideNegative.setChecked(
             pOptions.getBool("GuiWritingStats", "hideNegative", False)
         )
         self.hideNegative.clicked.connect(self._updateListBox)
 
-        self.groupByDay = NSwitch(self, height=sPx)
+        self.groupByDay = NSwitch(self, height=iPx)
         self.groupByDay.setChecked(
             pOptions.getBool("GuiWritingStats", "groupByDay", False)
         )
         self.groupByDay.clicked.connect(self._updateListBox)
 
-        self.showIdleTime = NSwitch(self, height=sPx)
+        self.showIdleTime = NSwitch(self, height=iPx)
         self.showIdleTime.setChecked(
             pOptions.getBool("GuiWritingStats", "showIdleTime", False)
         )
         self.showIdleTime.clicked.connect(self._updateListBox)
 
-        self.filterForm.addWidget(QLabel(self.tr("Count novel files")),        0, 0)
-        self.filterForm.addWidget(QLabel(self.tr("Count note files")),         1, 0)
-        self.filterForm.addWidget(QLabel(self.tr("Hide zero word count")),     2, 0)
-        self.filterForm.addWidget(QLabel(self.tr("Hide negative word count")), 3, 0)
-        self.filterForm.addWidget(QLabel(self.tr("Group entries by day")),     4, 0)
-        self.filterForm.addWidget(QLabel(self.tr("Show idle time")),           5, 0)
+        self.filterForm.addWidget(QLabel(self.tr("Count novel files"), self),        0, 0)
+        self.filterForm.addWidget(QLabel(self.tr("Count note files"), self),         1, 0)
+        self.filterForm.addWidget(QLabel(self.tr("Hide zero word count"), self),     2, 0)
+        self.filterForm.addWidget(QLabel(self.tr("Hide negative word count"), self), 3, 0)
+        self.filterForm.addWidget(QLabel(self.tr("Group entries by day"), self),     4, 0)
+        self.filterForm.addWidget(QLabel(self.tr("Show idle time"), self),           5, 0)
         self.filterForm.addWidget(self.incNovel,     0, 1)
         self.filterForm.addWidget(self.incNotes,     1, 1)
         self.filterForm.addWidget(self.hideZeros,    2, 1)
@@ -255,17 +261,17 @@ class GuiWritingStats(QDialog):
 
         self.optsBox = QHBoxLayout()
         self.optsBox.addStretch(1)
-        self.optsBox.addWidget(QLabel(self.tr("Word count cap for the histogram")), 0)
+        self.optsBox.addWidget(QLabel(self.tr("Word count cap for the histogram"), self), 0)
         self.optsBox.addWidget(self.histMax, 0)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox()
+        self.buttonBox = QDialogButtonBox(self)
         self.buttonBox.rejected.connect(self._doClose)
 
-        self.btnClose = self.buttonBox.addButton(QDialogButtonBox.Close)
+        self.btnClose = self.buttonBox.addButton(QtDialogClose)
         self.btnClose.setAutoDefault(False)
 
-        self.btnSave = self.buttonBox.addButton(self.tr("Save As"), QDialogButtonBox.ActionRole)
+        self.btnSave = self.buttonBox.addButton(self.tr("Save As"), QtRoleAction)
         self.btnSave.setAutoDefault(False)
 
         self.saveMenu = QMenu(self)
@@ -300,10 +306,10 @@ class GuiWritingStats(QDialog):
 
     def populateGUI(self) -> None:
         """Populate list box with data from the log file."""
-        qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
+        QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
         self._loadLogFile()
         self._updateListBox()
-        qApp.restoreOverrideCursor()
+        QApplication.restoreOverrideCursor()
         return
 
     ##
@@ -569,6 +575,8 @@ class GuiWritingStats(QDialog):
             pcTotal = wcTotal
 
         # Populate the list
+        mTrans = Qt.TransformationMode.FastTransformation
+        mAspect = Qt.AspectRatioMode.IgnoreAspectRatio
         showIdleTime = self.showIdleTime.isChecked()
         for _, sStart, sDiff, nWords, _, _, sIdle in self.filterData:
 
@@ -587,16 +595,14 @@ class GuiWritingStats(QDialog):
             if nWords > 0 and listMax > 0:
                 wBar = self.barImage.scaled(
                     int(200*min(nWords, histMax)/listMax),
-                    self.barHeight,
-                    Qt.IgnoreAspectRatio,
-                    Qt.FastTransformation
+                    self.barHeight, mAspect, mTrans
                 )
-                newItem.setData(self.C_BAR, Qt.DecorationRole, wBar)
+                newItem.setData(self.C_BAR, QtDecoration, wBar)
 
-            newItem.setTextAlignment(self.C_LENGTH, Qt.AlignRight)
-            newItem.setTextAlignment(self.C_IDLE, Qt.AlignRight)
-            newItem.setTextAlignment(self.C_COUNT, Qt.AlignRight)
-            newItem.setTextAlignment(self.C_BAR, Qt.AlignLeft | Qt.AlignVCenter)
+            newItem.setTextAlignment(self.C_LENGTH, QtAlignRight)
+            newItem.setTextAlignment(self.C_IDLE, QtAlignRight)
+            newItem.setTextAlignment(self.C_COUNT, QtAlignRight)
+            newItem.setTextAlignment(self.C_BAR, QtAlignLeftMiddle)
 
             newItem.setFont(self.C_TIME, SHARED.theme.guiFontFixed)
             newItem.setFont(self.C_LENGTH, SHARED.theme.guiFontFixed)