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

novelwriter/extensions/pagedsidebar.py

@@ -32,6 +32,8 @@ from PyQt5.QtWidgets import (
     QStyleOptionToolButton, QToolBar, QToolButton, QWidget
 )
 
+from novelwriter.types import QtPaintAnitAlias, QtAlignLeft, QtMouseOver, QtNoBrush, QtNoPen
+
 
 class NPagedSideBar(QToolBar):
     """Extensions: Paged Side Bar
@@ -54,10 +56,10 @@ class NPagedSideBar(QToolBar):
         self._group.buttonClicked.connect(self._buttonClicked)
 
         self.setMovable(False)
-        self.setOrientation(Qt.Vertical)
+        self.setOrientation(Qt.Orientation.Vertical)
 
         stretch = QWidget(self)
-        stretch.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        stretch.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         self._stretchAction = self.addWidget(stretch)
 
         return
@@ -117,13 +119,13 @@ class _NPagedToolButton(QToolButton):
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
 
-        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
         self.setCheckable(True)
 
         fH = self.fontMetrics().height()
         self._bH = round(fH * 1.7)
         self._tM = (self._bH - fH)//2
-        self._lM = 3*self.style().pixelMetric(QStyle.PM_ButtonMargin)//2
+        self._lM = 3*self.style().pixelMetric(QStyle.PixelMetric.PM_ButtonMargin)//2
         self._cR = self._lM//2
         self._aH = 2*fH//7
         self.setFixedHeight(self._bH)
@@ -143,15 +145,15 @@ class _NPagedToolButton(QToolButton):
         opt.initFrom(self)
 
         paint = QPainter(self)
-        paint.setRenderHint(QPainter.Antialiasing, True)
-        paint.setPen(Qt.NoPen)
-        paint.setBrush(Qt.NoBrush)
+        paint.setRenderHint(QtPaintAnitAlias, True)
+        paint.setPen(QtNoPen)
+        paint.setBrush(QtNoBrush)
 
         width = self.width()
         height = self.height()
         palette = self.palette()
 
-        if opt.state & QStyle.State_MouseOver == QStyle.State_MouseOver:
+        if opt.state & QtMouseOver == QtMouseOver:
             backCol = palette.base()
             paint.setBrush(backCol)
             paint.setOpacity(0.75)
@@ -171,7 +173,7 @@ class _NPagedToolButton(QToolButton):
 
         paint.setPen(textCol)
         paint.setOpacity(1.0)
-        paint.drawText(QRectF(self._lM, self._tM, tW, tH), Qt.AlignLeft, self.text())
+        paint.drawText(QRectF(self._lM, self._tM, tW, tH), QtAlignLeft, self.text())
 
         tC = self.height()//2
         tW = self.width() - self._aH - self._lM
@@ -195,12 +197,12 @@ class _NPagedToolLabel(QLabel):
     def __init__(self, parent: QWidget, textColor: QColor | None = None) -> None:
         super().__init__(parent=parent)
 
-        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
 
         fH = self.fontMetrics().height()
         self._bH = round(fH * 1.7)
         self._tM = (self._bH - fH)//2
-        self._lM = self.style().pixelMetric(QStyle.PM_ButtonMargin)//2
+        self._lM = self.style().pixelMetric(QStyle.PixelMetric.PM_ButtonMargin)//2
         self.setFixedHeight(self._bH)
 
         self._textCol = textColor or self.palette().text().color()
@@ -212,8 +214,8 @@ class _NPagedToolLabel(QLabel):
         label that matches the button style.
         """
         paint = QPainter(self)
-        paint.setRenderHint(QPainter.Antialiasing, True)
-        paint.setPen(Qt.NoPen)
+        paint.setRenderHint(QtPaintAnitAlias, True)
+        paint.setPen(QtNoPen)
 
         width = self.width()
         height = self.height()
@@ -223,7 +225,7 @@ class _NPagedToolLabel(QLabel):
 
         paint.setPen(self._textCol)
         paint.setOpacity(1.0)
-        paint.drawText(QRectF(self._lM, self._tM, tW, tH), Qt.AlignLeft, self.text())
+        paint.drawText(QRectF(self._lM, self._tM, tW, tH), QtAlignLeft, self.text())
 
         return
 

