Port QtVCP from PyQt5 to QtPy

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

@@ -5,8 +5,8 @@
 import os
 import linuxcnc
 
-from PyQt5 import QtCore, QtWidgets
-from PyQt5.QtGui import QColor
+from qtpy import QtCore, QtWidgets
+from qtpy.QtGui import QColor
 
 from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET
 from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE

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

@@ -1,5 +1,5 @@
 import os, time
-from PyQt5 import QtCore, QtWidgets, QtGui
+from qtpy import QtCore, QtWidgets, QtGui
 from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE
 from qtvcp.widgets.gcode_graphics import GCodeGraphics as GRAPHICS
 from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET
@@ -28,7 +28,7 @@
 QHAL = Qhal()
 
 try:
-    from PyQt5.QtWebEngineWidgets import QWebEnginePage
+    from qtpy.QtWebEngineWidgets import QWebEnginePage
 except:
     LOG.warning('QtDragon Warning with loading QtWebEngineWidget - is python3-pyqt5.qtwebengine installed?')
 

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

@@ -2,8 +2,8 @@
 # **** IMPORT SECTION **** #
 ############################
 
-from PyQt5 import QtCore
-from PyQt5 import QtWidgets
+from qtpy import QtCore
+from qtpy import QtWidgets
 from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET
 from qtvcp.widgets.tool_offsetview import ToolOffsetView as TOOLVIEW_WIDGET
 from qtvcp.widgets.dialog_widget import CamViewDialog as CAMVIEW

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

@@ -2,7 +2,7 @@
 # **** IMPORT SECTION **** #
 ############################
 
-from PyQt5 import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET
 from qtvcp.widgets.dialog_widget import CamViewDialog as CAMVIEW
 from qtvcp.widgets.dialog_widget import MacroTabDialog as LATHEMACRO

configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler.py

@@ -5,7 +5,7 @@
 import os
 import linuxcnc
 
-from PyQt5 import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 
 from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET
 from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE

configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler_1.py

@@ -2,8 +2,8 @@
 # **** IMPORT SECTION **** #
 ############################
 
-from PyQt5 import QtCore
-from PyQt5 import QtWidgets
+from qtpy import QtCore
+from qtpy import QtWidgets
 from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET
 from qtvcp.widgets.tool_offsetview import ToolOffsetView as TOOLVIEW_WIDGET
 from qtvcp.widgets.dialog_widget import CamViewDialog as CAMVIEW

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

@@ -2,8 +2,8 @@
 # **** IMPORT SECTION **** #
 ############################
 
-from PyQt5 import QtCore
-from PyQt5 import QtWidgets
+from qtpy import QtCore
+from qtpy import QtWidgets
 from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET
 from qtvcp.widgets.tool_offsetview import ToolOffsetView as TOOLVIEW_WIDGET
 from qtvcp.widgets.dialog_widget import CamViewDialog as CAMVIEW

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

@@ -2,10 +2,10 @@
 import linuxcnc
 import hal
 import sys
-from PyQt5.QtWidgets import QMessageBox
-from PyQt5 import QtCore, QtWidgets, QtGui, uic
+from qtpy.QtWidgets import QMessageBox
+from qtpy import QtCore, QtWidgets, QtGui, uic
 try:
-    from PyQt5.QtWebKitWidgets import QWebView
+    from qtpy.QtWebKitWidgets import QWebView
 except ImportError:
     raise Exception("Qtvcp error with woodpecker - is package python-pyqt5.qtwebkit installed?")
 from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE

configs/sim/woodpecker/compensate.py

@@ -21,7 +21,7 @@
 import time
 import linuxcnc
 import hal
-from PyQt5 import QtGui, QtWidgets
+from qtpy import QtGui, QtWidgets
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.cm as cm

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

@@ -6,7 +6,7 @@
 #
 # WARNING! All changes made in this file will be lost!
 
-from PyQt5 import QtCore
+from qtpy import QtCore
 
 qt_resource_data = b"\
 \x00\x00\x08\x28\

configs/sim/woodpecker/woodpecker_/woodpecker_handler.py

@@ -2,7 +2,7 @@
 import linuxcnc
 import hal
 import time
-from PyQt5 import QtCore, QtWidgets, QtGui
+from qtpy import QtCore, QtWidgets, QtGui
 from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE
 from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET
 from qtvcp.widgets.tool_offsetview import ToolOffsetView as TOOL_TABLE

configs/sim/woodpecker/zlevel.py

@@ -5,9 +5,9 @@
 import atexit
 import shutil
 
