novelWriter 2.4.4__py3-none-any.whl → 2.5__py3-none-any.whl

novelwriter/tools/writingstats.py

@@ -32,15 +32,16 @@ from typing import TYPE_CHECKING
 from PyQt5.QtCore import Qt, pyqtSlot
 from PyQt5.QtGui import QCloseEvent, QCursor, QPixmap
 from PyQt5.QtWidgets import (
-    QAction, QApplication, QDialog, QDialogButtonBox, QFileDialog, QGridLayout,
+    QAction, QApplication, QDialogButtonBox, QFileDialog, QGridLayout,
     QGroupBox, QHBoxLayout, QLabel, QMenu, QSpinBox, QTreeWidget,
     QTreeWidgetItem
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import formatTime, checkInt, checkIntTuple, minmax
+from novelwriter.common import checkInt, checkIntTuple, formatTime, minmax
 from novelwriter.constants import nwConst
 from novelwriter.error import formatException
+from novelwriter.extensions.modified import NToolDialog
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.types import (
     QtAlignLeftMiddle, QtAlignRight, QtAlignRightMiddle, QtDecoration,
@@ -53,7 +54,7 @@ if TYPE_CHECKING:  # pragma: no cover
 logger = logging.getLogger(__name__)
 
 
-class GuiWritingStats(QDialog):
+class GuiWritingStats(NToolDialog):
     """GUI Tools: Writing Statistics
 
     Displays data from the NWSessionLog object.
@@ -68,13 +69,11 @@ class GuiWritingStats(QDialog):
     FMT_JSON = 0
     FMT_CSV  = 1
 
-    def __init__(self, mainGui: GuiMain) -> None:
-        super().__init__(parent=mainGui)
+    def __init__(self, parent: GuiMain) -> None:
+        super().__init__(parent=parent)
 
         logger.debug("Create: GuiWritingStats")
         self.setObjectName("GuiWritingStats")
-        if CONFIG.osDarwin:
-            self.setWindowFlag(Qt.WindowType.Tool)
 
         self.logData    = []
         self.filterData = []
@@ -319,7 +318,7 @@ class GuiWritingStats(QDialog):
     def closeEvent(self, event: QCloseEvent) -> None:
         """Capture the user closing the window."""
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -385,14 +384,14 @@ class GuiWritingStats(QDialog):
             return False
 
         # Generate the file name
-        savePath = CONFIG.lastPath() / f"sessionStats.{fileExt}"
+        savePath = CONFIG.lastPath("stats") / f"sessionStats.{fileExt}"
         savePath, _ = QFileDialog.getSaveFileName(
             self, self.tr("Save Data As"), str(savePath), f"{textFmt} (*.{fileExt})"
         )
         if not savePath:
             return False
 
-        CONFIG.setLastPath(savePath)
+        CONFIG.setLastPath("stats", savePath)
 
         # Do the actual writing
         wSuccess = False
@@ -615,5 +614,3 @@ class GuiWritingStats(QDialog):
         self.labelFilter.setText(formatTime(round(self.timeFilter)))
 
         return
-
-# END Class GuiWritingStats

novelwriter/types.py

@@ -23,9 +23,9 @@ 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
+from PyQt5.QtCore import QRegularExpression, Qt
+from PyQt5.QtGui import QColor, QFont, QPainter, QTextCharFormat, QTextCursor, QTextFormat
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QSizePolicy, QStyle
 
 # Qt Alignment Flags
 
@@ -44,9 +44,19 @@ QtAlignRightMiddle = Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter
 QtAlignRightTop = Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignTop
 QtAlignTop = Qt.AlignmentFlag.AlignTop
 
+QtVAlignNormal = QTextCharFormat.VerticalAlignment.AlignNormal
+QtVAlignSub = QTextCharFormat.VerticalAlignment.AlignSubScript
+QtVAlignSuper = QTextCharFormat.VerticalAlignment.AlignSuperScript
+
+# Qt Page Break
+
+QtPageBreakBefore = QTextFormat.PageBreakFlag.PageBreak_AlwaysBefore
+QtPageBreakAfter = QTextFormat.PageBreakFlag.PageBreak_AlwaysAfter
+
 # Qt Painter Types
 
 QtTransparent = QColor(0, 0, 0, 0)
+QtBlack = QColor(0, 0, 0)
 QtNoBrush = Qt.BrushStyle.NoBrush
 QtNoPen = Qt.PenStyle.NoPen
 QtRoundCap = Qt.PenCapStyle.RoundCap
@@ -63,13 +73,16 @@ QtUserRole = Qt.ItemDataRole.UserRole
 # Keyboard and Mouse Buttons
 
 QtModCtrl = Qt.KeyboardModifier.ControlModifier
-QtModeNone = Qt.KeyboardModifier.NoModifier
+QtModNone = Qt.KeyboardModifier.NoModifier
 QtModShift = Qt.KeyboardModifier.ShiftModifier
 QtMouseLeft = Qt.MouseButton.LeftButton
 QtMouseMiddle = Qt.MouseButton.MiddleButton
 
 # Dialog Button Box Types
 
+QtAccepted = QDialog.DialogCode.Accepted
+QtRejected = QDialog.DialogCode.Rejected
+
 QtDialogApply = QDialogButtonBox.StandardButton.Apply
 QtDialogCancel = QDialogButtonBox.StandardButton.Cancel
 QtDialogClose = QDialogButtonBox.StandardButton.Close
@@ -88,3 +101,35 @@ QtKeepAnchor = QTextCursor.MoveMode.KeepAnchor
 QtMoveAnchor = QTextCursor.MoveMode.MoveAnchor
 QtMoveLeft = QTextCursor.MoveOperation.Left
 QtMoveRight = QTextCursor.MoveOperation.Right
+
+# Size Policy
+
+QtSizeExpanding = QSizePolicy.Policy.Expanding
+QtSizeFixed = QSizePolicy.Policy.Fixed
+QtSizeIgnored = QSizePolicy.Policy.Ignored
+QtSizeMinimum = QSizePolicy.Policy.Minimum
+QtSizeMinimumExpanding = QSizePolicy.Policy.MinimumExpanding
+
+# Other
+
+QRegExUnicode = QRegularExpression.PatternOption.UseUnicodePropertiesOption
+
+# Maps
+
+FONT_WEIGHTS: dict[int, int] = {
+    QFont.Weight.Thin:       100,
+    QFont.Weight.ExtraLight: 200,
+    QFont.Weight.Light:      300,
+    QFont.Weight.Normal:     400,
+    QFont.Weight.Medium:     500,
+    QFont.Weight.DemiBold:   600,
+    QFont.Weight.Bold:       700,
+    QFont.Weight.ExtraBold:  800,
+    QFont.Weight.Black:      900,
+}
+
+FONT_STYLE: dict[int, str] = {
+    QFont.Style.StyleNormal:  "normal",
+    QFont.Style.StyleItalic:  "italic",
+    QFont.Style.StyleOblique: "oblique",
+}

novelwriter/extensions/simpleprogress.py

@@ -1,55 +0,0 @@
-"""
-novelWriter – Custom Widget: Progress Simple
-============================================
-
-File History:
-Created: 2023-06-09 [2.1b1]
-
-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 math import ceil
-
-from PyQt5.QtGui import QPaintEvent, QPainter
-from PyQt5.QtWidgets import QProgressBar, QWidget
-
-from novelwriter.types import QtPaintAnitAlias
-
-
-class NProgressSimple(QProgressBar):
-    """Extension: Simple Progress Widget
-
-    A custom widget that paints a plain bar with no other styling.
-    """
-
-    def __init__(self, parent: QWidget) -> None:
-        super().__init__(parent=parent)
-        return
-
-    def paintEvent(self, event: QPaintEvent) -> None:
-        """Custom painter for the progress bar."""
-        if (value := self.value()) > 0:
-            progress = ceil(self.width()*float(value)/self.maximum())
-            painter = QPainter(self)
-            painter.setRenderHint(QtPaintAnitAlias, True)
-            painter.setPen(self.palette().highlight().color())
-            painter.setBrush(self.palette().highlight())
-            painter.drawRect(0, 0, progress, self.height())
-        return
-
-# END Class NProgressSimple