Use GUI Qt bindings through pyqtgraph for PyQt5/PyQt6 support

KuttyPyAndroidQuiz.py

@@ -8,7 +8,7 @@
 import sys
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
-from PyQt5 import QtGui, QtCore, QtWidgets
+from pyqtgraph.Qt import QtGui, QtCore, QtWidgets
 
 from utilities import syntax
 from utilities import texteditor
@@ -54,13 +54,13 @@ def getscr(self):
 
 class AppWindow(QtWidgets.QMainWindow, layout.Ui_MainWindow):
     p = None
-    logThis = QtCore.pyqtSignal(str)
-    showStatusSignal = QtCore.pyqtSignal(str, bool)
-    serverSignal = QtCore.pyqtSignal(str,str)
-    removeSignal = QtCore.pyqtSignal(str)
-    imageSignal = QtCore.pyqtSignal(str,bytes)
-    logThisPlain = QtCore.pyqtSignal(bytes)
-    codeOutput = QtCore.pyqtSignal(str, str)
+    logThis = QtCore.Signal(str)
+    showStatusSignal = QtCore.Signal(str, bool)
+    serverSignal = QtCore.Signal(str,str)
+    removeSignal = QtCore.Signal(str)
+    imageSignal = QtCore.Signal(str,bytes)
+    logThisPlain = QtCore.Signal(bytes)
+    codeOutput = QtCore.Signal(str, str)
 
     def __init__(self, parent=None, **kwargs):
         super(AppWindow, self).__init__(parent)
@@ -217,7 +217,7 @@ def registerScreenshot(self, addr, msg):
             image.loadFromData(QtCore.QByteArray(msg))
             # Create and show the ImageDialog
             dialog = ImageDialog(image)
-            dialog.exec_()
+            dialog.exec()
 
     def activateQuizListener(self):
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -562,7 +562,7 @@ def showStatus(self, msg, error=None):
 
     ######## WINDOW EXPORT SVG
     def exportSvg(self):
-        from PyQt5 import QtSvg
+        from pyqtgraph.Qt import QtSvg
         path, _filter = QtWidgets.QFileDialog.getSaveFileName(self, 'Save File', '~/')
         if path:
             generator = QtSvg.QSvgGenerator()
@@ -590,7 +590,7 @@ def translators(langDir, lang=None):
     result = []
     qtTranslator = QtCore.QTranslator()
     qtTranslator.load("qt_" + lang,
-                      QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath))
+                      (QtCore.QLibraryInfo.path if hasattr(QtCore.QLibraryInfo, 'path') else QtCore.QLibraryInfo.location)(QtCore.QLibraryInfo.TranslationsPath))
     result.append(qtTranslator)
 
     # path to the translation files (.qm files)
@@ -662,7 +662,7 @@ def run():
 
     myapp = AppWindow(app=app, path=path)
     myapp.show()
