Switch test code to PyQt6

This commit is contained in:
Veronica Berglyd Olsen
2025-01-11 20:36:42 +01:00
parent 40c4e74d48
commit da036efdcf
47 changed files with 169 additions and 160 deletions
+5 -4
View File
@@ -22,9 +22,9 @@ from __future__ import annotations
import pytest
from PyQt5.QtCore import QEvent, QObject, QPoint, Qt
from PyQt5.QtGui import QKeyEvent, QWheelEvent
from PyQt5.QtWidgets import QWidget
from PyQt6.QtCore import QEvent, QObject, QPoint, QPointF, Qt
from PyQt6.QtGui import QKeyEvent, QWheelEvent
from PyQt6.QtWidgets import QWidget
from novelwriter.extensions.eventfilters import WheelEventFilter
from novelwriter.types import QtModNone, QtModShift
@@ -57,8 +57,9 @@ def testExtEventFilters_WheelEventFilter():
# Sending a mouse wheel event forwards it
pos = QPoint(0, 0)
posF = QPointF(0.0, 0.0)
event = QWheelEvent(
pos, pos, pos, pos,
posF, posF, pos, pos,
Qt.MouseButton.NoButton, QtModNone,
Qt.ScrollPhase.NoScrollPhase, False,
)
+4 -4
View File
@@ -22,9 +22,9 @@ from __future__ import annotations
import pytest
from PyQt5.QtCore import QEvent, QPoint, QPointF, Qt
from PyQt5.QtGui import QKeyEvent, QMouseEvent, QWheelEvent
from PyQt5.QtWidgets import QWidget
from PyQt6.QtCore import QEvent, QPoint, QPointF, Qt
from PyQt6.QtGui import QKeyEvent, QMouseEvent, QWheelEvent
from PyQt6.QtWidgets import QWidget
from novelwriter.extensions.modified import (
NClickableLabel, NComboBox, NDialog, NDoubleSpinBox, NSpinBox
@@ -150,7 +150,7 @@ def testExtModified_NClickableLabel(qtbot, monkeypatch):
dialog = SimpleDialog(widget)
dialog.show()
position = widget.rect().center()
position = QPointF(widget.rect().center())
event = QMouseEvent(
QEvent.Type.MouseButtonPress, position, QtMouseLeft, QtMouseLeft, QtModNone
)
+1 -1
View File
@@ -24,7 +24,7 @@ from time import sleep
import pytest
from PyQt5.QtGui import QColor
from PyQt6.QtGui import QColor
from novelwriter.extensions.progressbars import NProgressCircle, NProgressSimple
+4 -4
View File
@@ -22,8 +22,8 @@ from __future__ import annotations
import pytest
from PyQt5.QtCore import QEvent, QPoint
from PyQt5.QtGui import QMouseEvent
from PyQt6.QtCore import QEvent, QPointF
from PyQt6.QtGui import QEnterEvent, QMouseEvent
from novelwriter.extensions.switch import NSwitch
from novelwriter.types import QtModNone, QtMouseLeft
@@ -65,10 +65,10 @@ def testExtSwitch_Main(qtbot):
button = QtMouseLeft
modifier = QtModNone
event = QMouseEvent(QEvent.Type.MouseButtonRelease, QPoint(), button, button, modifier)
event = QMouseEvent(QEvent.Type.MouseButtonRelease, QPointF(), button, button, modifier)
switch.mouseReleaseEvent(event)
event = QEvent(QEvent.Type.Enter)
event = QEnterEvent(QPointF(), QPointF(), QPointF())
switch.enterEvent(event)
# qtbot.stop()
+1 -1
View File
@@ -24,7 +24,7 @@ from urllib.error import HTTPError
import pytest
from PyQt5.QtCore import QUrl
from PyQt6.QtCore import QUrl
from novelwriter import SHARED
from novelwriter.constants import nwConst