novelWriter 2.5.2__py3-none-any.whl → 2.6__py3-none-any.whl

novelwriter/tools/noveldetails.py

@@ -6,7 +6,7 @@ File History:
 Created: 2024-01-18 [2.3b1] GuiNovelDetails
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2024 Veronica Berglyd Olsen and novelWriter contributors
 
 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

novelwriter/tools/welcome.py

@@ -6,7 +6,7 @@ File History:
 Created: 2023-12-14 [2.3b1] GuiWelcome
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2023 Veronica Berglyd Olsen and novelWriter contributors
 
 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
@@ -49,7 +49,7 @@ from novelwriter.extensions.configlayout import NWrappedWidgetBox
 from novelwriter.extensions.modified import NDialog, NIconToolButton, NSpinBox
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.versioninfo import VersionInfoWidget
-from novelwriter.types import QtAlignLeft, QtAlignRightTop, QtSelected
+from novelwriter.types import QtAlignLeft, QtAlignRightTop, QtScrollAsNeeded, QtSelected
 
 logger = logging.getLogger(__name__)
 
@@ -297,7 +297,7 @@ class _OpenProjectPage(QWidget):
         self.selectedPath.addAction(self.aMissing, QLineEdit.ActionPosition.TrailingPosition)
 
         self.keyDelete = QShortcut(self)
-        self.keyDelete.setKey(Qt.Key.Key_Delete)
+        self.keyDelete.setKey("Del")
         self.keyDelete.activated.connect(self._deleteSelectedItem)
 
         # Assemble
@@ -376,7 +376,7 @@ class _OpenProjectPage(QWidget):
         action = ctxMenu.addAction(self.tr("Remove Project"))
         action.triggered.connect(self._deleteSelectedItem)
         ctxMenu.exec(self.mapToGlobal(pos))
-        ctxMenu.deleteLater()
+        ctxMenu.setParent(None)
         return
 
     ##
@@ -501,8 +501,8 @@ class _NewProjectPage(QWidget):
         self.scrollArea = QScrollArea(self)
         self.scrollArea.setWidget(self.projectForm)
         self.scrollArea.setWidgetResizable(True)
-        self.scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
-        self.scrollArea.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
+        self.scrollArea.setHorizontalScrollBarPolicy(QtScrollAsNeeded)
+        self.scrollArea.setVerticalScrollBarPolicy(QtScrollAsNeeded)
 
         self.enterForm = self.projectForm.enterForm
 

novelwriter/tools/writingstats.py

@@ -6,7 +6,7 @@ File History:
 Created: 2019-10-20 [0.3.0] GuiWritingStats
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2019 Veronica Berglyd Olsen and novelWriter contributors
 
 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
@@ -38,7 +38,7 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import checkInt, checkIntTuple, formatTime, minmax
+from novelwriter.common import checkInt, checkIntTuple, formatTime, minmax, qtLambda
 from novelwriter.constants import nwConst
 from novelwriter.error import formatException
 from novelwriter.extensions.modified import NToolDialog
@@ -277,11 +277,11 @@ class GuiWritingStats(NToolDialog):
         self.btnSave.setMenu(self.saveMenu)
 
         self.saveJSON = QAction(self.tr("JSON Data File (.json)"), self)
-        self.saveJSON.triggered.connect(lambda: self._saveData(self.FMT_JSON))
+        self.saveJSON.triggered.connect(qtLambda(self._saveData, self.FMT_JSON))
         self.saveMenu.addAction(self.saveJSON)
 
         self.saveCSV = QAction(self.tr("CSV Data File (.csv)"), self)
-        self.saveCSV.triggered.connect(lambda: self._saveData(self.FMT_CSV))
+        self.saveCSV.triggered.connect(qtLambda(self._saveData, self.FMT_CSV))
         self.saveMenu.addAction(self.saveCSV)
 
         # Assemble

novelwriter/types.py

@@ -6,7 +6,7 @@ File History:
 Created: 2024-04-01 [2.4rc1]
 
 This file is a part of novelWriter
-Copyright 2018–2024, Veronica Berglyd Olsen
+Copyright (C) 2024 Veronica Berglyd Olsen and novelWriter contributors
 
 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
@@ -23,9 +23,12 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtCore import QRegularExpression, Qt
-from PyQt5.QtGui import QColor, QFont, QPainter, QTextCharFormat, QTextCursor, QTextFormat
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QSizePolicy, QStyle
+from PyQt5.QtCore import Qt
+from PyQt5.QtGui import (
+    QColor, QFont, QPainter, QTextBlockFormat, QTextCharFormat, QTextCursor,
+    QTextFormat
+)
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, QSizePolicy, QStyle
 
 # Qt Alignment Flags
 
@@ -48,11 +51,13 @@ QtVAlignNormal = QTextCharFormat.VerticalAlignment.AlignNormal
 QtVAlignSub = QTextCharFormat.VerticalAlignment.AlignSubScript
 QtVAlignSuper = QTextCharFormat.VerticalAlignment.AlignSuperScript
 
-# Qt Page Break
+# Qt Text Formats
 
 QtPageBreakBefore = QTextFormat.PageBreakFlag.PageBreak_AlwaysBefore
 QtPageBreakAfter = QTextFormat.PageBreakFlag.PageBreak_AlwaysAfter
 
+QtPropLineHeight = QTextBlockFormat.LineHeightTypes.ProportionalHeight
+
 # Qt Painter Types
 
 QtTransparent = QColor(0, 0, 0, 0)
@@ -61,10 +66,14 @@ QtNoBrush = Qt.BrushStyle.NoBrush
 QtNoPen = Qt.PenStyle.NoPen
 QtRoundCap = Qt.PenCapStyle.RoundCap
 QtSolidLine = Qt.PenStyle.SolidLine
-QtPaintAnitAlias = QPainter.RenderHint.Antialiasing
+QtPaintAntiAlias = QPainter.RenderHint.Antialiasing
 QtMouseOver = QStyle.StateFlag.State_MouseOver
 QtSelected = QStyle.StateFlag.State_Selected
 
+# Qt Colour Types
+
+QtHexRgb = QColor.NameFormat.HexRgb
+
 # Qt Tree and Table Types
 
 QtDecoration = Qt.ItemDataRole.DecorationRole
@@ -110,9 +119,16 @@ QtSizeIgnored = QSizePolicy.Policy.Ignored
 QtSizeMinimum = QSizePolicy.Policy.Minimum
 QtSizeMinimumExpanding = QSizePolicy.Policy.MinimumExpanding
 
-# Other
+# Resize Mode
+
+QtHeaderStretch = QHeaderView.ResizeMode.Stretch
+QtHeaderToContents = QHeaderView.ResizeMode.ResizeToContents
+QtHeaderFixed = QHeaderView.ResizeMode.Fixed
+
+# Scroll Bar Policy
 
-QRegExUnicode = QRegularExpression.PatternOption.UseUnicodePropertiesOption
+QtScrollAlwaysOff = Qt.ScrollBarPolicy.ScrollBarAlwaysOff
+QtScrollAsNeeded = Qt.ScrollBarPolicy.ScrollBarAsNeeded
 
 # Maps
 
@@ -128,7 +144,7 @@ FONT_WEIGHTS: dict[int, int] = {
     QFont.Weight.Black:      900,
 }
 
-FONT_STYLE: dict[int, str] = {
+FONT_STYLE: dict[QFont.Style, str] = {
     QFont.Style.StyleNormal:  "normal",
     QFont.Style.StyleItalic:  "italic",
     QFont.Style.StyleOblique: "oblique",