-    r = app.exec_()
+    r = app.exec()
     '''
     if myapp.compile_thread is not None:
         myapp.compile_thread.terminate()

KuttyPyGUI.py

@@ -5,7 +5,7 @@
 import os,sys,time,re,traceback,platform
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
-from PyQt5 import QtGui, QtCore, QtWidgets
+from pyqtgraph.Qt import QtGui, QtCore, QtWidgets
 import KuttyPyLib
 
 from utilities.templates import ui_layout as layout
@@ -29,7 +29,7 @@ def translate(lang = None):
 	app.installTranslator(t)
 	t1=QtCore.QTranslator()
 	t1.load("qt_"+lang,
-		QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath))
+		(QtCore.QLibraryInfo.path if hasattr(QtCore.QLibraryInfo, 'path') else QtCore.QLibraryInfo.location)(QtCore.QLibraryInfo.TranslationsPath))
 	app.installTranslator(t1)
 
 
@@ -54,9 +54,9 @@ def progress(self):
 class AppWindow(QtWidgets.QMainWindow, layout.Ui_MainWindow):
 	p=None
 	ports = ['A','B','C','D']
-	logThis = QtCore.pyqtSignal(str)
-	logThisPlain = QtCore.pyqtSignal(bytes)
-	serialGaugeSignal = QtCore.pyqtSignal(bytes)
+	logThis = QtCore.Signal(str)
+	logThisPlain = QtCore.Signal(bytes)
+	serialGaugeSignal = QtCore.Signal(bytes)
 	serialGaugeConvert = 'bytes'
 	serialStream = b''
 	def __init__(self, parent=None,**kwargs):
@@ -218,8 +218,8 @@ def setLogType(self,tp):
 
 	################USER CODE SECTION####################
 	class codeObject(QtCore.QObject):
-		finished = QtCore.pyqtSignal()
-		logThis = QtCore.pyqtSignal(str)
+		finished = QtCore.Signal()
+		logThis = QtCore.Signal(str)
 		code = ''
 
 		def __init__(self,REGISTERS):
@@ -550,9 +550,9 @@ def loadExample(self,filename):
 	########################### UPLOAD HEX FILE #######################
 
 	class uploadObject(QtCore.QObject):
-		finished = QtCore.pyqtSignal()
-		logThis = QtCore.pyqtSignal(str)
-		logThisPlain = QtCore.pyqtSignal(bytes)
+		finished = QtCore.Signal()
+		logThis = QtCore.Signal(str)
+		logThisPlain = QtCore.Signal(bytes)
 		fname = ''
 		p = None
 		def __init__(self):
@@ -854,7 +854,7 @@ def updateStatus(self):
 
 	######## WINDOW EXPORT SVG
 	def exportSvg(self):
-		from PyQt5 import QtSvg
+		from pyqtgraph.Qt import QtSvg
 		path, _filter  = QtWidgets.QFileDialog.getSaveFileName(self, 'Save File', '~/')
 		if path:
 			generator = QtSvg.QSvgGenerator()
@@ -890,7 +890,7 @@ def translators(langDir, lang=None):
 	result=[]
 	qtTranslator=QtCore.QTranslator()
 	qtTranslator.load("qt_" + lang,
-			QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath))
+			(QtCore.QLibraryInfo.path if hasattr(QtCore.QLibraryInfo, 'path') else QtCore.QLibraryInfo.location)(QtCore.QLibraryInfo.TranslationsPath))
 	result.append(qtTranslator)
 
 	# path to the translation files (.qm files)
@@ -954,7 +954,7 @@ def run():
 	app = QtWidgets.QApplication(sys.argv)
 	myapp = AppWindow(app=app, path=path)
 	myapp.show()
-	r = app.exec_()
+	r = app.exec()
 	'''
 	if myapp.p.connected:
 		myapp.p.fd.write(b'j')

KuttyPyIDE.py

@@ -5,9 +5,9 @@
 import os, sys, time, re, traceback, platform
 from typing import List
 
-from PyQt5 import QtGui, QtCore, QtWidgets
-from PyQt5.QtCore import QThread
-from PyQt5.QtGui import QPixmap
+from pyqtgraph.Qt import QtGui, QtCore, QtWidgets
+from pyqtgraph.Qt.QtCore import QThread
+from pyqtgraph.Qt.QtGui import QPixmap
 
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
@@ -34,7 +34,7 @@ def translate(lang=None):
     app.installTranslator(t)
     t1 = QtCore.QTranslator()
     t1.load("qt_" + lang,
-            QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath))
+            (QtCore.QLibraryInfo.path if hasattr(QtCore.QLibraryInfo, 'path') else QtCore.QLibraryInfo.location)(QtCore.QLibraryInfo.TranslationsPath))
     app.installTranslator(t1)
 
 
@@ -66,17 +66,17 @@ def progress(self):
 
 class AppWindow(QtWidgets.QMainWindow, layout.Ui_MainWindow):
     p = None
-    logThis = QtCore.pyqtSignal(str)
-    showStatusSignal = QtCore.pyqtSignal(str, bool)
-    serverSignal = QtCore.pyqtSignal(str)
-    addMPSignal = QtCore.pyqtSignal()
-    delMPSignal = QtCore.pyqtSignal()
-    queryMPSignal = QtCore.pyqtSignal()
-    cameraReadySignal = QtCore.pyqtSignal()
-
-    logThisPlain = QtCore.pyqtSignal(bytes)
-    codeOutput = QtCore.pyqtSignal(str, str)
-    serialGaugeSignal = QtCore.pyqtSignal(bytes)
+    logThis = QtCore.Signal(str)
+    showStatusSignal = QtCore.Signal(str, bool)
+    serverSignal = QtCore.Signal(str)
+    addMPSignal = QtCore.Signal()
+    delMPSignal = QtCore.Signal()
+    queryMPSignal = QtCore.Signal()
+    cameraReadySignal = QtCore.Signal()
+
+    logThisPlain = QtCore.Signal(bytes)
+    codeOutput = QtCore.Signal(str, str)
+    serialGaugeSignal = QtCore.Signal(bytes)
     serialGaugeConvert = 'bytes'
     serialStream = b''
 
