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

novelwriter/extensions/pagedsidebar.py

@@ -25,14 +25,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtGui import QColor, QPaintEvent, QPainter, QPolygon
 from PyQt5.QtCore import QPoint, QRectF, QSize, Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QColor, QPainter, QPaintEvent, QPolygon
 from PyQt5.QtWidgets import (
-    QAbstractButton, QAction, QButtonGroup, QLabel, QSizePolicy, QStyle,
+    QAbstractButton, QAction, QButtonGroup, QLabel, QStyle,
     QStyleOptionToolButton, QToolBar, QToolButton, QWidget
 )
 
-from novelwriter.types import QtPaintAnitAlias, QtAlignLeft, QtMouseOver, QtNoBrush, QtNoPen
+from novelwriter.types import (
+    QtAlignLeft, QtMouseOver, QtNoBrush, QtNoPen, QtPaintAnitAlias,
+    QtSizeExpanding, QtSizeFixed
+)
 
 
 class NPagedSideBar(QToolBar):
@@ -59,7 +62,7 @@ class NPagedSideBar(QToolBar):
         self.setOrientation(Qt.Orientation.Vertical)
 
         stretch = QWidget(self)
-        stretch.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+        stretch.setSizePolicy(QtSizeExpanding, QtSizeExpanding)
         self._stretchAction = self.addWidget(stretch)
 
         return
@@ -109,8 +112,6 @@ class NPagedSideBar(QToolBar):
             self.buttonClicked.emit(buttonId)
         return
 
-# END Class NPagedSideBar
-
 
 class _NPagedToolButton(QToolButton):
 
@@ -119,7 +120,7 @@ class _NPagedToolButton(QToolButton):
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
 
-        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+        self.setSizePolicy(QtSizeExpanding, QtSizeFixed)
         self.setCheckable(True)
 
         fH = self.fontMetrics().height()
@@ -187,8 +188,6 @@ class _NPagedToolButton(QToolButton):
 
         return
 
-# END Class _NPagedToolButton
-
 
 class _NPagedToolLabel(QLabel):
 
@@ -197,7 +196,7 @@ class _NPagedToolLabel(QLabel):
     def __init__(self, parent: QWidget, textColor: QColor | None = None) -> None:
         super().__init__(parent=parent)
 
-        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+        self.setSizePolicy(QtSizeExpanding, QtSizeFixed)
 
         fH = self.fontMetrics().height()
         self._bH = round(fH * 1.7)
@@ -228,5 +227,3 @@ class _NPagedToolLabel(QLabel):
         paint.drawText(QRectF(self._lM, self._tM, tW, tH), QtAlignLeft, self.text())
 
         return
-
-# END Class _NPagedToolLabel

novelwriter/extensions/{circularprogress.py → progressbars.py}

