updating build process for x86 and mac

client-py3/full/linux/installer.sh

@@ -7,7 +7,7 @@ update-desktop-database
 echo "Installation process done."
 echo "Remember that the following packages must be installed on system:"
 echo "* Python3 paramiko"
-echo "* Python3 PySide6 or PyQt5"
+echo "* Python3 PyQt6 or PyQt5"
 echo "* Python3 six"
 echo "* Python3 requests"
 echo "* Python3 cryptography"

client-py3/full/linux/udsclient-appimage-x86_64.recipe

@@ -35,7 +35,7 @@ AppDir:
     include:
       - python3
       - python3-pkg-resources
-      # In future, will be replaced with pyside6 (when available as debian package)
+      # In future, will be replaced with PyQt6 (when available as debian package)
       - python3-pyqt5
       - python3-paramiko
       - python3-cryptography

client-py3/full/src/UDSClient.py

@@ -38,10 +38,10 @@ import webbrowser
 import threading
 import typing
 
-# First, try to use PySide6, available on arm64, x86_64, i386, ...
+# First, try to use PyQt6, available on arm64, x86_64, i386, ...
 try:
-    from PySide6 import QtCore, QtWidgets, QtGui
+    from PyQt6 import QtCore, QtWidgets, QtGui
-    from PySide6.QtCore import QSettings
+    from PyQt6.QtCore import QSettings
 except ImportError:  # If not found, try to use PyQt5 (not available on arm64)
     from PyQt5 import QtCore, QtWidgets, QtGui  # type: ignore
     from PyQt5.QtCore import QSettings  # type: ignore

client-py3/full/src/UDSClientLauncher.py

@@ -7,9 +7,9 @@ from uds.log import logger
 import UDSClient
 from UDSLauncherMac import Ui_MacLauncher
 
-# First, try to use PySide6 (has arm64, x86_64 support)
+# First, try to use PyQt6 (has arm64, x86_64 support)
 try:
-    from PySide6 import QtCore, QtWidgets, QtGui
+    from PyQt6 import QtCore, QtWidgets, QtGui
 except ImportError:  # If not found, try to use PyQt5 (only x86_64)
     from PyQt5 import QtCore, QtWidgets, QtGui  # type: ignore
 

client-py3/full/src/UDSLauncherMac.py

@@ -7,9 +7,9 @@
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
 
-# Note: This file is generated by pyuic5, but it is modified to use PySide6 instead of PyQt5 if possible
+# Note: This file is generated by pyuic5, but it is modified to use PyQt6 instead of PyQt5 if possible
 try:
-    from PySide6 import QtCore, QtGui, QtWidgets
+    from PyQt6 import QtCore, QtGui, QtWidgets
 except ImportError:
     from PyQt5 import QtCore, QtGui, QtWidgets  # type: ignore
 

client-py3/full/src/UDSResources_rc.py

@@ -6,9 +6,9 @@
 #
 # WARNING! All changes made in this file will be lost!
 
-# Note: This file is generated by pyuic5, but it is modified to use PySide6 instead of PyQt5 if possible
+# Note: This file is generated by pyuic5, but it is modified to use PyQt6 instead of PyQt5 if possible
 try:
-    from PySide6 import QtCore
+    from PyQt6 import QtCore
 except ImportError:
     from PyQt5 import QtCore  # type: ignore
 

client-py3/full/src/UDSWindow.py

@@ -7,9 +7,9 @@
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
 
-# Note: This file is generated by pyuic5, but it is modified to use PySide6 instead of PyQt5 if possible
+# Note: This file is generated by pyuic5, but it is modified to use PyQt6 instead of PyQt5 if possible
 try:
-    from PySide6 import QtCore, QtGui, QtWidgets
+    from PyQt6 import QtCore, QtGui, QtWidgets
 except ImportError:
     from PyQt5 import QtCore, QtGui, QtWidgets  # type: ignore
 

client-py3/full/src/rc_UDSResources.py

@@ -3,7 +3,7 @@
 # Created by: The Resource Compiler for Qt version 6.3.1
 # WARNING! All changes made in this file will be lost!
 
-from PySide6 import QtCore
+from PyQt6 import QtCore
 
 qt_resource_data = b"\
 \x00\x00\x08\xed\

client-py3/full/src/uds/log.py

@@ -36,10 +36,10 @@ import platform
 import sys
 import tempfile
 
-# First, try to use PySide6, available on arm64, x86_64, i386, ...
+# First, try to use PyQt6, available on arm64, x86_64, i386, ...
 try:
-    from PySide6 import QtCore   # Just to test if it's available
+    from PyQt6 import QtCore   # Just to test if it's available
-    QT='PySide6'
+    QT='PyQt6'
 except ImportError:  # If not found, it is using PyQt5
     QT='PyQt5'
 

client-py3/full/src/update.sh

@@ -7,7 +7,7 @@ function process {
     done
 }    
 
-pyrcc5 UDSResources.qrc -o UDSResources_rc.py
+pyrcc5 UDSResources.qrc -o uds/ UDSResources_rc.py
 
 
 # process current directory ui's