@@ -753,10 +753,10 @@ def updateEverything(self):
     ########################### UPLOAD HEX FILE #######################
 
     class uploadObject(QtCore.QObject):
-        finished = QtCore.pyqtSignal()
-        logThis = QtCore.pyqtSignal(str)
-        resultSignal = QtCore.pyqtSignal(str, str)
-        logThisPlain = QtCore.pyqtSignal(bytes)
+        finished = QtCore.Signal()
+        logThis = QtCore.Signal(str)
+        resultSignal = QtCore.Signal(str, str)
+        logThisPlain = QtCore.Signal(bytes)
         fname = ''
         p = None
 
@@ -1176,7 +1176,7 @@ def checkConnectionStatus(self, dialog=False):
 
     ######## WINDOW EXPORT SVG
     def exportSvg(self):
-        from PyQt5 import QtSvg
+        from pyqtgraph.Qt import QtSvg
         path, _filter = QtWidgets.QFileDialog.getSaveFileName(self, 'Save File', '~/')
         if path:
             generator = QtSvg.QSvgGenerator()
@@ -1204,7 +1204,7 @@ def translators(langDir, lang=None):
     result = []
     qtTranslator = QtCore.QTranslator()
     qtTranslator.load("qt_" + lang,
-                      QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath))
+                      (QtCore.QLibraryInfo.path if hasattr(QtCore.QLibraryInfo, 'path') else QtCore.QLibraryInfo.location)(QtCore.QLibraryInfo.TranslationsPath))
     result.append(qtTranslator)
 
     # path to the translation files (.qm files)
@@ -1279,7 +1279,7 @@ def run():
     app = QtWidgets.QApplication(sys.argv)
     myapp = AppWindow(app=app, path=path)
     myapp.show()
-    r = app.exec_()
+    r = app.exec()
     if myapp.mp_thread is not None:
         myapp.mp_thread.stopRunning()
 

KuttyPyNano.py

@@ -40,9 +40,9 @@ def progress(self):
 
 class AppWindow(QtWidgets.QMainWindow, layout.Ui_MainWindow):
 	p=None
-	logThis = QtCore.pyqtSignal(str)
-	logThisPlain = QtCore.pyqtSignal(bytes)
-	serialGaugeSignal = QtCore.pyqtSignal(int)
+	logThis = QtCore.Signal(str)
+	logThisPlain = QtCore.Signal(bytes)
+	serialGaugeSignal = QtCore.Signal(int)
 	def __init__(self, parent=None,**kwargs):
 		super(AppWindow, self).__init__(parent)
 		self.setupUi(self)
@@ -169,8 +169,8 @@ def tabChanged(self,index):
 
 	################USER CODE SECTION####################
 	class codeObject(QtCore.QObject):
-		finished = QtCore.pyqtSignal()
-		logThis = QtCore.pyqtSignal(str)
+		finished = QtCore.Signal()
+		logThis = QtCore.Signal(str)
 		code = ''
 
 		def __init__(self,REGISTERS):
@@ -489,9 +489,9 @@ def loadExample(self,filename):
 	########################### UPLOAD HEX FILE #######################
 
 	class uploadObject(QtCore.QObject):
-		finished = QtCore.pyqtSignal()
-		logThis = QtCore.pyqtSignal(str)
-		logThisPlain = QtCore.pyqtSignal(bytes)
+		finished = QtCore.Signal()
+		logThis = QtCore.Signal(str)
+		logThisPlain = QtCore.Signal(bytes)
 		fname = ''
 		p = None
 		def __init__(self):
@@ -760,7 +760,7 @@ def translators(langDir, lang=None):
 	result=[]
 	qtTranslator=QtCore.QTranslator()
 	qtTranslator.load("qt_" + lang,
-			QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath))
+			(QtCore.QLibraryInfo.path if hasattr(QtCore.QLibraryInfo, 'path') else QtCore.QLibraryInfo.location)(QtCore.QLibraryInfo.TranslationsPath))
 	result.append(qtTranslator)
 
 	# path to the translation files (.qm files)