-from PyQt5 import QtCore, QtGui, QtWidgets, uic
-from PyQt5.QtCore import QFile
-from PyQt5.QtWidgets import QFileDialog
+from qtpy import QtCore, QtGui, QtWidgets, uic
+from qtpy.QtCore import QFile
+from qtpy.QtWidgets import QFileDialog
 
 #from linuxcnc import OPERATOR_ERROR, NML_ERROR
 from qtvcp.core import Status, Action, Info

debian/configure

@@ -134,7 +134,7 @@ PYTHON_GST=python3-gst-1.0,gstreamer1.0-plugins-base
 TCLTK_VERSION=8.6
 PYTHON_IMAGING=python3-pil
 PYTHON_IMAGING_TK=python3-pil.imagetk
-QTVCP_DEPENDS="python3-pyqt5,\n    python3-pyqt5.qsci,\n    python3-pyqt5.qtsvg,\n    python3-pyqt5.qtopengl,\n    python3-opencv,\n    python3-dbus,\n    python3-espeak,\n    python3-dbus.mainloop.pyqt5,\n    python3-pyqt5.qtwebengine,\n    espeak-ng,\n    pyqt5-dev-tools,\n    gstreamer1.0-tools,\n    espeak,\n    sound-theme-freedesktop,\n    python3-poppler-qt5"
+QTVCP_DEPENDS="python3-qtpy,\n    python3-pyqt5,\n    python3-pyqt5.qsci,\n    python3-pyqt5.qtsvg,\n    python3-pyqt5.qtopengl,\n    python3-opencv,\n    python3-dbus,\n    python3-espeak,\n    python3-dbus.mainloop.pyqt5,\n    python3-pyqt5.qtwebengine,\n    espeak-ng,\n    pyqt5-dev-tools,\n    gstreamer1.0-tools,\n    espeak,\n    sound-theme-freedesktop,\n    python3-poppler-qt5"
 YAPPS_RUNTIME="python3-yapps"
 DEBHELPER="debhelper (>= 12)"
 COMPAT="12"

lib/python/qtvcp/core.py

@@ -8,7 +8,7 @@
 import _hal
 import hal
 import traceback
-from PyQt5.QtCore import QObject, QTimer, pyqtSignal
+from qtpy.QtCore import QObject, QTimer, Signal
 
 from common.hal_glib import GStat
 from common.iniinfo import _IStat as IStatParent

lib/python/qtvcp/designer/README.txt

@@ -7,6 +7,7 @@ gstreamer1.0-tools
 espeak
 espeak-ng
 sound-theme-freedesktop
+python3-qtpy
 python3-opengl
 python3-pyqt5
 python3-pyqt5.qsci

lib/python/qtvcp/designer/install_script

@@ -5,7 +5,7 @@ echo -e '\ninstalling common base packages'
 sudo apt-get install -y gstreamer1.0-tools espeak espeak-ng sound-theme-freedesktop
 
 echo -e '\ninstalling base packages for python3'
-sudo apt-get install -y python3-opengl python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-opencv python3-dbus python3-dbus.mainloop.pyqt5 python3-espeak python3-pyqt5.qtwebengine python3-xlib python3-numpy python3-cairo python3-gi-cairo python3-poppler-qt5
+sudo apt-get install -y python3-qtpy python3-opengl python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-opencv python3-dbus python3-dbus.mainloop.pyqt5 python3-espeak python3-pyqt5.qtwebengine python3-xlib python3-numpy python3-cairo python3-gi-cairo python3-poppler-qt5
 
 echo -e '\ninstalling python3 tools'
 sudo apt-get install -y pyqt5-dev-tools

lib/python/qtvcp/lib/auto_height/auto_height.py

@@ -18,9 +18,9 @@
 import linuxcnc
 import json
 
-from PyQt5 import QtCore, QtGui, QtWidgets, uic
-from PyQt5.QtWidgets import QMessageBox
-from PyQt5.QtCore import QProcess
+from qtpy import QtCore, QtGui, QtWidgets, uic
+from qtpy.QtWidgets import QMessageBox
+from qtpy.QtCore import QProcess
 from qtvcp.core import Info, Status, Action, Path
 from qtvcp import logger
 

lib/python/qtvcp/lib/gcode_utility/facing.py

@@ -6,9 +6,9 @@
 import atexit
 import shutil
 
-from PyQt5 import QtGui, QtWidgets, uic
-from PyQt5.QtCore import QFile, QRegExp
-from PyQt5.QtWidgets import QFileDialog, QMessageBox
+from qtpy import QtGui, QtWidgets, uic
+from qtpy.QtCore import QFile, QRegExp
+from qtpy.QtWidgets import QFileDialog, QMessageBox
 
 from linuxcnc import OPERATOR_ERROR, NML_ERROR
 from qtvcp.core import Info, Status, Action, Path

