novelWriter 2.6.2__py3-none-any.whl → 2.7b1__py3-none-any.whl

novelwriter/extensions/configlayout.py

@@ -27,13 +27,12 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtGui import QColor, QFont, QPalette, QPixmap
-from PyQt5.QtWidgets import (
+from PyQt6.QtGui import QColor, QFont, QPalette, QPixmap
+from PyQt6.QtWidgets import (
     QAbstractButton, QFrame, QHBoxLayout, QLabel, QLayout, QScrollArea,
     QVBoxLayout, QWidget
 )
 
-from novelwriter import CONFIG
 from novelwriter.types import QtScrollAsNeeded
 
 DEFAULT_SCALE = 0.9
@@ -99,14 +98,14 @@ class NScrollableForm(QScrollArea):
         self._helpCol = QColor(0, 0, 0)
         self._fontScale = DEFAULT_SCALE
         self._first = True
-        self._indent = CONFIG.pxInt(12)
+        self._indent = 12
 
         self._sections: dict[int, QLabel] = {}
-        self._editable: dict[str, NColourLabel] = {}
+        self._editable: dict[str, NColorLabel] = {}
         self._index: dict[str, QWidget] = {}
 
         self._layout = QVBoxLayout()
-        self._layout.setSpacing(CONFIG.pxInt(12))
+        self._layout.setSpacing(12)
 
         self._widget = QWidget(self)
         self._widget.setLayout(self._layout)
@@ -156,24 +155,25 @@ class NScrollableForm(QScrollArea):
     def scrollToSection(self, identifier: int) -> None:
         """Scroll to the requested section identifier."""
         if identifier in self._sections:
-            yPos = self._sections[identifier].pos().y() - CONFIG.pxInt(8)
-            self.verticalScrollBar().setValue(yPos)
+            yPos = self._sections[identifier].pos().y() - 8
+            if vBar := self.verticalScrollBar():
+                vBar.setValue(yPos)
         return
 
     def scrollToLabel(self, label: str) -> None:
         """Scroll to the requested label."""
         if label in self._index:
-            yPos = self._index[label].pos().y() - CONFIG.pxInt(8)
-            self.verticalScrollBar().setValue(yPos)
+            yPos = self._index[label].pos().y() - 8
+            if vBar := self.verticalScrollBar():
+                vBar.setValue(yPos)
         return
 
     def addGroupLabel(self, label: str, identifier: int | None = None) -> None:
         """Add a text label to separate groups of settings."""
-        hM = CONFIG.pxInt(4)
         qLabel = QLabel(f"<b>{label}</b>", self)
-        qLabel.setContentsMargins(0, hM, 0, hM)
+        qLabel.setContentsMargins(0, 4, 0, 4)
         if not self._first:
-            self._layout.addSpacing(5*hM)
+            self._layout.addSpacing(20)
         self._layout.addWidget(qLabel)
         self._first = False
         if identifier is not None:
@@ -192,7 +192,7 @@ class NScrollableForm(QScrollArea):
     ) -> None:
         """Add a label and a widget as a new row of the form."""
         row = QHBoxLayout()
-        row.setSpacing(CONFIG.pxInt(12))
+        row.setSpacing(12)
 
         if isinstance(widget, list):
             wBox = QHBoxLayout()
@@ -205,7 +205,7 @@ class NScrollableForm(QScrollArea):
                     icon.setPixmap(item)
                     wBox.addWidget(icon)
                 elif isinstance(item, int):
-                    wBox.addSpacing(CONFIG.pxInt(item))
+                    wBox.addSpacing(item)
             qWidget = QWidget(self)
             qWidget.setLayout(wBox)
         else:
@@ -216,7 +216,7 @@ class NScrollableForm(QScrollArea):
         qLabel.setBuddy(qWidget)
 
         if helpText:
-            qHelp = NColourLabel(
+            qHelp = NColorLabel(
                 str(helpText), self, color=self._helpCol,
                 scale=self._fontScale, wrap=True, indent=self._indent
             )
@@ -252,12 +252,12 @@ class NScrollableForm(QScrollArea):
 
     def finalise(self) -> None:
         """Finalise the layout when the form is built."""
-        self._layout.addSpacing(CONFIG.pxInt(20))
+        self._layout.addSpacing(20)
         self._layout.addStretch(1)
         return
 
 
-class NColourLabel(QLabel):
+class NColorLabel(QLabel):
     """Extension: A Coloured Label
 
     A custom widget that draws a label in a specific colour, and

novelwriter/extensions/eventfilters.py

@@ -24,9 +24,13 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtCore import QEvent, QObject
-from PyQt5.QtGui import QStatusTipEvent, QWheelEvent
-from PyQt5.QtWidgets import QWidget
+from typing import TYPE_CHECKING
+
+from PyQt6.QtCore import QEvent, QObject
+from PyQt6.QtGui import QStatusTipEvent, QWheelEvent
+
+if TYPE_CHECKING:
+    from PyQt6.QtWidgets import QWidget
 
 
 class WheelEventFilter(QObject):
@@ -40,7 +44,7 @@ class WheelEventFilter(QObject):
     Reference: https://stackoverflow.com/a/17739995/5825851
     """
 
-    __slots__ = ("_parent", "_locked")
+    __slots__ = ("_locked", "_parent")
 
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
@@ -48,7 +52,7 @@ class WheelEventFilter(QObject):
         self._locked = False
         return
 
-    def eventFilter(self, object: QObject, event: QEvent) -> bool:
+    def eventFilter(self, obj: QObject, event: QEvent) -> bool:
         """Filter events of type QWheelEvent and forward them to the
         parent widget's wheelEvent handler.
         """

novelwriter/extensions/modified.py

@@ -27,20 +27,22 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from enum import Enum
 from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import QSize, Qt, pyqtSignal, pyqtSlot
-from PyQt5.QtGui import QMouseEvent, QWheelEvent
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import QModelIndex, QSize, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import (
     QApplication, QComboBox, QDialog, QDoubleSpinBox, QLabel, QSpinBox,
-    QToolButton, QWidget
+    QToolButton, QTreeView, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.types import QtMouseLeft
+from novelwriter.types import QtMouseLeft, QtMouseMiddle
+
+if TYPE_CHECKING:
+    from enum import Enum
+
+    from PyQt6.QtGui import QMouseEvent, QWheelEvent
 
-if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
 
 
@@ -99,6 +101,20 @@ class NNonBlockingDialog(NDialog):
         return
 
 
+class NTreeView(QTreeView):
+
+    middleClicked = pyqtSignal(QModelIndex)
+
+    def mousePressEvent(self, event: QMouseEvent | None) -> None:
+        """Emit a signal on mouse middle click."""
+        if (
+            event and event.button() == QtMouseMiddle
+            and (index := self.indexAt(event.pos())).isValid()
+        ):
+            self.middleClicked.emit(index)
+        return super().mousePressEvent(event)
+
+
 class NComboBox(QComboBox):
 
     def __init__(self, parent: QWidget | None = None) -> None:
@@ -141,15 +157,15 @@ class NDoubleSpinBox(QDoubleSpinBox):
         self,
         parent: QWidget | None = None,
         *,
-        min: float = 0.0,
-        max: float = 15.0,
+        minVal: float = 0.0,
+        maxVal: float = 15.0,
         step: float = 0.1,
         prec: int = 2,
     ) -> None:
         super().__init__(parent=parent)
         self.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
-        self.setMinimum(min)
-        self.setMaximum(max)
+        self.setMinimum(minVal)
+        self.setMaximum(maxVal)
         self.setSingleStep(step)
         self.setDecimals(prec)
         return
@@ -164,18 +180,21 @@ class NDoubleSpinBox(QDoubleSpinBox):
 
 class NIconToolButton(QToolButton):
 
-    def __init__(self, parent: QWidget, iconSize: QSize, icon: str | None = None) -> None:
+    def __init__(
+        self, parent: QWidget, iconSize: QSize,
+        icon: str | None = None, color: str | None = None
+    ) -> None:
         super().__init__(parent=parent)
         self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
         self.setIconSize(iconSize)
         self.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
         if icon:
-            self.setThemeIcon(icon)
+            self.setThemeIcon(icon, color)
         return
 
-    def setThemeIcon(self, iconKey: str) -> None:
+    def setThemeIcon(self, iconKey: str, color: str | None = None) -> None:
         """Set an icon from the current theme."""
-        self.setIcon(SHARED.theme.getIcon(iconKey))
+        self.setIcon(SHARED.theme.getIcon(iconKey, color))
         return
 
 

novelwriter/extensions/novelselector.py

@@ -25,8 +25,9 @@ from __future__ import annotations
 
 import logging
 
-from PyQt5.QtCore import pyqtSignal, pyqtSlot
-from PyQt5.QtWidgets import QComboBox, QWidget
+from PyQt6.QtCore import pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QPalette
+from PyQt6.QtWidgets import QComboBox, QWidget
 
 from novelwriter import SHARED
 from novelwriter.constants import nwLabels
@@ -46,6 +47,7 @@ class NovelSelector(QComboBox):
         self._includeAll = False
         self._listFormat = None
         self.currentIndexChanged.connect(self._indexChanged)
+        self.updateTheme()
         return
 
     ##
@@ -53,8 +55,11 @@ class NovelSelector(QComboBox):
     ##
 
     @property
-    def handle(self) -> str:
-        return self.currentData()
+    def handle(self) -> str | None:
+        """Return the selected handle, if any."""
+        if tHandle := self.currentData():
+            return tHandle
+        return None
 
     @property
     def firstHandle(self) -> str | None:
@@ -83,6 +88,14 @@ class NovelSelector(QComboBox):
             self._listFormat = value
         return
 
+    def updateTheme(self) -> None:
+        """Update theme colours."""
+        palette = self.palette()
+        palette.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.Text, palette.text())
+        self.setPalette(palette)
+        self.refreshNovelList()
+        return
+
     ##
     #  Public Slots
     ##