@@ -825,7 +825,7 @@ def run():
 
 	myapp = AppWindow(app=app, path=path)
 	myapp.show()
-	r = app.exec_()
+	r = app.exec()
 	'''
 	if myapp.p.connected:
 		myapp.p.fd.write(b'j')

KuttyPyPlus.py

@@ -6,7 +6,7 @@
 
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
-from PyQt5 import QtGui, QtCore, QtWidgets
+from pyqtgraph.Qt import QtGui, QtCore, QtWidgets
 import KuttyPyLib
 import socket
 
@@ -30,7 +30,7 @@ def translate(lang=None):
     app.installTranslator(t)
     t1 = QtCore.QTranslator()
     t1.load("qt_" + lang,
-            QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath))
+            (QtCore.QLibraryInfo.path if hasattr(QtCore.QLibraryInfo, 'path') else QtCore.QLibraryInfo.location)(QtCore.QLibraryInfo.TranslationsPath))
     app.installTranslator(t1)
 
 
@@ -59,12 +59,12 @@ def progress(self):
 class AppWindow(QtWidgets.QMainWindow, layout.Ui_MainWindow):
     p = None
     ports = ['A', 'B', 'C', 'D']
-    logThis = QtCore.pyqtSignal(str)
-    showStatusSignal = QtCore.pyqtSignal(str, bool)
-    serverSignal = QtCore.pyqtSignal(str)
-    logThisPlain = QtCore.pyqtSignal(bytes)
-    codeOutput = QtCore.pyqtSignal(str, str)
-    serialGaugeSignal = QtCore.pyqtSignal(bytes)
+    logThis = QtCore.Signal(str)
+    showStatusSignal = QtCore.Signal(str, bool)
+    serverSignal = QtCore.Signal(str)
+    logThisPlain = QtCore.Signal(bytes)
+    codeOutput = QtCore.Signal(str, str)
+    serialGaugeSignal = QtCore.Signal(bytes)
     serialGaugeConvert = 'bytes'
     serialStream = b''
 
@@ -436,8 +436,8 @@ def openHexTab(self):
         self.codingTabs.addTab(self.hexTab, "")
 
     class codeObject(QtCore.QObject):
-        finished = QtCore.pyqtSignal()
-        logThis = QtCore.pyqtSignal(str)
+        finished = QtCore.Signal()
+        logThis = QtCore.Signal(str)
         code = ''
 
         def __init__(self, REGISTERS):
@@ -781,10 +781,10 @@ def loadExample(self, filename):
     ########################### UPLOAD HEX FILE #######################
 
     class uploadObject(QtCore.QObject):
-        finished = QtCore.pyqtSignal()
-        logThis = QtCore.pyqtSignal(str)
-        resultSignal = QtCore.pyqtSignal(str, str)
-        logThisPlain = QtCore.pyqtSignal(bytes)
+        finished = QtCore.Signal()
+        logThis = QtCore.Signal(str)
+        resultSignal = QtCore.Signal(str, str)
+        logThisPlain = QtCore.Signal(bytes)
         fname = ''
         p = None
 
@@ -1177,7 +1177,7 @@ def checkConnectionStatus(self, dialog=False):
 
     ######## WINDOW EXPORT SVG
     def exportSvg(self):
-        from PyQt5 import QtSvg
+        from pyqtgraph.Qt import QtSvg
         path, _filter = QtWidgets.QFileDialog.getSaveFileName(self, 'Save File', '~/')
         if path:
             generator = QtSvg.QSvgGenerator()
@@ -1214,7 +1214,7 @@ def translators(langDir, lang=None):
     result = []
     qtTranslator = QtCore.QTranslator()
     qtTranslator.load("qt_" + lang,
-                      QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath))
+                      (QtCore.QLibraryInfo.path if hasattr(QtCore.QLibraryInfo, 'path') else QtCore.QLibraryInfo.location)(QtCore.QLibraryInfo.TranslationsPath))
     result.append(qtTranslator)
 
     # path to the translation files (.qm files)
@@ -1323,7 +1323,7 @@ def run():
     print('QT Version', QtWidgets.__file__)
     myapp = AppWindow(app=app, path=path, splash= splash)
     myapp.show()
-    r = app.exec_()
+    r = app.exec()
     if myapp.compile_thread is not None:
         myapp.compile_thread.terminate()
         print('waiting to quit compile_thread')