@@ -1,9 +1,10 @@
 """
-novelWriter – Custom Widget: Progress Circle
-============================================
+novelWriter – Custom Widget: Progress Bars
+==========================================
 
 File History:
-Created: 2023-06-07 [2.1b1]
+Created: 2023-06-07 [2.1b1] NProgressCircle
+Created: 2023-06-09 [2.1b1] NProgressSimple
 
 This file is a part of novelWriter
 Copyright 2018–2024, Veronica Berglyd Olsen
@@ -26,11 +27,12 @@ from __future__ import annotations
 from math import ceil
 
 from PyQt5.QtCore import QRect
-from PyQt5.QtGui import QBrush, QColor, QPaintEvent, QPainter, QPen
-from PyQt5.QtWidgets import QProgressBar, QSizePolicy, QWidget
+from PyQt5.QtGui import QBrush, QColor, QPainter, QPaintEvent, QPen
+from PyQt5.QtWidgets import QProgressBar, QWidget
 
 from novelwriter.types import (
-    QtPaintAnitAlias, QtAlignCenter, QtRoundCap, QtSolidLine, QtTransparent
+    QtAlignCenter, QtPaintAnitAlias, QtRoundCap, QtSizeFixed, QtSolidLine,
+    QtTransparent
 )
 
 
@@ -59,7 +61,7 @@ class NProgressCircle(QProgressBar):
             bar=self.palette().highlight().color(),
             text=self.palette().text().color()
         )
-        self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
+        self.setSizePolicy(QtSizeFixed, QtSizeFixed)
         self.setFixedWidth(size)
         self.setFixedHeight(size)
         return
@@ -101,4 +103,24 @@ class NProgressCircle(QProgressBar):
         painter.drawText(self._cRect, QtAlignCenter, self._text or f"{progress:.1f} %")
         return
 
-# END Class NProgressCircle
+
+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

novelwriter/extensions/statusled.py

@@ -25,44 +25,56 @@ from __future__ import annotations
 
 import logging
 
-from typing import Literal
-
-from PyQt5.QtGui import QColor, QPaintEvent, QPainter
+from PyQt5.QtGui import QColor, QPainter, QPaintEvent
 from PyQt5.QtWidgets import QAbstractButton, QWidget
 
-from novelwriter.types import QtPaintAnitAlias
+from novelwriter import CONFIG
+from novelwriter.enum import nwTrinary
+from novelwriter.types import QtBlack, QtPaintAnitAlias
 
 logger = logging.getLogger(__name__)
 
 
 class StatusLED(QAbstractButton):
 
-    S_NONE = 0
-    S_BAD  = 1
-    S_GOOD = 2
+    __slots__ = (
+        "_neutral", "_postitve", "_negative", "_color", "_state", "_bPx"
+    )
 
-    def __init__(self, colNone: QColor, colGood: QColor, colBad: QColor,
-                 sW: int, sH: int, parent: QWidget | None = None) -> None:
+    def __init__(self, sW: int, sH: int, parent: QWidget | None = None) -> None:
         super().__init__(parent=parent)
-
-        self._colNone = colNone
-        self._colGood = colGood
-        self._colBad = colBad
-        self._theCol = colNone
-
+        self._neutral = QtBlack
+        self._postitve = QtBlack
+        self._negative = QtBlack
+        self._color = QtBlack
+        self._state = nwTrinary.NEUTRAL
+        self._bPx = CONFIG.pxInt(1)
         self.setFixedWidth(sW)
         self.setFixedHeight(sH)
+        return
 
+    @property
+    def state(self) -> nwTrinary:
+        """The current state of the LED."""
+        return self._state
+
+    def setColors(self, neutral: QColor, positive: QColor, negative: QColor) -> None:
+        """Set the three colours for the status values."""
+        self._neutral = neutral
+        self._postitve = positive
+        self._negative = negative
+        self.setState(self._state)
         return
 
-    def setState(self, state: Literal[0, 1, 2]) -> None:
+    def setState(self, state: nwTrinary) -> None:
         """Set the colour state."""
-        if state == self.S_GOOD:
-            self._theCol = self._colGood
-        elif state == self.S_BAD:
-            self._theCol = self._colBad
+        if state == nwTrinary.POSITIVE:
+            self._color = self._postitve
+        elif state == nwTrinary.NEGATIVE:
+            self._color = self._negative
         else:
-            self._theCol = self._colNone
+            self._color = self._neutral
+        self._state = state
         self.update()
         return
 
@@ -70,10 +82,12 @@ class StatusLED(QAbstractButton):
         """Draw the LED."""
         painter = QPainter(self)
         painter.setRenderHint(QtPaintAnitAlias, True)
-        painter.setPen(self.palette().dark().color())
-        painter.setBrush(self._theCol)
+        painter.setPen(self.palette().windowText().color())
+        painter.setBrush(self._color)
         painter.setOpacity(1.0)
-        painter.drawEllipse(1, 1, self.width() - 2, self.height() - 2)
+        painter.drawEllipse(
+            self._bPx, self._bPx,
+            self.width() - 2*self._bPx,
+            self.height() - 2*self._bPx
+        )
         return
-
-# END Class StatusLED

novelwriter/extensions/switch.py

@@ -23,12 +23,12 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtGui import QMouseEvent, QPainter, QPaintEvent, QResizeEvent
 from PyQt5.QtCore import QEvent, QPropertyAnimation, Qt, pyqtProperty
-from PyQt5.QtWidgets import QAbstractButton, QSizePolicy, QWidget
+from PyQt5.QtGui import QMouseEvent, QPainter, QPaintEvent, QResizeEvent
+from PyQt5.QtWidgets import QAbstractButton, QWidget
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.types import QtPaintAnitAlias, QtMouseLeft, QtNoPen
+from novelwriter.types import QtMouseLeft, QtNoPen, QtPaintAnitAlias, QtSizeFixed
 
 
 class NSwitch(QAbstractButton):
@@ -46,7 +46,7 @@ class NSwitch(QAbstractButton):
         self._rR = self._xR - self._rB
 
         self.setCheckable(True)
-        self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
+        self.setSizePolicy(QtSizeFixed, QtSizeFixed)
         self.setFixedWidth(self._xW)
         self.setFixedHeight(self._xH)
         self._offset = self._xR
@@ -133,5 +133,3 @@ class NSwitch(QAbstractButton):
         self.setCursor(Qt.CursorShape.PointingHandCursor)
         super().enterEvent(event)
         return
-
-# END Class NSwitch

novelwriter/extensions/switchbox.py

@@ -23,12 +23,15 @@ 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 pyqtSignal
-from PyQt5.QtWidgets import QGridLayout, QLabel, QScrollArea, QSizePolicy, QWidget
+from PyQt5.QtGui import QIcon
+from PyQt5.QtWidgets import QGridLayout, QLabel, QScrollArea, QWidget
 
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.types import QtAlignLeft, QtAlignRight, QtAlignRightMiddle
+from novelwriter.types import (
+    QtAlignLeft, QtAlignRight, QtAlignRightMiddle, QtSizeMinimum,
+    QtSizeMinimumExpanding
+)
 
 
 class NSwitchBox(QScrollArea):
@@ -59,7 +62,7 @@ class NSwitchBox(QScrollArea):
         self._content.setColumnStretch(1, 1)
 
         self._widget = QWidget(self)
-        self._widget.setSizePolicy(QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Minimum)
+        self._widget.setSizePolicy(QtSizeMinimumExpanding, QtSizeMinimum)
         self._widget.setLayout(self._content)
 
         self.setWidgetResizable(True)
@@ -124,5 +127,3 @@ class NSwitchBox(QScrollArea):
         self._content.setRowStretch(self._index + 1, 1)
         self._index += 1
         return
-
-# END Class NSwitchBox

novelwriter/extensions/versioninfo.py

@@ -26,16 +26,16 @@ from __future__ import annotations
 import json
 import logging
 
-from time import sleep
 from datetime import datetime
+from time import sleep
 from urllib.error import HTTPError
 from urllib.request import Request, urlopen
 
-from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtCore import QObject, QRunnable, QUrl, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtWidgets import QLabel, QVBoxLayout, QWidget
 
-from novelwriter import CONFIG, SHARED, __version__, __date__, __domain__
+from novelwriter import CONFIG, SHARED, __date__, __domain__, __version__
 from novelwriter.common import formatVersion
 from novelwriter.constants import nwConst
 
@@ -111,8 +111,6 @@ class VersionInfoWidget(QWidget):
             self._lblRelease.setText(self._trLatest.format(reason or self.tr("Failed")))
         return
 
-# END Class VersionInfoWidget
-
 
 class _Retriever(QRunnable):
 
@@ -144,10 +142,6 @@ class _Retriever(QRunnable):
             self.signals.dataReady.emit("", str(e))
         return
 
-# END Class _Retriever
-
 
 class _RetrieverSignal(QObject):
     dataReady = pyqtSignal(str, str)
-
-# END Class _RetrieverSignal