@@ -96,7 +109,7 @@ class NovelSelector(QComboBox):
         self._firstHandle = None
         self.clear()
 
-        icon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[nwItemClass.NOVEL])
+        icon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[nwItemClass.NOVEL], "blue")
         for tHandle, nwItem in SHARED.project.tree.iterRoots(nwItemClass.NOVEL):
             if self._listFormat:
                 name = self._listFormat.format(nwItem.itemName)

novelwriter/extensions/pagedsidebar.py

@@ -25,11 +25,11 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-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, QStyle,
-    QStyleOptionToolButton, QToolBar, QToolButton, QWidget
+from PyQt6.QtCore import QPoint, QRectF, QSize, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QColor, QPainter, QPaintEvent, QPolygon
+from PyQt6.QtWidgets import (
+    QAbstractButton, QButtonGroup, QLabel, QStyleOptionToolButton, QToolBar,
+    QToolButton, QWidget
 )
 
 from novelwriter.types import (
@@ -83,21 +83,19 @@ class NPagedSideBar(QToolBar):
         self.insertWidget(self._stretchAction, label)
         return
 
-    def addButton(self, text: str, buttonId: int = -1) -> QAction:
+    def addButton(self, text: str, buttonId: int = -1) -> None:
         """Add a new button to the toolbar."""
         button = _PagedToolButton(self)
         button.setText(text)
-
-        action = self.insertWidget(self._stretchAction, button)
+        self.insertWidget(self._stretchAction, button)
         self._group.addButton(button, id=buttonId)
-
         self._buttons[buttonId] = button
-
-        return action
+        return
 
     def setSelected(self, buttonId: int) -> None:
         """Set the selected button."""
-        self._group.button(buttonId).setChecked(True)
+        if button := self._group.button(buttonId):
+            button.setChecked(True)
         return
 
     ##
@@ -115,7 +113,7 @@ class NPagedSideBar(QToolBar):
 
 class _PagedToolButton(QToolButton):
 
-    __slots__ = ("_bH", "_tM", "_lM", "_cR", "_aH")
+    __slots__ = ("_aH", "_bH", "_tM")
 
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
@@ -126,8 +124,6 @@ class _PagedToolButton(QToolButton):
         fH = self.fontMetrics().height()
         self._bH = round(fH * 1.7)
         self._tM = (self._bH - fH)//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)
 
@@ -145,53 +141,51 @@ class _PagedToolButton(QToolButton):
         opt = QStyleOptionToolButton()
         opt.initFrom(self)
 
-        paint = QPainter(self)
-        paint.setRenderHint(QtPaintAntiAlias, True)
-        paint.setPen(QtNoPen)
-        paint.setBrush(QtNoBrush)
+        painter = QPainter(self)
+        painter.setRenderHint(QtPaintAntiAlias, True)
+        painter.setPen(QtNoPen)
+        painter.setBrush(QtNoBrush)
 
         width = self.width()
         height = self.height()
         palette = self.palette()
 
         if opt.state & QtMouseOver == QtMouseOver:  # pragma: no cover
-            backCol = palette.base()
-            paint.setBrush(backCol)
-            paint.setOpacity(0.75)
-            paint.drawRoundedRect(0, 0, width, height, self._cR, self._cR)
+            painter.setBrush(palette.light())
+            painter.drawRoundedRect(0, 0, width, height, 4, 4)
 
         if self.isChecked():
-            backCol = palette.highlight()
-            paint.setBrush(backCol)
-            paint.setOpacity(0.35)
-            paint.drawRoundedRect(0, 0, width, height, self._cR, self._cR)
+            painter.setBrush(palette.highlight())
+            painter.setOpacity(0.35)
+            painter.drawRoundedRect(0, 0, width, height, 4, 4)
             textCol = palette.highlightedText().color()
         else:
             textCol = palette.text().color()
 
-        tW = width - 2*self._lM
+        tW = width - 24
         tH = height - 2*self._tM
 
-        paint.setPen(textCol)
-        paint.setOpacity(1.0)
-        paint.drawText(QRectF(self._lM, self._tM, tW, tH), QtAlignLeft, self.text())
+        painter.setPen(textCol)
+        painter.setOpacity(1.0)
+        painter.drawText(QRectF(12, self._tM, tW, tH), QtAlignLeft, self.text())
 
         tC = self.height()//2
-        tW = self.width() - self._aH - self._lM
+        tW = self.width() - self._aH - 12
         if self.isChecked():
-            paint.setBrush(textCol)
-        paint.drawPolygon(QPolygon([
+            painter.setBrush(textCol)
+        painter.drawPolygon(QPolygon([
             QPoint(tW, tC - self._aH),
             QPoint(tW + self._aH, tC),
             QPoint(tW, tC + self._aH),
         ]))
+        painter.end()
 
         return
 
 
 class _NPagedToolLabel(QLabel):
 
-    __slots__ = ("_bH", "_tM", "_lM", "_textCol")
+    __slots__ = ("_bH", "_tM", "_textCol")
 
     def __init__(self, parent: QWidget, textColor: QColor | None = None) -> None:
         super().__init__(parent=parent)
@@ -201,7 +195,6 @@ class _NPagedToolLabel(QLabel):
         fH = self.fontMetrics().height()
         self._bH = round(fH * 1.7)
         self._tM = (self._bH - fH)//2
-        self._lM = self.style().pixelMetric(QStyle.PixelMetric.PM_ButtonMargin)//2
         self.setFixedHeight(self._bH)
 
         self._textCol = textColor or self.palette().text().color()
@@ -212,18 +205,15 @@ class _NPagedToolLabel(QLabel):
         """Overload the paint event to draw a simple, left aligned text
         label that matches the button style.
         """
-        paint = QPainter(self)
-        paint.setRenderHint(QtPaintAntiAlias, True)
-        paint.setPen(QtNoPen)
-
-        width = self.width()
-        height = self.height()
-
-        tW = width - 2*self._lM
-        tH = height - 2*self._tM
-
-        paint.setPen(self._textCol)
-        paint.setOpacity(1.0)
-        paint.drawText(QRectF(self._lM, self._tM, tW, tH), QtAlignLeft, self.text())
+        tW = self.width() - 8
+        tH = self.height() - 2*self._tM
+
+        painter = QPainter(self)
+        painter.setRenderHint(QtPaintAntiAlias, True)
+        painter.setPen(QtNoPen)
+        painter.setPen(self._textCol)
+        painter.setOpacity(1.0)
+        painter.drawText(QRectF(4, self._tM, tW, tH), QtAlignLeft, self.text())
+        painter.end()
 
         return

novelwriter/extensions/progressbars.py

@@ -26,9 +26,9 @@ from __future__ import annotations
 
 from math import ceil
 
-from PyQt5.QtCore import QRect
-from PyQt5.QtGui import QBrush, QColor, QPainter, QPaintEvent, QPen
-from PyQt5.QtWidgets import QProgressBar, QWidget
+from PyQt6.QtCore import QRect
+from PyQt6.QtGui import QBrush, QColor, QPainter, QPaintEvent, QPen
+from PyQt6.QtWidgets import QProgressBar, QWidget
 
 from novelwriter.types import (
     QtAlignCenter, QtPaintAntiAlias, QtRoundCap, QtSizeFixed, QtSolidLine,
@@ -44,8 +44,8 @@ class NProgressCircle(QProgressBar):
     """
 
     __slots__ = (
-        "_text", "_point", "_dRect", "_cRect", "_dPen", "_dBrush",
-        "_cPen", "_bPen", "_tColor"
+        "_bPen", "_cPen", "_cRect", "_dBrush", "_dPen", "_dRect", "_point",
+        "_tColor", "_text",
     )
 
     def __init__(self, parent: QWidget, size: int, point: int) -> None:
@@ -56,7 +56,7 @@ class NProgressCircle(QProgressBar):
         self._cRect = QRect(point, point, size - 2*point, size - 2*point)
         self._dPen = QPen(QtTransparent)
         self._dBrush = QBrush(QtTransparent)
-        self.setColours(
+        self.setColors(
             track=self.palette().alternateBase().color(),
             bar=self.palette().highlight().color(),
             text=self.palette().text().color()
@@ -66,8 +66,10 @@ class NProgressCircle(QProgressBar):
         self.setFixedHeight(size)
         return
 
-    def setColours(self, back: QColor | None = None, track: QColor | None = None,
-                   bar: QColor | None = None, text: QColor | None = None) -> None:
+    def setColors(
+        self, back: QColor | None = None, track: QColor | None = None,
+        bar: QColor | None = None, text: QColor | None = None
+    ) -> None:
         """Set the colours of the widget."""
         if isinstance(back, QColor):
             self._dPen = QPen(back)

novelwriter/extensions/statusled.py

@@ -25,10 +25,9 @@ from __future__ import annotations
 
 import logging
 
-from PyQt5.QtGui import QColor, QPainter, QPaintEvent
-from PyQt5.QtWidgets import QAbstractButton, QWidget
+from PyQt6.QtGui import QColor, QPainter, QPaintEvent
+from PyQt6.QtWidgets import QAbstractButton, QWidget
 
-from novelwriter import CONFIG
 from novelwriter.types import QtBlack, QtPaintAntiAlias
 
 logger = logging.getLogger(__name__)
@@ -36,9 +35,7 @@ logger = logging.getLogger(__name__)
 
 class StatusLED(QAbstractButton):
 
-    __slots__ = (
-        "_neutral", "_postitve", "_negative", "_color", "_state", "_bPx"
-    )
+    __slots__ = ("_color", "_negative", "_neutral", "_postitve", "_state")
 
     def __init__(self, sW: int, sH: int, parent: QWidget | None = None) -> None:
         super().__init__(parent=parent)
@@ -47,7 +44,6 @@ class StatusLED(QAbstractButton):
         self._negative = QtBlack
         self._color = QtBlack
         self._state = None
-        self._bPx = CONFIG.pxInt(1)
         self.setFixedWidth(sW)
         self.setFixedHeight(sH)
         return
@@ -81,12 +77,9 @@ class StatusLED(QAbstractButton):
         """Draw the LED."""
         painter = QPainter(self)
         painter.setRenderHint(QtPaintAntiAlias, True)
-        painter.setPen(self.palette().windowText().color())
+        painter.setPen(self.palette().text().color())
         painter.setBrush(self._color)
         painter.setOpacity(1.0)
-        painter.drawEllipse(
-            self._bPx, self._bPx,
-            self.width() - 2*self._bPx,
-            self.height() - 2*self._bPx
-        )
+        painter.drawEllipse(1, 1, self.width() - 2, self.height() - 2)
+        painter.end()
         return

novelwriter/extensions/switch.py

@@ -23,17 +23,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtCore import QEvent, QPropertyAnimation, Qt, pyqtProperty
-from PyQt5.QtGui import QMouseEvent, QPainter, QPaintEvent, QResizeEvent
-from PyQt5.QtWidgets import QAbstractButton, QWidget
+from PyQt6.QtCore import QPropertyAnimation, Qt, pyqtProperty  # pyright: ignore
+from PyQt6.QtGui import QEnterEvent, QMouseEvent, QPainter, QPaintEvent, QResizeEvent
+from PyQt6.QtWidgets import QAbstractButton, QWidget
 
-from novelwriter import CONFIG, SHARED
+from novelwriter import SHARED
 from novelwriter.types import QtMouseLeft, QtNoPen, QtPaintAntiAlias, QtSizeFixed
 
 
 class NSwitch(QAbstractButton):
 
-    __slots__ = ("_xW", "_xH", "_xR", "_rB", "_rH", "_rR", "_offset")
+    __slots__ = ("_offset", "_rH", "_rR", "_xH", "_xR", "_xW")
 
     def __init__(self, parent: QWidget, height: int = 0) -> None:
         super().__init__(parent=parent)
@@ -41,9 +41,8 @@ class NSwitch(QAbstractButton):
         self._xH = height or SHARED.theme.baseButtonHeight
         self._xW = 2*self._xH
         self._xR = int(self._xH*0.5)
-        self._rB = CONFIG.pxInt(2)
-        self._rH = self._xH - 2*self._rB
-        self._rR = self._xR - self._rB
+        self._rH = self._xH - 4
+        self._rR = self._xR - 2
 
         self.setCheckable(True)
         self.setSizePolicy(QtSizeFixed, QtSizeFixed)
@@ -57,7 +56,7 @@ class NSwitch(QAbstractButton):
     #  Properties
     ##
 
-    @pyqtProperty(int)  # type: ignore
+    @pyqtProperty(int)
     def offset(self) -> int:  # type: ignore
         return self._offset
 
@@ -89,31 +88,21 @@ class NSwitch(QAbstractButton):
 
     def paintEvent(self, event: QPaintEvent) -> None:
         """Drawing the switch itself."""
+        palette = self.palette()
+
         painter = QPainter(self)
         painter.setRenderHint(QtPaintAntiAlias, True)
-        painter.setPen(QtNoPen)
+        painter.setOpacity(1.0 if self.isEnabled() else 0.5)
 
-        palette = self.palette()
-        if self.isChecked():
-            trackBrush = palette.highlight()
-            thumbBrush = palette.highlightedText()
-        else:
-            trackBrush = palette.dark()
-            thumbBrush = palette.light()
-
-        if self.isEnabled():
-            trackOpacity = 1.0
-        else:
-            trackOpacity = 0.6
-            trackBrush = palette.shadow()
-            thumbBrush = palette.mid()
-
-        painter.setBrush(trackBrush)
-        painter.setOpacity(trackOpacity)
+        painter.setPen(palette.mid().color())
+        painter.setBrush(palette.highlight() if self.isChecked() else palette.alternateBase())
         painter.drawRoundedRect(0, 0, self._xW, self._xH, self._xR, self._xR)
 
-        painter.setBrush(thumbBrush)
-        painter.drawEllipse(self._offset - self._rR, self._rB, self._rH, self._rH)
+        painter.setPen(QtNoPen)
+        painter.setBrush(palette.highlightedText())
+        painter.drawEllipse(self._offset - self._rR, 2, self._rH, self._rH)
+
+        painter.end()
 
         return
 
@@ -128,7 +117,7 @@ class NSwitch(QAbstractButton):
             anim.start()
         return
 
-    def enterEvent(self, event: QEvent) -> None:
+    def enterEvent(self, event: QEnterEvent) -> None:
         """Change the cursor when hovering the button."""
         self.setCursor(Qt.CursorShape.PointingHandCursor)
         super().enterEvent(event)

novelwriter/extensions/switchbox.py

@@ -23,9 +23,10 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtCore import pyqtSignal
-from PyQt5.QtGui import QIcon
-from PyQt5.QtWidgets import QGridLayout, QLabel, QScrollArea, QWidget
+from typing import TYPE_CHECKING
+
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtWidgets import QGridLayout, QLabel, QScrollArea, QWidget
 
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.types import (
@@ -33,6 +34,9 @@ from novelwriter.types import (
     QtSizeMinimumExpanding
 )
 
+if TYPE_CHECKING:
+    from PyQt6.QtGui import QIcon
+
 
 class NSwitchBox(QScrollArea):
     """Extension: Switch Box Widget