novelwriter/extensions/simpleprogress.py

@@ -28,6 +28,8 @@ 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
@@ -44,7 +46,7 @@ class NProgressSimple(QProgressBar):
         if (value := self.value()) > 0:
             progress = ceil(self.width()*float(value)/self.maximum())
             painter = QPainter(self)
-            painter.setRenderHint(QPainter.Antialiasing, True)
+            painter.setRenderHint(QtPaintAnitAlias, True)
             painter.setPen(self.palette().highlight().color())
             painter.setBrush(self.palette().highlight())
             painter.drawRect(0, 0, progress, self.height())

novelwriter/extensions/statusled.py

@@ -30,6 +30,8 @@ from typing import Literal
 from PyQt5.QtGui import QColor, QPaintEvent, QPainter
 from PyQt5.QtWidgets import QAbstractButton, QWidget
 
+from novelwriter.types import QtPaintAnitAlias
+
 logger = logging.getLogger(__name__)
 
 
@@ -67,7 +69,7 @@ class StatusLED(QAbstractButton):
     def paintEvent(self, event: QPaintEvent) -> None:
         """Draw the LED."""
         painter = QPainter(self)
-        painter.setRenderHint(QPainter.Antialiasing, True)
+        painter.setRenderHint(QtPaintAnitAlias, True)
         painter.setPen(self.palette().dark().color())
         painter.setBrush(self._theCol)
         painter.setOpacity(1.0)

novelwriter/extensions/switch.py

@@ -27,25 +27,26 @@ from PyQt5.QtGui import QMouseEvent, QPainter, QPaintEvent, QResizeEvent
 from PyQt5.QtCore import QEvent, QPropertyAnimation, Qt, pyqtProperty
 from PyQt5.QtWidgets import QAbstractButton, QSizePolicy, QWidget
 
-from novelwriter import CONFIG
+from novelwriter import CONFIG, SHARED
+from novelwriter.types import QtPaintAnitAlias, QtMouseLeft, QtNoPen
 
 
 class NSwitch(QAbstractButton):
 
     __slots__ = ("_xW", "_xH", "_xR", "_rB", "_rH", "_rR", "_offset")
 
-    def __init__(self, parent: QWidget | None = None, height: int = 0) -> None:
+    def __init__(self, parent: QWidget, height: int = 0) -> None:
         super().__init__(parent=parent)
 
-        self._xH = height or CONFIG.pxInt(20)
+        self._xH = height or SHARED.theme.baseButtonHeight
         self._xW = 2*self._xH
         self._xR = int(self._xH*0.5)
-        self._rB = int(CONFIG.guiScale*2)
+        self._rB = CONFIG.pxInt(2)
         self._rH = self._xH - 2*self._rB
         self._rR = self._xR - self._rB
 
         self.setCheckable(True)
-        self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
         self.setFixedWidth(self._xW)
         self.setFixedHeight(self._xH)
         self._offset = self._xR
@@ -89,8 +90,8 @@ class NSwitch(QAbstractButton):
     def paintEvent(self, event: QPaintEvent) -> None:
         """Drawing the switch itself."""
         painter = QPainter(self)
-        painter.setRenderHint(QPainter.Antialiasing, True)
-        painter.setPen(Qt.NoPen)
+        painter.setRenderHint(QtPaintAnitAlias, True)
+        painter.setPen(QtNoPen)
 
         palette = self.palette()
         if self.isChecked():
@@ -119,7 +120,7 @@ class NSwitch(QAbstractButton):
     def mouseReleaseEvent(self, event: QMouseEvent) -> None:
         """Animate the switch on mouse release."""
         super().mouseReleaseEvent(event)
-        if event.button() == Qt.LeftButton:
+        if event.button() == QtMouseLeft:
             anim = QPropertyAnimation(self, b"offset", self)
             anim.setDuration(120)
             anim.setStartValue(self._offset)
@@ -129,7 +130,7 @@ class NSwitch(QAbstractButton):
 
     def enterEvent(self, event: QEvent) -> None:
         """Change the cursor when hovering the button."""
