novelWriter 2.3rc1__py3-none-any.whl → 2.4__py3-none-any.whl

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)

novelwriter/types.py

@@ -0,0 +1,90 @@
+"""
+novelWriter – Types and Flags
+=============================
+
+File History:
+Created: 2024-04-01 [2.4rc1]
+
+This file is a part of novelWriter
+Copyright 2018–2024, Veronica Berglyd Olsen
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+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/>.
+"""
+from __future__ import annotations
+
+from PyQt5.QtCore import Qt
+from PyQt5.QtGui import QColor, QPainter, QTextCursor
+from PyQt5.QtWidgets import QDialogButtonBox, QStyle
+
+# Qt Alignment Flags
+
+QtAlignAbsolute = Qt.AlignmentFlag.AlignAbsolute
+QtAlignCenter = Qt.AlignmentFlag.AlignCenter
+QtAlignCenterTop = Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignTop
+QtAlignJustify = Qt.AlignmentFlag.AlignJustify
+QtAlignLeft = Qt.AlignmentFlag.AlignLeft
+QtAlignLeftBase = Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignBaseline
+QtAlignLeftMiddle = Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter
+QtAlignLeftTop = Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignTop
+QtAlignMiddle = Qt.AlignmentFlag.AlignVCenter
+QtAlignRight = Qt.AlignmentFlag.AlignRight
+QtAlignRightBase = Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignBaseline
+QtAlignRightMiddle = Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter
+QtAlignRightTop = Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignTop
+QtAlignTop = Qt.AlignmentFlag.AlignTop
+
+# Qt Painter Types
+
+QtTransparent = QColor(0, 0, 0, 0)
+QtNoBrush = Qt.BrushStyle.NoBrush
+QtNoPen = Qt.PenStyle.NoPen
+QtRoundCap = Qt.PenCapStyle.RoundCap
+QtSolidLine = Qt.PenStyle.SolidLine
+QtPaintAnitAlias = QPainter.RenderHint.Antialiasing
+QtMouseOver = QStyle.StateFlag.State_MouseOver
+QtSelected = QStyle.StateFlag.State_Selected
+
+# Qt Tree and Table Types
+
+QtDecoration = Qt.ItemDataRole.DecorationRole
+QtUserRole = Qt.ItemDataRole.UserRole
+
+# Keyboard and Mouse Buttons
+
+QtModCtrl = Qt.KeyboardModifier.ControlModifier
+QtModeNone = Qt.KeyboardModifier.NoModifier
+QtModShift = Qt.KeyboardModifier.ShiftModifier
+QtMouseLeft = Qt.MouseButton.LeftButton
+QtMouseMiddle = Qt.MouseButton.MiddleButton
+
+# Dialog Button Box Types
+
+QtDialogApply = QDialogButtonBox.StandardButton.Apply
+QtDialogCancel = QDialogButtonBox.StandardButton.Cancel
+QtDialogClose = QDialogButtonBox.StandardButton.Close
+QtDialogOk = QDialogButtonBox.StandardButton.Ok
+QtDialogReset = QDialogButtonBox.StandardButton.Reset
+QtDialogSave = QDialogButtonBox.StandardButton.Save
+
+QtRoleAccept = QDialogButtonBox.ButtonRole.AcceptRole
+QtRoleAction = QDialogButtonBox.ButtonRole.ActionRole
+QtRoleApply = QDialogButtonBox.ButtonRole.ApplyRole
+QtRoleReject = QDialogButtonBox.ButtonRole.RejectRole
+
+# Cursor Types
+
+QtKeepAnchor = QTextCursor.MoveMode.KeepAnchor
+QtMoveAnchor = QTextCursor.MoveMode.MoveAnchor
+QtMoveLeft = QTextCursor.MoveOperation.Left
+QtMoveRight = QTextCursor.MoveOperation.Right

novelWriter-2.3rc1.dist-info/entry_points.txt

@@ -1,5 +0,0 @@
-[console_script]
-novelwriter-cli = novelwriter:main
-
-[gui_scripts]
-novelwriter = novelwriter:main

novelwriter/core/__init__.py

@@ -1,3 +0,0 @@
-"""
-novelWriter – Core Init File
-"""

novelwriter/dialogs/__init__.py

@@ -1,3 +0,0 @@
-"""
-novelWriter – Dialogs Init File
-"""

novelwriter/extensions/__init__.py

@@ -1,3 +0,0 @@
-"""
-novelWriter – Custom Layouts and Widgets
-"""

novelwriter/gui/__init__.py

@@ -1,3 +0,0 @@
-"""
-novelWriter – GUI Init File
-"""

novelwriter/tools/__init__.py

@@ -1,3 +0,0 @@
-"""
-novelWriter – Tools Init File
-"""