Skip to content

Commit 2aee010

Browse files
snowgoer540snowgoer540
authored
Merge pull request #3881 from bgermann/qtpy
Port QtVCP from PyQt5 to QtPy
2 parents c760c1b + 93c23af commit 2aee010

File tree

188 files changed

+1413
-1346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+1413
-1346
lines changed

‎configs/sim/qtvcp_screens/qtaxis_lathe/qtaxis/qtaxis_handler.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import os
66
import linuxcnc
77

8-
from PyQt5 import QtCore, QtWidgets
9-
from PyQt5.QtGui import QColor
8+
from qtpy import QtCore, QtWidgets
9+
from qtpy.QtGui import QColor
1010

1111
from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET
1212
from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE

‎configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import os, time
2-
from PyQt5 import QtCore, QtWidgets, QtGui
2+
from qtpy import QtCore, QtWidgets, QtGui
33
from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE
44
from qtvcp.widgets.gcode_graphics import GCodeGraphics as GRAPHICS
55
from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET
@@ -28,7 +28,7 @@
2828
QHAL = Qhal()
2929

3030
try:
31-
from PyQt5.QtWebEngineWidgets import QWebEnginePage
31+
from qtpy.QtWebEngineWidgets import QWebEnginePage
3232
except:
3333
LOG.warning('QtDragon Warning with loading QtWebEngineWidget - is python3-pyqt5.qtwebengine installed?')
3434

‎configs/sim/qtvcp_screens/qtvcp_custom/qtdefault_ngc/qtdefault_ngc_handler.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# **** IMPORT SECTION **** #
33
############################
44

5-
from PyQt5 import QtCore
6-
from PyQt5 import QtWidgets
5+
from qtpy import QtCore
6+
from qtpy import QtWidgets
77
from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET
88
from qtvcp.widgets.tool_offsetview import ToolOffsetView as TOOLVIEW_WIDGET
99
from qtvcp.widgets.dialog_widget import CamViewDialog as CAMVIEW

‎configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp/qtdefault_gladevcp_handler.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# **** IMPORT SECTION **** #
33
############################
44

5-
from PyQt5 import QtCore, QtWidgets
5+
from qtpy import QtCore, QtWidgets
66
from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET
77
from qtvcp.widgets.dialog_widget import CamViewDialog as CAMVIEW
88
from qtvcp.widgets.dialog_widget import MacroTabDialog as LATHEMACRO

‎configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import os
66
import linuxcnc
77

8-
from PyQt5 import QtCore, QtWidgets
8+
from qtpy import QtCore, QtWidgets
99

1010
from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET
1111
from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE

‎configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler_1.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# **** IMPORT SECTION **** #
33
############################
44

5-
from PyQt5 import QtCore
6-
from PyQt5 import QtWidgets
5+
from qtpy import QtCore
6+
from qtpy import QtWidgets
77
from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET
88
from qtvcp.widgets.tool_offsetview import ToolOffsetView as TOOLVIEW_WIDGET
99
from qtvcp.widgets.dialog_widget import CamViewDialog as CAMVIEW

‎configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_ngc/qtdefault_ngc_handler.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# **** IMPORT SECTION **** #
33
############################
44

5-
from PyQt5 import QtCore
6-
from PyQt5 import QtWidgets
5+
from qtpy import QtCore
6+
from qtpy import QtWidgets
77
from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET
88
from qtvcp.widgets.tool_offsetview import ToolOffsetView as TOOLVIEW_WIDGET
99
from qtvcp.widgets.dialog_widget import CamViewDialog as CAMVIEW

‎configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import linuxcnc
33
import hal
44
import sys
5-
from PyQt5.QtWidgets import QMessageBox
6-
from PyQt5 import QtCore, QtWidgets, QtGui, uic
5+
from qtpy.QtWidgets import QMessageBox
6+
from qtpy import QtCore, QtWidgets, QtGui, uic
77
try:
8-
from PyQt5.QtWebKitWidgets import QWebView
8+
from qtpy.QtWebKitWidgets import QWebView
99
except ImportError:
1010
raise Exception("Qtvcp error with woodpecker - is package python-pyqt5.qtwebkit installed?")
1111
from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE

‎configs/sim/woodpecker/compensate.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import time
2222
import linuxcnc
2323
import hal
24-
from PyQt5 import QtGui, QtWidgets
24+
from qtpy import QtGui, QtWidgets
2525
import numpy as np
2626
import matplotlib.pyplot as plt
2727
import matplotlib.cm as cm

‎configs/sim/woodpecker/qtvcp/screens/woodpecker/resources.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
# WARNING! All changes made in this file will be lost!
88

9-
from PyQt5 import QtCore
9+
from qtpy import QtCore
1010

1111
qt_resource_data = b"\
1212
\x00\x00\x08\x28\

0 commit comments

Comments
 (0)