-        self.setCursor(Qt.PointingHandCursor)
+        self.setCursor(Qt.CursorShape.PointingHandCursor)
         super().enterEvent(event)
         return
 

novelwriter/extensions/switchbox.py

@@ -24,10 +24,11 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 from __future__ import annotations
 
 from PyQt5.QtGui import QIcon
-from PyQt5.QtCore import Qt, pyqtSignal
+from PyQt5.QtCore import pyqtSignal
 from PyQt5.QtWidgets import QGridLayout, QLabel, QScrollArea, QSizePolicy, QWidget
 
 from novelwriter.extensions.switch import NSwitch
+from novelwriter.types import QtAlignLeft, QtAlignRight, QtAlignRightMiddle
 
 
 class NSwitchBox(QScrollArea):
@@ -57,8 +58,8 @@ class NSwitchBox(QScrollArea):
         self._content = QGridLayout()
         self._content.setColumnStretch(1, 1)
 
-        self._widget = QWidget()
-        self._widget.setSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.Minimum)
+        self._widget = QWidget(self)
+        self._widget.setSizePolicy(QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Minimum)
         self._widget.setLayout(self._content)
 
         self.setWidgetResizable(True)
@@ -68,29 +69,29 @@ class NSwitchBox(QScrollArea):
 
     def addLabel(self, text: str) -> None:
         """Add a header label to the content box."""
-        label = QLabel(text)
+        label = QLabel(text, self)
         font = label.font()
         font.setBold(True)
         label.setFont(font)
-        self._content.addWidget(label, self._index, 0, 1, 3, Qt.AlignLeft)
+        self._content.addWidget(label, self._index, 0, 1, 3, QtAlignLeft)
         self._widgets.append(label)
         self._bumpIndex()
         return
 
     def addItem(self, qIcon: QIcon, text: str, identifier: str, default: bool = False) -> None:
         """Add an item to the content box."""
-        icon = QLabel("")
-        icon.setAlignment(Qt.AlignRight | Qt.AlignVCenter)
+        icon = QLabel("", self)
+        icon.setAlignment(QtAlignRightMiddle)
         icon.setPixmap(qIcon.pixmap(self._sIcon, self._sIcon))
-        self._content.addWidget(icon, self._index, 0, Qt.AlignLeft)
+        self._content.addWidget(icon, self._index, 0, QtAlignLeft)
 
-        label = QLabel(text)
-        self._content.addWidget(label, self._index, 1, Qt.AlignLeft)
+        label = QLabel(text, self)
+        self._content.addWidget(label, self._index, 1, QtAlignLeft)
 
         switch = NSwitch(self, height=self._hSwitch)
         switch.setChecked(default)
         switch.toggled.connect(lambda state: self._emitSwitchSignal(identifier, state))
-        self._content.addWidget(switch, self._index, 2, Qt.AlignRight)
+        self._content.addWidget(switch, self._index, 2, QtAlignRight)
 
         self._widgets.append(switch)
         self._bumpIndex()
@@ -99,9 +100,9 @@ class NSwitchBox(QScrollArea):
 
     def addSeparator(self) -> None:
         """Add a blank entry in the content box."""
-        spacer = QWidget()
+        spacer = QWidget(self)
         spacer.setFixedHeight(int(0.5*self._sIcon))
-        self._content.addWidget(spacer, self._index, 0, 1, 3, Qt.AlignLeft)
+        self._content.addWidget(spacer, self._index, 0, 1, 3, QtAlignLeft)
         self._widgets.append(spacer)
         self._bumpIndex()
         return

novelwriter/extensions/versioninfo.py

@@ -57,7 +57,7 @@ class VersionInfoWidget(QWidget):
         # Labels
         self._lblInfo = QLabel("{0} {1} \u2013 {2} {3} \u2013 {4}".format(
             self.tr("Version"), formatVersion(__version__),
-            self.tr("Released on"), datetime.strptime(__date__, "%Y-%m-%d").strftime("%x"),
+            self.tr("Released on"), CONFIG.localDate(datetime.strptime(__date__, "%Y-%m-%d")),
             "<a href='#notes'>{0}</a>".format(self.tr("Release Notes")),
         ), self)
         self._lblInfo.linkActivated.connect(self._processLink)