lib/python/qtvcp/lib/gcode_utility/hole_circle.py

@@ -7,10 +7,10 @@
 import atexit
 import shutil
 
-from PyQt5 import QtGui, QtWidgets, uic
-from PyQt5.QtCore import QPoint, QPointF, QLine, QRect, QFile, Qt, QEvent, QRegExp
-from PyQt5.QtWidgets import QFileDialog, QMessageBox
-from PyQt5.QtGui import QPainter, QBrush, QPen, QColor
+from qtpy import QtGui, QtWidgets, uic
+from qtpy.QtCore import QPoint, QPointF, QLine, QRect, QFile, Qt, QEvent, QRegExp
+from qtpy.QtWidgets import QFileDialog, QMessageBox
+from qtpy.QtGui import QPainter, QBrush, QPen, QColor
 
 from linuxcnc import OPERATOR_ERROR, NML_ERROR
 from qtvcp.core import Info, Status, Action, Path

lib/python/qtvcp/lib/gcode_utility/hole_enlarge.py

@@ -16,8 +16,8 @@
 import tempfile
 import atexit
 
-from PyQt5 import QtCore, QtGui, QtWidgets, uic
-from PyQt5.QtWidgets import QFileDialog, QMessageBox
+from qtpy import QtCore, QtGui, QtWidgets, uic
+from qtpy.QtWidgets import QFileDialog, QMessageBox
 from qtvcp.core import Info, Status, Action, Tool, Path
 
 INFO = Info()

lib/python/qtvcp/lib/keybindings.py

@@ -15,7 +15,7 @@
 # you can add or change these
 
 import traceback
-from PyQt5.QtCore import Qt
+from qtpy.QtCore import Qt
 
 # Set up logging
 from qtvcp import logger

lib/python/qtvcp/lib/mdi_subprogram/mdi_command_process.py

@@ -19,9 +19,9 @@
 import hal
 import json
 
-from PyQt5 import QtGui, QtCore, QtWidgets, uic
-from PyQt5.QtCore import QObject
-from PyQt5.QtCore import QProcess, QEvent, Qt, pyqtProperty
+from qtpy import QtGui, QtCore, QtWidgets, uic
+from qtpy.QtCore import QObject
+from qtpy.QtCore import QProcess, QEvent, Qt, Property
 from qtvcp.core import Status, Action, Path
 from qtvcp import logger
 
@@ -120,9 +120,9 @@ def __setitem__(self, item, value):
 # Testing
 ####################################
 if __name__ == "__main__":
-    from PyQt5.QtWidgets import *
-    from PyQt5.QtCore import *
-    from PyQt5.QtGui import *
+    from qtpy.QtWidgets import *
+    from qtpy.QtCore import *
+    from qtpy.QtGui import *
 
     app = QtWidgets.QApplication(sys.argv)
     mdi = MDICommand()

lib/python/qtvcp/lib/mdi_subprogram/mdi_subprogram.py

@@ -19,7 +19,7 @@
 import json
 import linuxcnc
 
-from PyQt5.QtCore import QObject
+from qtpy.QtCore import QObject
 from qtvcp.core import Status, Action, Info
 
 # Instantiate the libraries with global reference

lib/python/qtvcp/lib/message.py

@@ -1,6 +1,6 @@
-from PyQt5.QtWidgets import *
-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QColor
+from qtpy.QtWidgets import *
+from qtpy.QtCore import Qt
+from qtpy.QtGui import QColor
 from qtvcp.core import Status, Info
 from qtvcp.widgets.dialog_widget import LcncDialog
 import hal
@@ -251,7 +251,7 @@ def __setitem__(self, item, value):
 
 if __name__ == '__main__':
     import sys
-    from PyQt5.QtCore import *
+    from qtpy.QtCore import *
 
     def callreturn(dialog, btn, pinname):
         result = dialog.qualifiedReturn(btn)

lib/python/qtvcp/lib/qt_ngcgui/ngcgui.py

@@ -21,9 +21,9 @@
 import hashlib
 import datetime
 import shutil
-from PyQt5 import QtGui, QtWidgets, QtCore, uic
-from PyQt5.QtCore import QRegExp
-from PyQt5.QtWidgets import QFileDialog, QHBoxLayout, QVBoxLayout, QLabel, QWidget, QLineEdit, QMessageBox
+from qtpy import QtGui, QtWidgets, QtCore, uic
+from qtpy.QtCore import QRegExp
+from qtpy.QtWidgets import QFileDialog, QHBoxLayout, QVBoxLayout, QLabel, QWidget, QLineEdit, QMessageBox
 from qtvcp.core import Action, Info, Path
 from qtvcp import logger