diff --git a/novelwriter/core/status.py b/novelwriter/core/status.py index 4e5a0edf..f8569532 100644 --- a/novelwriter/core/status.py +++ b/novelwriter/core/status.py @@ -37,7 +37,7 @@ from PyQt5.QtGui import QColor, QIcon, QPainter, QPainterPath, QPixmap, QPolygon from novelwriter import SHARED from novelwriter.common import simplified from novelwriter.enum import nwStatusShape -from novelwriter.types import QtPaintAnitAlias, QtTransparent +from novelwriter.types import QtPaintAntiAlias, QtTransparent if TYPE_CHECKING: # pragma: no cover from typing import TypeGuard # Requires Python 3.10 @@ -195,7 +195,7 @@ class NWStatus: pixmap.fill(QtTransparent) painter = QPainter(pixmap) - painter.setRenderHint(QtPaintAnitAlias) + painter.setRenderHint(QtPaintAntiAlias) painter.fillPath(_SHAPES.getShape(shape), color) painter.end() diff --git a/novelwriter/error.py b/novelwriter/error.py index 78a1284e..bdca704b 100644 --- a/novelwriter/error.py +++ b/novelwriter/error.py @@ -76,7 +76,7 @@ class NWErrorMessage(QDialog): font = QFont() font.setPointSize(round(0.9*self.font().pointSize())) - font.setFamily(QFontDatabase.systemFont(QFontDatabase.FixedFont).family()) + font.setFamily(QFontDatabase.systemFont(QFontDatabase.SystemFont.FixedFont).family()) self.msgBody = QPlainTextEdit() self.msgBody.setFont(font) diff --git a/novelwriter/extensions/pagedsidebar.py b/novelwriter/extensions/pagedsidebar.py index 8f3063e7..319cfaaf 100644 --- a/novelwriter/extensions/pagedsidebar.py +++ b/novelwriter/extensions/pagedsidebar.py @@ -33,7 +33,7 @@ from PyQt5.QtWidgets import ( ) from novelwriter.types import ( - QtAlignLeft, QtMouseOver, QtNoBrush, QtNoPen, QtPaintAnitAlias, + QtAlignLeft, QtMouseOver, QtNoBrush, QtNoPen, QtPaintAntiAlias, QtSizeExpanding, QtSizeFixed ) @@ -146,7 +146,7 @@ class _PagedToolButton(QToolButton): opt.initFrom(self) paint = QPainter(self) - paint.setRenderHint(QtPaintAnitAlias, True) + paint.setRenderHint(QtPaintAntiAlias, True) paint.setPen(QtNoPen) paint.setBrush(QtNoBrush) @@ -213,7 +213,7 @@ class _NPagedToolLabel(QLabel): label that matches the button style. """ paint = QPainter(self) - paint.setRenderHint(QtPaintAnitAlias, True) + paint.setRenderHint(QtPaintAntiAlias, True) paint.setPen(QtNoPen) width = self.width() diff --git a/novelwriter/extensions/progressbars.py b/novelwriter/extensions/progressbars.py index b08d4808..1c7684fb 100644 --- a/novelwriter/extensions/progressbars.py +++ b/novelwriter/extensions/progressbars.py @@ -31,7 +31,7 @@ from PyQt5.QtGui import QBrush, QColor, QPainter, QPaintEvent, QPen from PyQt5.QtWidgets import QProgressBar, QWidget from novelwriter.types import ( - QtAlignCenter, QtPaintAnitAlias, QtRoundCap, QtSizeFixed, QtSolidLine, + QtAlignCenter, QtPaintAntiAlias, QtRoundCap, QtSizeFixed, QtSolidLine, QtTransparent ) @@ -91,7 +91,7 @@ class NProgressCircle(QProgressBar): progress = 100.0*self.value()/self.maximum() angle = ceil(16*3.6*progress) painter = QPainter(self) - painter.setRenderHint(QtPaintAnitAlias, True) + painter.setRenderHint(QtPaintAntiAlias, True) painter.setPen(self._dPen) painter.setBrush(self._dBrush) painter.drawEllipse(self._dRect) @@ -119,7 +119,7 @@ class NProgressSimple(QProgressBar): if (value := self.value()) > 0: progress = ceil(self.width()*float(value)/self.maximum()) painter = QPainter(self) - painter.setRenderHint(QtPaintAnitAlias, True) + painter.setRenderHint(QtPaintAntiAlias, True) painter.setPen(self.palette().highlight().color()) painter.setBrush(self.palette().highlight()) painter.drawRect(0, 0, progress, self.height()) diff --git a/novelwriter/extensions/statusled.py b/novelwriter/extensions/statusled.py index 1aeb2065..e9a88104 100644 --- a/novelwriter/extensions/statusled.py +++ b/novelwriter/extensions/statusled.py @@ -30,7 +30,7 @@ from PyQt5.QtWidgets import QAbstractButton, QWidget from novelwriter import CONFIG from novelwriter.enum import nwTrinary -from novelwriter.types import QtBlack, QtPaintAnitAlias +from novelwriter.types import QtBlack, QtPaintAntiAlias logger = logging.getLogger(__name__) @@ -81,7 +81,7 @@ class StatusLED(QAbstractButton): def paintEvent(self, event: QPaintEvent) -> None: """Draw the LED.""" painter = QPainter(self) - painter.setRenderHint(QtPaintAnitAlias, True) + painter.setRenderHint(QtPaintAntiAlias, True) painter.setPen(self.palette().windowText().color()) painter.setBrush(self._color) painter.setOpacity(1.0) diff --git a/novelwriter/extensions/switch.py b/novelwriter/extensions/switch.py index 20a2b2f1..43d60fc6 100644 --- a/novelwriter/extensions/switch.py +++ b/novelwriter/extensions/switch.py @@ -28,7 +28,7 @@ from PyQt5.QtGui import QMouseEvent, QPainter, QPaintEvent, QResizeEvent from PyQt5.QtWidgets import QAbstractButton, QWidget from novelwriter import CONFIG, SHARED -from novelwriter.types import QtMouseLeft, QtNoPen, QtPaintAnitAlias, QtSizeFixed +from novelwriter.types import QtMouseLeft, QtNoPen, QtPaintAntiAlias, QtSizeFixed class NSwitch(QAbstractButton): @@ -90,7 +90,7 @@ class NSwitch(QAbstractButton): def paintEvent(self, event: QPaintEvent) -> None: """Drawing the switch itself.""" painter = QPainter(self) - painter.setRenderHint(QtPaintAnitAlias, True) + painter.setRenderHint(QtPaintAntiAlias, True) painter.setPen(QtNoPen) palette = self.palette() diff --git a/novelwriter/types.py b/novelwriter/types.py index a692a8c6..0732f5a8 100644 --- a/novelwriter/types.py +++ b/novelwriter/types.py @@ -66,7 +66,7 @@ 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