diff --git a/configs/sim/qtvcp_screens/qtaxis_lathe/qtaxis/qtaxis_handler.py b/configs/sim/qtvcp_screens/qtaxis_lathe/qtaxis/qtaxis_handler.py index ffb74613d8c..edb87ac15b3 100644 --- a/configs/sim/qtvcp_screens/qtaxis_lathe/qtaxis/qtaxis_handler.py +++ b/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 PyQt6 import QtCore, QtWidgets +from PyQt6.QtGui import QColor from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE @@ -161,8 +161,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to @@ -430,7 +430,7 @@ def quick_reference(self): msg.setLayout(layout) msg.setMinimumSize(700,800) msg.show() - retval = msg.exec_() + retval = msg.exec() def launch_log_dialog(self): ACTION.CALL_DIALOG({'NAME':'MACHINELOG', 'ID':'_qtaxis_handler_'}) @@ -484,7 +484,7 @@ def make_corner_widgets(self): self.w.tool_stat.setProperty('tool_number_status', True) self.w.tool_stat.setProperty('textTemplate', 'Tool %d') self.w.tool_stat.hal_init() - self.w.tool_stat.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.w.tool_stat.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter) self.w.tool_stat.setFixedWidth(60) self.w.leftTab.setCornerWidget(self.w.tool_stat) diff --git a/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py b/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py index 1c039fe8544..779337f8d08 100644 --- a/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py +++ b/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 PyQt6 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,9 +28,9 @@ QHAL = Qhal() try: - from PyQt5.QtWebEngineWidgets import QWebEnginePage + from PyQt6.QtWebEngineWidgets import QWebEnginePage except: - LOG.warning('QtDragon Warning with loading QtWebEngineWidget - is python3-pyqt5.qtwebengine installed?') + LOG.warning('QtDragon Warning with loading QtWebEngineWidget - is python3-pyqt6.qtwebengine installed?') # constants for tab pages TAB_MAIN = 0 @@ -66,7 +66,7 @@ def __init__(self, halcomp, widgets, paths): self.w = widgets self.gcodes = GCodes(widgets) # This validator precludes using comma as a decimal - self.valid = QtGui.QRegExpValidator(QtCore.QRegExp('-?[0-9]{0,6}[.][0-9]{0,3}')) + self.valid = QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('-?[0-9]{0,6}[.][0-9]{0,3}')) self.KEYBIND = KEYBIND KEYBIND.add_call('Key_F11','on_keycall_F11') KEYBIND.add_call('Key_F12','on_keycall_F12') @@ -478,7 +478,7 @@ def init_probe(self): self.probe.setObjectName('versaprobe') # only use cycle start button to start probing self.probe.setProperty('runImmediately',False) - self.probe.setFocusPolicy(QtCore.Qt.ClickFocus) + self.probe.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) elif probe == 'basicprobe': LOG.info("Using Basic Probe") @@ -488,7 +488,7 @@ def init_probe(self): self.probe.setObjectName('basicprobe') # only use cycle start button to start probing self.probe.setProperty('runImmediately',False) - self.probe.setFocusPolicy(QtCore.Qt.ClickFocus) + self.probe.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) else: LOG.info("No valid probe widget specified") @@ -603,8 +603,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2): -# QtCore.Qt.Key_F3,QtCore.Qt.Key_F4,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2): +# QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F4,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to @@ -1390,12 +1390,12 @@ def update_gcode_properties(self, props ): return # pop a dialog of the properties msg = QtWidgets.QMessageBox() - msg.setIcon(QtWidgets.QMessageBox.Information) + msg.setIcon(QtWidgets.QMessageBox.Icon.Information) msg.setText(smallmess) msg.setWindowTitle("Gcode Properties") - msg.setStandardButtons(QtWidgets.QMessageBox.Ok) + msg.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok) msg.show() - retval = msg.exec_() + retval = msg.exec() def touchoff(self, selector): if selector == 'touchplate': @@ -1702,7 +1702,7 @@ def adjust_stacked_widgets(self,requestedIndex,mode_change=False): #print ('CURRENT:',name) # record current qsplitter settings self.w.settings.beginGroup("qtdragon-{}".format(self.w.splitter_h.objectName())) - self.w.settings.setValue(name, QtCore.QVariant(self.w.splitter_h.saveState().data())) + self.w.settings.setValue(name, QtCore.self.w.splitter_h.saveState(.data())) self.w.settings.endGroup() # ignore, show or hide jog controls diff --git a/configs/sim/qtvcp_screens/qtvcp_custom/qtdefault_ngc/qtdefault_ngc_handler.py b/configs/sim/qtvcp_screens/qtvcp_custom/qtdefault_ngc/qtdefault_ngc_handler.py index 39cfe032b00..4753724a42c 100644 --- a/configs/sim/qtvcp_screens/qtvcp_custom/qtdefault_ngc/qtdefault_ngc_handler.py +++ b/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 PyQt6 import QtCore +from PyQt6 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 @@ -75,8 +75,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): if isinstance(receiver, OFFVIEW_WIDGET) or \ isinstance(receiver, MDI_WIDGET) or isinstance(receiver, TOOLVIEW_WIDGET): if is_pressed: diff --git a/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp/qtdefault_gladevcp_handler.py b/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp/qtdefault_gladevcp_handler.py index 7a0d56703e7..a974abedd68 100644 --- a/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp/qtdefault_gladevcp_handler.py +++ b/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp/qtdefault_gladevcp_handler.py @@ -2,7 +2,7 @@ # **** IMPORT SECTION **** # ############################ -from PyQt5 import QtCore, QtWidgets +from PyQt6 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 @@ -59,8 +59,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): if isinstance(receiver, OFFVIEW_WIDGET) or isinstance(receiver, MDI_WIDGET): if is_pressed: receiver.keyPressEvent(event) diff --git a/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler.py b/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler.py index c9fc29b5e09..a6ac51b10ad 100644 --- a/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler.py +++ b/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler.py @@ -5,7 +5,7 @@ import os import linuxcnc -from PyQt5 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE @@ -56,8 +56,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to diff --git a/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler_1.py b/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler_1.py index 711f569c8a3..e17193dd70f 100644 --- a/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler_1.py +++ b/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 PyQt6 import QtCore +from PyQt6 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 @@ -75,8 +75,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): if isinstance(receiver, OFFVIEW_WIDGET) or \ isinstance(receiver, MDI_WIDGET) or isinstance(receiver, TOOLVIEW_WIDGET): if is_pressed: diff --git a/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_ngc/qtdefault_ngc_handler.py b/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_ngc/qtdefault_ngc_handler.py index 5e57576f90d..3cb37907f06 100644 --- a/configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_ngc/qtdefault_ngc_handler.py +++ b/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 PyQt6 import QtCore +from PyQt6 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 @@ -75,8 +75,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): if isinstance(receiver, OFFVIEW_WIDGET) or \ isinstance(receiver, MDI_WIDGET) or isinstance(receiver, TOOLVIEW_WIDGET): if is_pressed: diff --git a/configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py b/configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py index 48d63a6f441..35801caf8e9 100644 --- a/configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py +++ b/configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py @@ -2,12 +2,12 @@ import linuxcnc import hal import sys -from PyQt5.QtWidgets import QMessageBox -from PyQt5 import QtCore, QtWidgets, QtGui, uic +from PyQt6.QtWidgets import QMessageBox +from PyQt6 import QtCore, QtWidgets, QtGui, uic try: - from PyQt5.QtWebKitWidgets import QWebView + from PyQt6.QtWebKitWidgets import QWebView except ImportError: - raise Exception("Qtvcp error with woodpecker - is package python-pyqt5.qtwebkit installed?") + raise Exception("Qtvcp error with woodpecker - is package python-pyqt6.qtwebkit installed?") 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 @@ -63,7 +63,7 @@ def __init__(self, halcomp, widgets, paths): self.PATHS = paths self.gcodes = GCodes(widgets) self._last_count = 0 - self.valid = QtGui.QRegExpValidator(QtCore.QRegExp('-?[0-9]{0,6}[.][0-9]{0,3}')) + self.valid = QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('-?[0-9]{0,6}[.][0-9]{0,3}')) self.styleeditor = SSE(widgets, paths) KEYBIND.add_call('Key_F10','on_keycall_F10') KEYBIND.add_call('Key_F11','on_keycall_F11') @@ -417,7 +417,7 @@ def init_widgets(self): # gcode file history self.w.cmb_gcode_history.addItem("No File Loaded") - self.w.cmb_gcode_history.view().setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) + self.w.cmb_gcode_history.view().setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) # mdi history self.w.mdihistory.MDILine.setFixedHeight(30) self.w.mdihistory.MDILine.setPlaceholderText('MDI:') @@ -434,7 +434,7 @@ def init_widgets(self): #tool icons self.w.cmb_tool_icons.addItem("SELECT\nICON") - self.w.cmb_tool_icons.view().setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) + self.w.cmb_tool_icons.view().setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) path = os.path.join(PATH.CONFIGPATH, "tool_icons") if os.path.isdir(path): icons = os.listdir(path) @@ -520,8 +520,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2): -# QtCore.Qt.Key_F3,QtCore.Qt.Key_F4,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2): +# QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F4,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to @@ -1310,12 +1310,12 @@ def update_gcode_properties(self, props ): return # pop a dialog of the properties msg = QtWidgets.QMessageBox() - msg.setIcon(QtWidgets.QMessageBox.Information) + msg.setIcon(QtWidgets.QMessageBox.Icon.Information) msg.setText(smallmess) msg.setWindowTitle("Gcode Properties") - msg.setStandardButtons(QtWidgets.QMessageBox.Ok) + msg.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok) msg.show() - retval = msg.exec_() + retval = msg.exec() def touchoff(self, selector): if selector == 'touchplate': diff --git a/configs/sim/woodpecker/README.md b/configs/sim/woodpecker/README.md index 7741a8b18da..2ee4024a20b 100644 --- a/configs/sim/woodpecker/README.md +++ b/configs/sim/woodpecker/README.md @@ -2,7 +2,7 @@ ### Extra libraries are required in addition to those for the installation of QTVCP for additional functionality #### For viewing job setup sheets and help pages formatted in HTML -sudo apt-get install python3-pyqt5.qtwebengine +sudo apt-get install python3-pyqt6.qtwebengine #### To communicate with Huanyang GT series VFDs sudo apt-get install python3-pymodbus @@ -15,7 +15,7 @@ sudo apt-get install python3-scipy sudo apt-get install python3-matplotlib #### To view PDF files -sudo apt-get install python3-poppler-qt5 +sudo apt-get install python3-pyqt6.qtpdf ### To numstr.py File line_number.txt to the /home/name/line-number.txt according to the address in numstr.py. diff --git a/configs/sim/woodpecker/compensate.py b/configs/sim/woodpecker/compensate.py index 85563cd67c1..daaa6700e1d 100755 --- a/configs/sim/woodpecker/compensate.py +++ b/configs/sim/woodpecker/compensate.py @@ -21,7 +21,7 @@ import time import linuxcnc import hal -from PyQt5 import QtGui, QtWidgets +from PyQt6 import QtGui, QtWidgets import numpy as np import matplotlib.pyplot as plt import matplotlib.cm as cm diff --git a/configs/sim/woodpecker/qtvcp/screens/woodpecker/resources.py b/configs/sim/woodpecker/qtvcp/screens/woodpecker/resources.py index a4239d4f6a0..e2316e580e2 100644 --- a/configs/sim/woodpecker/qtvcp/screens/woodpecker/resources.py +++ b/configs/sim/woodpecker/qtvcp/screens/woodpecker/resources.py @@ -2,11 +2,9 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.12.8) -# # WARNING! All changes made in this file will be lost! -from PyQt5 import QtCore +from PyQt6 import QtCore qt_resource_data = b"\ \x00\x00\x08\x28\ diff --git a/configs/sim/woodpecker/woodpecker_/woodpecker_handler.py b/configs/sim/woodpecker/woodpecker_/woodpecker_handler.py index 0b3f28b128f..eb374328590 100644 --- a/configs/sim/woodpecker/woodpecker_/woodpecker_handler.py +++ b/configs/sim/woodpecker/woodpecker_/woodpecker_handler.py @@ -2,7 +2,7 @@ import linuxcnc import hal import time -from PyQt5 import QtCore, QtWidgets, QtGui +from PyQt6 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 @@ -308,8 +308,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2): -# QtCore.Qt.Key_F3,QtCore.Qt.Key_F4,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2): +# QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F4,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to diff --git a/configs/sim/woodpecker/zlevel.py b/configs/sim/woodpecker/zlevel.py index b7eb9ab5669..c7c5795e302 100644 --- a/configs/sim/woodpecker/zlevel.py +++ b/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 PyQt6 import QtCore, QtGui, QtWidgets, uic +from PyQt6.QtCore import QFile +from PyQt6.QtWidgets import QFileDialog #from linuxcnc import OPERATOR_ERROR, NML_ERROR from qtvcp.core import Status, Action, Info @@ -84,7 +84,7 @@ def save_gcode(self): self.add_status("GCode file not created yet") return options = QFileDialog.Options() - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog fileName, _ = QFileDialog.getSaveFileName(self,"Save to file","","All Files (*);;ngc Files (*.ngc)", options=options) if fileName: shutil.copy(self._tmp, fileName) @@ -187,5 +187,5 @@ def _mktemp(self): app = QtWidgets.QApplication(sys.argv) w = ZLevel() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/debian/configure b/debian/configure index 044e61f2391..646c2c35433 100755 --- a/debian/configure +++ b/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-pyqt6,\n python3-pyqt6.qsci,\n python3-pyqt6.qtsvg,\n python3-opencv,\n python3-dbus,\n python3-espeak,\n python3-dbus.mainloop.pyqt6,\n python3-pyqt6.qtwebengine,\n espeak-ng,\n pyqt6-dev-tools,\n gstreamer1.0-tools,\n espeak,\n sound-theme-freedesktop,\n python3-pyqt6.qtpdf" YAPPS_RUNTIME="python3-yapps" DEBHELPER="debhelper (>= 12)" COMPAT="12" diff --git a/docs/src/gui/filter-programs.adoc b/docs/src/gui/filter-programs.adoc index c15ed1de3d9..7debcd19ea3 100644 --- a/docs/src/gui/filter-programs.adoc +++ b/docs/src/gui/filter-programs.adoc @@ -92,7 +92,7 @@ for i in range(0,100): ---- Here is a similar program but it actually could filter. -It puts up a PyQt5 dialog with a cancel button. +It puts up a PyQt6 dialog with a cancel button. Then it reads the program line by line and passes it to standard output. As it goes along, it updates any process listening to standard error output. @@ -104,9 +104,9 @@ import sys import os import time -from PyQt5.QtWidgets import (QApplication, QDialog, QDialogButtonBox, +from PyQt6.QtWidgets import (QApplication, QDialog, QDialogButtonBox, QVBoxLayout,QDialogButtonBox) -from PyQt5.QtCore import QTimer, Qt +from PyQt6.QtCore import QTimer, Qt class CustomDialog(QDialog): diff --git a/docs/src/gui/qtdragon.adoc b/docs/src/gui/qtdragon.adoc index 80a8d1042b8..d9acdcb923b 100644 --- a/docs/src/gui/qtdragon.adoc +++ b/docs/src/gui/qtdragon.adoc @@ -1522,9 +1522,9 @@ It will be referred to as `_xx` in this document, so `qtdragon_xx.ts` in this do The default locale for QtDragon is `_en` which means that any translation files created as `qtdragon_en.*` will not be used for translations. -If any of the required utilities (pyuic5, pylupdate5, linguist) are not installed then the user will need to install the required development tools: +If any of the required utilities (pyuic6, pylupdate6, linguist) are not installed then the user will need to install the required development tools: ---- -sudo apt install qttools5-dev-tools pyqt5-dev-tools +sudo apt install qt6-tools-dev-tools pyqt6-dev-tools ---- Change to the languages directory: @@ -1534,7 +1534,7 @@ cd ~/linuxcnc-dev/share/qtvcp/screens/qtdragon/languages If any text changes have been made to the GUI then run the following to update the GUI Python file: ---- -pyuic5 ../qtdragon.ui > qtdragon.py +pyuic6 ../qtdragon.ui > qtdragon.py ---- The user can either create a new translation source file for a non-existing language translation @@ -1547,7 +1547,7 @@ Create or edit a .ts file: ---- [NOTE] -this command is a script which runs the following: $ pylupdate5 *.py ../*.py ../../../../../lib/python/qtvcp/lib/qtdragon/*.py -ts qtdragon_xx.ts +this command is a script which runs the following: $ pylupdate6 *.py ../*.py ../../../../../lib/python/qtvcp/lib/qtdragon/*.py -ts qtdragon_xx.ts The editing of the translation is done with the linguist application: ---- diff --git a/docs/src/gui/qtvcp-code-snippets.adoc b/docs/src/gui/qtvcp-code-snippets.adoc index 38bf68a9b40..4c6f19e4458 100644 --- a/docs/src/gui/qtvcp-code-snippets.adoc +++ b/docs/src/gui/qtvcp-code-snippets.adoc @@ -563,8 +563,8 @@ First we must import the libraries we need, if they're not already imported in t # **** IMPORT SECTION **** # ############################ -from PyQt5 import QtWidgets -from PyQt5.QtGui import QColor +from PyQt6 import QtWidgets +from PyQt6.QtGui import QColor from qtvcp.widgets.state_led import StateLED as LED from qtvcp.core import Status, Info ---- @@ -675,7 +675,7 @@ def make_corner_widgets(self): *`self.PREFS_`*:: the _instance of an optional preference file_ *`self.SETTINGS_`*:: the `Qsettings` _object_ -<5> Initializes a PyQt5 `QProgressBar`. +<5> Initializes a PyQt6 `QProgressBar`. <6> Sets the max range of the progress bar to the max specified in the `INI`. <7> We create a QWidget + Since you can only add one widget to the tab corner and we want two there, we must add both into a *container*. diff --git a/docs/src/gui/qtvcp-custom-widgets.adoc b/docs/src/gui/qtvcp-custom-widgets.adoc index a0f95ad5e54..cc679856094 100644 --- a/docs/src/gui/qtvcp-custom-widgets.adoc +++ b/docs/src/gui/qtvcp-custom-widgets.adoc @@ -101,7 +101,7 @@ This is where we import libraries that our widget class needs. ############################### # Imports ############################### -from PyQt5 import QtWidgets # <1> +from PyQt6 import QtWidgets # <1> from qtvcp.widgets.widget_baseclass \ import _HalWidgetBase, _HalSensitiveBase # <2> import hal # <3> @@ -171,7 +171,7 @@ This LED indicator widget will respond to selectable LinuxCNC controller states. ############################### # Imports ############################### -from PyQt5.QtCore import pyqtProperty +from PyQt6.QtCore import pyqtProperty from qtvcp.widgets.led_widget import LED from qtvcp.core import Status @@ -252,7 +252,7 @@ This is where we import libraries that our widget class needs. ############################### # Imports ############################### -from PyQt5.QtCore import pyqtProperty # <1> +from PyQt6.QtCore import pyqtProperty # <1> from qtvcp.widgets.led_widget import LED # <2> from qtvcp.core import Status # <3> ---- @@ -457,9 +457,9 @@ It changes: import os import hal -from PyQt5.QtWidgets import QWidget, QToolButton, QMenu, QAction -from PyQt5.QtCore import Qt, QEvent, pyqtProperty, QBasicTimer, pyqtSignal -from PyQt5.QtGui import QIcon +from PyQt6.QtWidgets import QWidget, QToolButton, QMenu, QAction +from PyQt6.QtCore import Qt, QEvent, pyqtProperty, QBasicTimer, pyqtSignal +from PyQt6.QtGui import QIcon from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.widgets.dialog_widget import EntryDialog @@ -659,8 +659,8 @@ Then `qtvcp/plugins/qtvcp_plugin.py` would need to be adjusted to _import_ them. ---- #!/usr/bin/env python3 -from PyQt5 import QtCore, QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtCore, QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.simple_widgets import Lcnc_GridLayout from qtvcp.widgets.qtvcp_icons import Icon ICON = Icon() @@ -704,8 +704,8 @@ class LcncGridLayoutPlugin(QPyDesignerCustomWidgetPlugin): ---- #!/usr/bin/env python3 -from PyQt5 import QtCore, QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtCore, QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.system_tool_button import SystemToolButton from qtvcp.widgets.qtvcp_icons import Icon ICON = Icon() @@ -756,8 +756,8 @@ This is the plugin used for _action buttons_. #!/usr/bin/env python3 import sip -from PyQt5 import QtCore, QtGui, QtWidgets -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin, \ +from PyQt6 import QtCore, QtGui, QtWidgets +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin, \ QPyDesignerTaskMenuExtension, QExtensionFactory, \ QDesignerFormWindowInterface, QPyDesignerMemberSheetExtension from qtvcp.widgets.action_button import ActionButton diff --git a/docs/src/gui/qtvcp-vcp-panels.adoc b/docs/src/gui/qtvcp-vcp-panels.adoc index e1027e4383d..4cc822353fb 100644 --- a/docs/src/gui/qtvcp-vcp-panels.adoc +++ b/docs/src/gui/qtvcp-vcp-panels.adoc @@ -509,7 +509,7 @@ Here is a sample to change the circle color in cam_align: + import sys import os import importlib -from PyQt5.QtCore import Qt +from PyQt6.QtCore import Qt from qtvcp.core import Path PATH = Path() diff --git a/docs/src/gui/qtvcp-vismach.adoc b/docs/src/gui/qtvcp-vismach.adoc index 2ce2e4dc8a9..d09c7e793bb 100644 --- a/docs/src/gui/qtvcp-vismach.adoc +++ b/docs/src/gui/qtvcp-vismach.adoc @@ -585,7 +585,7 @@ part1 = Translate([dogs],-1,49,0) # create a top-level model model = Collection([base, saddle, head, carousel]) -# we want to either embed into qtvcp or display directly with PyQt5 +# we want to either embed into qtvcp or display directly with PyQt6 # so build a window to display the model class Window(QWidget): @@ -624,7 +624,7 @@ class Window(QWidget): mainLayout.addWidget(self.glWidget) self.setLayout(mainLayout) -# if you call this file directly from python3, it will display a PyQt5 window +# if you call this file directly from python3, it will display a PyQt6 window # good for confirming the parts of the assembly. if __name__ == '__main__': diff --git a/docs/src/gui/qtvcp-widgets.adoc b/docs/src/gui/qtvcp-widgets.adoc index 1c2b689a9c4..1120d189f56 100644 --- a/docs/src/gui/qtvcp-widgets.adoc +++ b/docs/src/gui/qtvcp-widgets.adoc @@ -2903,7 +2903,7 @@ def _releasedOutput(self, btncode): self['joy_{}_pressed'.format(btncode.lower())].emit(False) ---- -As coded these function _issue (emit) PyQt5 signals (joy_btn_pressed and joy__pressed) for the any button pressed or released_. +As coded these function _issue (emit) PyQt6 signals (joy_btn_pressed and joy__pressed) for the any button pressed or released_. Signal 'joy_btn_pressed' outputs a string code for the button. + Signal 'joy__pressed' outputs a bool value. diff --git a/docs/src/gui/qtvcp.adoc b/docs/src/gui/qtvcp.adoc index bca394ac03b..a655f7f38b2 100644 --- a/docs/src/gui/qtvcp.adoc +++ b/docs/src/gui/qtvcp.adoc @@ -57,7 +57,7 @@ Normally QtVCP uses the stock UI and handler file, but you can specify QtVCP to A *'local' file* is one that is in the _configuration folder_ that defines the rest of the machine's requirements. One is not restricted to adding a custom panel on the right or a custom tab as QtVCP leverages _Qt Designer_ (the editor) -and _PyQt5_ (the widget toolkit). +and _PyQt6_ (the widget toolkit). QtVCP has some added *special LinuxCNC widgets and actions*. + There are special widgets to bridge third party widgets to HAL pins. + @@ -65,9 +65,9 @@ It's possible to create widget responses by connecting signals to Python code in === QtVCP Widgets -QtVCP uses the *PyQt5 toolkit's widgets* for LinuxCNC integration. +QtVCP uses the *PyQt6 toolkit's widgets* for LinuxCNC integration. -*Widget* is the _general name for user interface objects_ such as buttons and labels in PyQt5. +*Widget* is the _general name for user interface objects_ such as buttons and labels in PyQt6. You are free to use any available *default widgets* in the Qt Designer editor. @@ -145,7 +145,7 @@ If the update time is not set right the screen can become unresponsive or very j A Qt Designer file is a text file organized in the _XML_ standard that describes the *layout and widgets* of the screen. -_PyQt5_ uses this file to build the display and react to those widgets. +_PyQt6_ uses this file to build the display and react to those widgets. The Qt Designer editor makes it relatively easy to build and edit this file. @@ -525,7 +525,7 @@ First you must have the *Qt Designer installed*. + The following commands should add it to your system, or use your package manager to do the same: ---- -sudo apt-get install qttools5-dev-tools qttools5-dev libpython3-dev +sudo apt-get install pyqt6-dev-tools libpython3-dev ---- //// @@ -577,14 +577,14 @@ You may need to create the `plugins/python` folder. + ---- . scripts/rip-environment <1> -designer -qt=5 <2> +designer -qt=6 <2> ---- * For a _package install_: + Open a terminal and type: + ---- -designer -qt=5 +designer -qt=6 ---- If all goes right, Qt Designer will launch and you will see the selectable LinuxCNC widgets on the left hand side. @@ -734,7 +734,7 @@ import sys import os import linuxcnc -from PyQt5 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE diff --git a/docs/src/plasma/qtplasmac.adoc b/docs/src/plasma/qtplasmac.adoc index 97a6fd313e7..dab47505423 100644 --- a/docs/src/plasma/qtplasmac.adoc +++ b/docs/src/plasma/qtplasmac.adoc @@ -4240,9 +4240,9 @@ It will be referred to as `_xx` in this document, so `qtplasmac_xx.ts` in this d The default locale for QtPlasmaC is `_en` which means that any translation files created as `qtplasmac_en.*` will not be used for translations. -If any of the required utilities (pyuic5, pylupdate5, linguist) are not installed then the user will need to install the required development tools: +If any of the required utilities (pyuic6, pylupdate6, linguist) are not installed then the user will need to install the required development tools: ---- -sudo apt install qttools5-dev-tools pyqt5-dev-tools +sudo apt install qt6-tools-dev-tools pyqt6-dev-tools ---- Change to the languages directory: @@ -4252,7 +4252,7 @@ cd ~/linuxcnc-dev/share/qtvcp/screens/qtplasmac/languages If any text changes have been made to the GUI then run the following to update the GUI Python file: ---- -pyuic5 ../qtplasmac.ui > qtplasmac.py +pyuic6 ../qtplasmac.ui > qtplasmac.py ---- The user can either create a new translation source file for a non-existing language translation @@ -4265,7 +4265,7 @@ Create or edit a .ts file: ---- [NOTE] -this command is a script which runs the following: $ pylupdate5 *.py ../*.py ../../../../../lib/python/qtvcp/lib/qtplasmac/*.py -ts qtplasmac_xx.ts +this command is a script which runs the following: $ pylupdate6 *.py ../*.py ../../../../../lib/python/qtvcp/lib/qtplasmac/*.py -ts qtplasmac_xx.ts The editing of the translation is done with the linguist application: ---- diff --git a/docs/src/user/user-intro.adoc b/docs/src/user/user-intro.adoc index 62b8cca5879..b13b5f9a974 100644 --- a/docs/src/user/user-intro.adoc +++ b/docs/src/user/user-intro.adoc @@ -139,7 +139,7 @@ TkLinuxCNC:: <>, another interface based on Tcl .TkLinuxCNC graphical interface image::images/tkemc.png["TkLinuxCNC graphical interface",align="center"] -QtDragon:: <>, a touch screen GUI based on QtVCP using the PyQt5 library. +QtDragon:: <>, a touch screen GUI based on QtVCP using the PyQt6 library. It comes in two versions 'QtDragon' and 'QtDragon_hd'. They are very similar in features but QtDragon_hd is made for larger monitors. @@ -147,7 +147,7 @@ They are very similar in features but QtDragon_hd is made for larger monitors. .QtDragon, a touch screen GUI based on QtVCP image::images/qtdragon.png["QtDragon, a touch screen GUI based on QtVCP",align="center"] -QtPlasmaC:: <>, a touch screen plasma cutting GUI based on QtVCP using the PyQt5 library. +QtPlasmaC:: <>, a touch screen plasma cutting GUI based on QtVCP using the PyQt6 library. It comes in three aspect ratios, 16:9, 4:3, and 9:16. [[fig:QtPlasmaC-graphical-interface]] @@ -184,7 +184,7 @@ GladeVCP:: <>, a Glade-based virtual control panel tha .GladeVCP Example Embedded Into AXIS GUI image::../gui/images/axis-gladevcp.png["GladeVCP embedded into AXIS",align="center"] -QtVCP:: <>, a PyQt5-based virtual control panel that can be added to most GUIs or run as a standalone panel. +QtVCP:: <>, a PyQt6-based virtual control panel that can be added to most GUIs or run as a standalone panel. QtVCP has the advantage over PyVCP in that it is not limited to the display or control of HAL virtual signals, but can include other external interfaces outside LinuxCNC such as window or network events by extending with python code. QtVCP is also more flexible in how it may be configured to appear on the GUI with many special widgets: diff --git a/lib/python/qtvcp/core.py b/lib/python/qtvcp/core.py index 321433adf42..7aa24deeb65 100644 --- a/lib/python/qtvcp/core.py +++ b/lib/python/qtvcp/core.py @@ -8,7 +8,7 @@ import _hal import hal import traceback -from PyQt5.QtCore import QObject, QTimer, pyqtSignal +from PyQt6.QtCore import QObject, QTimer, pyqtSignal from common.hal_glib import GStat from common.iniinfo import _IStat as IStatParent diff --git a/lib/python/qtvcp/designer/README.txt b/lib/python/qtvcp/designer/README.txt index 21e3531eb03..0dbaa9c7852 100644 --- a/lib/python/qtvcp/designer/README.txt +++ b/lib/python/qtvcp/designer/README.txt @@ -8,29 +8,27 @@ espeak espeak-ng sound-theme-freedesktop python3-opengl -python3-pyqt5 -python3-pyqt5.qsci -python3-pyqt5.qtsvg -python3-pyqt5.qtopengl +python3-pyqt6 +python3-pyqt6.qsci +python3-pyqt6.qtsvg python3-opencv python3-dbus -python3-dbus.mainloop.pyqt5 +python3-dbus.mainloop.pyqt6 python3-espeak -python3-pyqt5.qtwebengine +python3-pyqt6.qtwebengine python3-xlib python3-numpy python3-cairo python3-gi-cairo -python3-poppler-qt5 -pyqt5-dev-tools +python3-pyqt6.qtpdf +pyqt6-dev-tools ------------------------------------------------------------------------------- Below are requirements for using Designer to edit or create new QtVCP screens or panels: Required packages: -qttools5-dev -qttools5-dev-tools +qt6-tools-dev libpython3-dev To enable LinuxCNC specific widgets to appear in Designer: @@ -55,4 +53,4 @@ For a RIP install only: source ~/linuxcnc-dev/scripts/rip-environment Start designer with: - designer -qt=5 + designer -qt=6 diff --git a/lib/python/qtvcp/designer/install_script b/lib/python/qtvcp/designer/install_script index 81204b8a1f0..b41c9ff61a2 100755 --- a/lib/python/qtvcp/designer/install_script +++ b/lib/python/qtvcp/designer/install_script @@ -5,10 +5,10 @@ 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-opengl python3-pyqt6 python3-pyqt6.qsci python3-pyqt6.qtsvg python3-opencv python3-dbus python3-dbus.mainloop.pyqt6 python3-espeak python3-pyqt6.qtwebengine python3-xlib python3-numpy python3-cairo python3-gi-cairo python3-pyqt6.qtpdf echo -e '\ninstalling python3 tools' -sudo apt-get install -y pyqt5-dev-tools +sudo apt-get install -y pyqt6-dev-tools # prompt to install designer while true; do @@ -31,7 +31,7 @@ done # install tools #clear echo -e '\ninstalling common tools' -sudo apt-get install -y qttools5-dev qttools5-dev-tools +sudo apt-get install -y pyqt6-dev-tools echo -e '\ninstalling python3 tools' sudo apt-get install -y libpython3-dev @@ -82,35 +82,9 @@ fi echo -e '\ncreate plugin link at:\n~/.designer/plugins/python/\n' ln -s "$pifile" ~/.designer/plugins/python/ -arch=$(uname -m) -sopath=/usr/lib/$arch-linux-gnu/qt5/plugins/designer/ -p2sofile=libpyqt5_py2.so -p3sofile=libpyqt5.so - -# ensure we have a python3 .so file -if [ ! -f "$sopath/$p3sofile" ]; then - # check if we have a python3 .so backup file from a python2 installation - if [ -f "$sopath/$p3sofile.old" ]; then - echo -e '\nrename libpyqt5.so.old file to libpyqt5.so' - sudo mv "$sopath/$p3sofile.old" "$sopath/$p3sofile" - # otherwise report an error - else - echo -e '\nlibpyqt5.so is missing from:' - echo -e '/usr/lib/x86_64-linux-gnu/qt5/plugins/designer/' - echo -e '\ndesigner installation aborted...\n' - exit - fi -fi - -# remove python2 .so file if it exists -if [ -f "$sopath/$p2sofile" ]; then - echo -e '\nremove python2 .so file' - sudo rm "$sopath/$p2sofile" -fi - #clear echo -e '\nInstallation complete, designer can be started with:' -echo -e '\ndesigner -qt=5\n' +echo -e '\ndesigner -qt=6\n' if [ "$response" -eq 2 ]; then echo -e 'After setting the rip-environment\n' fi diff --git a/lib/python/qtvcp/lib/auto_height/auto_height.py b/lib/python/qtvcp/lib/auto_height/auto_height.py index 7cf2dba71e4..fff18d893c9 100644 --- a/lib/python/qtvcp/lib/auto_height/auto_height.py +++ b/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 PyQt6 import QtCore, QtGui, QtWidgets, uic +from PyQt6.QtWidgets import QMessageBox +from PyQt6.QtCore import QProcess from qtvcp.core import Info, Status, Action, Path from qtvcp import logger @@ -86,11 +86,11 @@ def __init__(self, parent=None): help_file = open(os.path.join(HERE,"auto_height.txt"), "r") help_text = help_file.read() self.mb = QMessageBox() - self.mb.setIcon(QMessageBox.Information) + self.mb.setIcon(QMessageBox.Icon.Information) self.mb.setWindowTitle("Auto Workpiece Height Measurement") self.mb.setText("Auto Height Measure") self.mb.setInformativeText(help_text) - self.mb.setStandardButtons(QMessageBox.Ok) + self.mb.setStandardButtons(QMessageBox.StandardButton.Ok) # signal connections self.chk_enable_set.stateChanged.connect(self.chk_enable_changed) @@ -231,4 +231,4 @@ def __setitem__(self, item, value): app = QtWidgets.QApplication(sys.argv) w = Auto_Measure() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/lib/gcode_utility/facing.py b/lib/python/qtvcp/lib/gcode_utility/facing.py index bb855d777ff..bacfc342173 100644 --- a/lib/python/qtvcp/lib/gcode_utility/facing.py +++ b/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 PyQt6 import QtGui, QtWidgets, uic +from PyQt6.QtCore import QFile, QRegularExpression +from PyQt6.QtWidgets import QFileDialog, QMessageBox from linuxcnc import OPERATOR_ERROR, NML_ERROR from qtvcp.core import Info, Status, Action, Path @@ -34,10 +34,10 @@ def __init__(self, parent=None): help_file = open(os.path.join(HERE,"facing_help.txt"), "r") help_text = help_file.read() self.mb = QMessageBox() - self.mb.setIcon(QMessageBox.Information) + self.mb.setIcon(QMessageBox.Icon.Information) self.mb.setWindowTitle("Facing Help") self.mb.setText(help_text) - self.mb.setStandardButtons(QMessageBox.Ok) + self.mb.setStandardButtons(QMessageBox.StandardButton.Ok) STATUS.connect('forced-update',lambda w:self.init()) def init(self): @@ -107,15 +107,15 @@ def units_changed(self): def set_validator(self): # set valid input formats for lineEdits if self.rbtn_inch.isChecked(): - valid_size = QtGui.QRegExpValidator(QRegExp('[0-9]{0,6}[.][0-9]{0,4}')) - valid_step = QtGui.QRegExpValidator(QRegExp('[0-9]{0,6}[.][0-9]{0,2}')) - valid_feed = QtGui.QRegExpValidator(QRegExp('[0-9]{0,6}[.][0-9]{0,3}')) + valid_size = QtGui.QRegularExpressionValidator(QRegularExpression('[0-9]{0,6}[.][0-9]{0,4}')) + valid_step = QtGui.QRegularExpressionValidator(QRegularExpression('[0-9]{0,6}[.][0-9]{0,2}')) + valid_feed = QtGui.QRegularExpressionValidator(QRegularExpression('[0-9]{0,6}[.][0-9]{0,3}')) else: - valid_size = QtGui.QRegExpValidator(QRegExp('[0-9]{0,6}[.][0-9]{0,3}')) - valid_step = QtGui.QRegExpValidator(QRegExp('[0-9]{0,5}[.][0-9]{0,1}')) - valid_feed = QtGui.QRegExpValidator(QRegExp('[0-9]{0,5}[.][0-9]{0,1}')) + valid_size = QtGui.QRegularExpressionValidator(QRegularExpression('[0-9]{0,6}[.][0-9]{0,3}')) + valid_step = QtGui.QRegularExpressionValidator(QRegularExpression('[0-9]{0,5}[.][0-9]{0,1}')) + valid_feed = QtGui.QRegularExpressionValidator(QRegularExpression('[0-9]{0,5}[.][0-9]{0,1}')) self.lineEdit_tool.setValidator(valid_size) - self.lineEdit_spindle.setValidator(QtGui.QRegExpValidator(QRegExp('[0-9]{0,5}'))) + self.lineEdit_spindle.setValidator(QtGui.QRegularExpressionValidator(QRegularExpression('[0-9]{0,5}'))) self.lineEdit_feedrate.setValidator(valid_feed) self.lineEdit_stepover.setValidator(valid_step) self.lineEdit_size_x.setValidator(valid_size) @@ -207,7 +207,7 @@ def create_program(self): STATUS.emit('error', OPERATOR_ERROR, "Facing: There are errors in the input fields") return options = QFileDialog.Options() - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog fileName, _ = QFileDialog.getSaveFileName(self,"Save to file","","All Files (*);;ngc Files (*.ngc)", options=options) if fileName: self.calculate_toolpath(fileName) @@ -462,5 +462,5 @@ def _mktemp(self): app = QtWidgets.QApplication(sys.argv) w = Facing() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/lib/gcode_utility/hole_circle.py b/lib/python/qtvcp/lib/gcode_utility/hole_circle.py index 940b41f2079..ab891d11887 100644 --- a/lib/python/qtvcp/lib/gcode_utility/hole_circle.py +++ b/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 PyQt6 import QtGui, QtWidgets, uic +from PyQt6.QtCore import QPoint, QPointF, QLine, QRect, QFile, Qt, QEvent, QRegularExpression +from PyQt6.QtWidgets import QFileDialog, QMessageBox +from PyQt6.QtGui import QPainter, QBrush, QPen, QColor from linuxcnc import OPERATOR_ERROR, NML_ERROR from qtvcp.core import Info, Status, Action, Path @@ -44,7 +44,7 @@ def draw_main_circle(self, event, qp): h = size.height()/2 center = QPointF(w, h) radius = min(w, h) - 35 - qp.setPen(QPen(Qt.black, 1)) + qp.setPen(QPen(Qt.GlobalColor.black, 1)) qp.drawEllipse(center, radius, radius) def draw_crosshair(self, event, qp): @@ -52,7 +52,7 @@ def draw_crosshair(self, event, qp): cx = int(size.width()/2) cy = int(size.height()/2) L = min(cx, cy) - 25 - qp.setPen(QPen(Qt.black, 1)) + qp.setPen(QPen(Qt.GlobalColor.black, 1)) p1 = QPoint(cx + L, cy) p2 = QPoint(cx, cy - L) p3 = QPoint(cx - L, cy) @@ -63,10 +63,10 @@ def draw_crosshair(self, event, qp): br2 = QRect(cx-15, cy - L - 12, 30, 12) br3 = QRect(cx - L - 30, cy-6, 30, 12) br4 = QRect(cx-15, cy + L, 30, 12) - qp.drawText(br1, Qt.AlignHCenter|Qt.AlignVCenter, "0") - qp.drawText(br2, Qt.AlignHCenter|Qt.AlignVCenter, "90") - qp.drawText(br3, Qt.AlignHCenter|Qt.AlignVCenter, "180") - qp.drawText(br4, Qt.AlignHCenter|Qt.AlignVCenter, "270") + qp.drawText(br1, Qt.AlignmentFlag.AlignHCenter|Qt.AlignmentFlag.AlignVCenter, "0") + qp.drawText(br2, Qt.AlignmentFlag.AlignHCenter|Qt.AlignmentFlag.AlignVCenter, "90") + qp.drawText(br3, Qt.AlignmentFlag.AlignHCenter|Qt.AlignmentFlag.AlignVCenter, "180") + qp.drawText(br4, Qt.AlignmentFlag.AlignHCenter|Qt.AlignmentFlag.AlignVCenter, "270") def draw_holes(self, event, qp): size = self.size() @@ -74,10 +74,10 @@ def draw_holes(self, event, qp): h = size.height() center = QPointF(w/2, h/2) r = (min(w, h) - 70)/2 - qp.setPen(QPen(Qt.red, 2)) + qp.setPen(QPen(Qt.GlobalColor.red, 2)) for i in range(self.num_holes): if i ==1: - qp.setPen(QPen(Qt.black, 2)) + qp.setPen(QPen(Qt.GlobalColor.black, 2)) theta = ((360.0/self.num_holes) * i) + self.first_angle x = r * math.cos(math.radians(theta)) y = r * math.sin(math.radians(theta)) @@ -108,10 +108,10 @@ def __init__(self, parent=None): help_file = open(os.path.join(HERE,"hole_circle_help.txt"), "r") help_text = help_file.read() self.mb = QMessageBox() - self.mb.setIcon(QMessageBox.Information) + self.mb.setIcon(QMessageBox.Icon.Information) self.mb.setWindowTitle("Hole Circle Help") self.mb.setText(help_text) - self.mb.setStandardButtons(QMessageBox.Ok) + self.mb.setStandardButtons(QMessageBox.StandardButton.Ok) # Initial values self._tmp = None @@ -168,18 +168,18 @@ def units_changed(self): def set_validator(self): # set valid input formats for lineEdits if self.btn_inch.isChecked(): - valid_size = QtGui.QRegExpValidator(QRegExp(r'^((\d+(\.\d{,4})?)|(\.\d{,4}))$')) - valid_radius = QtGui.QRegExpValidator(QRegExp(r'^((\d{1,3}(\.\d{1,4})?)|(\.\d{1,4}))$')) - valid_feed = QtGui.QRegExpValidator(QRegExp('[0-9]{0,6}[.][0-9]{0,3}')) + valid_size = QtGui.QRegularExpressionValidator(QRegularExpression(r'^((\d+(\.\d{,4})?)|(\.\d{,4}))$')) + valid_radius = QtGui.QRegularExpressionValidator(QRegularExpression(r'^((\d{1,3}(\.\d{1,4})?)|(\.\d{1,4}))$')) + valid_feed = QtGui.QRegularExpressionValidator(QRegularExpression('[0-9]{0,6}[.][0-9]{0,3}')) else: - valid_size = QtGui.QRegExpValidator(QRegExp(r'^((\d+(\.\d{,3})?)|(\.\d{,3}))$')) - valid_radius = QtGui.QRegExpValidator(QRegExp(r'^((\d{1,4}(\.\d{1,3})?)|(\.\d{1,3}))$')) - valid_feed = QtGui.QRegExpValidator(QRegExp(r'\d{0,5}[.]\d{0,1}')) + valid_size = QtGui.QRegularExpressionValidator(QRegularExpression(r'^((\d+(\.\d{,3})?)|(\.\d{,3}))$')) + valid_radius = QtGui.QRegularExpressionValidator(QRegularExpression(r'^((\d{1,4}(\.\d{1,3})?)|(\.\d{1,3}))$')) + valid_feed = QtGui.QRegularExpressionValidator(QRegularExpression(r'\d{0,5}[.]\d{0,1}')) - self.lineEdit_spindle.setValidator(QtGui.QRegExpValidator(QRegExp(r'\d{0,5}'))) + self.lineEdit_spindle.setValidator(QtGui.QRegularExpressionValidator(QRegularExpression(r'\d{0,5}'))) self.lineEdit_num_holes.setValidator(QtGui.QDoubleValidator(0, 99, 0)) self.lineEdit_radius.setValidator(valid_radius) - self.lineEdit_first.setValidator(QtGui.QRegExpValidator(QRegExp(r'\d{0,3}[.]\d{0,2}'))) + self.lineEdit_first.setValidator(QtGui.QRegularExpressionValidator(QRegularExpression(r'\d{0,3}[.]\d{0,2}'))) self.lineEdit_safe_z.setValidator(valid_size) self.lineEdit_start_height.setValidator(valid_size) self.lineEdit_depth.setValidator(valid_size) @@ -290,7 +290,7 @@ def create_program(self): STATUS.emit('error', OPERATOR_ERROR, "Hole Circle: There are errors in input fields") return options = QFileDialog.Options() - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog fileName, _ = QFileDialog.getSaveFileName(self,"Save to file","","All Files (*);;ngc Files (*.ngc)", options=options) if fileName: self.calculate_toolpath(fileName) @@ -396,5 +396,5 @@ def next_line(self, text): w = Hole_Circle() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/lib/gcode_utility/hole_enlarge.py b/lib/python/qtvcp/lib/gcode_utility/hole_enlarge.py index 2904b7f00df..53c49411cde 100644 --- a/lib/python/qtvcp/lib/gcode_utility/hole_enlarge.py +++ b/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 PyQt6 import QtCore, QtGui, QtWidgets, uic +from PyQt6.QtWidgets import QFileDialog, QMessageBox from qtvcp.core import Info, Status, Action, Tool, Path INFO = Info() @@ -57,15 +57,15 @@ def __init__(self, parent=None): except AttributeError as e: print("Error: ", e) - self.lineEdit_tool.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp('[0-9]{0,5}'))) - self.lineEdit_spindle.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp('[0-9]{0,5}'))) - self.lineEdit_feed.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp('[0-9]{0,4}'))) - self.lineEdit_tool_dia.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp('[0-9]{0,3}[.][0-9]{0,4}'))) - self.lineEdit_start_dia.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp('[0-9]{0,5}[.][0-9]{0,4}'))) - self.lineEdit_final_dia.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp('[0-9]{0,5}[.][0-9]{0,4}'))) - self.lineEdit_loops.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp('[0-9]{0,2}'))) - self.lineEdit_cut_depth.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp('[0-9]{0,4}[.][0-9]{0,4}'))) - self.lineEdit_z_safe.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp('[0-9]{0,4}'))) + self.lineEdit_tool.setValidator(QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('[0-9]{0,5}'))) + self.lineEdit_spindle.setValidator(QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('[0-9]{0,5}'))) + self.lineEdit_feed.setValidator(QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('[0-9]{0,4}'))) + self.lineEdit_tool_dia.setValidator(QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('[0-9]{0,3}[.][0-9]{0,4}'))) + self.lineEdit_start_dia.setValidator(QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('[0-9]{0,5}[.][0-9]{0,4}'))) + self.lineEdit_final_dia.setValidator(QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('[0-9]{0,5}[.][0-9]{0,4}'))) + self.lineEdit_loops.setValidator(QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('[0-9]{0,2}'))) + self.lineEdit_cut_depth.setValidator(QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('[0-9]{0,4}[.][0-9]{0,4}'))) + self.lineEdit_z_safe.setValidator(QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('[0-9]{0,4}'))) self.red_border = "border: 2px solid red;" self.black_border = "border: 2px solid black;" @@ -77,11 +77,11 @@ def __init__(self, parent=None): with open(help_path) as file: help_text = file.read() self.mb = QMessageBox() - self.mb.setIcon(QMessageBox.Information) + self.mb.setIcon(QMessageBox.Icon.Information) self.mb.setWindowTitle("Hole Enlarge Help") - self.mb.setTextFormat(QtCore.Qt.RichText) + self.mb.setTextFormat(QtCore.Qt.TextFormat.RichText) self.mb.setText(help_text) - self.mb.setStandardButtons(QMessageBox.Ok) + self.mb.setStandardButtons(QMessageBox.StandardButton.Ok) # signal connections STATUS.connect('metric-mode-changed', lambda w, mode: self.units_changed(mode)) @@ -98,7 +98,7 @@ def create_program(self): if not self.validate(): return self.estimate_runtime() options = QFileDialog.Options() - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog sub_path = INFO.SUB_PATH_LIST _dir = os.path.expanduser(sub_path[0]) fileName, _ = QFileDialog.getSaveFileName(self,"Save to file",_dir,"All Files (*);;ngc Files (*.ngc)", options=options) @@ -232,7 +232,7 @@ def validate(self): def create_gcode(self): options = QFileDialog.Options() - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog fileName, _ = QFileDialog.getSaveFileName(self,"Save to file","","All Files (*);;ngc Files (*.ngc)", options=options) if fileName: self.calculate_program(fileName) @@ -381,5 +381,5 @@ def __setitem__(self, item, value): app = QtWidgets.QApplication(sys.argv) w = Hole_Enlarge() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/lib/keybindings.py b/lib/python/qtvcp/lib/keybindings.py index 060ec5f216d..b00d0ccd5e3 100644 --- a/lib/python/qtvcp/lib/keybindings.py +++ b/lib/python/qtvcp/lib/keybindings.py @@ -15,7 +15,7 @@ # you can add or change these import traceback -from PyQt5.QtCore import Qt +from PyQt6.QtCore import Qt # Set up logging from qtvcp import logger @@ -31,147 +31,147 @@ def key_pressed(event): keynum = int(event.key()) keys = { - Qt.Key_Escape: "Key_Escape", - Qt.Key_Tab: "Key_Tab", - Qt.Key_Backtab: "Key_Backtab", - Qt.Key_Backspace: "Key_Backspace", - Qt.Key_Return: "Key_Return", - Qt.Key_Enter: "Key_Enter", - Qt.Key_Insert: "Key_Insert", - Qt.Key_Delete: "Key_Delete", - Qt.Key_Pause: "Key_Pause", - Qt.Key_Print: "Key_Print", - Qt.Key_SysReq: "Key_SysReq", - Qt.Key_Clear: "Key_Clear", - Qt.Key_Home: "Key_Home", - Qt.Key_End: "Key_End", - Qt.Key_Left: "Key_Left", - Qt.Key_Up: "Key_Up", - Qt.Key_Right: "Key_Right", - Qt.Key_Down: "Key_Down", - Qt.Key_PageUp: "Key_PageUp", - Qt.Key_PageDown: "Key_PageDown", - Qt.Key_Shift: "Key_Shift", - Qt.Key_Control: "Key_Control", - Qt.Key_Meta: "Key_Meta", - # Qt.Key_Alt: "Key_Alt", - Qt.Key_AltGr: "Key_AltGr", - Qt.Key_CapsLock: "Key_CapsLock", - Qt.Key_NumLock: "Key_NumLock", - Qt.Key_ScrollLock: "Key_ScrollLock", - Qt.Key_F1: "Key_F1", - Qt.Key_F2: "Key_F2", - Qt.Key_F3: "Key_F3", - Qt.Key_F4: "Key_F4", - Qt.Key_F5: "Key_F5", - Qt.Key_F6: "Key_F6", - Qt.Key_F7: "Key_F7", - Qt.Key_F8: "Key_F8", - Qt.Key_F9: "Key_F9", - Qt.Key_F10: "Key_F10", - Qt.Key_F11: "Key_F11", - Qt.Key_F12: "Key_F12", - Qt.Key_F13: "Key_F13", - Qt.Key_F14: "Key_F14", - Qt.Key_F15: "Key_F15", - Qt.Key_F16: "Key_F16", - Qt.Key_F17: "Key_F17", - Qt.Key_F18: "Key_F18", - Qt.Key_F19: "Key_F19", - Qt.Key_F20: "Key_F20", - Qt.Key_F21: "Key_F21", - Qt.Key_F22: "Key_F22", - Qt.Key_F23: "Key_F23", - Qt.Key_F24: "Key_F24", - Qt.Key_F25: "Key_F25", - Qt.Key_F26: "Key_F26", - Qt.Key_F27: "Key_F27", - Qt.Key_F28: "Key_F28", - Qt.Key_F29: "Key_F29", - Qt.Key_F30: "Key_F30", - Qt.Key_F31: "Key_F31", - Qt.Key_F32: "Key_F32", - Qt.Key_F33: "Key_F33", - Qt.Key_F34: "Key_F34", - Qt.Key_F35: "Key_F35", - Qt.Key_Super_L: "Key_Super_L", - Qt.Key_Super_R: "Key_Super_R", - Qt.Key_Menu: "Key_Menu", - Qt.Key_Hyper_L: "Key_HYPER_L", - Qt.Key_Hyper_R: "Key_Hyper_R", - Qt.Key_Help: "Key_Help", - Qt.Key_Direction_L: "Key_Direction_L", - Qt.Key_Direction_R: "Key_Direction_R", - Qt.Key_Space: "Key_Space", - Qt.Key_Any: "Key_Any", - Qt.Key_Exclam: "Key_Exclam", - Qt.Key_QuoteDbl: "Key_QuoteDdl", - Qt.Key_NumberSign: "Key_NumberSign", - Qt.Key_Dollar: "Key_Dollar", - Qt.Key_Percent: "Key_Percent", - Qt.Key_Ampersand: "Key_Ampersand", - Qt.Key_Apostrophe: "Key_Apostrophe", - Qt.Key_ParenLeft: "Key_ParenLeft", - Qt.Key_ParenRight: "Key_ParenRight", - Qt.Key_Asterisk: "Key_Asterisk", - Qt.Key_Plus: "Key_Plus", - Qt.Key_Comma: "Key_Comma", - Qt.Key_Minus: "Key_Minus", - Qt.Key_Period: "Key_Period", - Qt.Key_Slash: "Key_Slash", - Qt.Key_0: "Key_0", - Qt.Key_1: "Key_1", - Qt.Key_2: "Key_2", - Qt.Key_3: "Key_3", - Qt.Key_4: "Key_4", - Qt.Key_5: "Key_5", - Qt.Key_6: "Key_6", - Qt.Key_7: "Key_7", - Qt.Key_8: "Key_8", - Qt.Key_9: "Key_9", - Qt.Key_Colon: "Key_Colon", - Qt.Key_Semicolon: "Key_Semicolon", - Qt.Key_Less: "Key_Less", - Qt.Key_Equal: "Key_Equal", - Qt.Key_Greater: "Key_Greater", - Qt.Key_Question: "Key_Question", - Qt.Key_At: "Key_At", - Qt.Key_A: "Key_", - Qt.Key_B: "Key_", - Qt.Key_C: "Key_", - Qt.Key_D: "Key_", - Qt.Key_E: "Key_", - Qt.Key_F: "Key_", - Qt.Key_G: "Key_", - Qt.Key_H: "Key_", - Qt.Key_I: "Key_", - Qt.Key_J: "Key_", - Qt.Key_K: "Key_", - Qt.Key_L: "Key_", - Qt.Key_M: "Key_", - Qt.Key_N: "Key_", - Qt.Key_O: "Key_", - Qt.Key_P: "Key_", - Qt.Key_Q: "Key_", - Qt.Key_R: "Key_", - Qt.Key_S: "Key_", - Qt.Key_T: "Key_", - Qt.Key_U: "Key_", - Qt.Key_V: "Key_", - Qt.Key_W: "Key_", - Qt.Key_X: "Key_", - Qt.Key_Y: "Key_", - Qt.Key_Z: "Key_", - Qt.Key_BracketLeft: "Key_BracketLeft", - Qt.Key_Backslash: "Key_Backslash", - Qt.Key_BracketRight: "Key_BracketRight", - Qt.Key_AsciiCircum: "Key_AsciiCircum", - Qt.Key_Underscore: "Key_Underscore", - Qt.Key_QuoteLeft: "Key_QuoteLeft", - Qt.Key_BraceLeft: "Key_BraceLeft", - Qt.Key_Bar: "Key_Bar", - Qt.Key_BraceRight: "Key_BraceRight", - Qt.Key_AsciiTilde: "Key_AsciiTilde", + Qt.Key.Key_Escape: "Key_Escape", + Qt.Key.Key_Tab: "Key_Tab", + Qt.Key.Key_Backtab: "Key_Backtab", + Qt.Key.Key_Backspace: "Key_Backspace", + Qt.Key.Key_Return: "Key_Return", + Qt.Key.Key_Enter: "Key_Enter", + Qt.Key.Key_Insert: "Key_Insert", + Qt.Key.Key_Delete: "Key_Delete", + Qt.Key.Key_Pause: "Key_Pause", + Qt.Key.Key_Print: "Key_Print", + Qt.Key.Key_SysReq: "Key_SysReq", + Qt.Key.Key_Clear: "Key_Clear", + Qt.Key.Key_Home: "Key_Home", + Qt.Key.Key_End: "Key_End", + Qt.Key.Key_Left: "Key_Left", + Qt.Key.Key_Up: "Key_Up", + Qt.Key.Key_Right: "Key_Right", + Qt.Key.Key_Down: "Key_Down", + Qt.Key.Key_PageUp: "Key_PageUp", + Qt.Key.Key_PageDown: "Key_PageDown", + Qt.Key.Key_Shift: "Key_Shift", + Qt.Key.Key_Control: "Key_Control", + Qt.Key.Key_Meta: "Key_Meta", + # Qt.Key.Key_Alt: "Key_Alt", + Qt.Key.Key_AltGr: "Key_AltGr", + Qt.Key.Key_CapsLock: "Key_CapsLock", + Qt.Key.Key_NumLock: "Key_NumLock", + Qt.Key.Key_ScrollLock: "Key_ScrollLock", + Qt.Key.Key_F1: "Key_F1", + Qt.Key.Key_F2: "Key_F2", + Qt.Key.Key_F3: "Key_F3", + Qt.Key.Key_F4: "Key_F4", + Qt.Key.Key_F5: "Key_F5", + Qt.Key.Key_F6: "Key_F6", + Qt.Key.Key_F7: "Key_F7", + Qt.Key.Key_F8: "Key_F8", + Qt.Key.Key_F9: "Key_F9", + Qt.Key.Key_F10: "Key_F10", + Qt.Key.Key_F11: "Key_F11", + Qt.Key.Key_F12: "Key_F12", + Qt.Key.Key_F13: "Key_F13", + Qt.Key.Key_F14: "Key_F14", + Qt.Key.Key_F15: "Key_F15", + Qt.Key.Key_F16: "Key_F16", + Qt.Key.Key_F17: "Key_F17", + Qt.Key.Key_F18: "Key_F18", + Qt.Key.Key_F19: "Key_F19", + Qt.Key.Key_F20: "Key_F20", + Qt.Key.Key_F21: "Key_F21", + Qt.Key.Key_F22: "Key_F22", + Qt.Key.Key_F23: "Key_F23", + Qt.Key.Key_F24: "Key_F24", + Qt.Key.Key_F25: "Key_F25", + Qt.Key.Key_F26: "Key_F26", + Qt.Key.Key_F27: "Key_F27", + Qt.Key.Key_F28: "Key_F28", + Qt.Key.Key_F29: "Key_F29", + Qt.Key.Key_F30: "Key_F30", + Qt.Key.Key_F31: "Key_F31", + Qt.Key.Key_F32: "Key_F32", + Qt.Key.Key_F33: "Key_F33", + Qt.Key.Key_F34: "Key_F34", + Qt.Key.Key_F35: "Key_F35", + Qt.Key.Key_Super_L: "Key_Super_L", + Qt.Key.Key_Super_R: "Key_Super_R", + Qt.Key.Key_Menu: "Key_Menu", + Qt.Key.Key_Hyper_L: "Key_HYPER_L", + Qt.Key.Key_Hyper_R: "Key_Hyper_R", + Qt.Key.Key_Help: "Key_Help", + Qt.Key.Key_Direction_L: "Key_Direction_L", + Qt.Key.Key_Direction_R: "Key_Direction_R", + Qt.Key.Key_Space: "Key_Space", + Qt.Key.Key_Any: "Key_Any", + Qt.Key.Key_Exclam: "Key_Exclam", + Qt.Key.Key_QuoteDbl: "Key_QuoteDdl", + Qt.Key.Key_NumberSign: "Key_NumberSign", + Qt.Key.Key_Dollar: "Key_Dollar", + Qt.Key.Key_Percent: "Key_Percent", + Qt.Key.Key_Ampersand: "Key_Ampersand", + Qt.Key.Key_Apostrophe: "Key_Apostrophe", + Qt.Key.Key_ParenLeft: "Key_ParenLeft", + Qt.Key.Key_ParenRight: "Key_ParenRight", + Qt.Key.Key_Asterisk: "Key_Asterisk", + Qt.Key.Key_Plus: "Key_Plus", + Qt.Key.Key_Comma: "Key_Comma", + Qt.Key.Key_Minus: "Key_Minus", + Qt.Key.Key_Period: "Key_Period", + Qt.Key.Key_Slash: "Key_Slash", + Qt.Key.Key_0: "Key_0", + Qt.Key.Key_1: "Key_1", + Qt.Key.Key_2: "Key_2", + Qt.Key.Key_3: "Key_3", + Qt.Key.Key_4: "Key_4", + Qt.Key.Key_5: "Key_5", + Qt.Key.Key_6: "Key_6", + Qt.Key.Key_7: "Key_7", + Qt.Key.Key_8: "Key_8", + Qt.Key.Key_9: "Key_9", + Qt.Key.Key_Colon: "Key_Colon", + Qt.Key.Key_Semicolon: "Key_Semicolon", + Qt.Key.Key_Less: "Key_Less", + Qt.Key.Key_Equal: "Key_Equal", + Qt.Key.Key_Greater: "Key_Greater", + Qt.Key.Key_Question: "Key_Question", + Qt.Key.Key_At: "Key_At", + Qt.Key.Key_A: "Key_", + Qt.Key.Key_B: "Key_", + Qt.Key.Key_C: "Key_", + Qt.Key.Key_D: "Key_", + Qt.Key.Key_E: "Key_", + Qt.Key.Key_F: "Key_", + Qt.Key.Key_G: "Key_", + Qt.Key.Key_H: "Key_", + Qt.Key.Key_I: "Key_", + Qt.Key.Key_J: "Key_", + Qt.Key.Key_K: "Key_", + Qt.Key.Key_L: "Key_", + Qt.Key.Key_M: "Key_", + Qt.Key.Key_N: "Key_", + Qt.Key.Key_O: "Key_", + Qt.Key.Key_P: "Key_", + Qt.Key.Key_Q: "Key_", + Qt.Key.Key_R: "Key_", + Qt.Key.Key_S: "Key_", + Qt.Key.Key_T: "Key_", + Qt.Key.Key_U: "Key_", + Qt.Key.Key_V: "Key_", + Qt.Key.Key_W: "Key_", + Qt.Key.Key_X: "Key_", + Qt.Key.Key_Y: "Key_", + Qt.Key.Key_Z: "Key_", + Qt.Key.Key_BracketLeft: "Key_BracketLeft", + Qt.Key.Key_Backslash: "Key_Backslash", + Qt.Key.Key_BracketRight: "Key_BracketRight", + Qt.Key.Key_AsciiCircum: "Key_AsciiCircum", + Qt.Key.Key_Underscore: "Key_Underscore", + Qt.Key.Key_QuoteLeft: "Key_QuoteLeft", + Qt.Key.Key_BraceLeft: "Key_BraceLeft", + Qt.Key.Key_Bar: "Key_Bar", + Qt.Key.Key_BraceRight: "Key_BraceRight", + Qt.Key.Key_AsciiTilde: "Key_AsciiTilde", } diff --git a/lib/python/qtvcp/lib/mdi_subprogram/mdi_command_process.py b/lib/python/qtvcp/lib/mdi_subprogram/mdi_command_process.py index 93d4949757e..a920a6674f4 100644 --- a/lib/python/qtvcp/lib/mdi_subprogram/mdi_command_process.py +++ b/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 PyQt6 import QtGui, QtCore, QtWidgets, uic +from PyQt6.QtCore import QObject +from PyQt6.QtCore import QProcess, QEvent, Qt, pyqtProperty 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 PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * app = QtWidgets.QApplication(sys.argv) mdi = MDICommand() @@ -137,5 +137,5 @@ def __setitem__(self, item, value): w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/lib/mdi_subprogram/mdi_subprogram.py b/lib/python/qtvcp/lib/mdi_subprogram/mdi_subprogram.py index ba6f39e70e4..f5886503143 100644 --- a/lib/python/qtvcp/lib/mdi_subprogram/mdi_subprogram.py +++ b/lib/python/qtvcp/lib/mdi_subprogram/mdi_subprogram.py @@ -19,7 +19,7 @@ import json import linuxcnc -from PyQt5.QtCore import QObject +from PyQt6.QtCore import QObject from qtvcp.core import Status, Action, Info # Instantiate the libraries with global reference diff --git a/lib/python/qtvcp/lib/message.py b/lib/python/qtvcp/lib/message.py index 4b608114bdf..b5c56a906c0 100644 --- a/lib/python/qtvcp/lib/message.py +++ b/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 PyQt6.QtWidgets import * +from PyQt6.QtCore import Qt +from PyQt6.QtGui import QColor from qtvcp.core import Status, Info from qtvcp.widgets.dialog_widget import LcncDialog import hal @@ -21,10 +21,10 @@ class Message: def __init__(self): - self.QUESTION = QMessageBox.Question - self.INFO = QMessageBox.Information - self.WARNING = QMessageBox.Warning - self.CRITICAL = QMessageBox.Critical + self.QUESTION = QMessageBox.Icon.Question + self.INFO = QMessageBox.Icon.Information + self.WARNING = QMessageBox.Icon.Warning + self.CRITICAL = QMessageBox.Icon.Critical self._color = QColor(0, 0, 0, 150) self.focus_text = ' ' self.play_sounds = True @@ -51,10 +51,10 @@ def message_setup(self, hal_comp, window=None, notify=None): log.info('invalid message type {} in INI File [DISPLAY] section'.format(details)) continue - if icon.upper() == 'CRITICAL': icon = QMessageBox.Critical - elif icon.upper() == 'INFO': icon = QMessageBox.Information - elif icon.upper() == 'WARNING': icon = QMessageBox.Warning - else: icon = QMessageBox.Question + if icon.upper() == 'CRITICAL': icon = QMessageBox.Icon.Critical + elif icon.upper() == 'INFO': icon = QMessageBox.Icon.Information + elif icon.upper() == 'WARNING': icon = QMessageBox.Icon.Warning + else: icon = QMessageBox.Icon.Question if not name == None: D = self['dialog-{}'.format(name)] = LcncDialog(window) @@ -178,23 +178,23 @@ def on_printmessage(self, dialog, pin, pinname, boldtext, text, details, type, i self.showDialog(dialog, boldtext, text, details, style, icon, pinname) def showDialog(self, dialog, message, more_info=None, details=None, display_type='OK', - icon=QMessageBox.Information, pinname=None, focus_text=None, + icon=QMessageBox.Icon.Information, pinname=None, focus_text=None, focus_color=None, play_alert=None, nblock= False, return_callback = None, flags = None, setflags = None, title = None): if type(icon) == str: - if icon.upper() == 'CRITICAL': icon = QMessageBox.Critical - elif icon.upper() == 'INFO': icon = QMessageBox.Information - elif icon.upper() == 'WARNING': icon = QMessageBox.Warning - else: icon = QMessageBox.Question + if icon.upper() == 'CRITICAL': icon = QMessageBox.Icon.Critical + elif icon.upper() == 'INFO': icon = QMessageBox.Icon.Information + elif icon.upper() == 'WARNING': icon = QMessageBox.Icon.Warning + else: icon = QMessageBox.Icon.Question if return_callback == None: return_callback = self.dialog_return - flags = (Qt.Tool | Qt.Dialog | Qt.WindowStaysOnTopHint\ - | Qt.WindowSystemMenuHint | Qt.CustomizeWindowHint) + flags = (Qt.WindowType.Tool | Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint\ + | Qt.WindowSystemMenuHint | Qt.WindowType.CustomizeWindowHint) title = 'User Message' - setFlags = {Qt.WindowCloseButtonHint: False} + setFlags = {Qt.WindowType.WindowCloseButtonHint: False} dialog.showdialog( message, more_info=more_info, details=details, display_type=display_type, icon=icon, pinname=pinname, focus_text=None, focus_color=None, play_alert=None, nblock= nblock, @@ -251,7 +251,7 @@ def __setitem__(self, item, value): if __name__ == '__main__': import sys - from PyQt5.QtCore import * + from PyQt6.QtCore import * def callreturn(dialog, btn, pinname): result = dialog.qualifiedReturn(btn) @@ -295,4 +295,4 @@ def callreturn(dialog, btn, pinname): w.setWindowTitle("PyQt Dialog demo") w.setGeometry(300, 300, 300, 150) w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/lib/qt_ngcgui/ngcgui.py b/lib/python/qtvcp/lib/qt_ngcgui/ngcgui.py index 3bb04c0c649..399532a118b 100644 --- a/lib/python/qtvcp/lib/qt_ngcgui/ngcgui.py +++ b/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 PyQt6 import QtGui, QtWidgets, QtCore, uic +from PyQt6.QtCore import QRegularExpression +from PyQt6.QtWidgets import QFileDialog, QHBoxLayout, QVBoxLayout, QLabel, QWidget, QLineEdit, QMessageBox from qtvcp.core import Action, Info, Path from qtvcp import logger @@ -139,7 +139,7 @@ def fill_parm_fields(self): def empty_label(self): lbl = QLabel() - lbl.setSizePolicy(QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding,QtWidgets.QSizePolicy.Expanding)) + lbl.setSizePolicy(QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding,QtWidgets.QSizePolicy.Policy.Expanding)) return lbl def new_label(self, width, text): @@ -150,8 +150,8 @@ def new_label(self, width, text): return lbl def new_lineedit(self, key, data): - # QRegExp('^[+-]?((\d+(\.\d{,4})?)|(\.\d{,4}))$' allows max 4 digits after the decimal - valid = QtGui.QRegExpValidator(QRegExp(r'^[+-]?((\d+(\.\d{,4})?)|(\.\d{,4}))$')) + # QRegularExpression('^[+-]?((\d+(\.\d{,4})?)|(\.\d{,4}))$' allows max 4 digits after the decimal + valid = QtGui.QRegularExpressionValidator(QRegularExpression(r'^[+-]?((\d+(\.\d{,4})?)|(\.\d{,4}))$')) lineedit = QLineEdit(str(data)) lineedit.parm_no = key lineedit.setMaxLength(10) @@ -688,22 +688,22 @@ def finalize_features(self): if len(plist) > 1: msgBox = QMessageBox() msgBox.setWindowTitle('Finalize Features') - msgBox.setIcon(QMessageBox.Question) - msgBox.setStandardButtons(QMessageBox.No | QMessageBox.Yes | QMessageBox.Cancel) - msgBox.setIcon(QMessageBox.Information) + msgBox.setIcon(QMessageBox.Icon.Question) + msgBox.setStandardButtons(QMessageBox.StandardButton.No | QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.Cancel) + msgBox.setIcon(QMessageBox.Icon.Information) msgBox.setText('Finalize all Tabs?\n\n' 'No: Current page only\n' 'Yes: All pages\n' 'Cancel: Nevermind\n\n' 'Order: left to right') returnValue = msgBox.exec() - if returnValue == QMessageBox.Yes: + if returnValue == QMessageBox.StandardButton.Yes: pass # use plist for all pages - elif returnValue == QMessageBox.No: + elif returnValue == QMessageBox.StandardButton.No: pno = self.tabWidget.currentIndex() npage = self.tabWidget.widget(pno) plist = [nset.pg_for_npage[npage]] - elif returnValue == QMessageBox.Cancel: + elif returnValue == QMessageBox.StandardButton.Cancel: return # do nothing else: self.textEdit_status.append('finalize_features: unknown return value') @@ -956,7 +956,7 @@ def find_positional_parms(s): def get_file_open(caption): dialog = QFileDialog() options = QFileDialog.Options() - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog _filter = "GCode Files (*.ngc *.nc)" _dir = os.path.abspath(INFO.NGC_SUB_PATH) fname, _ = dialog.getOpenFileName(None, caption, _dir, _filter, options=options) @@ -965,7 +965,7 @@ def get_file_open(caption): def get_file_save(caption): dialog = QFileDialog() options = QFileDialog.Options() - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog _filter = "GCode Files (*.ngc)" _dir = os.path.abspath(INFO.NGC_SUB_PATH) fname, _ = dialog.getSaveFileName(None, caption, _dir, _filter, options=options) @@ -1011,5 +1011,5 @@ def save_a_copy(fname, archive_dir='/tmp/old_ngc'): app = QtWidgets.QApplication(sys.argv) w = NgcGui() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/lib/qt_pdf/PDFViewer.py b/lib/python/qtvcp/lib/qt_pdf/PDFViewer.py index 8358d7adaa9..bb03f89c96f 100644 --- a/lib/python/qtvcp/lib/qt_pdf/PDFViewer.py +++ b/lib/python/qtvcp/lib/qt_pdf/PDFViewer.py @@ -1,19 +1,13 @@ import sys import os -from PyQt5 import QtGui, QtWidgets -from PyQt5.QtCore import Qt +from PyQt6 import QtGui, QtWidgets +from PyQt6.QtCore import Qt, QSize +from PyQt6.QtPdf import QPdfDocument, QPdfDocumentRenderOptions # Set up logging from qtvcp import logger LOG = logger.getLogger(__name__) -try: - import popplerqt5 - LIB_BAD = False -except: - LIB_BAD = True - LOG.warning('PDFViwer - Is python3-poppler-qt5 installed?') - class PDFView(QtWidgets.QScrollArea): def __init__(self, parent=None): super(PDFView, self).__init__(parent) @@ -24,10 +18,12 @@ def __init__(self, parent=None): self.vbox = QtWidgets.QVBoxLayout() self.widget.setLayout(self.vbox) self._zoom = 1.0 - - if LIB_BAD: - label = QtWidgets.QLabel('Missing python3-poppler-qt5 module') - self.vbox.addWidget(label) + self.doc = None + self._render_opts = QPdfDocumentRenderOptions() + self._render_opts.setRenderFlags( + QPdfDocumentRenderOptions.RenderFlag.Antialiasing | + QPdfDocumentRenderOptions.RenderFlag.TextAntialiasing + ) def loadSample(self, name): n = os.path.join(os.path.dirname(__file__),name+'.pdf') @@ -39,28 +35,32 @@ def loadSample(self, name): def loadView(self, path): filename = os.path.expanduser(path) if not os.path.exists(filename): - print('No path:',filename) - - if LIB_BAD: + print('No path:', filename) return - self.doc = doc = popplerqt5.Poppler.Document.load(filename) - doc.setRenderHint(popplerqt5.Poppler.Document.Antialiasing) - doc.setRenderHint(popplerqt5.Poppler.Document.TextAntialiasing) + self.doc = QPdfDocument(self) + self.doc.load(filename) self.refreshPages() def refreshPages(self): + if self.doc is None: + return + # clear layout of pages - for i in reversed(range(self.vbox.count())): + for i in reversed(range(self.vbox.count())): self.vbox.itemAt(i).widget().setParent(None) # convert pages to images in a label - for i in range(0,self.doc.numPages()): + for i in range(self.doc.pageCount()): label = QtWidgets.QLabel() label.setScaledContents(True) - page = self.doc.page(i) - image = page.renderToImage(72.0*self._zoom, 72.0*self._zoom) + page_size = self.doc.pagePointSize(i) + image_size = QSize( + int(page_size.width() * self._zoom), + int(page_size.height() * self._zoom) + ) + image = self.doc.render(i, image_size, self._render_opts) label.setPixmap(QtGui.QPixmap.fromImage(image)) self.vbox.addWidget(label) @@ -78,23 +78,29 @@ def pdf_view(filename): """Return a Scrollarea showing the pages of the specified PDF file.""" filename = os.path.expanduser(filename) if not os.path.exists(filename): - print('No path:',filename) + print('No path:', filename) + return None - doc = popplerqt5.Poppler.Document.load(filename) - doc.setRenderHint(popplerqt5.Poppler.Document.Antialiasing) - doc.setRenderHint(popplerqt5.Poppler.Document.TextAntialiasing) + doc = QPdfDocument() + doc.load(filename) area = QtWidgets.QScrollArea() area.setWidgetResizable(True) widget = QtWidgets.QWidget() vbox = QtWidgets.QVBoxLayout() - for i in range(0,doc.numPages()): + for i in range(doc.pageCount()): label = QtWidgets.QLabel() label.setScaledContents(True) - page = doc.page(i) - image = page.renderToImage() + page_size = doc.pagePointSize(i) + image_size = QSize(int(page_size.width()), int(page_size.height())) + render_opts = QPdfDocumentRenderOptions() + render_opts.setRenderFlags( + QPdfDocumentRenderOptions.RenderFlag.Antialiasing | + QPdfDocumentRenderOptions.RenderFlag.TextAntialiasing + ) + image = doc.render(i, image_size, render_opts) label.setPixmap(QtGui.QPixmap.fromImage(image)) vbox.addWidget(label) @@ -112,7 +118,7 @@ def main(): filename = argv[-1] view = pdf_view(filename) view.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == '__main__': main() diff --git a/lib/python/qtvcp/lib/qt_vismach/qt_vismach.py b/lib/python/qtvcp/lib/qt_vismach/qt_vismach.py index 35734d7b5f3..f43740f389c 100644 --- a/lib/python/qtvcp/lib/qt_vismach/qt_vismach.py +++ b/lib/python/qtvcp/lib/qt_vismach/qt_vismach.py @@ -2,9 +2,9 @@ import sys -from PyQt5.QtCore import pyqtSignal, QPoint, QSize, Qt, QTimer -from PyQt5.QtGui import QColor -from PyQt5.QtWidgets import (QApplication, QHBoxLayout, QOpenGLWidget, QSlider, +from PyQt6.QtCore import pyqtSignal, QPoint, QSize, Qt, QTimer +from PyQt6.QtGui import QColor +from PyQt6.QtWidgets import (QApplication, QHBoxLayout, QOpenGLWidget, QSlider, QWidget) import OpenGL.GL as GL @@ -51,7 +51,7 @@ def __init__(self): self.setWindowTitle("Qt Vismach") def createSlider(self): - slider = QSlider(Qt.Vertical) + slider = QSlider(Qt.Orientation.Vertical) slider.setRange(0, 360 * 16) slider.setSingleStep(16) @@ -407,10 +407,10 @@ def mouseMoveEvent(self, event): dx = event.x() - self.lastPos.x() dy = event.y() - self.lastPos.y() - if event.buttons() & Qt.LeftButton: + if event.buttons() & Qt.MouseButton.LeftButton: self.setXRotation(self.xRot + 8 * dy) self.setYRotation(self.yRot - 8 * dx) - elif event.buttons() & Qt.RightButton: + elif event.buttons() & Qt.MouseButton.RightButton: self.setXRotation(self.xRot + 8 * dy) self.setZRotation(self.zRot + 8 * dx) else: @@ -427,7 +427,7 @@ def mouseMoveEvent(self, event): self.lastPos = event.pos() def mouseDoubleClickEvent(self, event): - if event.button() & Qt.RightButton: + if event.button() & Qt.MouseButton.RightButton: self.plotclear() def wheelEvent(self, event): @@ -471,7 +471,7 @@ def main(model, tool, work, size=10, hud=None, rotation_vectors=None, lat=0, lon window.setZoomRange(int(t.near),int(t.far)) window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == '__main__': diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_block.py b/lib/python/qtvcp/lib/qtplasmac/conv_block.py index 3f3c34b5f8a..fc85bcc5bd3 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_block.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_block.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from qtvcp.core import Status from importlib import reload from plasmac import block as BLOCK @@ -38,7 +38,7 @@ def preview(P, W, Conv, doMirror=False, doFlip=False): W.aEntry.text(), W.scEntry.text(), W.rtEntry.text(), doMirror, doFlip) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Block Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Block Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -89,15 +89,15 @@ def widgets(P, W, Conv): centerAlign = ['lDesc', 'ccLabel', 'rrLabel', 'oLabel', 'shLabel', 'ptLabel'] pButton = ['preview', 'add', 'undo', 'mirror', 'flip'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in leftAlign: - W[widget].setAlignment(Qt.AlignLeft | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignVCenter) if widget == 'lDesc': W[widget].setFixedWidth(240) else: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_bolt.py b/lib/python/qtvcp/lib/qtplasmac/conv_bolt.py index fb6dd390129..c79a4414cfc 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_bolt.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_bolt.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from importlib import reload from plasmac import bolt_circle as BOLT @@ -43,7 +43,7 @@ def preview(P, W, Conv): W.hEntry.text(), W.caEntry.text(), P.invalidLeads) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Bolt-Circle Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Bolt-Circle Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -85,15 +85,15 @@ def widgets(P, W, Conv): rButton = ['centLeft'] pButton = ['preview', 'add', 'undo', 'overcut'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in leftAlign: - W[widget].setAlignment(Qt.AlignLeft | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_circle.py b/lib/python/qtvcp/lib/qtplasmac/conv_circle.py index 6f4af4f1a7d..55366a9cbd8 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_circle.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_circle.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from importlib import reload from plasmac import circle as CIRCLE @@ -43,7 +43,7 @@ def preview(P, W, Conv): W.dEntry.text(), P.invalidLeads) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Circle Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Circle Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -113,11 +113,11 @@ def widgets(P, W, Conv): rButton = ['intExt', 'centLeft'] pButton = ['preview', 'add', 'undo', 'overcut'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_ellipse.py b/lib/python/qtvcp/lib/qtplasmac/conv_ellipse.py index d1032a15b4b..338ef779b9a 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_ellipse.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_ellipse.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from importlib import reload from plasmac import ellipse as ELLIPSE @@ -41,7 +41,7 @@ def preview(P, W, Conv): W.wEntry.text(), W.hEntry.text(), W.aEntry.text(), P.unitsPerMm) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Ellipse Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Ellipse Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -82,11 +82,11 @@ def widgets(P, W, Conv): rButton = ['intExt', 'centLeft'] pButton = ['preview', 'add', 'undo'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_gusset.py b/lib/python/qtvcp/lib/qtplasmac/conv_gusset.py index 5c1494230a2..a012967544e 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_gusset.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_gusset.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from importlib import reload from plasmac import gusset as GUSSET @@ -41,7 +41,7 @@ def preview(P, W, Conv): W.rEntry.text(), W.rButton.text()) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Gusset Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Gusset Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -92,11 +92,11 @@ def widgets(P, W, Conv): rButton = ['intExt'] pButton = ['preview', 'add', 'undo', 'rButton'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_line.py b/lib/python/qtvcp/lib/qtplasmac/conv_line.py index fab6147a90d..0318e3caac9 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_line.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_line.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from importlib import reload from plasmac import line as LINE @@ -265,7 +265,7 @@ def set_arc_widgets(P, W): def error_set(P, error): - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Line Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Line Error'), error) def widgets(P, W, Conv): @@ -280,11 +280,11 @@ def widgets(P, W, Conv): rButton = ['g23Arc'] pButton = ['preview', 'add', 'undo'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_polygon.py b/lib/python/qtvcp/lib/qtplasmac/conv_polygon.py index 3cdf179aa1f..acfee5d886e 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_polygon.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_polygon.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from importlib import reload from plasmac import polygon as POLYGON @@ -42,7 +42,7 @@ def preview(P, W, Conv): W.mCombo.currentIndex(), W.dLabel.text()) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Polygon Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Polygon Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -95,11 +95,11 @@ def widgets(P, W, Conv): rButton = ['intExt', 'centLeft'] pButton = ['preview', 'add', 'undo'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_rectangle.py b/lib/python/qtvcp/lib/qtplasmac/conv_rectangle.py index d204df3c80f..ec305a401c1 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_rectangle.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_rectangle.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from importlib import reload from plasmac import rectangle as RECTANGLE @@ -50,7 +50,7 @@ def preview(P, W, Conv): W.r1Button.text(), W.r2Button.text(), W.r3Button.text(), W.r4Button.text()) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Rectangle Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Rectangle Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -108,11 +108,11 @@ def widgets(P, W, Conv): pButton = ['preview', 'add', 'undo', 'r1Button', 'r2Button', 'r3Button', 'r4Button'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_sector.py b/lib/python/qtvcp/lib/qtplasmac/conv_sector.py index 399a6025dba..0c61b3970d4 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_sector.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_sector.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from importlib import reload from plasmac import sector as SECTOR @@ -40,7 +40,7 @@ def preview(P, W, Conv): W.rEntry.text(), W.sEntry.text(), W.aEntry.text()) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Sector Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Sector Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -81,11 +81,11 @@ def widgets(P, W, Conv): rButton = ['intExt'] pButton = ['preview', 'add', 'undo'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_settings.py b/lib/python/qtvcp/lib/qtplasmac/conv_settings.py index b0045aa03c7..f8a14b5488c 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_settings.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_settings.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox _translate = QCoreApplication.translate @@ -55,7 +55,7 @@ def save(P, W, Conv): error += f'{msg}\n\n' if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Settings Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Settings Error'), error) return P.PREFS.putpref('Preamble', P.preAmble, str, 'CONVERSATIONAL') P.PREFS.putpref('Postamble', P.postAmble, str, 'CONVERSATIONAL') @@ -137,15 +137,15 @@ def widgets(P, W, Conv): rb = ['centLeft'] bt = ['save', 'reload', 'cExit'] for w in ra: - W[w].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[w].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[w].setFixedWidth(80) W[w].setFixedHeight(24) for w in la: - W[w].setAlignment(Qt.AlignLeft | Qt.AlignVCenter) + W[w].setAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter) W[w].setFixedWidth(80) W[w].setFixedHeight(24) for w in ca: - W[w].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[w].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[w].setFixedWidth(240) W[w].setFixedHeight(24) for w in rb: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_slot.py b/lib/python/qtvcp/lib/qtplasmac/conv_slot.py index 899732ac3c4..739b7da4a09 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_slot.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_slot.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from importlib import reload from plasmac import slot as SLOT @@ -41,7 +41,7 @@ def preview(P, W, Conv): W.lEntry.text(), W.wEntry.text(), W.aEntry.text()) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Slot Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Slot Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -81,11 +81,11 @@ def widgets(P, W, Conv): rButton = ['intExt', 'centLeft'] pButton = ['preview', 'add', 'undo'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_star.py b/lib/python/qtvcp/lib/qtplasmac/conv_star.py index 58e6bd6326c..0f275316cc1 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_star.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_star.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QLabel, QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QLabel, QMessageBox from importlib import reload from plasmac import star as STAR @@ -41,7 +41,7 @@ def preview(P, W, Conv): W.pEntry.text(), W.odEntry.text(), W.idEntry.text(), W.aEntry.text()) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Star Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Star Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -82,11 +82,11 @@ def widgets(P, W, Conv): rButton = ['intExt', 'centLeft'] pButton = ['preview', 'add', 'undo'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_triangle.py b/lib/python/qtvcp/lib/qtplasmac/conv_triangle.py index b3c7e4c41e5..a7d7dd3413a 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conv_triangle.py +++ b/lib/python/qtvcp/lib/qtplasmac/conv_triangle.py @@ -19,8 +19,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QMessageBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QMessageBox from importlib import reload from plasmac import triangle as TRIANGLE @@ -42,7 +42,7 @@ def preview(P, W, Conv): W.aEntry.text()) if error: P.dialogError = True - P.dialog_show_ok(QMessageBox.Warning, _translate('Conversational', 'Triangle Error'), error) + P.dialog_show_ok(QMessageBox.Icon.Warning, _translate('Conversational', 'Triangle Error'), error) else: W.conv_preview.load(P.fNgc) W.conv_preview.set_current_view() @@ -89,11 +89,11 @@ def widgets(P, W, Conv): rButton = ['intExt'] pButton = ['preview', 'add', 'undo'] for widget in rightAlign: - W[widget].setAlignment(Qt.AlignRight | Qt.AlignVCenter) + W[widget].setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) W[widget].setFixedWidth(80) W[widget].setFixedHeight(24) for widget in centerAlign: - W[widget].setAlignment(Qt.AlignCenter | Qt.AlignBottom) + W[widget].setAlignment(Qt.AlignmentFlag.AlignCenter | Qt.AlignmentFlag.AlignBottom) W[widget].setFixedWidth(240) W[widget].setFixedHeight(24) for widget in rButton: diff --git a/lib/python/qtvcp/lib/qtplasmac/conversational.py b/lib/python/qtvcp/lib/qtplasmac/conversational.py index b21d0064c5e..81fd140ce6c 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conversational.py +++ b/lib/python/qtvcp/lib/qtplasmac/conversational.py @@ -23,9 +23,9 @@ import re from shutil import copy as COPY from importlib import reload -from PyQt5.QtCore import Qt, QCoreApplication -from PyQt5.QtWidgets import QFileDialog, QMessageBox, QPushButton, QLabel, QLineEdit -from PyQt5.QtWidgets import QComboBox +from PyQt6.QtCore import Qt, QCoreApplication +from PyQt6.QtWidgets import QFileDialog, QMessageBox, QPushButton, QLabel, QLineEdit +from PyQt6.QtWidgets import QComboBox from qtvcp.core import Status, Action from qtvcp.lib.qtplasmac import conv_settings as CONVSET from qtvcp.lib.qtplasmac import conv_line as CONVLINE @@ -205,7 +205,7 @@ def conv_new_pressed(P, W, button): else: msg0 = _translate('HandlerClass', 'You have an unsaved, unsent, or active previewed shape') msg1 = _translate('HandlerClass', 'If you continue it will be deleted') - if not P.dialog_show_yesno(QMessageBox.Warning, f'{head}', f'{msg0}\n\n{msg1}\n', f'{btn1}', f'{btn2}'): + if not P.dialog_show_yesno(QMessageBox.Icon.Warning, f'{head}', f'{msg0}\n\n{msg1}\n', f'{btn1}', f'{btn2}'): return if P.oldConvButton == 'conv_line': if W.lType.currentText() == _translate('Conversational', 'LINE POINT ~ POINT'): @@ -240,17 +240,17 @@ def conv_save_pressed(P, W): for line in inFile: if '(new conversational file)' in line: msg0 = _translate('HandlerClass', 'An empty file cannot be saved') - P.dialog_show_ok(QMessageBox.Warning, f'{head}', f'{msg0}\n') + P.dialog_show_ok(QMessageBox.Icon.Warning, f'{head}', f'{msg0}\n') return P.vkb_show() dlg = QFileDialog(W) - dlg.setOptions(QFileDialog.DontUseNativeDialog) - dlg.setAcceptMode(QFileDialog.AcceptSave) + dlg.setOptions(QFileDialog.Option.DontUseNativeDialog) + dlg.setAcceptMode(QFileDialog.AcceptMode.AcceptSave) dlg.setNameFilters(['G-Code Files (*.ngc *.nc *.tap)', 'All Files (*)']) dlg.setDefaultSuffix('ngc') dlg.setDirectory(P.programPrefix) name = '' - if dlg.exec_(): + if dlg.exec(): name = dlg.selectedFiles()[0] if name: COPY(P.fNgc, name) @@ -289,13 +289,13 @@ def conv_block_pressed(P, W): for line in inFile: if '(new conversational file)' in line: msg0 = _translate('HandlerClass', 'An empty file cannot be arrayed, rotated, or scaled') - P.dialog_show_ok(QMessageBox.Warning, f'{head}', f'{msg0}\n') + P.dialog_show_ok(QMessageBox.Icon.Warning, f'{head}', f'{msg0}\n') return # see if we can do something about NURBS blocks down the track # elif 'g5.2' in line.lower() or 'g5.3' in line.lower(): # head = _translate('HandlerClass', 'Scale Error') # msg0 = _translate('HandlerClass', 'Cannot scale a GCode NURBS block') - # P.dialog_show_ok(QMessageBox.Warning, f'{head}', f'{msg0}\n\n{line}') + # P.dialog_show_ok(QMessageBox.Icon.Warning, f'{head}', f'{msg0}\n\n{line}') # return elif 'M3' in line.upper() or 'M03' in line.upper(): break @@ -412,7 +412,7 @@ def conv_active_shape(P, W): head = _translate('HandlerClass', 'Active Preview') msg0 = _translate('HandlerClass', 'You have an active previewed shape') msg1 = _translate('HandlerClass', 'If you continue it will be deleted') - response = P.dialog_show_yesno(QMessageBox.Warning, f'{head}', f'{msg0}\n\n{msg1}\n', f'{btn1}', f'{btn2}') + response = P.dialog_show_yesno(QMessageBox.Icon.Warning, f'{head}', f'{msg0}\n\n{msg1}\n', f'{btn1}', f'{btn2}') if response: conv_undo_shape(P, W) conv_preview_button(P, W, False) @@ -552,12 +552,12 @@ def conv_undo_shape(P, W): name = os.path.basename(ACTION.prefilter_path) msg0 = _translate('HandlerClass', 'The original file will be loaded') msg1 = _translate('HandlerClass', 'If you continue all changes will be deleted') - if not P.dialog_show_yesno(QMessageBox.Warning, f'{head}', f'{msg0}:\n\n{name}\n\n{msg1}\n', f'{btn1}', f'{btn2}'): + if not P.dialog_show_yesno(QMessageBox.Icon.Warning, f'{head}', f'{msg0}:\n\n{name}\n\n{msg1}\n', f'{btn1}', f'{btn2}'): return(True) else: msg0 = _translate('HandlerClass', 'An empty file will be loaded') msg1 = _translate('HandlerClass', 'If you continue all changes will be deleted') - if not P.dialog_show_yesno(QMessageBox.Warning, f'{head}', f'{msg0}\n\n{msg1}\n', f'{btn1}', f'{btn2}'): + if not P.dialog_show_yesno(QMessageBox.Icon.Warning, f'{head}', f'{msg0}\n\n{msg1}\n', f'{btn1}', f'{btn2}'): return(True) P.validShape = False W.preview.setEnabled(True) @@ -665,14 +665,14 @@ def conv_widgets(P, W): ''' create all required widgets without showing them ''' # common W.preview = QPushButton(_translate('Conversational', 'PREVIEW')) - W.preview.setFocusPolicy(Qt.ClickFocus) + W.preview.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.undo = QPushButton(_translate('Conversational', 'RELOAD')) - W.undo.setFocusPolicy(Qt.ClickFocus) + W.undo.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.centLeft = QPushButton(_translate('Conversational', 'BTM LEFT'), objectName='centLeft') - W.centLeft.setFocusPolicy(Qt.ClickFocus) + W.centLeft.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.centLeft.setCheckable(True) W.intExt = QPushButton(_translate('Conversational', 'EXTERNAL'), objectName='intExt') - W.intExt.setFocusPolicy(Qt.ClickFocus) + W.intExt.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.intExt.setCheckable(True) W.liLabel = QLabel(_translate('Conversational', 'LEAD IN')) W.liEntry = QLineEdit(objectName='liEntry') @@ -685,7 +685,7 @@ def conv_widgets(P, W): W.ysLabel = QLabel(_translate('Conversational', 'Y ORIGIN')) W.ysEntry = QLineEdit('0.000', objectName='ysEntry') W.overcut = QPushButton(_translate('Conversational', 'OVER CUT')) - W.overcut.setFocusPolicy(Qt.ClickFocus) + W.overcut.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.overcut.setEnabled(False) W.overcut.setCheckable(True) W.ocLabel = QLabel(_translate('Conversational', 'OC LENGTH')) @@ -693,10 +693,10 @@ def conv_widgets(P, W): W.ocEntry.setEnabled(False) W.ocEntry.setText(f'{4 * P.unitsPerMm}') W.add = QPushButton(_translate('Conversational', 'ADD')) - W.add.setFocusPolicy(Qt.ClickFocus) + W.add.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.lDesc = QLabel('') W.iLabel = QLabel() - W.iLabel.setAlignment(Qt.AlignRight | Qt.AlignTop) + W.iLabel.setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignTop) W.aLabel = QLabel(_translate('Conversational', 'ANGLE')) W.aEntry = QLineEdit('0.0', objectName='aEntry') W.dLabel = QLabel(_translate('Conversational', 'DIAMETER')) @@ -711,26 +711,26 @@ def conv_widgets(P, W): W.wEntry = QLineEdit(objectName='') W.rLabel = QLabel(_translate('Conversational', 'RADIUS')) W.rButton = QPushButton(_translate('Conversational', 'RADIUS')) - W.rButton.setFocusPolicy(Qt.ClickFocus) + W.rButton.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.rEntry = QLineEdit('') W.sLabel = QLabel() # shared with different uses W.sEntry = QLineEdit() # shared with different uses W.mCombo = QComboBox() - W.mCombo.setFocusPolicy(Qt.ClickFocus) + W.mCombo.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.mCombo.addItem(_translate('Conversational', 'CIRCUMSCRIBED')) W.mCombo.addItem(_translate('Conversational', 'INSCRIBED')) W.mCombo.addItem(_translate('Conversational', 'SIDE LENGTH')) W.r1Button = QPushButton(_translate('Conversational', 'RADIUS 1')) - W.r1Button.setFocusPolicy(Qt.ClickFocus) + W.r1Button.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.r1Entry = QLineEdit() W.r2Button = QPushButton(_translate('Conversational', 'RADIUS 2')) - W.r2Button.setFocusPolicy(Qt.ClickFocus) + W.r2Button.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.r2Entry = QLineEdit() W.r3Button = QPushButton(_translate('Conversational', 'RADIUS 3')) - W.r3Button.setFocusPolicy(Qt.ClickFocus) + W.r3Button.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.r3Entry = QLineEdit() W.r4Button = QPushButton(_translate('Conversational', 'RADIUS 4')) - W.r4Button.setFocusPolicy(Qt.ClickFocus) + W.r4Button.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.r4Entry = QLineEdit() W.lLabel = QLabel(_translate('Conversational', 'LENGTH')) W.lEntry = QLineEdit() @@ -776,12 +776,12 @@ def conv_widgets(P, W): W.rtEntry = QLineEdit('0.0', objectName='aEntry') W.rtLabel = QLabel(_translate('Conversational', 'ROTATION')) W.mirror = QPushButton(_translate('Conversational', 'MIRROR')) - W.mirror.setFocusPolicy(Qt.ClickFocus) + W.mirror.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.flip = QPushButton(_translate('Conversational', 'FLIP')) - W.flip.setFocusPolicy(Qt.ClickFocus) + W.flip.setFocusPolicy(Qt.FocusPolicy.ClickFocus) # lines and arcs W.lType = QComboBox() - W.lType.setFocusPolicy(Qt.ClickFocus) + W.lType.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.label1 = QLabel() W.entry1 = QLineEdit(objectName='neg') W.label2 = QLabel() @@ -795,7 +795,7 @@ def conv_widgets(P, W): W.label6 = QLabel() W.entry6 = QLineEdit(objectName='neg') W.g23Arc = QPushButton('CW - G2') - W.g23Arc.setFocusPolicy(Qt.ClickFocus) + W.g23Arc.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.g23Arc.setCheckable(True) # settings W.preLabel = QLabel(_translate('Conversational', 'PREAMBLE')) @@ -810,11 +810,11 @@ def conv_widgets(P, W): W.gsLabel = QLabel(_translate('Conversational', 'GRID SIZE')) W.gsEntry = QLineEdit(objectName='gsEntry') W.save = QPushButton(_translate('Conversational', 'SAVE')) - W.save.setFocusPolicy(Qt.ClickFocus) + W.save.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.reload = QPushButton(_translate('Conversational', 'RELOAD')) - W.reload.setFocusPolicy(Qt.ClickFocus) + W.reload.setFocusPolicy(Qt.FocusPolicy.ClickFocus) W.cExit = QPushButton(_translate('Conversational', 'EXIT')) - W.cExit.setFocusPolicy(Qt.ClickFocus) + W.cExit.setFocusPolicy(Qt.FocusPolicy.ClickFocus) if not W.lType.count(): W.lType.addItem(_translate('Conversational', 'LINE POINT ~ POINT')) W.lType.addItem(_translate('Conversational', 'LINE BY ANGLE')) diff --git a/lib/python/qtvcp/lib/qtplasmac/set_offsets.py b/lib/python/qtvcp/lib/qtplasmac/set_offsets.py index 4b9fdb32739..f4a5f6ef1ec 100644 --- a/lib/python/qtvcp/lib/qtplasmac/set_offsets.py +++ b/lib/python/qtvcp/lib/qtplasmac/set_offsets.py @@ -21,10 +21,10 @@ import os from shutil import copy as COPY -from PyQt5 import QtCore -from PyQt5.QtCore import QCoreApplication -from PyQt5.QtWidgets import QDialog, QMessageBox, QPushButton, QGridLayout, QLabel, QComboBox -from PyQt5.QtGui import QIcon +from PyQt6 import QtCore +from PyQt6.QtCore import QCoreApplication +from PyQt6.QtWidgets import QDialog, QMessageBox, QPushButton, QGridLayout, QLabel, QComboBox +from PyQt6.QtGui import QIcon _translate = QCoreApplication.translate @@ -88,7 +88,7 @@ def dlg_laser_clicked(P, W, prefs, iniPath, STATUS, ACTION, TOOL, dlg, lbl, btn1 P.laserOnPin.set(0) head = _translate('HandlerClass', 'Laser Offsets') msg0 = _translate('HandlerClass', 'Laser offsets have been saved') - P.dialog_show_ok(QMessageBox.Information, f'{head}', f'\n{msg0}\n') + P.dialog_show_ok(QMessageBox.Icon.Information, f'{head}', f'\n{msg0}\n') dlg.close() else: dlg_set_text(True, dlg, lbl, btn1, btn2, btn3, btn4) @@ -97,7 +97,7 @@ def dlg_laser_clicked(P, W, prefs, iniPath, STATUS, ACTION, TOOL, dlg, lbl, btn1 def dlg_camera_clicked(P, W, prefs, iniPath, STATUS, ACTION, TOOL, dlg, lbl, btn1, btn2, btn3, btn4): if 'CAMERA' in btn2.text(): dlg.hide() - W.setCursor(QtCore.Qt.WaitCursor) + W.setCursor(QtCore.Qt.CursorShape.WaitCursor) cameras = camera_search(P, W, dlg) if not cameras: W.unsetCursor() @@ -131,7 +131,7 @@ def dlg_camera_clicked(P, W, prefs, iniPath, STATUS, ACTION, TOOL, dlg, lbl, btn W.preview_stack.setCurrentIndex(0) head = _translate('HandlerClass', 'Camera Offsets') msg0 = _translate('HandlerClass', 'Camera offsets have been saved') - P.dialog_show_ok(QMessageBox.Information, f'{head}', f'\n{msg0}\n') + P.dialog_show_ok(QMessageBox.Icon.Information, f'{head}', f'\n{msg0}\n') dlg.close() else: dlg_set_text(True, dlg, lbl, btn1, btn2, btn3, btn4) @@ -167,7 +167,7 @@ def dlg_scribe_clicked(P, W, prefs, iniPath, STATUS, ACTION, TOOL, dlg, lbl, btn P.offsetSetScribePin.set(0) head = _translate('HandlerClass', 'Scribe Offsets') msg0 = _translate('HandlerClass', 'Scribe offsets have been saved') - P.dialog_show_ok(QMessageBox.Information, f'{head}', f'\n{msg0}\n') + P.dialog_show_ok(QMessageBox.Icon.Information, f'{head}', f'\n{msg0}\n') dlg.close() else: dlg_set_text(True, dlg, lbl, btn1, btn2, btn3, btn4) @@ -191,7 +191,7 @@ def dlg_probe_clicked(P, W, prefs, iniPath, STATUS, ACTION, TOOL, dlg, lbl, btn1 except: head = _translate('HandlerClass', 'Entry Error') msg0 = _translate('HandlerClass', 'is not a valid number') - P.dialog_show_ok(QMessageBox.Warning, f'{head}', f'\'{value}\' {msg0}\n') + P.dialog_show_ok(QMessageBox.Icon.Warning, f'{head}', f'\'{value}\' {msg0}\n') return else: dlg_set_text(True, dlg, lbl, btn1, btn2, btn3, btn4) @@ -214,7 +214,7 @@ def dlg_probe_clicked(P, W, prefs, iniPath, STATUS, ACTION, TOOL, dlg, lbl, btn1 W.offset_feed_rate_lbl.hide() head = _translate('HandlerClass', 'Probe Offsets') msg0 = _translate('HandlerClass', 'Probe offsets have been saved') - P.dialog_show_ok(QMessageBox.Information, f'{head}', f'\n{msg0}\n') + P.dialog_show_ok(QMessageBox.Icon.Information, f'{head}', f'\n{msg0}\n') dlg.close() else: dlg_set_text(True, dlg, lbl, btn1, btn2, btn3, btn4) @@ -263,7 +263,7 @@ def get_reply(P, STATUS, xOffset, yOffset, probe=False, delay=0.0, new=0.0): msg0 += f':\nX:{xP:0.4f} Y:{yP:0.4f} Delay:{new:0.2f}\n' else: msg0 += f':\nX:{xP:0.4f} Y:{yP:0.4f}\n' - if P.dialog_show_yesno(QMessageBox.Warning, f'{head}', f'\n{msg0}', f'{btn1}', f'{btn2}'): + if P.dialog_show_yesno(QMessageBox.Icon.Warning, f'{head}', f'\n{msg0}', f'{btn1}', f'{btn2}'): return True else: return False @@ -278,7 +278,7 @@ def camera_search(P, W, dlg): msg1 = _translate('Offsets', 'Try installing by entering the following in a terminal') msg2 = _translate('Offsets', 'sudo apt install python3-opencv') W.unsetCursor() - P.dialog_show_ok(QMessageBox.Critical, f'{head}', f'\n{msg0}.\n\n{msg1}:\n\n{msg2}\n') + P.dialog_show_ok(QMessageBox.Icon.Critical, f'{head}', f'\n{msg0}.\n\n{msg1}:\n\n{msg2}\n') return for file in os.listdir('/dev'): if file.startswith('video'): @@ -290,7 +290,7 @@ def camera_search(P, W, dlg): cap.release() if not cameras: msg0 = _translate('HandlerClass', 'No cameras have been found') - P.dialog_show_ok(QMessageBox.Warning, f'{head}', f'\n{msg0}\n') + P.dialog_show_ok(QMessageBox.Icon.Warning, f'{head}', f'\n{msg0}\n') return cameras def camera_select(P, W, STATUS, cameras): @@ -327,8 +327,8 @@ def camera_select(P, W, STATUS, cameras): dlg.exec() def camera_changed(P, W, STATUS, dlg, camnum): - dlg.setCursor(QtCore.Qt.WaitCursor) - W.setCursor(QtCore.Qt.WaitCursor) + dlg.setCursor(QtCore.Qt.CursorShape.WaitCursor) + W.setCursor(QtCore.Qt.CursorShape.WaitCursor) W.camview.hideEvent(None) W.camview.set_camnum(camnum) W.camview.showEvent(None) diff --git a/lib/python/qtvcp/lib/qtplasmac/tooltips.py b/lib/python/qtvcp/lib/qtplasmac/tooltips.py index 4480091c47a..ded9cd6a51c 100644 --- a/lib/python/qtvcp/lib/qtplasmac/tooltips.py +++ b/lib/python/qtvcp/lib/qtplasmac/tooltips.py @@ -19,7 +19,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' -from PyQt5.QtCore import QCoreApplication +from PyQt6.QtCore import QCoreApplication _translate = QCoreApplication.translate diff --git a/lib/python/qtvcp/lib/sys_notify.py b/lib/python/qtvcp/lib/sys_notify.py index 71d6a2f9995..77ec6eb59c1 100644 --- a/lib/python/qtvcp/lib/sys_notify.py +++ b/lib/python/qtvcp/lib/sys_notify.py @@ -26,9 +26,9 @@ DBusQtMainLoop = None try: - from dbus.mainloop.pyqt5 import DBusQtMainLoop + from dbus.mainloop.pyqt6 import DBusQtMainLoop except ImportError: - LOG.warning("Could not import DBusQtMainLoop, is package 'python3-dbus.mainloop.pyqt5' installed?") + LOG.warning("Could not import DBusQtMainLoop, is package 'python3-dbus.mainloop.pyqt6' installed?") APP_NAME = '' DBUS_IFACE = None @@ -253,7 +253,7 @@ def onClose(n): if __name__ == "__main__": import sys - from PyQt5.QtCore import QCoreApplication + from PyQt6.QtCore import QCoreApplication app = QCoreApplication(sys.argv) @@ -276,4 +276,4 @@ def onClose(n): n.onClose(onClose) n.show() - app.exec_() + app.exec() diff --git a/lib/python/qtvcp/lib/toolbar_actions.py b/lib/python/qtvcp/lib/toolbar_actions.py index 6130adcfb91..ab86552dc63 100644 --- a/lib/python/qtvcp/lib/toolbar_actions.py +++ b/lib/python/qtvcp/lib/toolbar_actions.py @@ -14,7 +14,7 @@ # GNU General Public License for more details. import os -from PyQt5 import QtWidgets, QtCore +from PyQt6 import QtWidgets, QtCore from qtvcp.core import Status, Action, Info from qtvcp.qt_makegui import VCPWindow from qtvcp.lib.aux_program_loader import Aux_program_loader @@ -449,12 +449,12 @@ def actOnProperties(self, widget, state=None): # pop a dialog of the properties msg = QtWidgets.QMessageBox() - msg.setIcon(QtWidgets.QMessageBox.Information) + msg.setIcon(QtWidgets.QMessageBox.Icon.Information) msg.setText(mess) msg.setWindowTitle("Gcode Properties") - msg.setStandardButtons(QtWidgets.QMessageBox.Ok) + msg.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok) msg.show() - retval = msg.exec_() + retval = msg.exec() def actOnRun(self, widget, state=None): ACTION.RUN() @@ -577,10 +577,10 @@ def actOnAbout(self, widget, state=None): mess = 'This is a QtVCP based screen for Linuxcnc' msg.setText(mess) - msg.setIcon(QtWidgets.QMessageBox.Information) - msg.setStandardButtons(QtWidgets.QMessageBox.Ok) + msg.setIcon(QtWidgets.QMessageBox.Icon.Information) + msg.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok) msg.show() - retval = msg.exec_() + retval = msg.exec() def actOnRunFromLine(self, widget, state=False): STATUS.emit('dialog-request', {'NAME': 'RUNFROMLINE', 'LINE':self.selected_line}) @@ -847,7 +847,7 @@ def close(): bar.setMaximumHeight(20) bar.setSizeGripEnabled(False) WIDGETS.statusClear = QtWidgets.QPushButton() - icon = QtWidgets.QApplication.style().standardIcon(QtWidgets.QStyle.SP_MessageBoxCritical) + icon = QtWidgets.QApplication.style().standardIcon(QtWidgets.QStyle.StandardPixmap.SP_MessageBoxCritical) WIDGETS.statusClear.setIcon(icon) WIDGETS.statusClear.setMaximumSize(20, 20) WIDGETS.statusClear.setIconSize(QtCore.QSize(22, 22)) @@ -860,7 +860,7 @@ def last(): bar.setMaximumHeight(20) bar.setSizeGripEnabled(False) - icon = QtWidgets.QApplication.style().standardIcon(QtWidgets.QStyle.SP_MessageBoxInformation) + icon = QtWidgets.QApplication.style().standardIcon(QtWidgets.QStyle.StandardPixmap.SP_MessageBoxInformation) WIDGETS.statusLast = QtWidgets.QPushButton() WIDGETS.statusLast.setIcon(icon) WIDGETS.statusLast.setMaximumSize(20, 20) diff --git a/lib/python/qtvcp/lib/touchoff_subprogram.py b/lib/python/qtvcp/lib/touchoff_subprogram.py index 9e33119d985..b23fb20337a 100644 --- a/lib/python/qtvcp/lib/touchoff_subprogram.py +++ b/lib/python/qtvcp/lib/touchoff_subprogram.py @@ -21,7 +21,7 @@ import time import linuxcnc -from PyQt5.QtCore import QObject +from PyQt6.QtCore import QObject from qtvcp.core import Status, Action, Info from qtvcp import logger LOG = logger.getLogger(__name__) diff --git a/lib/python/qtvcp/lib/writer/ext/datetime.py b/lib/python/qtvcp/lib/writer/ext/datetime.py index d507bd16842..0ebbbd0fd5c 100644 --- a/lib/python/qtvcp/lib/writer/ext/datetime.py +++ b/lib/python/qtvcp/lib/writer/ext/datetime.py @@ -1,8 +1,7 @@ -from PyQt5 import QtWidgets -#PYQT5 QDialog, QPushButton, QGridLayout, QComboBox +from PyQt6 import QtWidgets -from PyQt5 import QtGui, QtCore -from PyQt5.QtCore import Qt +from PyQt6 import QtGui, QtCore +from PyQt6.QtCore import Qt from time import strftime diff --git a/lib/python/qtvcp/lib/writer/ext/find.py b/lib/python/qtvcp/lib/writer/ext/find.py index 7972078e066..35cc237ee6f 100644 --- a/lib/python/qtvcp/lib/writer/ext/find.py +++ b/lib/python/qtvcp/lib/writer/ext/find.py @@ -1,12 +1,11 @@ -from PyQt5 import QtWidgets -#PYQT5 QTextEdit, QDialog, QPushButton, QRadioButton, QGridLayout +from PyQt6 import QtWidgets -from PyQt5 import QtGui, QtCore -from PyQt5.QtCore import Qt +from PyQt6 import QtGui, QtCore +from PyQt6.QtCore import Qt import re @@ -94,7 +93,7 @@ def find(self): # Make the next search start from the beginning again self.lastStart = 0 - self.parent.text.moveCursor(QtGui.QTextCursor.End) + self.parent.text.moveCursor(QtGui.QTextCursor.MoveOperation.End) else: @@ -115,7 +114,7 @@ def find(self): self.lastStart = 0 # We set the cursor to the end if the search was unsuccessful - self.parent.text.moveCursor(QtGui.QTextCursor.End) + self.parent.text.moveCursor(QtGui.QTextCursor.MoveOperation.End) def replace(self): @@ -153,7 +152,7 @@ def moveCursor(self,start,end): # Next we move the Cursor by over the match and pass the KeepAnchor parameter # which will make the cursor select the the match's text - cursor.movePosition(QtGui.QTextCursor.Right,QtGui.QTextCursor.KeepAnchor,end - start) + cursor.movePosition(QtGui.QTextCursor.Right,QtGui.QTextCursor.MoveMode.KeepAnchor,end - start) # And finally we set this new cursor as the parent's self.parent.text.setTextCursor(cursor) diff --git a/lib/python/qtvcp/lib/writer/ext/table.py b/lib/python/qtvcp/lib/writer/ext/table.py index 912ab7a7d6e..1b303468095 100644 --- a/lib/python/qtvcp/lib/writer/ext/table.py +++ b/lib/python/qtvcp/lib/writer/ext/table.py @@ -1,12 +1,11 @@ import sys -from PyQt5 import QtWidgets -#PYQT5 QSpinBox, QMessageBox, QDialog, QPushButton, QGridLayout, QLabel +from PyQt6 import QtWidgets -from PyQt5 import QtGui, QtCore -from PyQt5.QtCore import Qt +from PyQt6 import QtGui, QtCore +from PyQt6.QtCore import Qt class Table(QtWidgets.QDialog): def __init__(self,parent = None): @@ -76,10 +75,10 @@ def insert(self): if not rows or not cols: - popup = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Warning, + popup = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Icon.Warning, "Parameter error", "Row and column numbers may not be zero!", - QtWidgets.QMessageBox.Ok, + QtWidgets.QMessageBox.StandardButton.Ok, self) popup.show() diff --git a/lib/python/qtvcp/lib/writer/ext/wordcount.py b/lib/python/qtvcp/lib/writer/ext/wordcount.py index 63814d57599..1050b4fd8e1 100644 --- a/lib/python/qtvcp/lib/writer/ext/wordcount.py +++ b/lib/python/qtvcp/lib/writer/ext/wordcount.py @@ -1,8 +1,7 @@ -from PyQt5 import QtWidgets -#PYQT5 QDialog, QGridLayout, QLabel, QWidget +from PyQt6 import QtWidgets -from PyQt5 import QtGui, QtCore -from PyQt5.QtCore import Qt +from PyQt6 import QtGui, QtCore +from PyQt6.QtCore import Qt class WordCount(QtWidgets.QDialog): def __init__(self,parent = None): diff --git a/lib/python/qtvcp/lib/writer/writer.py b/lib/python/qtvcp/lib/writer/writer.py index 92c9441f4b2..34cbf3452d3 100755 --- a/lib/python/qtvcp/lib/writer/writer.py +++ b/lib/python/qtvcp/lib/writer/writer.py @@ -5,10 +5,10 @@ import sys import os -from PyQt5 import QtWidgets -from PyQt5 import QtPrintSupport -from PyQt5 import QtGui, QtCore -from PyQt5.QtCore import Qt +from PyQt6 import QtWidgets +from PyQt6 import QtPrintSupport +from PyQt6 import QtGui, QtCore +from PyQt6.QtCore import Qt from .ext import * from qtvcp.core import Path @@ -340,7 +340,7 @@ def initUI(self): self.text.cursorPositionChanged.connect(self.cursorPosition) # We need our own context menu for tables - self.text.setContextMenuPolicy(Qt.CustomContextMenu) + self.text.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu) self.text.customContextMenuRequested.connect(self.context) self.text.textChanged.connect(self.changed) @@ -362,24 +362,24 @@ def closeEvent(self, event): popup = QtWidgets.QMessageBox(self) - popup.setIcon(QtWidgets.QMessageBox.Warning) + popup.setIcon(QtWidgets.QMessageBox.Icon.Warning) popup.setText("The document has been modified") popup.setInformativeText("Do you want to save your changes?") - popup.setStandardButtons(QtWidgets.QMessageBox.Save | - QtWidgets.QMessageBox.Cancel | - QtWidgets.QMessageBox.Discard) + popup.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Save | + QtWidgets.QMessageBox.StandardButton.Cancel | + QtWidgets.QMessageBox.StandardButton.Discard) - popup.setDefaultButton(QtWidgets.QMessageBox.Save) + popup.setDefaultButton(QtWidgets.QMessageBox.StandardButton.Save) - answer = popup.exec_() + answer = popup.exec() - if answer == QtWidgets.QMessageBox.Save: + if answer == QtWidgets.QMessageBox.StandardButton.Save: self.save() - elif answer == QtWidgets.QMessageBox.Discard: + elif answer == QtWidgets.QMessageBox.StandardButton.Discard: event.accept() else: @@ -570,7 +570,7 @@ def new(self): def open(self): # Get filename and show only .writer files - # PYQT5 Returns a tuple in PyQt5, we only need the filename + # PYQT5 Returns a tuple in PyQt6, we only need the filename if self.filename is None: searchDir = self.default_path else: @@ -611,14 +611,14 @@ def preview(self): # If a print is requested, open print dialog preview.paintRequested.connect(lambda p: self.text.print_(p)) - preview.exec_() + preview.exec() def printHandler(self): # Open printing dialog dialog = QtPrintSupport.QPrintDialog() - if dialog.exec_() == QtWidgets.QDialog.Accepted: + if dialog.exec() == QtWidgets.QDialog.DialogCode.Accepted: self.text.document().print_(dialog.printer()) def cursorPosition(self): @@ -658,10 +658,10 @@ def insertImage(self): # Error if unloadable if image.isNull(): - popup = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Critical, + popup = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Icon.Critical, "Image load error", "Could not load image file!", - QtWidgets.QMessageBox.Ok, + QtWidgets.QMessageBox.StandardButton.Ok, self) popup.show() @@ -687,13 +687,13 @@ def highlight(self): def bold(self): - if self.text.fontWeight() == QtGui.QFont.Bold: + if self.text.fontWeight() == QtGui.QFont.Weight.Bold: - self.text.setFontWeight(QtGui.QFont.Normal) + self.text.setFontWeight(QtGui.QFont.Weight.Normal) else: - self.text.setFontWeight(QtGui.QFont.Bold) + self.text.setFontWeight(QtGui.QFont.Weight.Bold) def italic(self): @@ -759,16 +759,16 @@ def subScript(self): self.text.setCurrentCharFormat(fmt) def alignLeft(self): - self.text.setAlignment(Qt.AlignLeft) + self.text.setAlignment(Qt.AlignmentFlag.AlignLeft) def alignRight(self): - self.text.setAlignment(Qt.AlignRight) + self.text.setAlignment(Qt.AlignmentFlag.AlignRight) def alignCenter(self): - self.text.setAlignment(Qt.AlignCenter) + self.text.setAlignment(Qt.AlignmentFlag.AlignCenter) def alignJustify(self): - self.text.setAlignment(Qt.AlignJustify) + self.text.setAlignment(Qt.AlignmentFlag.AlignJustify) def indent(self): @@ -791,7 +791,7 @@ def indent(self): # Iterate over lines (diff absolute value) for n in range(abs(diff) + 1): # Move to start of each line - cursor.movePosition(QtGui.QTextCursor.StartOfLine) + cursor.movePosition(QtGui.QTextCursor.MoveOperation.StartOfLine) # Insert tabbing cursor.insertText("\t") @@ -806,7 +806,7 @@ def indent(self): def handleDedent(self, cursor): - cursor.movePosition(QtGui.QTextCursor.StartOfLine) + cursor.movePosition(QtGui.QTextCursor.MoveOperation.StartOfLine) # Grab the current line line = cursor.block().text() @@ -874,7 +874,7 @@ def main(): main = Main() main.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": diff --git a/lib/python/qtvcp/lib/xembed.py b/lib/python/qtvcp/lib/xembed.py index c532f96697d..0ca111a54f1 100644 --- a/lib/python/qtvcp/lib/xembed.py +++ b/lib/python/qtvcp/lib/xembed.py @@ -19,7 +19,7 @@ # embed qt instance 'window' into X11 window 'parent' def reparent_qt_to_x11(window, parent): - """ Forced reparent. When reparenting pyqt5 applications into Tk + """ Forced reparent. When reparenting PyQt6 applications into Tk some extra protocol calls are needed. """ try: diff --git a/lib/python/qtvcp/plugins/actionbutton_plugin.py b/lib/python/qtvcp/plugins/actionbutton_plugin.py index 46931a5960c..9bd4bad3a9c 100644 --- a/lib/python/qtvcp/plugins/actionbutton_plugin.py +++ b/lib/python/qtvcp/plugins/actionbutton_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtCore, QtGui, QtWidgets -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin, \ +from PyQt6 import QtCore, QtGui, QtWidgets +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin, \ QPyDesignerTaskMenuExtension, QExtensionFactory, \ QDesignerFormWindowInterface from qtvcp.widgets.action_button import ActionButton @@ -96,7 +96,7 @@ def __init__(self, parent=None): self._last_pick = None tree_view = QtWidgets.QTreeView(self) - tree_view.setFrameShape(QtWidgets.QFrame.NoFrame) + tree_view.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) tree_view.setEditTriggers(tree_view.NoEditTriggers) tree_view.setAlternatingRowColors(True) tree_view.setSelectionBehavior(tree_view.SelectRows) @@ -125,7 +125,7 @@ def selectIndex(self, index): def eventFilter(self, object, event): if event.type() == QtCore.QEvent.MouseButtonPress and object is self.view().viewport(): index = self.view().indexAt(event.pos()) - # print index.parent(),index.row(),index.column(),index.data(),index.data(QtCore.Qt.UserRole + 1) + # print index.parent(),index.row(),index.column(),index.data(),index.data(QtCore.Qt.ItemDataRole.UserRole + 1) # print self.view().isExpanded(self.view().currentIndex()) # if self.itemAt(event.pos()) is None self.__skip_next_hide = not self.view().visualRect(index).contains(event.pos()) @@ -134,8 +134,8 @@ def eventFilter(self, object, event): def addItems(self, parent, elements): for text, value, children in elements: item = QtGui.QStandardItem(text) - item.setData(value[0], role=QtCore.Qt.UserRole + 1) - item.setData(value[1], role=QtCore.Qt.UserRole + 2) + item.setData(value[0], role=QtCore.Qt.ItemDataRole.UserRole + 1) + item.setData(value[1], role=QtCore.Qt.ItemDataRole.UserRole + 2) parent.appendRow(item) if children: self.addItems(item, children) @@ -161,7 +161,7 @@ def __init__(self, widget, parent=None): self.setWindowTitle(self.tr("Set Options")) self.setGeometry(300, 300, 300, 300) - self.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) + self.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Preferred) self.widget = widget self.previewWidget = ActionButton() @@ -210,7 +210,7 @@ def __init__(self, widget, parent=None): def buildtab1(self): self.combo = TreeComboBox() model = QtGui.QStandardItemModel() - model.setHeaderData(0, QtCore.Qt.Horizontal, 'Name', QtCore.Qt.DisplayRole) + model.setHeaderData(0, QtCore.Qt.Orientation.Horizontal, 'Name', QtCore.Qt.ItemDataRole.DisplayRole) # (('Displayed name',['widget property name', code to show related data],[]) node_1 = (('Estop', ['estop', 0], []), @@ -517,15 +517,15 @@ def buildtab1(self): break if flag: self.combo.select(pnum, cnum) - winPropertyName = self.combo.itemData(cnum, role=QtCore.Qt.UserRole + 1) + winPropertyName = self.combo.itemData(cnum, role=QtCore.Qt.ItemDataRole.UserRole + 1) # print 'selected property,related data code:',winPropertyName self.combo.updateLastPick(winPropertyName) else: self.combo.select(0, 0) def selectionChanged(self, i): - winPropertyName = self.combo.itemData(i, role=QtCore.Qt.UserRole + 1) - userDataCode = self.combo.itemData(i, role=QtCore.Qt.UserRole + 2) + winPropertyName = self.combo.itemData(i, role=QtCore.Qt.ItemDataRole.UserRole + 1) + userDataCode = self.combo.itemData(i, role=QtCore.Qt.ItemDataRole.UserRole + 2) # print 'selected property,related data code:',winPropertyName,userDataCode,i self.combo.updateLastPick(winPropertyName) if winPropertyName is None: @@ -589,8 +589,8 @@ def buildtab2(self): self.halP.hide() line = QtWidgets.QFrame() - line.setFrameShape(QtWidgets.QFrame.HLine) - line.setFrameShadow(QtWidgets.QFrame.Sunken) + line.setFrameShape(QtWidgets.QFrame.Shape.HLine) + line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) layout.addWidget(line) # Linuxcnc Status LED option @@ -634,7 +634,7 @@ def buildtab2(self): if data[1] and self.widget['_{}'.format(data[1])]: flag = index self.statusCombo.addItem(data[0]) - self.statusCombo.setItemData(index, data[1], QtCore.Qt.UserRole + 1) + self.statusCombo.setItemData(index, data[1], QtCore.Qt.ItemDataRole.UserRole + 1) self.statusCombo.setCurrentIndex(flag) self.statusCombo.activated.connect(self.statusSelectionChanged) hbox.addWidget(label) @@ -662,8 +662,8 @@ def buildtab2(self): self.jnum.hide() line = QtWidgets.QFrame() - line.setFrameShape(QtWidgets.QFrame.HLine) - line.setFrameShadow(QtWidgets.QFrame.Sunken) + line.setFrameShape(QtWidgets.QFrame.Shape.HLine) + line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) layout.addWidget(line) # Shape selection @@ -837,14 +837,14 @@ def buildtab2(self): self.colorFalse.hide() line = QtWidgets.QFrame() - line.setFrameShape(QtWidgets.QFrame.HLine) - line.setFrameShadow(QtWidgets.QFrame.Sunken) + line.setFrameShape(QtWidgets.QFrame.Shape.HLine) + line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) layout.addWidget(line) self.tab2.setLayout(layout) def statusSelectionChanged(self, index): - choice = self.statusCombo.itemData(self.statusCombo.currentIndex(), QtCore.Qt.UserRole + 1) + choice = self.statusCombo.itemData(self.statusCombo.currentIndex(), QtCore.Qt.ItemDataRole.UserRole + 1) if choice is None: self.jnum.hide() return @@ -994,7 +994,7 @@ def onSetOptions(self): self.hfraction.show() self.wfraction.show() - choice = self.statusCombo.itemData(self.statusCombo.currentIndex(), QtCore.Qt.UserRole + 1) + choice = self.statusCombo.itemData(self.statusCombo.currentIndex(), QtCore.Qt.ItemDataRole.UserRole + 1) if choice is not None: if choice == 'is_joint_homed' or 'is_spindle' in choice: self.jnum.show() @@ -1051,53 +1051,53 @@ def updateWidget(self): if formWindow: # set widget option formWindow.cursor().setProperty('indicator_option', - QtCore.QVariant(self.indicatorCheckBox.isChecked())) + QtCore.self.indicatorCheckBox.isChecked()) formWindow.cursor().setProperty('python_command_option', - QtCore.QVariant(self.pythonCheckBox.isChecked())) + QtCore.self.pythonCheckBox.isChecked()) formWindow.cursor().setProperty('checked_state_text_option', - QtCore.QVariant(self.textCheckBox.isChecked())) + QtCore.self.textCheckBox.isChecked()) formWindow.cursor().setProperty('indicator_HAL_pin_option', - QtCore.QVariant(self.halCheckBox.isChecked())) + QtCore.self.halCheckBox.isChecked()) formWindow.cursor().setProperty('indicator_status_option', - QtCore.QVariant(self.statusCheckBox.isChecked())) + QtCore.self.statusCheckBox.isChecked()) formWindow.cursor().setProperty('indicator_size', - QtCore.QVariant(self.floatSpinBox.value())) + QtCore.self.floatSpinBox.value()) formWindow.cursor().setProperty('right_edge_offset', - QtCore.QVariant(self.rightedgeoffsetSpinBox.value())) + QtCore.self.rightedgeoffsetSpinBox.value()) formWindow.cursor().setProperty('top_edge_offset', - QtCore.QVariant(self.topedgeoffsetSpinBox.value())) + QtCore.self.topedgeoffsetSpinBox.value()) formWindow.cursor().setProperty('corner_radius', - QtCore.QVariant(self.radiusSpinBox.value())) + QtCore.self.radiusSpinBox.value()) formWindow.cursor().setProperty('height_fraction', - QtCore.QVariant(self.hfractionSpinBox.value())) + QtCore.self.hfractionSpinBox.value()) formWindow.cursor().setProperty('width_fraction', - QtCore.QVariant(self.wfractionSpinBox.value())) + QtCore.self.wfractionSpinBox.value()) formWindow.cursor().setProperty('circle_diameter', - QtCore.QVariant(self.diamSpinBox.value())) + QtCore.self.diamSpinBox.value()) formWindow.cursor().setProperty('shape_option', - QtCore.QVariant(self.shapeCombo.itemData( - self.shapeCombo.currentIndex()))) + QtCore.self.shapeCombo.itemData( + self.shapeCombo.currentIndex())) formWindow.cursor().setProperty('joint_number_status', - QtCore.QVariant(self.jnumCombo.itemData( - self.jnumCombo.currentIndex()))) + QtCore.self.jnumCombo.itemData( + self.jnumCombo.currentIndex())) formWindow.cursor().setProperty('on_color', - QtCore.QVariant(self._onColor)) + QtCore.self._onColor) formWindow.cursor().setProperty('off_color', - QtCore.QVariant(self._offColor)) + QtCore.self._offColor) formWindow.cursor().setProperty('true_state_string', - QtCore.QVariant(self.tTextEditBox.text())) + QtCore.self.tTextEditBox.text()) formWindow.cursor().setProperty('false_state_string', - QtCore.QVariant(self.fTextEditBox.text())) + QtCore.self.fTextEditBox.text()) formWindow.cursor().setProperty('true_python_cmd_string', - QtCore.QVariant(self.tCommandEditBox.text())) + QtCore.self.tCommandEditBox.text()) formWindow.cursor().setProperty('false_python_cmd_string', - QtCore.QVariant(self.fCommandEditBox.text())) + QtCore.self.fCommandEditBox.text()) if formWindow and winProperty == 'unused': formWindow.cursor().setProperty('estop_action', @@ -1112,50 +1112,50 @@ def updateWidget(self): # we read all data from combo and set each property to its # current dialog state (ie. selected is true, all others false) for i in range(1, self.statusCombo.count()): - data = self.statusCombo.itemData(i, QtCore.Qt.UserRole + 1) + data = self.statusCombo.itemData(i, QtCore.Qt.ItemDataRole.UserRole + 1) propertyText = '{}_status'.format(data) - if self.statusCombo.itemData(self.statusCombo.currentIndex(), QtCore.Qt.UserRole + 1) == data: + if self.statusCombo.itemData(self.statusCombo.currentIndex(), QtCore.Qt.ItemDataRole.UserRole + 1) == data: state = True else: state = False formWindow.cursor().setProperty(propertyText, - QtCore.QVariant(state)) + QtCore.state) formWindow.cursor().setProperty('invert_the_status', - QtCore.QVariant(self.invertCheckBox.isChecked())) + QtCore.self.invertCheckBox.isChecked()) ##################### # set related data ##################### formWindow.cursor().setProperty('joint_number', - QtCore.QVariant(self.JNumSpinBox.value())) + QtCore.self.JNumSpinBox.value()) formWindow.cursor().setProperty('incr_imperial_number', - QtCore.QVariant(self.jogIncImpSpinBox.value())) + QtCore.self.jogIncImpSpinBox.value()) formWindow.cursor().setProperty('incr_mm_number', - QtCore.QVariant(self.jogIncMMSpinBox.value())) + QtCore.self.jogIncMMSpinBox.value()) formWindow.cursor().setProperty('incr_angular_number', - QtCore.QVariant(self.jogIncAngSpinBox.value())) + QtCore.self.jogIncAngSpinBox.value()) formWindow.cursor().setProperty('float_num', - QtCore.QVariant(self.floatSpinBox.value())) + QtCore.self.floatSpinBox.value()) formWindow.cursor().setProperty('float_alt_num', - QtCore.QVariant(self.floatAltSpinBox.value())) + QtCore.self.floatAltSpinBox.value()) formWindow.cursor().setProperty('view_type_string', - QtCore.QVariant(self.viewComboBox.currentText())) + QtCore.self.viewComboBox.currentText()) formWindow.cursor().setProperty('toggle_float_option', - QtCore.QVariant(self.toggleCheckBox.isChecked())) + QtCore.self.toggleCheckBox.isChecked()) formWindow.cursor().setProperty('command_text_string', - QtCore.QVariant(self.commandEditBox.text())) + QtCore.self.commandEditBox.text()) formWindow.cursor().setProperty('ini_mdi_number', - QtCore.QVariant(self.MDISpinBox.value())) + QtCore.self.MDISpinBox.value()) formWindow.cursor().setProperty('template_label_option', - QtCore.QVariant(self.textTemplateCheckBox.isChecked())) + QtCore.self.textTemplateCheckBox.isChecked()) # block signal so button text doesn't change when selecting action self.widget._designer_block_signal = True formWindow.cursor().setProperty('text', - QtCore.QVariant(self.defaultTextTemplateEditBox.text())) + QtCore.self.defaultTextTemplateEditBox.text()) formWindow.cursor().setProperty('textTemplate', - QtCore.QVariant(self.textTemplateEditBox.text())) + QtCore.self.textTemplateEditBox.text()) formWindow.cursor().setProperty('alt_textTemplate', - QtCore.QVariant(self.altTextTemplateEditBox.text())) + QtCore.self.altTextTemplateEditBox.text()) self.widget._designer_block_signal = False self.accept() @@ -1188,7 +1188,7 @@ def taskActions(self): def updateOptions(self): dialog = ActionButtonDialog(self.widget) - dialog.exec_() + dialog.exec() class ActionButtonTaskMenuFactory(QExtensionFactory): diff --git a/lib/python/qtvcp/plugins/bar_plugin.py b/lib/python/qtvcp/plugins/bar_plugin.py index 13202647c99..2bff7db2309 100644 --- a/lib/python/qtvcp/plugins/bar_plugin.py +++ b/lib/python/qtvcp/plugins/bar_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.bar import HalBar from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/basic_probe_plugin.py b/lib/python/qtvcp/plugins/basic_probe_plugin.py index e257e66558c..cf3874303a7 100644 --- a/lib/python/qtvcp/plugins/basic_probe_plugin.py +++ b/lib/python/qtvcp/plugins/basic_probe_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.basic_probe import BasicProbe from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/camview_plugin.py b/lib/python/qtvcp/plugins/camview_plugin.py index b53d6a9b455..54df305964e 100644 --- a/lib/python/qtvcp/plugins/camview_plugin.py +++ b/lib/python/qtvcp/plugins/camview_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.camview_widget import CamView from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/container_plugin.py b/lib/python/qtvcp/plugins/container_plugin.py index 9203b67b71d..052a91fb383 100644 --- a/lib/python/qtvcp/plugins/container_plugin.py +++ b/lib/python/qtvcp/plugins/container_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.container_widgets import StateEnableGridLayout from qtvcp.widgets.container_widgets import JointEnableWidget from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/detach_tabs_plugin.py b/lib/python/qtvcp/plugins/detach_tabs_plugin.py index 38348fa79ea..80ad28e3b9d 100644 --- a/lib/python/qtvcp/plugins/detach_tabs_plugin.py +++ b/lib/python/qtvcp/plugins/detach_tabs_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.detach_tabs import DetachTabWidget from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/dialog_plugin.py b/lib/python/qtvcp/plugins/dialog_plugin.py index e76968af08b..b1c47cc255b 100644 --- a/lib/python/qtvcp/plugins/dialog_plugin.py +++ b/lib/python/qtvcp/plugins/dialog_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.dialog_widget import * from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/graphics_plugin.py b/lib/python/qtvcp/plugins/graphics_plugin.py index e534215aa0e..5c65a8bfd34 100644 --- a/lib/python/qtvcp/plugins/graphics_plugin.py +++ b/lib/python/qtvcp/plugins/graphics_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.gcode_graphics import GCodeGraphics from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/hal_label_plugin.py b/lib/python/qtvcp/plugins/hal_label_plugin.py index 53e93ab7bb8..fe4e01a13c1 100644 --- a/lib/python/qtvcp/plugins/hal_label_plugin.py +++ b/lib/python/qtvcp/plugins/hal_label_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.hal_label import HALLabel from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/jogincrements_plugin.py b/lib/python/qtvcp/plugins/jogincrements_plugin.py index a45c74612ee..1eef4bb6ed9 100644 --- a/lib/python/qtvcp/plugins/jogincrements_plugin.py +++ b/lib/python/qtvcp/plugins/jogincrements_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.jog_increments import JogIncrements from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/joypad_plugin.py b/lib/python/qtvcp/plugins/joypad_plugin.py index 6e93217de5c..c9f25036530 100644 --- a/lib/python/qtvcp/plugins/joypad_plugin.py +++ b/lib/python/qtvcp/plugins/joypad_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.joypad import JoyPad, HALPad from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/led_plugin.py b/lib/python/qtvcp/plugins/led_plugin.py index 37ee8c664cc..33ece991731 100644 --- a/lib/python/qtvcp/plugins/led_plugin.py +++ b/lib/python/qtvcp/plugins/led_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.led_widget import LED from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/nurbs_editor_plugin.py b/lib/python/qtvcp/plugins/nurbs_editor_plugin.py index db218fae799..dda4e14f375 100644 --- a/lib/python/qtvcp/plugins/nurbs_editor_plugin.py +++ b/lib/python/qtvcp/plugins/nurbs_editor_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.nurbs_editor import NurbsEditor from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/overlay_plugin.py b/lib/python/qtvcp/plugins/overlay_plugin.py index e4683d0a900..b46a7c1edc2 100644 --- a/lib/python/qtvcp/plugins/overlay_plugin.py +++ b/lib/python/qtvcp/plugins/overlay_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.overlay_widget import FocusOverlay from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/round_gauge_plugin.py b/lib/python/qtvcp/plugins/round_gauge_plugin.py index ca8ca2f8f61..647e0e5951f 100644 --- a/lib/python/qtvcp/plugins/round_gauge_plugin.py +++ b/lib/python/qtvcp/plugins/round_gauge_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.round_gauge import Gauge from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/round_progress_bar_plugin.py b/lib/python/qtvcp/plugins/round_progress_bar_plugin.py index 5cedd9fc08f..7c82c4a8733 100644 --- a/lib/python/qtvcp/plugins/round_progress_bar_plugin.py +++ b/lib/python/qtvcp/plugins/round_progress_bar_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.round_progress import RoundProgressBar from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/screenoptions_plugin.py b/lib/python/qtvcp/plugins/screenoptions_plugin.py index ff70767199a..af495453850 100644 --- a/lib/python/qtvcp/plugins/screenoptions_plugin.py +++ b/lib/python/qtvcp/plugins/screenoptions_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtCore, QtGui, QtWidgets -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin, \ +from PyQt6 import QtCore, QtGui, QtWidgets +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin, \ QPyDesignerTaskMenuExtension, QExtensionFactory, \ QDesignerFormWindowInterface @@ -118,19 +118,19 @@ def updateWidget(self): if formWindow: formWindow.cursor().setProperty("notify_option", - QtCore.QVariant(self.c_notify.isChecked())) + QtCore.self.c_notify.isChecked()) formWindow.cursor().setProperty("notify_max_messages", - QtCore.QVariant(self.c_notify_max_msgs.value())) + QtCore.self.c_notify_max_msgs.value()) formWindow.cursor().setProperty("catch_errors_option", - QtCore.QVariant(self.c_errors.isChecked())) + QtCore.self.c_errors.isChecked()) formWindow.cursor().setProperty("catch_close_option", - QtCore.QVariant(self.c_close.isChecked())) + QtCore.self.c_close.isChecked()) formWindow.cursor().setProperty("play_sounds_option", - QtCore.QVariant(self.c_play_sounds.isChecked())) + QtCore.self.c_play_sounds.isChecked()) formWindow.cursor().setProperty("use_pref_file_option", - QtCore.QVariant(self.c_use_pref_file.isChecked())) + QtCore.self.c_use_pref_file.isChecked()) formWindow.cursor().setProperty("halCompBaseName", - QtCore.QVariant(self.e_hal_base_name.text())) + QtCore.self.e_hal_base_name.text()) self.accept() @@ -152,7 +152,7 @@ def taskActions(self): def updateLocation(self): dialog = screenOptionsDialog(self.widget) - dialog.exec_() + dialog.exec() class screenOptionsTaskMenuFactory(QExtensionFactory): diff --git a/lib/python/qtvcp/plugins/simplewidgets_plugin.py b/lib/python/qtvcp/plugins/simplewidgets_plugin.py index 37b2add6963..75e7449d510 100644 --- a/lib/python/qtvcp/plugins/simplewidgets_plugin.py +++ b/lib/python/qtvcp/plugins/simplewidgets_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.simple_widgets import IndicatedPushButton from qtvcp.widgets.simple_widgets import PushButton from qtvcp.widgets.simple_widgets import CheckBox diff --git a/lib/python/qtvcp/plugins/state_label_plugin.py b/lib/python/qtvcp/plugins/state_label_plugin.py index e4f55822198..fc8d1a1e1e0 100644 --- a/lib/python/qtvcp/plugins/state_label_plugin.py +++ b/lib/python/qtvcp/plugins/state_label_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.state_label import StateLabel from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/state_led_plugin.py b/lib/python/qtvcp/plugins/state_led_plugin.py index 25b4d05c502..b61bd8d27a2 100644 --- a/lib/python/qtvcp/plugins/state_led_plugin.py +++ b/lib/python/qtvcp/plugins/state_led_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.state_led import StateLED from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/status_adjustment_bar_plugin.py b/lib/python/qtvcp/plugins/status_adjustment_bar_plugin.py index 603d651dd4c..7c54802fb34 100644 --- a/lib/python/qtvcp/plugins/status_adjustment_bar_plugin.py +++ b/lib/python/qtvcp/plugins/status_adjustment_bar_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.adjustment_bar import StatusAdjustmentBar from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/status_label_plugin.py b/lib/python/qtvcp/plugins/status_label_plugin.py index 4dbf216338f..8d8a740c932 100644 --- a/lib/python/qtvcp/plugins/status_label_plugin.py +++ b/lib/python/qtvcp/plugins/status_label_plugin.py @@ -1,9 +1,8 @@ #!/usr/bin/env python3 -from PyQt5 import QtCore, QtGui, QtWidgets -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtCore import QVariant -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin, QExtensionFactory, QPyDesignerTaskMenuExtension, \ +from PyQt6 import QtCore, QtGui, QtWidgets +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin, QExtensionFactory, QPyDesignerTaskMenuExtension, \ QPyDesignerPropertySheetExtension, QDesignerFormWindowInterface from qtvcp.widgets.richtext_selector import RichTextEditorDialog @@ -101,7 +100,7 @@ def __init__(self, widget, parent): # print self.widget.pyqtConfigure.__sizeof__() for i in StatusLabel.__dict__: # print i - if 'PyQt5.QtCore.pyqtProperty' in str(StatusLabel.__dict__[i]): + if 'PyQt6.QtCore.pyqtProperty' in str(StatusLabel.__dict__[i]): self.propertylist.append(i) print(i) # print dir(self.widget) @@ -113,12 +112,12 @@ def property(self, index): name = self.propertyName(index) print('property index:', index, name) if 'object' in name: - return QVariant('default') + return 'default' if 'orient' in name: - return QVariant(False) + return False if 'text' == name or 'alt' in name: - return QVariant(self.widget.text) - return QVariant(self.widget[str(name)]) + return self.widget.text + return self.widget[str(name)] def indexOf(self, name): # print 'NAME:',name @@ -166,7 +165,7 @@ def setProperty(self, index, vvalue): return if self.formWindow: - self.formWindow.cursor().setProperty(self.propertyName(index), QVariant(value)) + self.formWindow.cursor().setProperty(self.propertyName(index), value) return def getVisible(self, index, data): @@ -204,7 +203,7 @@ def taskActions(self): def updateOptions(self): dialog = StatusLabelDialog(self.widget) - dialog.exec_() + dialog.exec() class StatusLabelTaskMenuFactory(QExtensionFactory): @@ -227,7 +226,7 @@ def __init__(self, parent=None): self.__skip_next_hide = False tree_view = QtWidgets.QTreeView(self) - tree_view.setFrameShape(QtWidgets.QFrame.NoFrame) + tree_view.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) tree_view.setEditTriggers(tree_view.NoEditTriggers) tree_view.setAlternatingRowColors(True) tree_view.setSelectionBehavior(tree_view.SelectRows) @@ -256,7 +255,7 @@ def selectIndex(self, index): def eventFilter(self, object, event): if event.type() == QtCore.QEvent.MouseButtonPress and object is self.view().viewport(): index = self.view().indexAt(event.pos()) - # print index.parent(),index.row(),index.column(),index.data(),index.data(QtCore.Qt.UserRole + 1) + # print index.parent(),index.row(),index.column(),index.data(),index.data(QtCore.Qt.ItemDataRole.UserRole + 1) # print self.view().isExpanded(self.view().currentIndex()) # if self.itemAt(event.pos()) is None self.__skip_next_hide = not self.view().visualRect(index).contains(event.pos()) @@ -265,8 +264,8 @@ def eventFilter(self, object, event): def addItems(self, parent, elements): for text, value, children in elements: item = QtGui.QStandardItem(text) - item.setData(value[0], role=QtCore.Qt.UserRole + 1) - item.setData(value[1], role=QtCore.Qt.UserRole + 2) + item.setData(value[0], role=QtCore.Qt.ItemDataRole.UserRole + 1) + item.setData(value[1], role=QtCore.Qt.ItemDataRole.UserRole + 2) parent.appendRow(item) if children: self.addItems(item, children) @@ -285,7 +284,7 @@ def __init__(self, widget, parent=None): self.setWindowTitle(self.tr("Set Options")) self.setGeometry(300, 300, 200, 200) - self.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + self.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) self.widget = widget self.previewWidget = StatusLabel() @@ -320,7 +319,7 @@ def __init__(self, widget, parent=None): def buildtab1(self): self.combo = TreeComboBox() model = QtGui.QStandardItemModel() - model.setHeaderData(0, QtCore.Qt.Horizontal, 'Name', QtCore.Qt.DisplayRole) + model.setHeaderData(0, QtCore.Qt.Orientation.Horizontal, 'Name', QtCore.Qt.ItemDataRole.DisplayRole) # (('Displayed name',['widget property name', code to show related data],[]) node_1 = (('Set Feed Override', ['feed_override', 2], []), @@ -478,8 +477,8 @@ def launchDialog(self, widget): widget.setText(style) def selectionChanged(self, i): - winPropertyName = self.combo.itemData(i, role=QtCore.Qt.UserRole + 1) - userDataCode = self.combo.itemData(i, role=QtCore.Qt.UserRole + 2) + winPropertyName = self.combo.itemData(i, role=QtCore.Qt.ItemDataRole.UserRole + 1) + userDataCode = self.combo.itemData(i, role=QtCore.Qt.ItemDataRole.UserRole + 2) # print 'selected property,related data code:',winPropertyName,userDataCode,i if winPropertyName is None: # collapsed = self.combo.view().isExpanded(self.combo.view().currentIndex()) @@ -498,7 +497,7 @@ def selectionChanged(self, i): def updateWidget(self): i = self.combo.currentIndex() - winProperty = self.combo.itemData(i, role=QtCore.Qt.UserRole + 1) + winProperty = self.combo.itemData(i, role=QtCore.Qt.ItemDataRole.UserRole + 1) if winProperty is None: self.combo.select(0, 0) return @@ -516,17 +515,17 @@ def updateWidget(self): # set related data formWindow.cursor().setProperty('index_number', - QtCore.QVariant(self.JNumSpinBox.value())) + QtCore.self.JNumSpinBox.value()) # block signal so button text doesn't change when selecting action self.widget._designer_block_signal = True formWindow.cursor().setProperty('textTemplate', - QtCore.QVariant(self.textTemplateEditBox.text())) + QtCore.self.textTemplateEditBox.text()) formWindow.cursor().setProperty('alt_textTemplate', - QtCore.QVariant(self.altTextTemplateEditBox.text())) + QtCore.self.altTextTemplateEditBox.text()) formWindow.cursor().setProperty('text', - QtCore.QVariant(self.defaultTextTemplateEditBox.text())) + QtCore.self.defaultTextTemplateEditBox.text()) formWindow.cursor().setProperty('halpin_name', - QtCore.QVariant(self.halpinEditBox.text())) + QtCore.self.halpinEditBox.text()) self.widget._designer_block_signal = False self.accept() diff --git a/lib/python/qtvcp/plugins/status_slider_plugin.py b/lib/python/qtvcp/plugins/status_slider_plugin.py index 8a96f79fcf0..d6e03568a5a 100644 --- a/lib/python/qtvcp/plugins/status_slider_plugin.py +++ b/lib/python/qtvcp/plugins/status_slider_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import QIcon, QPixmap -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6.QtGui import QIcon, QPixmap +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.status_slider import StatusSlider from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/tab_widget_plugin.py b/lib/python/qtvcp/plugins/tab_widget_plugin.py index 8ff9f445bc0..5a8af933c95 100644 --- a/lib/python/qtvcp/plugins/tab_widget_plugin.py +++ b/lib/python/qtvcp/plugins/tab_widget_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.tab_widget import TabWidget from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/toolbutton_plugin.py b/lib/python/qtvcp/plugins/toolbutton_plugin.py index 4eb84eb4f2b..47a923214a6 100644 --- a/lib/python/qtvcp/plugins/toolbutton_plugin.py +++ b/lib/python/qtvcp/plugins/toolbutton_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.system_tool_button import SystemToolButton from qtvcp.widgets.action_tool_button import ActionToolButton from qtvcp.widgets.axisPickTool_button import AxisPickToolButton diff --git a/lib/python/qtvcp/plugins/versa_probe_plugin.py b/lib/python/qtvcp/plugins/versa_probe_plugin.py index ac1e5f9722e..f4a11124453 100644 --- a/lib/python/qtvcp/plugins/versa_probe_plugin.py +++ b/lib/python/qtvcp/plugins/versa_probe_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.versa_probe import VersaProbe from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/virtualkeyboard_plugin.py b/lib/python/qtvcp/plugins/virtualkeyboard_plugin.py index 6c58b78e2df..28209480367 100644 --- a/lib/python/qtvcp/plugins/virtualkeyboard_plugin.py +++ b/lib/python/qtvcp/plugins/virtualkeyboard_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.virtualkeyboard import VirtualKeyboard from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/web_widget_plugin.py b/lib/python/qtvcp/plugins/web_widget_plugin.py index 6d78b5e4899..7a832984ef8 100644 --- a/lib/python/qtvcp/plugins/web_widget_plugin.py +++ b/lib/python/qtvcp/plugins/web_widget_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.web_widget import WebWidget from qtvcp.widgets.qtvcp_icons import Icon diff --git a/lib/python/qtvcp/plugins/widgets_plugin.py b/lib/python/qtvcp/plugins/widgets_plugin.py index 1bff2f10458..80d73a8a980 100644 --- a/lib/python/qtvcp/plugins/widgets_plugin.py +++ b/lib/python/qtvcp/plugins/widgets_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from PyQt5 import QtGui -from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin +from PyQt6 import QtGui +from PyQt6.QtDesigner import QPyDesignerCustomWidgetPlugin from qtvcp.widgets.dro_widget import DROLabel from qtvcp.widgets.user_dro_label import UserDROLabel from qtvcp.widgets.mdi_line import MDILine diff --git a/lib/python/qtvcp/qt_action.py b/lib/python/qtvcp/qt_action.py index 2c5f18cedb0..ed91ed96733 100644 --- a/lib/python/qtvcp/qt_action.py +++ b/lib/python/qtvcp/qt_action.py @@ -2,10 +2,10 @@ import math import subprocess from time import sleep -from PyQt5.QtWidgets import (QApplication, QTabWidget, QStackedWidget, +from PyQt6.QtWidgets import (QApplication, QTabWidget, QStackedWidget, QWidget, QGridLayout,QGraphicsBlurEffect, QGraphicsDropShadowEffect, QGraphicsColorizeEffect) -from PyQt5.QtCore import Qt, QProcess +from PyQt6.QtCore import Qt, QProcess import linuxcnc @@ -752,7 +752,7 @@ def CALL_DIALOG(self, command): def HIDE_POINTER(self, state): if state: - QApplication.setOverrideCursor(Qt.BlankCursor) + QApplication.setOverrideCursor(Qt.CursorShape.BlankCursor) else: QApplication.restoreOverrideCursor() @@ -942,7 +942,7 @@ def GET_ABOUT_INFO(self): if not os.path.exists(path): path = os.path.join(PATH.CONFIGPATH, 'README') if not os.path.exists(path): - return "This is a Pyqt5/QtVCP based screen for Linuxcnc\n No ABOUT or README found." + return "This is a PyQt6/QtVCP based screen for Linuxcnc\n No ABOUT or README found." for line in open(path): mess += line diff --git a/lib/python/qtvcp/qt_halobjects.py b/lib/python/qtvcp/qt_halobjects.py index 5e1080d8117..d6f80c71020 100644 --- a/lib/python/qtvcp/qt_halobjects.py +++ b/lib/python/qtvcp/qt_halobjects.py @@ -1,7 +1,7 @@ import hal import _hal import traceback -from PyQt5.QtCore import QObject, QTimer, pyqtSignal +from PyQt6.QtCore import QObject, QTimer, pyqtSignal # Set up logging from common import logger diff --git a/lib/python/qtvcp/qt_makegui.py b/lib/python/qtvcp/qt_makegui.py index 2bad32c4ad6..a8f7bc3d315 100644 --- a/lib/python/qtvcp/qt_makegui.py +++ b/lib/python/qtvcp/qt_makegui.py @@ -2,7 +2,7 @@ import sys import subprocess -from PyQt5 import QtGui, QtCore, QtWidgets, uic +from PyQt6 import QtGui, QtCore, QtWidgets, uic import traceback from qtvcp.widgets.widget_baseclass import _HalWidgetBase # Set up logging @@ -41,7 +41,7 @@ def process_event(self, event, pressed): return (pressed, key, code, shift, ctrl) def eventFilter(self, receiver, event): - # in pyqt5 QWindow gets all events before the widgets inside it do + # in pyqt5/6 QWindow gets all events before the widgets inside it do # we need the widgets inside it to get their events first # this line line provides that. # (pyqt4 did not require this) @@ -143,24 +143,29 @@ def load_resources(self): def qrccompile(qrcname, qrcpy): log.info('Compiling qrc: {} to \n {}'.format(qrcname, qrcpy)) try: - subprocess.call(["pyrcc5", "-o", "{}".format(qrcpy), "{}".format(qrcname)]) + subprocess.call(["pyside6-rcc", "-o", "{}".format(qrcpy), "{}".format(qrcname)]) + with open(qrcpy, 'r') as f: + content = f.read() + content = content.replace('from PySide6', 'from PyQt6').replace('import PySide6', 'import PyQt6') + with open(qrcpy, 'w') as f: + f.write(content) except OSError as e: log.error( - '{}, pyrcc5 error. try in terminal: sudo apt install pyqt5-dev-tools to install dev tools'.format( + '{}, pyside6-rcc error. try in terminal: sudo apt install pyside6-tools to install dev tools'.format( e)) msg = QtWidgets.QMessageBox() - msg.setIcon(QtWidgets.QMessageBox.Critical) + msg.setIcon(QtWidgets.QMessageBox.Icon.Critical) msg.setText("QTvcp qrc compiling ERROR! ") msg.setInformativeText( - 'Qrc Compile error, try: "sudo apt install pyqt5-dev-tools" to install dev tools') + 'Qrc Compile error, try: "sudo apt install pyside6-tools" to install dev tools') msg.setWindowTitle("Error") msg.setDetailedText('You can continue but some images may be missing') msg.setStandardButtons(QtWidgets.QMessageBox.Retry | QtWidgets.QMessageBox.Abort) msg.show() - retval = msg.exec_() + retval = msg.exec() if retval == QtWidgets.QMessageBox.Abort: # cancel button log.critical("Canceled from qrc compiling Error Dialog.\n") - raise SystemError('pyrcc5 compiling error: try: "sudo apt install pyqt5-dev-tools"') + raise SystemError('pyside6-rcc compiling error: try: "sudo apt install pyside6-tools"') qrcname = self.PATHS.QRC qrcpy = self.PATHS.QRCPY @@ -222,7 +227,7 @@ def apply_styles(self, fname=None): BNAME = self.PATHS.BASENAME # apply one word system theme if fname in (list(QtWidgets.QStyleFactory.keys())): - QtWidgets.qApp.setStyle(fname) + QtWidgets.QApplication.instance().setStyle(fname) log.info('Applied System Style name: yellow<{}>'.format(fname)) return @@ -263,7 +268,7 @@ def apply_styles(self, fname=None): themes = '' log.error('QSS Filepath Error: {}'.format(qssname)) log.error("{} theme not available.".format(fname)) - current_theme = str(QtWidgets.qApp.style().objectName()) + current_theme = str(QtWidgets.QApplication.instance().style().objectName()) for i in (list(QtWidgets.QStyleFactory.keys())): themes += (', {}'.format(i)) log.error('QTvcp Available system themes: green<{}> {}'.format(current_theme, themes)) diff --git a/lib/python/qtvcp/qt_makepins.py b/lib/python/qtvcp/qt_makepins.py index a5f86f8a3e3..197322b84d0 100644 --- a/lib/python/qtvcp/qt_makepins.py +++ b/lib/python/qtvcp/qt_makepins.py @@ -20,8 +20,8 @@ import os from qtvcp.widgets.simple_widgets import _HalWidgetBase from qtvcp.widgets.screen_options import ScreenOptions -from PyQt5.QtCore import QObject -from PyQt5.QtWidgets import QDesktopWidget +from PyQt6.QtCore import QObject +from PyQt6.QtWidgets import QApplication from qtvcp.core import Info @@ -203,7 +203,7 @@ def go(x, y, w, h): return elif 'center' in self._geo_string.lower(): geom = self.window.frameGeometry() - geom.moveCenter(QDesktopWidget().availableGeometry().center()) + geom.moveCenter(QApplication.primaryScreen().availableGeometry().center()) self.window.setGeometry(geom) return else: diff --git a/lib/python/qtvcp/qt_pstat.py b/lib/python/qtvcp/qt_pstat.py index 8ccba4b7cd4..a82384d82aa 100644 --- a/lib/python/qtvcp/qt_pstat.py +++ b/lib/python/qtvcp/qt_pstat.py @@ -18,7 +18,7 @@ import os import sys -from PyQt5 import QtCore +from PyQt6 import QtCore # Set up logging from . import logger diff --git a/lib/python/qtvcp/widgets/action_button.py b/lib/python/qtvcp/widgets/action_button.py index df0a24f18c6..746e6d8d654 100644 --- a/lib/python/qtvcp/widgets/action_button.py +++ b/lib/python/qtvcp/widgets/action_button.py @@ -19,7 +19,7 @@ # In the designer editor, it is possible to select what the button will do. ############################################################################### -from PyQt5 import QtCore +from PyQt6 import QtCore import linuxcnc from qtvcp.widgets.widget_baseclass import _HalWidgetBase @@ -1679,7 +1679,7 @@ def __setitem__(self, item, value): if __name__ == "__main__": import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = ActionButton('Action') @@ -1692,4 +1692,4 @@ def __setitem__(self, item, value): widget._hal_init() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/action_button_round.py b/lib/python/qtvcp/widgets/action_button_round.py index c43ccba62d7..2c76f1c623d 100644 --- a/lib/python/qtvcp/widgets/action_button_round.py +++ b/lib/python/qtvcp/widgets/action_button_round.py @@ -20,7 +20,7 @@ # In the designer editor, it is possible to select what the button will do. ############################################################################### -from PyQt5 import QtGui, QtCore +from PyQt6 import QtGui, QtCore from qtvcp.widgets.action_button import ActionButton @@ -28,7 +28,7 @@ class RoundButton(ActionButton): def __init__(self, parent=None): super(RoundButton, self).__init__(parent) self.setCheckable(True) - self.setWindowFlags(QtCore.Qt.FramelessWindowHint) + self.setWindowFlags(QtCore.Qt.WindowType.FramelessWindowHint) self.pixmap = QtGui.QPixmap() self.false_pixmap = QtGui.QPixmap() self.clip_region = QtGui.QRegion(QtCore.QRect(5, 5, self.width()-10, self.height()-10), QtGui.QRegion.Ellipse) @@ -79,11 +79,11 @@ def resetFalseImagePath(self): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = RoundButton() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/action_tool_button.py b/lib/python/qtvcp/widgets/action_tool_button.py index bc133649167..1d54de7c95a 100644 --- a/lib/python/qtvcp/widgets/action_tool_button.py +++ b/lib/python/qtvcp/widgets/action_tool_button.py @@ -14,10 +14,10 @@ # GNU General Public License for more details. ############################################################################### -from PyQt5.QtWidgets import (QToolButton, QMenu, QAction, +from PyQt6.QtWidgets import (QToolButton, QMenu, QAction, QComboBox, QWidgetAction) -from PyQt5.QtCore import pyqtProperty -from PyQt5.QtGui import QIcon +from PyQt6.QtCore import pyqtProperty +from PyQt6.QtGui import QIcon from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.widgets.indicatorMixIn import IndicatedMixIn @@ -228,11 +228,11 @@ def getOptionMenu(self): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = ActionToolButton() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/adjustment_bar.py b/lib/python/qtvcp/widgets/adjustment_bar.py index b1fbdf514e4..f6f4db3369e 100644 --- a/lib/python/qtvcp/widgets/adjustment_bar.py +++ b/lib/python/qtvcp/widgets/adjustment_bar.py @@ -14,9 +14,9 @@ # GNU General Public License for more details. ############################################################################### -from PyQt5.QtWidgets import QWidget, QProgressBar, QToolButton, QHBoxLayout, QMenu, QAction -from PyQt5.QtCore import Qt, pyqtProperty, QBasicTimer, pyqtSignal -from PyQt5.QtGui import QPainter, QFont, QIcon +from PyQt6.QtWidgets import QWidget, QProgressBar, QToolButton, QHBoxLayout, QMenu, QAction +from PyQt6.QtCore import Qt, pyqtProperty, QBasicTimer, pyqtSignal +from PyQt6.QtGui import QPainter, QFont, QIcon from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Action, Info @@ -61,7 +61,7 @@ def paintEvent(self, event): def drawText(self, qp): qp.setOpacity(1.0) qp.setFont(self.font) - qp.drawText(self.rect(), Qt.AlignCenter, self.text) + qp.drawText(self.rect(), Qt.AlignmentFlag.AlignCenter, self.text) class HAdjustmentBar(QWidget): @@ -78,7 +78,7 @@ def __init__(self, parent=None): self.showToggleButton = True self.showSettingMenu = True self.bar = LabeledBar() - #self.bar.setSizePolicy(QSizePolicy.Expanding,QSizePolicy.Expanding) + #self.bar.setSizePolicy(QSizePolicy.Policy.Expanding,QSizePolicy.Policy.Expanding) # black magic class patching # so calling these functions actually calls the self.bar's functions. self.minimum = self.bar.minimum @@ -111,7 +111,7 @@ def buildWidget(self): tb_set.setText('<>') if self.showSettingMenu: tb_set.setMenu(SettingMenu) - tb_set.setPopupMode(QToolButton.DelayedPopup) + tb_set.setPopupMode(QToolButton.ToolButtonPopupMode.DelayedPopup) layout.addWidget(self.tb_down) layout.addWidget(self.bar) @@ -388,7 +388,7 @@ def __setitem__(self, item, value): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = StatusAdjustmentBar() widget.PREFS_=None @@ -397,6 +397,6 @@ def main(): widget.setValue(75) widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/axisPickTool_button.py b/lib/python/qtvcp/widgets/axisPickTool_button.py index 47dd6e64216..5c3adfa6332 100644 --- a/lib/python/qtvcp/widgets/axisPickTool_button.py +++ b/lib/python/qtvcp/widgets/axisPickTool_button.py @@ -1,7 +1,7 @@ -from PyQt5.QtWidgets import (QToolButton, QMenu, QAction, +from PyQt6.QtWidgets import (QToolButton, QMenu, QAction, QComboBox, QWidgetAction, QSizePolicy) -from PyQt5.QtCore import pyqtProperty, pyqtSignal -from PyQt5.QtGui import QIcon +from PyQt6.QtCore import pyqtProperty, pyqtSignal +from PyQt6.QtGui import QIcon from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.widgets.indicatorMixIn import IndicatedMixIn @@ -38,7 +38,7 @@ def _hal_init(self): def createAxisButton(self, text): tmpl = lambda s: self._textTemplate % s self.setText(tmpl(text)) - self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) + self.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) self.setMinimumSize(70, 40) self.clicked.connect(self.axisClicked) SettingMenu = QMenu() diff --git a/lib/python/qtvcp/widgets/axis_tool_button.py b/lib/python/qtvcp/widgets/axis_tool_button.py index 4bbca31d3fd..a4d4d2054b1 100644 --- a/lib/python/qtvcp/widgets/axis_tool_button.py +++ b/lib/python/qtvcp/widgets/axis_tool_button.py @@ -16,9 +16,9 @@ import hal -from PyQt5.QtWidgets import QToolButton, QMenu, QAction -from PyQt5.QtCore import pyqtProperty -from PyQt5.QtGui import QIcon +from PyQt6.QtWidgets import QToolButton, QMenu, QAction +from PyQt6.QtCore import pyqtProperty +from PyQt6.QtGui import QIcon from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.widgets.indicatorMixIn import IndicatedMixIn @@ -297,7 +297,7 @@ def _switch_units(self, widget, data): def set_joint(self, data): self._joint = data if data == -1: - self.setPopupMode(QToolButton.InstantPopup) + self.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup) def get_joint(self): return self._joint def reset_joint(self): @@ -394,11 +394,11 @@ def __setitem__(self, item, value): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = AxisToolButton() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/bar.py b/lib/python/qtvcp/widgets/bar.py index 0d3f130952a..4693c1b5b48 100644 --- a/lib/python/qtvcp/widgets/bar.py +++ b/lib/python/qtvcp/widgets/bar.py @@ -1,13 +1,9 @@ -from PyQt5 import QtWidgets -from PyQt5.QtGui import QColor, QBrush, QPainter, QLinearGradient -from PyQt5.QtCore import (Qt, pyqtSlot, pyqtProperty, pyqtSignal, QVariant, QRectF, +from PyQt6 import QtWidgets +from PyQt6.QtGui import QColor, QBrush, QPainter, QLinearGradient +from PyQt6.QtCore import (Qt, pyqtSlot, pyqtProperty, pyqtSignal, QRectF, QSize) -try: - from PyQt5.QtCore import Q_ENUM -except: - # before Qt 5.10 - from PyQt5.QtCore import Q_ENUMS as Q_ENUM +from PyQt6.QtCore import Q_ENUM from qtvcp.widgets.widget_baseclass import _HalWidgetBase import hal @@ -32,8 +28,8 @@ def __init__(self, *args, **kwargs): self._value = 100 self.setSizePolicy( - QtWidgets.QSizePolicy.MinimumExpanding, - QtWidgets.QSizePolicy.MinimumExpanding + QtWidgets.QSizePolicy.Policy.MinimumExpanding, + QtWidgets.QSizePolicy.Policy.MinimumExpanding ) # set default number of colored steps @@ -51,7 +47,7 @@ def paintEvent(self, e): brush = QBrush() brush.setColor(self._background_color) - brush.setStyle(Qt.SolidPattern) + brush.setStyle(Qt.BrushStyle.SolidPattern) rect = QRectF(0, 0, painter.device().width(), painter.device().height()) painter.fillRect(rect, brush) @@ -391,7 +387,7 @@ def resetVert(self): self.update() stepColorList = pyqtProperty( - QVariant.typeToName(QVariant.StringList), + .typeToName(.StringList), get_step_color_l, set_step_color_l, reset_step_color_l) backgroundColor = pyqtProperty(QColor, getBackgroundColor, setBackgroundColor) @@ -413,11 +409,6 @@ class HalBar(Bar, _HalWidgetBase): HALPinType = HALPinType Q_ENUM(HALPinType) - # older version of pyqt5 need this as well as Q_ENUM - NONE = 0 - S32 = hal.HAL_S32 - FLOAT = hal.HAL_FLOAT - def __init__(self, *args, **kwargs): super(). __init__( *args, **kwargs) self._pin_type = HALPinType.S32 @@ -474,7 +465,7 @@ def reset_invert_negative(self): invertOnNegative = pyqtProperty(bool, get_invert_negative, set_invert_negative, reset_invert_negative) if __name__ == '__main__': - from PyQt5.QtWidgets import (QLabel, QSlider, QWidget, QVBoxLayout, + from PyQt6.QtWidgets import (QLabel, QSlider, QWidget, QVBoxLayout, QHBoxLayout, QPushButton, QCheckBox) app = QtWidgets.QApplication([]) @@ -491,7 +482,7 @@ def reset_invert_negative(self): #bar.setValue(51) - slider = QSlider(Qt.Horizontal) + slider = QSlider(Qt.Orientation.Horizontal) slider.setMinimum(0) slider.setMaximum(200) slider.setSingleStep(10) @@ -537,5 +528,5 @@ def reset_invert_negative(self): layout.addLayout(lyt) w.show() - app.exec_() + app.exec() diff --git a/lib/python/qtvcp/widgets/basic_probe.py b/lib/python/qtvcp/widgets/basic_probe.py index 88deca6f6df..5723d7ca47a 100644 --- a/lib/python/qtvcp/widgets/basic_probe.py +++ b/lib/python/qtvcp/widgets/basic_probe.py @@ -19,9 +19,9 @@ import os import hal import json -from PyQt5.QtCore import QProcess, QRegExp, QFile, QEvent, Qt, pyqtProperty -from PyQt5 import QtGui, QtWidgets, uic, QtCore -from PyQt5.QtWidgets import QDialogButtonBox, QAbstractSlider, QLineEdit, qApp +from PyQt6.QtCore import QProcess, QRegularExpression, QFile, QEvent, Qt, pyqtProperty +from PyQt6 import QtGui, QtWidgets, uic, QtCore +from PyQt6.QtWidgets import QDialogButtonBox, QAbstractSlider, QLineEdit, QApplication.instance() from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Action, Status, Info, Path from qtvcp.widgets.dialogMixin import GeometryMixin @@ -56,9 +56,9 @@ def __init__(self, parent=None): self.hilightStyle = "border: 2px solid red;" if INFO.MACHINE_IS_METRIC: - self.valid = QtGui.QRegExpValidator(QRegExp(r'^[+-]?((\d+(\.\d{,4})?)|(\.\d{,4}))$')) + self.valid = QtGui.QRegularExpressionValidator(QRegularExpression(r'^[+-]?((\d+(\.\d{,4})?)|(\.\d{,4}))$')) else: - self.valid = QtGui.QRegExpValidator(QRegExp(r'^[+-]?((\d+(\.\d{,3})?)|(\.\d{,3}))$')) + self.valid = QtGui.QRegularExpressionValidator(QRegularExpression(r'^[+-]?((\d+(\.\d{,3})?)|(\.\d{,3}))$')) self.setMinimumSize(600, 420) # load the widgets ui file self.filename = PATH.find_widget_path('basic_probe.ui') @@ -119,7 +119,7 @@ def __init__(self, parent=None): self.cmb_probe_select.addItems(self.probe_list) self.stackedWidget_probe_buttons.setCurrentIndex(0) # define validators for all lineEdit widgets - self.lineEdit_probe_tool.setValidator(QtGui.QRegExpValidator(QRegExp('[0-9]{0,5}'))) + self.lineEdit_probe_tool.setValidator(QtGui.QRegularExpressionValidator(QRegularExpression('[0-9]{0,5}'))) for i in self.parm_list: self['lineEdit_' + i].setValidator(self.valid) @@ -272,7 +272,7 @@ def findBack(self, num): def popEntry(self, obj, next=False): STATUS.emit('focus-overlay-changed', False, None, None) obj.setStyleSheet(self.hilightStyle) - qApp.processEvents() + QApplication.instance().processEvents() mess = {'NAME':self.dialog_code, 'ID':'%s__' % self.objectName(), @@ -493,9 +493,9 @@ def show_results(self, line): # with pre-select option def set_checkableButtons(self, state): if state: - policy = Qt.ClickFocus + policy = Qt.FocusPolicy.ClickFocus else: - policy = Qt.NoFocus + policy = Qt.FocusPolicy.NoFocus self.setFocusPolicy(policy) for i in self.outside_buttonGroup.buttons(): i.setCheckable(state) @@ -548,8 +548,8 @@ class HelpDialog(QtWidgets.QDialog, GeometryMixin): def __init__(self, parent=None): super(HelpDialog, self).__init__(parent) self._title = 'Basic Probe Help' - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint | + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.currentHelpPage=-1 self.setMinimumWidth(600) @@ -598,10 +598,10 @@ def buildWidget(self): self.pageStepDwnbutton.clicked.connect(lambda : self.pageStep(t,True)) bBox = QDialogButtonBox(buttons) - bBox.addButton(self.pageStepUpbutton, QDialogButtonBox.ActionRole) - bBox.addButton(self.pageStepDwnbutton, QDialogButtonBox.ActionRole) - bBox.addButton(previousbutton, QDialogButtonBox.ActionRole) - bBox.addButton(nextbutton, QDialogButtonBox.ActionRole) + bBox.addButton(self.pageStepUpbutton, QDialogButtonBox.ButtonRole.ActionRole) + bBox.addButton(self.pageStepDwnbutton, QDialogButtonBox.ButtonRole.ActionRole) + bBox.addButton(previousbutton, QDialogButtonBox.ButtonRole.ActionRole) + bBox.addButton(nextbutton, QDialogButtonBox.ButtonRole.ActionRole) bBox.addButton(closebutton, QDialogButtonBox.DestructiveRole) bBox.rejected.connect(self.reject) @@ -663,7 +663,7 @@ def close(self): def showDialog(self): self.setWindowTitle(self._title); self.set_geometry() - retval = self.exec_() + retval = self.exec() LOG.debug('Value of pressed button: {}'.format(retval)) # look for a custom version of basicProbe @@ -679,11 +679,11 @@ def __init__(self, parent=None): # Testing # ############################# if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * app = QtWidgets.QApplication(sys.argv) w = BasicProbe() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/calculator.py b/lib/python/qtvcp/widgets/calculator.py index 864a5e79e35..c5ab32490aa 100644 --- a/lib/python/qtvcp/widgets/calculator.py +++ b/lib/python/qtvcp/widgets/calculator.py @@ -2,13 +2,13 @@ import math import sys -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import (QApplication, QGridLayout, QLayout, QLineEdit, +from PyQt6.QtCore import Qt +from PyQt6.QtWidgets import (QApplication, QGridLayout, QLayout, QLineEdit, QSizePolicy, QPushButton, QDialog, QDialogButtonBox, QMenu, QAction, QVBoxLayout, QToolButton, QLabel) -from PyQt5.QtGui import QDoubleValidator -from PyQt5.QtGui import QIcon -from PyQt5 import QtCore +from PyQt6.QtGui import QDoubleValidator +from PyQt6.QtGui import QIcon +from PyQt6 import QtCore from qtvcp.core import Status, Info STATUS = Status() INFO = Info() @@ -26,7 +26,7 @@ class CalculatorLineEdit(QLineEdit): def __init__(self, parent=None): super(CalculatorLineEdit, self).__init__(parent) self.setMaxLength(15) - self.setAlignment(Qt.AlignRight) + self.setAlignment(Qt.AlignmentFlag.AlignRight) # set up a validator so the input text can only be a number validator = QDoubleValidator() @@ -38,7 +38,7 @@ def __init__(self, parent=None): def keyPressEvent(self, event): # The digit and decimal keys emit a digitKeyPressed signal - if (event.key() >= Qt.Key_0 and event.key() <= Qt.Key_9) or event.key() == Qt.Key_Period: + if (event.key() >= Qt.Key.Key_0 and event.key() <= Qt.Key.Key_9) or event.key() == Qt.Key.Key_Period: self.digitKeyPressed.emit(str(event.text())) # these keys are absorbed and not sent to QLineEdit but a signal is emitted @@ -47,14 +47,14 @@ def keyPressEvent(self, event): # ALT+Right - move to next field # ALT+Backspace - cancel key_map = { - Qt.Key_Minus: lambda: self.operatorKeyPressed.emit('-'), - Qt.Key_Plus: lambda: self.operatorKeyPressed.emit('+'), - Qt.Key_Asterisk: lambda: self.operatorKeyPressed.emit('*'), - Qt.Key_Slash: lambda: self.operatorKeyPressed.emit('/'), - Qt.Key_Equal: lambda: self.operatorKeyPressed.emit('='), - (Qt.Key_Right, Qt.AltModifier): lambda: self.fieldKeyPressed.emit('next'), - (Qt.Key_Left, Qt.AltModifier): lambda: self.fieldKeyPressed.emit('previous'), - (Qt.Key_Backspace, Qt.AltModifier): self.cancelKeyPressed.emit + Qt.Key.Key_Minus: lambda: self.operatorKeyPressed.emit('-'), + Qt.Key.Key_Plus: lambda: self.operatorKeyPressed.emit('+'), + Qt.Key.Key_Asterisk: lambda: self.operatorKeyPressed.emit('*'), + Qt.Key.Key_Slash: lambda: self.operatorKeyPressed.emit('/'), + Qt.Key.Key_Equal: lambda: self.operatorKeyPressed.emit('='), + (Qt.Key.Key_Right, Qt.AltModifier): lambda: self.fieldKeyPressed.emit('next'), + (Qt.Key.Key_Left, Qt.AltModifier): lambda: self.fieldKeyPressed.emit('previous'), + (Qt.Key.Key_Backspace, Qt.AltModifier): self.cancelKeyPressed.emit } key = event.key() @@ -89,17 +89,17 @@ def __init__(self, parent=None): self.display = CalculatorLineEdit('0') self.display.setMinimumHeight(30) - self.display.setAlignment(Qt.AlignRight) + self.display.setAlignment(Qt.AlignmentFlag.AlignRight) self.display.setMaxLength(15) self.display.textEdited.connect(self.displayTextEdited) self.display.textChanged.connect(self.displayTextChanged) self.pendingLabel = QLabel() - self.pendingLabel.setAlignment(Qt.AlignRight) + self.pendingLabel.setAlignment(Qt.AlignmentFlag.AlignRight) self.memoryLabel = QLabel() - self.memoryLabel.setAlignment(Qt.AlignRight) + self.memoryLabel.setAlignment(Qt.AlignmentFlag.AlignRight) self.updateMemLabel() self.display.digitKeyPressed.connect(self.physDigitPressed) @@ -181,8 +181,8 @@ def __init__(self, parent=None): constValues = ''.join(constValues.split()) for value in constValues.split(',')[:6]: constButton = QPushButton(value) - constButton.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) - constButton.setFocusPolicy(Qt.NoFocus) + constButton.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) + constButton.setFocusPolicy(Qt.FocusPolicy.NoFocus) constButton.clicked.connect(self.constClicked) mainLayout.addWidget(constButton, len(self.constButtons) + 2, 6) self.constButtons.append(constButton) @@ -192,28 +192,28 @@ def __init__(self, parent=None): mainLayout.addWidget(self.memoryLabel, 1, 1, 1, mainLayout.columnCount()-1) self.backButton = QPushButton('Back') - self.backButton.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) - self.backButton.setFocusPolicy(Qt.NoFocus) + self.backButton.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) + self.backButton.setFocusPolicy(Qt.FocusPolicy.NoFocus) self.backButton.clicked.connect(self.backActionWrapper) self.nextButton = QPushButton('Next') - self.nextButton.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) - self.nextButton.setFocusPolicy(Qt.NoFocus) + self.nextButton.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) + self.nextButton.setFocusPolicy(Qt.FocusPolicy.NoFocus) self.nextButton.clicked.connect(self.nextActionWrapper) self.applyNextButton = QPushButton('Apply\nNext') - self.applyNextButton.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) + self.applyNextButton.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) self.applyNextButton.clicked.connect(self.applyActionWrapper) self.applyNextButton.setVisible(False) self.bBox = QDialogButtonBox() cancelButton = self.bBox.addButton(QDialogButtonBox.StandardButton.Cancel) - cancelButton.setFocusPolicy(Qt.NoFocus) + cancelButton.setFocusPolicy(Qt.FocusPolicy.NoFocus) applyButton = self.bBox.addButton(QDialogButtonBox.StandardButton.Apply) - applyButton.setFocusPolicy(Qt.NoFocus) - self.bBox.addButton(self.backButton, QDialogButtonBox.ActionRole) - self.bBox.addButton(self.nextButton, QDialogButtonBox.ActionRole) - self.bBox.addButton(self.applyNextButton, QDialogButtonBox.ActionRole) + applyButton.setFocusPolicy(Qt.FocusPolicy.NoFocus) + self.bBox.addButton(self.backButton, QDialogButtonBox.ButtonRole.ActionRole) + self.bBox.addButton(self.nextButton, QDialogButtonBox.ButtonRole.ActionRole) + self.bBox.addButton(self.applyNextButton, QDialogButtonBox.ButtonRole.ActionRole) self.bBox.rejected.connect(self.reject) self.bBox.accepted.connect(self.accept) @@ -227,7 +227,7 @@ def __init__(self, parent=None): for button in self.bBox.buttons(): if button.text() == 'Cancel' or button.text() == 'Apply': - button.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) + button.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) self.setWindowTitle("Calculator") if not INFO.LINUXCNC_IS_RUNNING: @@ -554,8 +554,8 @@ def addToMemory(self): def createButton(self, text, member, tip=None): button = QPushButton(text) - button.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) - button.setFocusPolicy(Qt.NoFocus) + button.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) + button.setFocusPolicy(Qt.FocusPolicy.NoFocus) button.setMinimumSize(70, 40) button.clicked.connect(member) if tip is not None: @@ -565,7 +565,7 @@ def createButton(self, text, member, tip=None): def createAxisButton(self, text, member): button = QToolButton() button.setText(text) - button.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) + button.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) button.setMinimumSize(70, 40) button.clicked.connect(member) SettingMenu = QMenu() @@ -635,4 +635,4 @@ def applyAction(self): app = QApplication(sys.argv) calc = Calculator() calc.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/camview_widget.py b/lib/python/qtvcp/widgets/camview_widget.py index be452220ba9..524d0ecd80b 100644 --- a/lib/python/qtvcp/widgets/camview_widget.py +++ b/lib/python/qtvcp/widgets/camview_widget.py @@ -20,8 +20,8 @@ import hal -from PyQt5 import QtWidgets, QtCore -from PyQt5.QtGui import QColor, QFont, QPainter, QPen, QImage +from PyQt6 import QtWidgets, QtCore +from PyQt6.QtGui import QColor, QFont, QPainter, QPen, QImage from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp import logger @@ -75,9 +75,9 @@ def __init__(self, parent=None): self.setWindowTitle('Cam View') self.setGeometry(100, 100, 200, 200) self.text_color = QColor(255, 255, 255) - self.circle_color = QtCore.Qt.red - self.cross_color = QtCore.Qt.yellow - self.cross_pointer_color = QtCore.Qt.white + self.circle_color = QtCore.Qt.GlobalColor.red + self.cross_color = QtCore.Qt.GlobalColor.yellow + self.cross_pointer_color = QtCore.Qt.GlobalColor.white self.font = QFont("arial,helvetica", 40) self.SUB = str.maketrans("0123456789", "₀₁₂₃₄₅₆₇₈₉") if LIB_GOOD: @@ -111,43 +111,43 @@ def _hal_init(self): ################################## def wheelEvent(self, event): super(CamView, self).wheelEvent(event) - mouse_state = QtWidgets.qApp.mouseButtons() + mouse_state = QtWidgets.QApplication.instance().mouseButtons() if event.angleDelta().y() < 0: - if mouse_state == QtCore.Qt.NoButton: + if mouse_state == QtCore.Qt.MouseButton.NoButton: self.diameter -= self.rotationIncrement - if mouse_state == QtCore.Qt.LeftButton: + if mouse_state == QtCore.Qt.MouseButton.LeftButton: self.scale -= .1 - if mouse_state == QtCore.Qt.RightButton: + if mouse_state == QtCore.Qt.MouseButton.RightButton: if not self._noRotate: self.rotation += self.rotationIncrement else: - if mouse_state == QtCore.Qt.NoButton: + if mouse_state == QtCore.Qt.MouseButton.NoButton: self.diameter += self.rotationIncrement - if mouse_state == QtCore.Qt.LeftButton: + if mouse_state == QtCore.Qt.MouseButton.LeftButton: self.scale += .1 - if mouse_state == QtCore.Qt.RightButton: + if mouse_state == QtCore.Qt.MouseButton.RightButton: if not self._noRotate: self.rotation -= self.rotationIncrement self.limitChecks() def mousePressEvent(self, event): - if event.button() & QtCore.Qt.LeftButton: + if event.button() & QtCore.Qt.MouseButton.LeftButton: if not self._noRotate: self.rotation += self.rotationIncrement self.limitChecks() - elif event.button() & QtCore.Qt.RightButton: + elif event.button() & QtCore.Qt.MouseButton.RightButton: if not self._noRotate: self.rotation -= self.rotationIncrement self.limitChecks() - elif event.button() & QtCore.Qt.MiddleButton: + elif event.button() & QtCore.Qt.MouseButton.MiddleButton: self.rotation_increments_changed() def mouseDoubleClickEvent(self, event): - if event.button() & QtCore.Qt.LeftButton: + if event.button() & QtCore.Qt.MouseButton.LeftButton: self.scale = 1 - elif event.button() & QtCore.Qt.RightButton: + elif event.button() & QtCore.Qt.MouseButton.RightButton: self.rotation = 0 - elif event.button() & QtCore.Qt.MiddleButton: + elif event.button() & QtCore.Qt.MouseButton.MiddleButton: self.diameter = 20 def zoom_in(self): @@ -349,7 +349,7 @@ def resizeEvent(self, event): # Create a square base size of 10x10 and scale it to the new size # maintaining aspect ratio. new_size = QtCore.QSize(10, 10) - new_size.scale(event.size(), QtCore.Qt.KeepAspectRatio) + new_size.scale(event.size(), QtCore.Qt.AspectRatioMode.KeepAspectRatio) self.resize(new_size) def paintEvent(self, event): @@ -373,10 +373,10 @@ def drawText(self, event, qp): else: inc = str(self.rotationIncrement).translate(self.SUB) if self.pix: - qp.drawText(self.rect(), QtCore.Qt.AlignTop, '{:.1f}{} {:>}'.format(self.rotation,self.degree, + qp.drawText(self.rect(), QtCore.Qt.AlignmentFlag.AlignTop, '{:.1f}{} {:>}'.format(self.rotation,self.degree, inc)) else: - qp.drawText(self.rect(), QtCore.Qt.AlignCenter, self.text) + qp.drawText(self.rect(), QtCore.Qt.AlignmentFlag.AlignCenter, self.text) def drawCircle(self, event, gp): size = self.size() @@ -393,8 +393,8 @@ def drawCrossHair(self, event, gp): size = self.size() w = size.width()//2 h = size.height()//2 - pen0 = QPen(self.cross_pointer_color, 1, QtCore.Qt.SolidLine) - pen = QPen(self.cross_color, 1, QtCore.Qt.SolidLine) + pen0 = QPen(self.cross_pointer_color, 1, QtCore.Qt.PenStyle.SolidLine) + pen = QPen(self.cross_color, 1, QtCore.Qt.PenStyle.SolidLine) gp.translate(w, h) gp.rotate(-self.rotation) gp.setPen(pen0) @@ -664,25 +664,25 @@ def __init__(self, parent=None): super(CamAngle, self).__init__(parent) def mouseDoubleClickEvent(self, event): - if event.button() & QtCore.Qt.LeftButton: + if event.button() & QtCore.Qt.MouseButton.LeftButton: # zoom self.scale = 1 - elif event.button() & QtCore.Qt.MiddleButton: + elif event.button() & QtCore.Qt.MouseButton.MiddleButton: self.diameter = 40 def wheelEvent(self, event): - mouse_state = QtWidgets.qApp.mouseButtons() + mouse_state = QtWidgets.QApplication.instance().mouseButtons() size = self.size() w = size.width() if event.angleDelta().y() < 0: - if mouse_state == QtCore.Qt.NoButton: + if mouse_state == QtCore.Qt.MouseButton.NoButton: self.diameter -= 2 - if mouse_state == QtCore.Qt.LeftButton: + if mouse_state == QtCore.Qt.MouseButton.LeftButton: self.scale -= .1 else: - if mouse_state == QtCore.Qt.NoButton: + if mouse_state == QtCore.Qt.MouseButton.NoButton: self.diameter += 2 - if mouse_state == QtCore.Qt.LeftButton: + if mouse_state == QtCore.Qt.MouseButton.LeftButton: self.scale += .1 if self.diameter < 2: self.diameter = 2 if self.diameter > w: self.diameter = w @@ -697,17 +697,17 @@ def drawText(self, event, qp): qp.setFont(self.font) if self.pix: angle = 0.0 if self.rotation == 0 else 360 - self.rotation - qp.drawText(self.rect(), QtCore.Qt.AlignTop, '{:0.3f}{}'.format(angle, self.degree)) + qp.drawText(self.rect(), QtCore.Qt.AlignmentFlag.AlignTop, '{:0.3f}{}'.format(angle, self.degree)) else: - qp.drawText(self.rect(), QtCore.Qt.AlignCenter, self.text) + qp.drawText(self.rect(), QtCore.Qt.AlignmentFlag.AlignCenter, self.text) if __name__ == '__main__': import sys - from PyQt5.QtWidgets import (QLabel, QSlider, QDial,QWidget, QVBoxLayout, + from PyQt6.QtWidgets import (QLabel, QSlider, QDial,QWidget, QVBoxLayout, QHBoxLayout) - from PyQt5.QtCore import (Qt) + from PyQt6.QtCore import (Qt) def hDialMoved(): print("Dial value = %i" % (hdial.value())) @@ -730,7 +730,7 @@ def setScale(): capture = CamAngle() - slider = QSlider(Qt.Horizontal) + slider = QSlider(Qt.Orientation.Horizontal) slider.setMinimum(100) slider.setMaximum(400) slider.setSingleStep(10) @@ -765,4 +765,4 @@ def jump(): timer.start(100) w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/container_widgets.py b/lib/python/qtvcp/widgets/container_widgets.py index 909f92af081..9660ed2519d 100644 --- a/lib/python/qtvcp/widgets/container_widgets.py +++ b/lib/python/qtvcp/widgets/container_widgets.py @@ -17,8 +17,8 @@ import os import linuxcnc -from PyQt5.QtWidgets import QWidget -from PyQt5.QtCore import pyqtProperty +from PyQt6.QtWidgets import QWidget +from PyQt6.QtCore import pyqtProperty from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Info diff --git a/lib/python/qtvcp/widgets/detach_tabs.py b/lib/python/qtvcp/widgets/detach_tabs.py index c252b38f181..b715ffbd31e 100644 --- a/lib/python/qtvcp/widgets/detach_tabs.py +++ b/lib/python/qtvcp/widgets/detach_tabs.py @@ -1,6 +1,6 @@ -from PyQt5.QtGui import * -from PyQt5.QtCore import * -from PyQt5.QtWidgets import * +from PyQt6.QtGui import * +from PyQt6.QtCore import * +from PyQt6.QtWidgets import * class DetachTabWidget(QTabWidget): def __init__(self, parent=None): @@ -141,7 +141,7 @@ def __init__(self, contentWidget, parent=None): self.contentWidget = contentWidget layout.addWidget(self.contentWidget) self.contentWidget.show() - self.setWindowFlags(Qt.Window) + self.setWindowFlags(Qt.WindowType.Window) ## @@ -180,7 +180,7 @@ def __init__(self, parent=None): QTabBar.__init__(self, parent) self.setAcceptDrops(True) - self.setElideMode(Qt.ElideRight) + self.setElideMode(Qt.TextElideMode.ElideRight) self.setSelectionBehaviorOnRemove(QTabBar.SelectLeftTab) self.dragStartPos = QPoint() @@ -203,7 +203,7 @@ def mouseDoubleClickEvent(self, event): # # @param event a mouse press event def mousePressEvent(self, event): - if event.button() == Qt.LeftButton: + if event.button() == Qt.MouseButton.LeftButton: self.dragStartPos = event.pos() self.dragDropedPos.setX(0) @@ -227,10 +227,10 @@ def mouseMoveEvent(self, event): self.dragInitiated = True # If the current movement is a drag initiated by the left button - if (((event.buttons() & Qt.LeftButton)) and self.dragInitiated): + if (((event.buttons() & Qt.MouseButton.LeftButton)) and self.dragInitiated): # Stop the move event - finishMoveEvent = QMouseEvent(QEvent.MouseMove, event.pos(), Qt.NoButton, Qt.NoButton, Qt.NoModifier) + finishMoveEvent = QMouseEvent(QEvent.MouseMove, event.pos(), Qt.MouseButton.NoButton, Qt.MouseButton.NoButton, Qt.NoModifier) QTabBar.mouseMoveEvent(self, finishMoveEvent) # Convert the move event into a drag @@ -242,7 +242,7 @@ def mouseMoveEvent(self, event): #Create the appearance of dragging the tab content pixmap = self.parentWidget().grab() targetPixmap = QPixmap(pixmap.size()) - targetPixmap.fill(Qt.transparent) + targetPixmap.fill(Qt.GlobalColor.transparent) painter = QPainter(targetPixmap) painter.setOpacity(0.85) painter.drawPixmap(0, 0, pixmap) @@ -250,16 +250,16 @@ def mouseMoveEvent(self, event): drag.setPixmap(targetPixmap) # Initiate the drag - dropAction = drag.exec_(Qt.MoveAction | Qt.CopyAction) + dropAction = drag.exec_(Qt.DropAction.MoveAction | Qt.DropAction.CopyAction) # If the drag completed outside of the tab bar, detach the tab and move # the content to the current cursor position - if dropAction == Qt.IgnoreAction: + if dropAction == Qt.DropAction.IgnoreAction: event.accept() self.onDetachTabSignal.emit(self.tabAt(self.dragStartPos), self.mouseCursor.pos()) # Else if the drag completed inside the tab bar, move the selected tab to the new position - elif dropAction == Qt.MoveAction: + elif dropAction == Qt.DropAction.MoveAction: if not self.dragDropedPos.isNull(): event.accept() self.onMoveTabSignal.emit(self.tabAt(self.dragStartPos), self.tabAt(self.dragDropedPos)) @@ -308,7 +308,7 @@ def __init__(self, parent=None): LineEdit.setFixedWidth(180) vbox.addWidget(Label) vbox.addWidget(LineEdit) - vbox.setAlignment(Qt.AlignTop) + vbox.setAlignment(Qt.AlignmentFlag.AlignTop) self.tab_1.setLayout(vbox) #tab 2 @@ -321,7 +321,7 @@ def __init__(self, parent=None): LineEdit.setFixedWidth(180) vbox.addWidget(Label) vbox.addWidget(LineEdit) - vbox.setAlignment(Qt.AlignTop) + vbox.setAlignment(Qt.AlignmentFlag.AlignTop) self.tab_2.setLayout(vbox) if __name__ == '__main__': diff --git a/lib/python/qtvcp/widgets/dialogMixin.py b/lib/python/qtvcp/widgets/dialogMixin.py index 5ed3a4ce996..ad21133f0cb 100644 --- a/lib/python/qtvcp/widgets/dialogMixin.py +++ b/lib/python/qtvcp/widgets/dialogMixin.py @@ -1,4 +1,4 @@ -from PyQt5.QtWidgets import (QDesktopWidget, QMessageBox) +from PyQt6.QtWidgets import (QMessageBox, QApplication) from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp import logger @@ -29,7 +29,7 @@ def get_default_geometry(self): def set_default_geometry(self): geom = self.frameGeometry() - geom.moveCenter(QDesktopWidget().availableGeometry().center()) + geom.moveCenter(QApplication.primaryScreen().availableGeometry().center()) self.setGeometry(geom) x = self.geometry().x() y = self.geometry().y() @@ -71,7 +71,7 @@ def set_geometry(self): # add 'always' or the user can reset the dialog elif 'center' in self._geometry_string.lower(): geom = self.frameGeometry() - geom.moveCenter(QDesktopWidget().availableGeometry().center()) + geom.moveCenter(QApplication.primaryScreen().availableGeometry().center()) self.setGeometry(geom) if not 'always' in self._geometry_string.lower(): self._geometry_string = self.get_current_geometry() @@ -80,9 +80,9 @@ def set_geometry(self): # add 'always' or the user can reset the dialog elif 'bottomleft' in self._geometry_string.lower(): # move to bottom left of parent - ph = QDesktopWidget().geometry().height() - px = QDesktopWidget().geometry().x() - py = QDesktopWidget().geometry().y() + ph = QApplication.primaryScreen().geometry().height() + px = QApplication.primaryScreen().geometry().x() + py = QApplication.primaryScreen().geometry().y() dw = self.geometry().width() dh = self.geometry().height() self.setGeometry(px, py+ph-dh, dw, dh) diff --git a/lib/python/qtvcp/widgets/dialog_widget.py b/lib/python/qtvcp/widgets/dialog_widget.py index 5a43370ffab..4227e3cc2f7 100644 --- a/lib/python/qtvcp/widgets/dialog_widget.py +++ b/lib/python/qtvcp/widgets/dialog_widget.py @@ -18,13 +18,13 @@ import os import hal -from PyQt5.QtWidgets import (QMessageBox, QFileDialog, QDesktopWidget, +from PyQt6.QtWidgets import (QMessageBox, QFileDialog, QDialog, QDialogButtonBox, QVBoxLayout, QPushButton, QHBoxLayout, QHBoxLayout, QLineEdit, QPushButton, QDialogButtonBox, QTabWidget, QTextEdit,QLabel) -from PyQt5.QtGui import QColor -from PyQt5.QtCore import Qt, pyqtSlot, pyqtProperty, QEvent, QUrl -from PyQt5 import uic +from PyQt6.QtGui import QColor +from PyQt6.QtCore import Qt, pyqtSlot, pyqtProperty, QEvent, QUrl +from PyQt6 import uic from qtvcp.widgets.widget_baseclass import _HalWidgetBase, hal from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET @@ -80,10 +80,10 @@ class LcncDialog(QMessageBox, GeometryMixin): def __init__(self, parent=None): super(LcncDialog, self).__init__(parent) - self.setTextFormat(Qt.RichText) + self.setTextFormat(Qt.TextFormat.RichText) self.setText('Sample Text?') - self.setStandardButtons(QMessageBox.Yes | QMessageBox.No) - self.setIcon(QMessageBox.Critical) + self.setStandardButtons(QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No) + self.setIcon(QMessageBox.Icon.Critical) self.setDetailedText('') self.mtype = 'OK' self._possibleTypes = ('OK','YESNO','OKCANCEL','CLOSEPROMPT','NONE') @@ -151,7 +151,7 @@ def _external_request(self, w, message): # - callback return (return_callback = function_name) # - by direct return statement (use_exec = True) def showdialog(self, messagetext, more_info=None, details=None, display_type='OK', - icon=QMessageBox.Information, pinname=None, focus_text=None, + icon=QMessageBox.Icon.Information, pinname=None, focus_text=None, focus_color=None, play_alert=None, nblock=False, return_callback = None, flags = None, setflags = None, title = None, use_exec = False,geoname=None, @@ -171,17 +171,17 @@ def showdialog(self, messagetext, more_info=None, details=None, display_type='OK # set standard flags or allow external selection if flags is None: if nblock: - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) if display_type == LcncDialog.NONE: - self.setWindowFlags(self.windowFlags() | Qt.CustomizeWindowHint) - self.setWindowFlag(Qt.WindowCloseButtonHint, False) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.CustomizeWindowHint) + self.setWindowFlag(Qt.WindowType.WindowCloseButtonHint, False) else: - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.FramelessWindowHint | Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.FramelessWindowHint | Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) else: self.setWindowFlags(self.windowFlags() | flags) @@ -198,10 +198,10 @@ def showdialog(self, messagetext, more_info=None, details=None, display_type='OK color = self._color # convert text descriptions to actual icons - if icon == 'QUESTION': icon = QMessageBox.Question - elif icon == 'WARNING': icon = QMessageBox.Warning - elif icon == 'CRITICAL': icon = QMessageBox.Critical - elif icon == 'INFO' or isinstance(icon,str): icon = QMessageBox.Information + if icon == 'QUESTION': icon = QMessageBox.Icon.Question + elif icon == 'WARNING': icon = QMessageBox.Icon.Warning + elif icon == 'CRITICAL': icon = QMessageBox.Icon.Critical + elif icon == 'INFO' or isinstance(icon,str): icon = QMessageBox.Icon.Information self.setIcon(icon) self.setText('%s' % messagetext) @@ -221,11 +221,11 @@ def showdialog(self, messagetext, more_info=None, details=None, display_type='OK if display_type not in self._possibleTypes: display_type = LcncDialog.OK if display_type == LcncDialog.OK: - self.setStandardButtons(QMessageBox.Ok) + self.setStandardButtons(QMessageBox.StandardButton.Ok) elif display_type == LcncDialog.YESNO: - self.setStandardButtons(QMessageBox.Yes | QMessageBox.No) + self.setStandardButtons(QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No) elif display_type == LcncDialog.OKCANCEL: - self.setStandardButtons(QMessageBox.Ok | QMessageBox.Cancel) + self.setStandardButtons(QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Cancel) elif display_type == LcncDialog.NONE: self.setStandardButtons(QMessageBox.NoButton) @@ -244,7 +244,7 @@ def showdialog(self, messagetext, more_info=None, details=None, display_type='OK self.forceDetailsOpen() if use_exec: - retval = self.exec_() + retval = self.exec() STATUS.emit('focus-overlay-changed', False, None, None) LOG.debug('Value of pressed button: {}'.format(retval)) return self.qualifiedReturn(retval) @@ -267,9 +267,9 @@ def forceDetailsOpen(self): self._forcedFlag = True def qualifiedReturn(self, retval): - if retval in(QMessageBox.No, QMessageBox.Cancel): + if retval in(QMessageBox.StandardButton.No, QMessageBox.StandardButton.Cancel): return False - elif retval in(QMessageBox.Ok, QMessageBox.Yes): + elif retval in(QMessageBox.StandardButton.Ok, QMessageBox.StandardButton.Yes): return True else: return self.buttonRole(self.clickedButton()) @@ -283,7 +283,7 @@ def showEvent(self, event): self.set_geometry() else: geom = self.frameGeometry() - geom.moveCenter(QDesktopWidget().availableGeometry().center()) + geom.moveCenter(QApplication.primaryScreen().availableGeometry().center()) self.setGeometry(geom) super(LcncDialog, self).showEvent(event) @@ -400,8 +400,8 @@ def __init__(self, parent=None): super(ToolDialog, self).__init__(parent) self.setText('Manual Tool Change Request') self.setInformativeText('Please Insert Tool 0') - self.setStandardButtons(QMessageBox.Ok) - self.setDefaultButton(QMessageBox.Ok) + self.setStandardButtons(QMessageBox.StandardButton.Ok) + self.setDefaultButton(QMessageBox.StandardButton.Ok) self._useDesktopNotify = False self._frameless = False self._curLine = 0 @@ -525,22 +525,22 @@ def showdialog(self, message, more_info=None, details=None, self.setWindowModality(Qt.ApplicationModal) if frameless: - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.FramelessWindowHint | Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.FramelessWindowHint | Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) else: - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) - self.setWindowFlags(self.windowFlags() | Qt.CustomizeWindowHint) - self.setWindowFlag(Qt.WindowCloseButtonHint, False) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.CustomizeWindowHint) + self.setWindowFlag(Qt.WindowType.WindowCloseButtonHint, False) self.setWindowTitle(self._title) - self.setIcon(QMessageBox.Critical) + self.setIcon(QMessageBox.Icon.Critical) self.setText('%s' % message) self.setInformativeText(more_info) self.setDetailedText(details) - self.setStandardButtons(QMessageBox.Ok) + self.setStandardButtons(QMessageBox.StandardButton.Ok) self.buttonClicked.connect(self.msgbtn) # force the details box open on first time display if self._flag and details != ' Tool Info: ': @@ -563,7 +563,7 @@ def msgbtn(self, i): LOG.debug('Button pressed is: {}'.format(i.text())) if self.clickedButton() == self._actionbutton: self._processChange(-1) - elif self.standardButton(self.clickedButton()) == QMessageBox.Ok: + elif self.standardButton(self.clickedButton()) == QMessageBox.StandardButton.Ok: self._processChange(True) else: self._processChange(False) @@ -605,12 +605,12 @@ def __init__(self, parent=None): self._save_request_name = 'SAVE' self._color = QColor(0, 0, 0, 150) options = QFileDialog.Options() - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog self.setOptions(options) self.setWindowModality(Qt.ApplicationModal) - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.INI_exts = INFO.get_qt_filter_extensions() self.setNameFilter(self.INI_exts) @@ -664,8 +664,8 @@ def showdialog(self): def load_dialog(self, extensions = None, preselect = None, directory = None, return_path=False): #print(extensions,preselect,os.path.expanduser(directory)) - self.setFileMode(QFileDialog.ExistingFile) - self.setAcceptMode(QFileDialog.AcceptOpen) + self.setFileMode(QFileDialog.FileMode.ExistingFile) + self.setAcceptMode(QFileDialog.AcceptMode.AcceptOpen) if extensions: self.setNameFilter(extensions) @@ -686,7 +686,7 @@ def load_dialog(self, extensions = None, preselect = None, directory = None, ret STATUS.emit('play-sound', self.sound_type) self.set_geometry() fname = None - if (self.exec_()): + if (self.exec()): fname = self.selectedFiles()[0] path = self.directory().absolutePath() self.setDirectory(path) @@ -704,8 +704,8 @@ def load_dialog(self, extensions = None, preselect = None, directory = None, ret def save_dialog(self, extensions = None, preselect = None, directory = None): - self.setFileMode(QFileDialog.AnyFile) - self.setAcceptMode(QFileDialog.AcceptSave) + self.setFileMode(QFileDialog.FileMode.AnyFile) + self.setAcceptMode(QFileDialog.AcceptMode.AcceptSave) self.setDefaultSuffix('ngc') if extensions: @@ -727,7 +727,7 @@ def save_dialog(self, extensions = None, preselect = None, directory = None): STATUS.emit('play-sound', self.sound_type) self.set_geometry() fname = None - if (self.exec_()): + if (self.exec()): fname = self.selectedFiles()[0] path = self.directory().absolutePath() self.setDirectory(path) @@ -795,9 +795,9 @@ def __init__(self, parent=None): self._request_name = 'ORIGINOFFSET' self.setWindowModality(Qt.ApplicationModal) - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.setMinimumSize(200, 200) buttonBox = QDialogButtonBox() buttonBox.setEnabled(False) @@ -855,7 +855,7 @@ def load_dialog(self): STATUS.emit('focus-overlay-changed', True, 'Set Origin Offsets', self._color) self.set_geometry() self.show() - self.exec_() + self.exec() STATUS.emit('focus-overlay-changed', False, None, None) self.record_geometry() @@ -915,9 +915,9 @@ def __init__(self, parent=None): self._request_name = 'TOOLOFFSET' self.setWindowModality(Qt.ApplicationModal) - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.setMinimumSize(200, 200) self._o = TOOLVIEW_WIDGET() @@ -989,7 +989,7 @@ def load_dialog(self): STATUS.emit('focus-overlay-changed', True, 'Set Tool Offsets', self._color) self.set_geometry() self.show() - self.exec_() + self.exec() STATUS.emit('focus-overlay-changed', False, None, None) self.record_geometry() @@ -1048,9 +1048,9 @@ def __init__(self, parent=None): self._title = 'Choose Tool' self.setWindowModality(Qt.ApplicationModal) - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.setMinimumSize(200, 200) self._o = TOOLCHOOSER_WIDGET() @@ -1072,8 +1072,8 @@ def __init__(self, parent=None): v.addWidget(self._o) self.bBox = QDialogButtonBox() - self.bBox.addButton('Apply', QDialogButtonBox.AcceptRole) - self.bBox.addButton('Cancel', QDialogButtonBox.RejectRole) + self.bBox.addButton('Apply', QDialogButtonBox.ButtonRole.AcceptRole) + self.bBox.addButton('Cancel', QDialogButtonBox.ButtonRole.RejectRole) self.bBox.rejected.connect(self.reject) self.bBox.accepted.connect(self.accept) @@ -1123,22 +1123,22 @@ def showdialog(self, message, more_info=None, details=None, self.setWindowModality(Qt.ApplicationModal) if frameless: - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.FramelessWindowHint | Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.FramelessWindowHint | Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) else: - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) - self.setWindowFlags(self.windowFlags() | Qt.CustomizeWindowHint) - self.setWindowFlag(Qt.WindowCloseButtonHint, False) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.CustomizeWindowHint) + self.setWindowFlag(Qt.WindowType.WindowCloseButtonHint, False) self.setWindowTitle(self._title) STATUS.emit('focus-overlay-changed', True, 'Tool Chooser', self._color) self.set_geometry() self.show() - self.exec_() + self.exec() STATUS.emit('focus-overlay-changed', False, None, None) self.record_geometry() @@ -1193,9 +1193,9 @@ def __init__(self, parent=None): self._request_name = 'CAMVIEW' self.setWindowModality(Qt.ApplicationModal) - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.setMinimumSize(200, 200) h = QHBoxLayout() h.addStretch(1) @@ -1220,15 +1220,15 @@ def _external_request(self, w, message): nblock = message.get('NONBLOCKING') if nblock: self.setWindowModality(Qt.NonModal) - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.load_dialog_nonblocking() else: self.setWindowModality(Qt.ApplicationModal) - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.FramelessWindowHint | Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.FramelessWindowHint | Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.load_dialog() def close(self): @@ -1243,7 +1243,7 @@ def load_dialog(self): STATUS.emit('focus-overlay-changed', True, 'Cam View Dialog', self._color) self.set_geometry() self.show() - self.exec_() + self.exec() STATUS.emit('focus-overlay-changed', False, None, None) # ********************** @@ -1292,9 +1292,9 @@ def __init__(self, parent=None): self._state = False self._request_name = 'MACROTAB' self.setWindowModality(Qt.ApplicationModal) - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.setMinimumSize(00, 200) self.resize(600, 400) # patch class to call our button methods rather then the @@ -1345,7 +1345,7 @@ def load_dialog(self): self.tab.stack.setCurrentIndex(0) self.set_geometry() self.show() - self.exec_() + self.exec() STATUS.emit('focus-overlay-changed', False, None, None) self.record_geometry() @@ -1393,12 +1393,12 @@ def __init__(self, parent=None): self._state = False self._request_name = 'VERSAPROBE' self.setWindowModality(Qt.ApplicationModal) - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | - Qt.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | + Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.setMinimumSize(200, 200) - buttonBox = QDialogButtonBox(QDialogButtonBox.Ok) - b = buttonBox.button(QDialogButtonBox.Ok) + buttonBox = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok) + b = buttonBox.button(QDialogButtonBox.StandardButton.Ok) b.clicked.connect(lambda: self.close()) l = QVBoxLayout() self._o = VersaProbe() @@ -1427,7 +1427,7 @@ def load_dialog(self): STATUS.emit('focus-overlay-changed', True, 'VersaProbe Dialog', self._color) self.set_geometry() self.show() - self.exec_() + self.exec() STATUS.emit('focus-overlay-changed', False, None, None) self.record_geometry() @@ -1475,8 +1475,8 @@ def __init__(self, parent=None): self.play_sound = False self._request_name = 'ENTRY' self._title = 'Numerical Entry' - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint | + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self._softKey = SoftInputWidget(self, 'numeric') @@ -1493,8 +1493,8 @@ def __init__(self, parent=None): gl.addWidget(self.Num) self.bBox = QDialogButtonBox() - self.bBox.addButton('Apply', QDialogButtonBox.AcceptRole) - self.bBox.addButton('Cancel', QDialogButtonBox.RejectRole) + self.bBox.addButton('Apply', QDialogButtonBox.ButtonRole.AcceptRole) + self.bBox.addButton('Cancel', QDialogButtonBox.ButtonRole.RejectRole) self.bBox.rejected.connect(self.reject) self.bBox.accepted.connect(self.accept) @@ -1551,7 +1551,7 @@ def showdialog(self, preload=None,overlay=True): flag = False while flag == False: self.Num.setFocus() - retval = self.exec_() + retval = self.exec() if retval: try: answer = float(self.Num.text()) @@ -1618,8 +1618,8 @@ def __init__(self, parent=None): self.play_sound = False self._request_name = 'KEYBOARD' self._title = 'Keyboard Entry' - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint | + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.keybrd = VirtualKeyboard() self.edit = QLineEdit() @@ -1629,8 +1629,8 @@ def __init__(self, parent=None): gl.addWidget(self.keybrd) self.bBox = QDialogButtonBox() - self.bBox.addButton('Apply', QDialogButtonBox.AcceptRole) - self.bBox.addButton('Cancel', QDialogButtonBox.RejectRole) + self.bBox.addButton('Apply', QDialogButtonBox.ButtonRole.AcceptRole) + self.bBox.addButton('Cancel', QDialogButtonBox.ButtonRole.RejectRole) self.bBox.rejected.connect(self.reject) self.bBox.accepted.connect(self.accept) @@ -1680,7 +1680,7 @@ def showdialog(self, preload=None, overlay=True): self.edit.setFocus() self.edit.setText(str(preload)) self.edit.deselect() - retval = self.exec_() + retval = self.exec() answer = self.edit.text() if retval: STATUS.emit('update-machine-log', 'keyboard Entry {}'.format(answer), 'TIME,DEBUG') @@ -1735,8 +1735,8 @@ def __init__(self, parent=None): self._nblock = False self._message = None self._overlay = None - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint | + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) def _hal_init(self): @@ -1822,7 +1822,7 @@ def showdialog(self, preload=None, overlay=True, cycle=False): else: if overlay: STATUS.emit('focus-overlay-changed', True, '', self._color) - retval = self.exec_() + retval = self.exec() if overlay: STATUS.emit('focus-overlay-changed', False, None, None) @@ -1912,8 +1912,8 @@ def __init__(self, parent=None): self.play_sound = False self._request_name = 'MACHINELOG' self._title = 'Machine Log' - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint | + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) @@ -1948,7 +1948,7 @@ def buildWidget(self): # build dialog buttons self.bBox = QDialogButtonBox() - self.bBox.addButton('Ok', QDialogButtonBox.AcceptRole) + self.bBox.addButton('Ok', QDialogButtonBox.ButtonRole.AcceptRole) self.bBox.accepted.connect(self.accept) # add buttons to layout l.addWidget(self.bBox) @@ -1981,7 +1981,7 @@ def showdialog(self, nonblock=None): STATUS.emit('play-sound', self.sound_type) self.set_geometry() if nonblock is not None: - self.exec_() + self.exec() STATUS.emit('focus-overlay-changed', False, None, None) self.record_geometry() return False @@ -2032,8 +2032,8 @@ def __init__(self, parent=None): self.play_sound = False self._request_name = 'RUNFROMLINE' self._title = 'Run from line preset Dialog' - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint | + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.buttonBox.clicked.connect(self.Clicked) @@ -2087,7 +2087,7 @@ def showdialog(self, line = 1, message=None, nonblock=None): STATUS.emit('play-sound', self.sound_type) self.set_geometry() if not nonblock: - self.exec_() + self.exec() STATUS.emit('focus-overlay-changed', False, None, None) self.record_geometry() return False @@ -2128,8 +2128,8 @@ def __init__(self, parent=None): self.play_sound = False self.text = QTextEdit('This is an ABOUT dialog') self.text.setReadOnly(True) - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint | + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) def _hal_init(self): @@ -2145,7 +2145,7 @@ def buildWidget(self): l.addWidget(self.text) # build dialog buttons self.bBox = QDialogButtonBox() - self.bBox.addButton('Ok', QDialogButtonBox.AcceptRole) + self.bBox.addButton('Ok', QDialogButtonBox.ButtonRole.AcceptRole) self.bBox.accepted.connect(self.accept) # add buttons to layout l.addWidget(self.bBox) @@ -2181,7 +2181,7 @@ def showdialog(self, nonblock=None): STATUS.emit('play-sound', self.sound_type) self.set_geometry() if nonblock is not None: - self.exec_() + self.exec() STATUS.emit('focus-overlay-changed', False, None, None) self.record_geometry() return False @@ -2215,7 +2215,7 @@ def resetIdName(self): ################################ def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) #widget = AboutDialog() diff --git a/lib/python/qtvcp/widgets/dro_widget.py b/lib/python/qtvcp/widgets/dro_widget.py index 66aa2ab64db..5469924a576 100644 --- a/lib/python/qtvcp/widgets/dro_widget.py +++ b/lib/python/qtvcp/widgets/dro_widget.py @@ -16,9 +16,9 @@ import linuxcnc -from PyQt5 import QtCore -from PyQt5.QtWidgets import QMenu, QAction -from PyQt5.QtGui import QIcon +from PyQt6 import QtCore +from PyQt6.QtWidgets import QMenu, QAction +from PyQt6.QtGui import QIcon from qtvcp.widgets.simple_widgets import ScaledLabel from qtvcp.widgets.widget_baseclass import _HalWidgetBase @@ -502,11 +502,11 @@ def __setitem__(self, item, value): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = DROLabel() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/entry_widget.py b/lib/python/qtvcp/widgets/entry_widget.py index 692d0ffeabd..b7878b9615d 100644 --- a/lib/python/qtvcp/widgets/entry_widget.py +++ b/lib/python/qtvcp/widgets/entry_widget.py @@ -18,7 +18,7 @@ # This widget pops up an onscreen keyboard for entries # Used in the Macro and MDI line widget -from PyQt5 import QtWidgets, QtCore, QtGui +from PyQt6 import QtWidgets, QtCore, QtGui #from decimal import Decimal # applicationle widgets @@ -29,7 +29,7 @@ class MyFlatPushButton(QtWidgets.QPushButton): def __init__(self, caption, min_size=(50, 50)): self.MIN_SIZE = min_size super(MyFlatPushButton, self).__init__(caption) - self.setFocusPolicy(QtCore.Qt.NoFocus) + self.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) def sizeHint(self): return QtCore.QSize(self.MIN_SIZE[0], self.MIN_SIZE[1]) @@ -38,21 +38,21 @@ class SoftInputWidget(QtWidgets.QDialog): def __init__(self, parent=None, keyboard_type='default'): super(SoftInputWidget, self).__init__(parent) self.setWindowModality(QtCore.Qt.ApplicationModal) - self.setWindowFlags(self.windowFlags() | QtCore.Qt.FramelessWindowHint | - QtCore.Qt.WindowStaysOnTopHint) + self.setWindowFlags(self.windowFlags() | QtCore.Qt.WindowType.FramelessWindowHint | + QtCore.Qt.WindowType.WindowStaysOnTopHint) self.INPUT_WIDGET = None self.PARENT_OBJECT = parent self.signalMapper = QtCore.QSignalMapper(self) self.NO_ORD_KEY_LIST = list() - self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key_Left) - self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key_Up) - self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key_Right) - self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key_Down) - self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key_Backspace) - self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key_Enter) - self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key_Tab) - self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key_Escape) + self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key.Key_Left) + self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key.Key_Up) + self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key.Key_Right) + self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key.Key_Down) + self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key.Key_Backspace) + self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key.Key_Enter) + self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key.Key_Tab) + self.NO_ORD_KEY_LIST.append(QtCore.Qt.Key.Key_Escape) self.do_layout(keyboard_type) @@ -98,35 +98,35 @@ def do_layout(self, keyboard_type='default'): button = MyFlatPushButton('LINE\nUP') button.setToolTip('Cursor Up') - button.KEY_CHAR = QtCore.Qt.Key_Up + button.KEY_CHAR = QtCore.Qt.Key.Key_Up control_widget_list.append(button) button = MyFlatPushButton('LINE\nDOWN') button.setToolTip('Cursor Down') - button.KEY_CHAR = QtCore.Qt.Key_Down + button.KEY_CHAR = QtCore.Qt.Key.Key_Down control_widget_list.append(button) # space button = MyFlatPushButton('SPACE', min_size=(160, 50)) - button.KEY_CHAR = QtCore.Qt.Key_Space + button.KEY_CHAR = QtCore.Qt.Key.Key_Space control_widget_list.append(button) # back space button = MyFlatPushButton('BACK') button.setToolTip('Backspace') - button.KEY_CHAR = QtCore.Qt.Key_Backspace + button.KEY_CHAR = QtCore.Qt.Key.Key_Backspace control_widget_list.append(button) # close button = MyFlatPushButton('CLOSE') button.setToolTip('Close Keyboard') - button.KEY_CHAR = QtCore.Qt.Key_Escape + button.KEY_CHAR = QtCore.Qt.Key.Key_Escape control_widget_list.append(button) # enter button = MyFlatPushButton('ENTER', min_size=(105, 50)) button.setToolTip('Enter Command') - button.KEY_CHAR = QtCore.Qt.Key_Enter + button.KEY_CHAR = QtCore.Qt.Key.Key_Enter control_widget_list.append(button) MAX_COL = 10 @@ -178,7 +178,7 @@ def do_layout(self, keyboard_type='default'): self.setLayout(gl) def reject(self): - self.buttonClicked(QtCore.Qt.Key_Escape) + self.buttonClicked(QtCore.Qt.Key.Key_Escape) def buttonClicked(self, char_ord): w = self.INPUT_WIDGET @@ -187,12 +187,12 @@ def buttonClicked(self, char_ord): else: keyPress = QtGui.QKeyEvent(QtCore.QEvent.KeyPress, char_ord, QtCore.Qt.NoModifier, chr(char_ord)) # hide on enter or esc button click - if char_ord == QtCore.Qt.Key_Escape: + if char_ord == QtCore.Qt.Key.Key_Escape: self.hide() else: # send keypress event to widget QtWidgets.QApplication.sendEvent(w, keyPress) - if char_ord == QtCore.Qt.Key_Enter: + if char_ord == QtCore.Qt.Key.Key_Enter: self.hide() # line edit returnPressed event is triggering twice for press and release both @@ -215,7 +215,7 @@ def update_panel_position(self): widget_rect = widget.rect() widget_bottom = widget.mapToGlobal(QtCore.QPoint(widget.frameGeometry().x(), widget.frameGeometry().y())).y() - screen_height = QtWidgets.qApp.desktop().availableGeometry().height() + screen_height = QtWidgets.QApplication.instance().desktop().availableGeometry().height() input_panel_height = self.geometry().height() + 5 if (screen_height - widget_bottom) > input_panel_height: @@ -267,7 +267,7 @@ def callDialog(self, widget, ktype): ## testing ## if __name__ == '__main__': import sys - from PyQt5.QtWidgets import QWidget + from PyQt6.QtWidgets import QWidget app = QtWidgets.QApplication([]) w = QWidget() w.setGeometry(100, 100, 200, 100) @@ -281,4 +281,4 @@ def callDialog(self, widget, ktype): test.callDialog(line, 'default') w.setLayout(layout) w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/file_manager.py b/lib/python/qtvcp/widgets/file_manager.py index 1064592b7c6..63bddc4bd4c 100644 --- a/lib/python/qtvcp/widgets/file_manager.py +++ b/lib/python/qtvcp/widgets/file_manager.py @@ -5,13 +5,13 @@ import shutil from collections import OrderedDict -from PyQt5.QtCore import QCoreApplication -from PyQt5.QtWidgets import (QApplication, QFileSystemModel, QWidget, QVBoxLayout, QHBoxLayout, +from PyQt6.QtCore import QCoreApplication +from PyQt6.QtWidgets import (QApplication, QFileSystemModel, QWidget, QVBoxLayout, QHBoxLayout, QListView, QComboBox, QPushButton, QToolButton, QSizePolicy, QMenu, QAction, QLineEdit, QCheckBox, QTableView, QHeaderView, QMessageBox) -from PyQt5.QtGui import QIcon, QDragEnterEvent, QDropEvent -from PyQt5.QtCore import (QModelIndex, QDir, Qt, pyqtSlot, pyqtSignal, pyqtProperty, QFileInfo, QMimeData, +from PyQt6.QtGui import QIcon, QDragEnterEvent, QDropEvent +from PyQt6.QtCore import (QModelIndex, QDir, Qt, pyqtSlot, pyqtSignal, pyqtProperty, QFileInfo, QMimeData, QItemSelectionModel, QItemSelection, QSortFilterProxyModel) from qtvcp.widgets.widget_baseclass import _HalWidgetBase @@ -174,10 +174,10 @@ def __init__(self, parent=None): def initUI(self): self.setWindowTitle(self.title) - self.setSizePolicy(QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)) - line_policy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) - button_policy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) - box_policy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) + self.setSizePolicy(QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)) + line_policy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed) + button_policy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) + box_policy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) self.textLine = QLineEdit() self.textLine.setToolTip('Current Directory/selected File') @@ -214,7 +214,7 @@ def initUI(self): self.model = QFileSystemModel() self.model.setRootPath(QDir.currentPath()) - self.model.setFilter(QDir.AllDirs | QDir.NoDot | QDir.Files) + self.model.setFilter(QDir.Filter.AllDirs | QDir.NoDot | QDir.Filter.Files) self.model.setNameFilterDisables(False) self.model.rootPathChanged.connect(self.folderChanged) @@ -233,11 +233,11 @@ def initUI(self): self.table.setAlternatingRowColors(True) header = self.table.horizontalHeader() - header.setSectionResizeMode(0, QHeaderView.Stretch) - header.setSectionResizeMode(1, QHeaderView.ResizeToContents) - header.setSectionResizeMode(3, QHeaderView.ResizeToContents) + header.setSectionResizeMode(0, QHeaderView.ResizeMode.Stretch) + header.setSectionResizeMode(1, QHeaderView.ResizeMode.ResizeToContents) + header.setSectionResizeMode(3, QHeaderView.ResizeMode.ResizeToContents) header.swapSections(1,3) - header.setSortIndicator(1,Qt.AscendingOrder) + header.setSortIndicator(1,Qt.SortOrder.AscendingOrder) self.table.setSortingEnabled(True) self.table.setColumnHidden(2, True) # type @@ -247,7 +247,7 @@ def initUI(self): self.cb.currentIndexChanged.connect(self.filterChanged) self.fillCombobox(INFO.PROGRAM_FILTERS_EXTENSIONS) self.cb.setMinimumSize(200,40) - self.cb.setSizePolicy(QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)) + self.cb.setSizePolicy(QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)) self.jumpButton = QToolButton() self.jumpButton.setText(_translate('FileManager','User')) @@ -563,10 +563,10 @@ def copyFile(self, source, dest): def overwriteMessage(self, d): title = "File Already Exists" info = f"Overwrite {d}?" - buttons = QMessageBox.No | QMessageBox.Yes + buttons = QMessageBox.StandardButton.No | QMessageBox.StandardButton.Yes retval = QMessageBox.warning( self, title, info, buttons) - if retval == QMessageBox.No: + if retval == QMessageBox.StandardButton.No: return False return True @@ -745,5 +745,5 @@ def resetShowListView(self, state): gui.onUserClicked() # gui.onMediaClicked() gui.setRestricted(True) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/gcode_editor.py b/lib/python/qtvcp/widgets/gcode_editor.py index 1b3275e7b43..1e92537ae3d 100644 --- a/lib/python/qtvcp/widgets/gcode_editor.py +++ b/lib/python/qtvcp/widgets/gcode_editor.py @@ -31,9 +31,9 @@ import os import re -from PyQt5.QtCore import pyqtProperty, pyqtSignal, QSize -from PyQt5.QtGui import QFont, QFontMetrics, QColor, QIcon -from PyQt5.QtWidgets import QWidget, QAction,\ +from PyQt6.QtCore import pyqtProperty, pyqtSignal, QSize +from PyQt6.QtGui import QFont, QFontMetrics, QColor, QIcon +from PyQt6.QtWidgets import QWidget, QAction,\ QVBoxLayout, QToolBar, QLineEdit, QHBoxLayout, QMessageBox, \ QFrame, QLabel, QStyle @@ -55,9 +55,9 @@ # load this after Logging set up so we get a nice dialog. try: - from PyQt5.Qsci import QsciScintilla, QsciLexerCustom, QsciLexerPython + from PyQt6.Qsci import QsciScintilla, QsciLexerCustom, QsciLexerPython except ImportError as e: - LOG.critical("Can't import QsciScintilla - is package python3-pyqt5.qsci installed?", exc_info=e) + LOG.critical("Can't import QsciScintilla - is package python3-pyqt6.qsci installed?", exc_info=e) sys.exit(1) @@ -171,8 +171,8 @@ class EditorBase(QsciScintilla): # set in the dict manually, or by CSS properties. _styleFont = { 0: QFont("Courier", 11), # Default Font -# 2: QFont("Courier", 20, weight=QFont.Bold), # Gcode -# 5: QFont("Courier", 11, weight=QFont.Bold), # Other +# 2: QFont("Courier", 20, weight=QFont.Weight.Bold), # Gcode +# 5: QFont("Courier", 11, weight=QFont.Weight.Bold), # Other # "Margins": QFont("Courier", 9), # Margins } @@ -807,7 +807,7 @@ def __init__(self, parent=None): self.isCaseSensitive = 0 self.setMinimumSize(QSize(300, 200)) - self.setWindowTitle("PyQt5 editor test example") + self.setWindowTitle("PyQt6 editor test example") lay = QVBoxLayout() lay.setContentsMargins(0,0,0,0) @@ -828,21 +828,21 @@ def __init__(self, parent=None): ################################ # Create new action - icon = self.style().standardIcon( QStyle.SP_FileIcon) + icon = self.style().standardIcon( QStyle.StandardPixmap.SP_FileIcon) self.newAction = QAction(icon, 'New', self) self.newAction.setShortcut('Ctrl+N') self.newAction.setStatusTip('New document') self.newAction.triggered.connect(self.newCall) # Create open action - icon = self.style().standardIcon( QStyle.SP_DirOpenIcon) + icon = self.style().standardIcon( QStyle.StandardPixmap.SP_DirOpenIcon) self.openAction = QAction(icon, '&Open', self) self.openAction.setShortcut('Ctrl+O') self.openAction.setStatusTip('Open document') self.openAction.triggered.connect(self.openCall) # Create save action - icon = self.style().standardIcon( QStyle.SP_DialogSaveButton) + icon = self.style().standardIcon( QStyle.StandardPixmap.SP_DialogSaveButton) self.saveAction = QAction(icon, '&Save', self) self.saveAction.setShortcut('Ctrl+S') self.saveAction.setStatusTip('Save document') @@ -1101,8 +1101,8 @@ def returnFromDialog(self, w, message): def killCheck(self): choice = QMessageBox.question(self, 'Warning!!', "This file has changed since loading...Still want to proceed?", - QMessageBox.Yes | QMessageBox.No) - if choice == QMessageBox.Yes: + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No) + if choice == QMessageBox.StandardButton.Yes: return True else: return False @@ -1157,9 +1157,9 @@ def reset_auto_show_manual(self): # for direct testing if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * sample_text = r"""( ----- Simple G-Code -----) G17 G20 G40 G49 G54 G80 G90 G94 @@ -1215,5 +1215,5 @@ def reset_auto_show_manual(self): if 1: w.label.setText('Edit mode title label') w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/gcode_graphics.py b/lib/python/qtvcp/widgets/gcode_graphics.py index 2b1e1575a69..3ac2ffccbc6 100644 --- a/lib/python/qtvcp/widgets/gcode_graphics.py +++ b/lib/python/qtvcp/widgets/gcode_graphics.py @@ -17,15 +17,15 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -PyQt5 widget for plotting gcode. +PyQt6 widget for plotting gcode. """ import sys import os import gcode import linuxcnc -from PyQt5.QtCore import pyqtProperty, QTimer, Qt -from PyQt5.QtGui import QColor +from PyQt6.QtCore import pyqtProperty, QTimer, Qt +from PyQt6.QtGui import QColor from qt5_graphics import Lcnc_3dGraphics from qtvcp.widgets.widget_baseclass import _HalWidgetBase @@ -304,29 +304,29 @@ def updateSignals(self, state): def updateMouseMode(self, value): if value == 0: - m = Qt.LeftButton; z = Qt.MiddleButton; r = Qt.RightButton + m = Qt.MouseButton.LeftButton; z = Qt.MouseButton.MiddleButton; r = Qt.MouseButton.RightButton elif value == 1: - m = Qt.MiddleButton; z = Qt.RightButton; r = Qt.LeftButton + m = Qt.MouseButton.MiddleButton; z = Qt.MouseButton.RightButton; r = Qt.MouseButton.LeftButton elif value == 2: - m = Qt.MiddleButton; z = Qt.LeftButton; r = Qt.RightButton + m = Qt.MouseButton.MiddleButton; z = Qt.MouseButton.LeftButton; r = Qt.MouseButton.RightButton elif value == 3: - m = Qt.LeftButton; z = Qt.RightButton; r = Qt.MiddleButton + m = Qt.MouseButton.LeftButton; z = Qt.MouseButton.RightButton; r = Qt.MouseButton.MiddleButton elif value == 4: - m = Qt.RightButton; z = Qt.LeftButton; r = Qt.MiddleButton + m = Qt.MouseButton.RightButton; z = Qt.MouseButton.LeftButton; r = Qt.MouseButton.MiddleButton elif value == 5: - m = Qt.RightButton; z = Qt.MiddleButton; r = Qt.LeftButton + m = Qt.MouseButton.RightButton; z = Qt.MouseButton.MiddleButton; r = Qt.MouseButton.LeftButton elif value == 6: - m = Qt.LeftButton; z = Qt.MiddleButton; r = False + m = Qt.MouseButton.LeftButton; z = Qt.MouseButton.MiddleButton; r = False elif value == 7: - m = Qt.MiddleButton; z = Qt.LeftButton; r = False + m = Qt.MouseButton.MiddleButton; z = Qt.MouseButton.LeftButton; r = False elif value == 8: - m = Qt.RightButton; z = Qt.LeftButton; r = False + m = Qt.MouseButton.RightButton; z = Qt.MouseButton.LeftButton; r = False elif value == 9: - m = Qt.LeftButton; z = Qt.RightButton; r = False + m = Qt.MouseButton.LeftButton; z = Qt.MouseButton.RightButton; r = False elif value == 10: - m = Qt.MiddleButton; z = Qt.RightButton; r = False + m = Qt.MouseButton.MiddleButton; z = Qt.MouseButton.RightButton; r = False elif value == 11: - m = Qt.RightButton; z = Qt.MiddleButton; r = False + m = Qt.MouseButton.RightButton; z = Qt.MouseButton.MiddleButton; r = False else: return self._buttonList =[m,z,r] @@ -582,12 +582,12 @@ def resetMouseWheelInvertZoom(self): if __name__ == "__main__": import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = GCodeGraphics() widget.use_gradient_background = True widget.enable_dro = True widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/geditor.py b/lib/python/qtvcp/widgets/geditor.py index ae2bcbee11c..60201ad1d2c 100644 --- a/lib/python/qtvcp/widgets/geditor.py +++ b/lib/python/qtvcp/widgets/geditor.py @@ -29,9 +29,9 @@ import sys -from PyQt5.QtCore import pyqtProperty, pyqtSignal, QSize, QEvent, Qt, QByteArray, QVariant -from PyQt5.QtGui import QIcon -from PyQt5.QtWidgets import QMainWindow, QAction,\ +from PyQt6.QtCore import pyqtProperty, pyqtSignal, QSize, QEvent, Qt, QByteArray +from PyQt6.QtGui import QIcon +from PyQt6.QtWidgets import QMainWindow, QAction,\ QToolBar, QLineEdit, QHBoxLayout, QMessageBox, \ QFrame, QLabel @@ -71,7 +71,7 @@ def __init__(self, parent=None, designer=False): self.isCaseSensitive = 0 self.setMinimumSize(QSize(300, 200)) - self.setWindowTitle("PyQt5 editor test example") + self.setWindowTitle("PyQt6 editor test example") # make editor self.editor = GcodeDisplay(self) @@ -337,7 +337,7 @@ def undo(self): def saveSettings(self): self.SETTINGS_.beginGroup("geditor-{}".format(self.objectName())) - self.SETTINGS_.setValue('state', QVariant(self.saveState().data())) + self.SETTINGS_.setValue('state', self.saveState(.data())) self.SETTINGS_.endGroup() def restoreSettings(self): @@ -433,8 +433,8 @@ def killCheck(self): """This file has changed since loading and has not been saved. You will lose your changes. Still want to proceed?""", - QMessageBox.Yes | QMessageBox.No) - if choice == QMessageBox.Yes: + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No) + if choice == QMessageBox.StandardButton.Yes: return True else: return False @@ -520,9 +520,9 @@ def reset_show_editor(self): # for direct testing if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * app = QApplication(sys.argv) w = GcodeEditor() @@ -554,6 +554,6 @@ def reset_show_editor(self): if 0: w.label.setText('Edit mode title label') w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/general_hal_input.py b/lib/python/qtvcp/widgets/general_hal_input.py index 65b22ca7f11..df9202ddbeb 100644 --- a/lib/python/qtvcp/widgets/general_hal_input.py +++ b/lib/python/qtvcp/widgets/general_hal_input.py @@ -14,11 +14,11 @@ # GNU General Public License for more details. ############################################################################### -from PyQt5.QtWidgets import QWidget +from PyQt6.QtWidgets import QWidget import hal from qtvcp.widgets.widget_baseclass import _HalWidgetBase -from PyQt5.QtCore import pyqtSignal, pyqtProperty +from PyQt6.QtCore import pyqtSignal, pyqtProperty from qtvcp import logger # Instantiate the libraries with global reference diff --git a/lib/python/qtvcp/widgets/general_hal_output.py b/lib/python/qtvcp/widgets/general_hal_output.py index acdc8faba4e..aa0f03a5f3c 100644 --- a/lib/python/qtvcp/widgets/general_hal_output.py +++ b/lib/python/qtvcp/widgets/general_hal_output.py @@ -14,11 +14,11 @@ # GNU General Public License for more details. ############################################################################### -from PyQt5.QtWidgets import QWidget +from PyQt6.QtWidgets import QWidget import hal from qtvcp.widgets.widget_baseclass import _HalWidgetBase -from PyQt5.QtCore import pyqtSlot, pyqtProperty +from PyQt6.QtCore import pyqtSlot, pyqtProperty from qtvcp import logger # Instantiate the libraries with global reference diff --git a/lib/python/qtvcp/widgets/hal_label.py b/lib/python/qtvcp/widgets/hal_label.py index 14eb8fb10d9..024e28a4b56 100644 --- a/lib/python/qtvcp/widgets/hal_label.py +++ b/lib/python/qtvcp/widgets/hal_label.py @@ -17,7 +17,7 @@ import hal from qtvcp.widgets.widget_baseclass import _HalWidgetBase -from PyQt5.QtCore import pyqtProperty, pyqtSlot, QVariant +from PyQt6.QtCore import pyqtProperty, pyqtSlot from qtvcp.widgets.simple_widgets import ScaledLabel from qtvcp import logger @@ -167,7 +167,7 @@ def reset_multi_label_l(self): use_multi_label = pyqtProperty(bool, get_use_multi_label, set_use_multi_label, reset_use_multi_label) textTemplate = pyqtProperty(str, get_textTemplate, set_textTemplate, reset_textTemplate) - multi_label_list = pyqtProperty(QVariant.typeToName(QVariant.StringList), + multi_label_list = pyqtProperty(.typeToName(.StringList), get_multi_label_l, set_multi_label_l, reset_multi_label_l) ############################## # required class boiler code # diff --git a/lib/python/qtvcp/widgets/hal_selectionbox.py b/lib/python/qtvcp/widgets/hal_selectionbox.py index 740dd971130..1fb53744ea4 100644 --- a/lib/python/qtvcp/widgets/hal_selectionbox.py +++ b/lib/python/qtvcp/widgets/hal_selectionbox.py @@ -14,9 +14,9 @@ # GNU General Public License for more details. ############################################################################### -from PyQt5.QtWidgets import QComboBox, QTreeView, QFrame -from PyQt5.QtGui import QStandardItemModel, QStandardItem -from PyQt5.QtCore import Qt, QEvent, QModelIndex, pyqtSignal +from PyQt6.QtWidgets import QComboBox, QTreeView, QFrame +from PyQt6.QtGui import QStandardItemModel, QStandardItem +from PyQt6.QtCore import Qt, QEvent, QModelIndex, pyqtSignal import hal from qtvcp.widgets.widget_baseclass import _HalWidgetBase @@ -41,7 +41,7 @@ def __init__(self, parent=None): tree_view = QTreeView(self) tree_view.setHeaderHidden( False ) - tree_view.setFrameShape(QFrame.NoFrame) + tree_view.setFrameShape(QFrame.Shape.NoFrame) tree_view.setEditTriggers(tree_view.NoEditTriggers) tree_view.setAlternatingRowColors(True) tree_view.setSelectionBehavior(tree_view.SelectItems) @@ -66,7 +66,7 @@ def hidePopup(self): def eventFilter(self, object, event): if event.type() == QEvent.MouseButtonPress and object is self.view().viewport(): index = self.view().indexAt(event.pos()) - # print index.parent(),index.row(),index.column(),index.data(),index.data(Qt.UserRole + 1) + # print index.parent(),index.row(),index.column(),index.data(),index.data(Qt.ItemDataRole.UserRole + 1) # print self.view().isExpanded(self.view().currentIndex()) # if self.itemAt(event.pos()) is None self.__skip_next_hide = not self.view().visualRect(index).contains(event.pos()) @@ -78,13 +78,13 @@ def addItems(self, parent, elements): # don't let title lines be selectable if not value[1]: item.setFlags(item.flags() & -(1<<1)) - item.setData(value[0], role=Qt.ToolTipRole) + item.setData(value[0], role=Qt.ItemDataRole.ToolTipRole) # store the HAL name and selectability in Qt user roles - item.setData(value[0], role=Qt.UserRole + self.NAME) + item.setData(value[0], role=Qt.ItemDataRole.UserRole + self.NAME) # selectability in Qt user roles - item.setData(value[1], role=Qt.UserRole + self.SELECTABLE) + item.setData(value[1], role=Qt.ItemDataRole.UserRole + self.SELECTABLE) # all info of object - item.setData(value[2], role=Qt.UserRole + self.OBJECT) + item.setData(value[2], role=Qt.ItemDataRole.UserRole + self.OBJECT) parent.appendRow(item) # next level @@ -93,7 +93,7 @@ def addItems(self, parent, elements): # emit the (by default) signal name def getSelectionData(self, index,userIndex=1): - choice = self.itemData(self.currentIndex(), Qt.UserRole + userIndex) + choice = self.itemData(self.currentIndex(), Qt.ItemDataRole.UserRole + userIndex) return choice def selected(self,index): @@ -227,13 +227,13 @@ def __setitem__(self, item, value): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) x = hal.component('_X_') widget = HALSelectionBox() widget._hal_init() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/image_switcher.py b/lib/python/qtvcp/widgets/image_switcher.py index 4fb6dc62632..309be50dc7d 100644 --- a/lib/python/qtvcp/widgets/image_switcher.py +++ b/lib/python/qtvcp/widgets/image_switcher.py @@ -17,9 +17,9 @@ import os -from PyQt5.QtCore import pyqtSignal, pyqtProperty, QVariant -from PyQt5.QtWidgets import QLabel -from PyQt5.QtGui import QPixmap +from PyQt6.QtCore import pyqtSignal, pyqtProperty +from PyQt6.QtWidgets import QLabel +from PyQt6.QtGui import QPixmap from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Info, Tool, Path @@ -121,7 +121,7 @@ def get_image_l(self): return self._imagePath def reset_image_l(self): self._imagePath = [self._defaultImage] - image_list = pyqtProperty(QVariant.typeToName(QVariant.StringList), get_image_l, set_image_l, reset_image_l) + image_list = pyqtProperty(.typeToName(.StringList), get_image_l, set_image_l, reset_image_l) def setImagePath(self, data): self.defaultPixmap = data @@ -440,13 +440,13 @@ def __setitem__(self, item, value): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = ImageSwitcher() widget._hal_init() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/indicatorMixIn.py b/lib/python/qtvcp/widgets/indicatorMixIn.py index 4ae9c5a19ef..2c5968e97a1 100644 --- a/lib/python/qtvcp/widgets/indicatorMixIn.py +++ b/lib/python/qtvcp/widgets/indicatorMixIn.py @@ -1,5 +1,5 @@ -from PyQt5 import QtCore, QtGui, QtWidgets -from PyQt5.QtCore import pyqtProperty, pyqtSlot +from PyQt6 import QtCore, QtGui, QtWidgets +from PyQt6.QtCore import pyqtProperty, pyqtSlot from qtvcp.widgets.widget_baseclass import (_HalWidgetBase) from qtvcp.lib.aux_program_loader import Aux_program_loader as _loader from qtvcp.core import Action, Status, Info @@ -461,7 +461,7 @@ def paintIndicator(self): size = int(self.height() * self._size) gradient = QtGui.QLinearGradient(top_right- QtCore.QPoint(size, 0), top_right) - gradient.setColorAt(0, QtCore.Qt.white) + gradient.setColorAt(0, QtCore.Qt.GlobalColor.white) gradient.setColorAt(1, color) p.setBrush(QtGui.QBrush(gradient)) p.setPen(color) @@ -476,7 +476,7 @@ def paintIndicator(self): bot_right = rect.bottomRight() - QtCore.QPoint(self._right_edge_offset,self._top_edge_offset) gradient = QtGui.QLinearGradient(bot_right- QtCore.QPoint(size, 0), bot_right) - gradient.setColorAt(0, QtCore.Qt.white) + gradient.setColorAt(0, QtCore.Qt.GlobalColor.white) gradient.setColorAt(1, color2) p.setBrush(QtGui.QBrush(gradient)) p.setPen(color2) @@ -492,11 +492,11 @@ def paintIndicator(self): y = int(0 + self._top_edge_offset) gradient = QtGui.QRadialGradient(x + self._diameter / 2, y + self._diameter / 2, self._diameter * 0.4, self._diameter * 0.4, self._diameter * 0.4) - gradient.setColorAt(0, QtCore.Qt.white) + gradient.setColorAt(0, QtCore.Qt.GlobalColor.white) gradient.setColorAt(1, color) p.setBrush(QtGui.QBrush(gradient)) p.setPen(color) - p.setRenderHint(QtGui.QPainter.Antialiasing, True) + p.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing, True) p.drawEllipse(x, y, self._diameter - 1, self._diameter - 1) # second LED @@ -504,11 +504,11 @@ def paintIndicator(self): y = self.height() - self._diameter - self._top_edge_offset gradient = QtGui.QRadialGradient(x + self._diameter / 2, y + self._diameter / 2, self._diameter * 0.4, self._diameter * 0.4, self._diameter * 0.4) - gradient.setColorAt(0, QtCore.Qt.white) + gradient.setColorAt(0, QtCore.Qt.GlobalColor.white) gradient.setColorAt(1, color2) p.setBrush(QtGui.QBrush(gradient)) p.setPen(color2) - p.setRenderHint(QtGui.QPainter.Antialiasing, True) + p.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing, True) p.drawEllipse(x, y, self._diameter - 1, self._diameter - 1) # top bar @@ -516,13 +516,13 @@ def paintIndicator(self): rect = p.window() topLeft = rect.topLeft() #p.setPen(color) - #p.setBrush(QtGui.QBrush(color, QtCore.Qt.SolidPattern)) + #p.setBrush(QtGui.QBrush(color, QtCore.Qt.BrushStyle.SolidPattern)) grad = QtGui.QLinearGradient() grad.setCoordinateMode(QtGui.QGradient.ObjectBoundingMode) grad.setStart(0,0) grad.setFinalStop(0,.8) grad.setColorAt(0, color) - grad.setColorAt(.5, QtCore.Qt.white) + grad.setColorAt(.5, QtCore.Qt.GlobalColor.white) grad.setColorAt(.8, color) p.setBrush(QtGui.QBrush(grad)) p.drawRoundedRect(int(topLeft.x()+(self.width()*((1-self._w_fraction)/2)) + self._top_edge_offset), @@ -537,13 +537,13 @@ def paintIndicator(self): rect = p.window() topRight = rect.topRight() #p.setPen(color) - #p.setBrush(QtGui.QBrush(color, QtCore.Qt.SolidPattern)) + #p.setBrush(QtGui.QBrush(color, QtCore.Qt.BrushStyle.SolidPattern)) grad = QtGui.QLinearGradient() grad.setCoordinateMode(QtGui.QGradient.ObjectBoundingMode) grad.setStart(0,0) grad.setFinalStop(0,.8) grad.setColorAt(0, color) - grad.setColorAt(.5, QtCore.Qt.white) + grad.setColorAt(.5, QtCore.Qt.GlobalColor.white) grad.setColorAt(.8, color) p.setBrush(QtGui.QBrush(grad)) p.drawRoundedRect(int(topRight.x()- self.width()*self._w_fraction-self._right_edge_offset), @@ -562,7 +562,7 @@ def paintIndicator(self): size = int(self.height() * self._size) gradient = QtGui.QLinearGradient(top_left + QtCore.QPoint(size, 0), top_left) - gradient.setColorAt(0, QtCore.Qt.white) + gradient.setColorAt(0, QtCore.Qt.GlobalColor.white) gradient.setColorAt(1, color) p.setBrush(QtGui.QBrush(gradient)) p.setPen(color) @@ -576,7 +576,7 @@ def paintIndicator(self): if self._doubleIndicator: top_bot = rect.bottomLeft() - QtCore.QPoint(self._right_edge_offset, self._top_edge_offset) gradient = QtGui.QLinearGradient(top_bot + QtCore.QPoint(size, 0), top_bot) - gradient.setColorAt(0, QtCore.Qt.white) + gradient.setColorAt(0, QtCore.Qt.GlobalColor.white) gradient.setColorAt(1, color2) p.setBrush(QtGui.QBrush(gradient)) p.setPen(color2) @@ -1176,7 +1176,7 @@ def __init__(self, parent=None): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = IndicatedToolButton() widget.setCheckable(True) @@ -1191,6 +1191,6 @@ def main(): widget._hal_init() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/jog_increments.py b/lib/python/qtvcp/widgets/jog_increments.py index 19037cddb02..7143c7ce5bd 100644 --- a/lib/python/qtvcp/widgets/jog_increments.py +++ b/lib/python/qtvcp/widgets/jog_increments.py @@ -15,7 +15,7 @@ # ################################################################################# -from PyQt5 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets import hal from qtvcp.widgets.widget_baseclass import _HalWidgetBase @@ -217,4 +217,4 @@ def reset_pin_name(self): app = QtWidgets.QApplication(sys.argv) combo = JogIncrements() combo.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/joypad.py b/lib/python/qtvcp/widgets/joypad.py index 492ba8d33f3..be60b31c59c 100644 --- a/lib/python/qtvcp/widgets/joypad.py +++ b/lib/python/qtvcp/widgets/joypad.py @@ -14,15 +14,11 @@ # GNU General Public License for more details. ############################################################################### import sys -from PyQt5 import QtCore, QtGui, QtWidgets -from PyQt5.QtCore import Qt, QPoint, QPointF, QRect, QRectF, QSize, QSizeF, QEvent -from PyQt5.QtGui import QPainter, QPainterPath, QPen, QBrush, QColor, QFont, QPixmap, QRadialGradient +from PyQt6 import QtCore, QtGui, QtWidgets +from PyQt6.QtCore import Qt, QPoint, QPointF, QRect, QRectF, QSize, QSizeF, QEvent +from PyQt6.QtGui import QPainter, QPainterPath, QPen, QBrush, QColor, QFont, QPixmap, QRadialGradient -try: - from PyQt5.QtCore import Q_ENUM -except: - # before qt5.10 - from PyQt5.QtCore import Q_ENUMS as Q_ENUM +from PyQt6.QtCore import Q_ENUM import hal from qtvcp.widgets.widget_baseclass import _HalWidgetBase @@ -91,7 +87,7 @@ def __init__(self, parent=None): def eventFilter(self, obj, event): if obj is self and self.isEnabled(): if event.type() == QEvent.MouseButtonPress: - if event.button() == Qt.RightButton: + if event.button() == Qt.MouseButton.RightButton: event.ignore() else: pos = event.localPos() @@ -100,7 +96,7 @@ def eventFilter(self, obj, event): if active_btn is not None: self._pressedOutput(active_btn) elif event.type() == QEvent.MouseButtonRelease: - if event.button() == Qt.RightButton: + if event.button() == Qt.MouseButton.RightButton: event.ignore() elif self.last_active_btn is not None: self._releasedOutput(self.last_active_btn) @@ -174,7 +170,7 @@ def draw_painter_paths(self, qp, event): bg.setColorAt(0, QColor(180, 180, 180)) bg.setColorAt(1, QColor(40, 40, 40)) qp.setBrush(QBrush(bg)) - qp.setPen(QPen(QColor(Qt.black), 4)) + qp.setPen(QPen(QColor(Qt.GlobalColor.black), 4)) qp.drawPath(self.left_path) qp.drawPath(self.right_path) qp.drawPath(self.top_path) @@ -193,35 +189,35 @@ def draw_icons(self, qp, event): pix = self.left_image qp.drawPixmap(rect, pix, pix.rect()) elif isinstance(self.left_image, str): - qp.drawText(rect, Qt.AlignCenter, self.left_image) + qp.drawText(rect, Qt.AlignmentFlag.AlignCenter, self.left_image) # right button rect.moveCenter(QPoint(int(center.x() + self.rect2.width()/3), center.y())) if isinstance(self.right_image, QPixmap): pix = self.right_image qp.drawPixmap(rect, pix, pix.rect()) elif isinstance(self.right_image, str): - qp.drawText(rect, Qt.AlignCenter, self.right_image) + qp.drawText(rect, Qt.AlignmentFlag.AlignCenter, self.right_image) # bottom button rect.moveCenter(QPoint(center.x(), int(center.y() + self.rect2.width()/3))) if isinstance(self.bottom_image, QPixmap): pix = self.bottom_image qp.drawPixmap(rect, pix, pix.rect()) elif isinstance(self.bottom_image, str): - qp.drawText(rect, Qt.AlignCenter, self.bottom_image) + qp.drawText(rect, Qt.AlignmentFlag.AlignCenter, self.bottom_image) # top button rect.moveCenter(QPoint(center.x(), int(center.y() - self.rect2.width()/3))) if isinstance(self.top_image, QPixmap): pix = self.top_image qp.drawPixmap(rect, pix, pix.rect()) elif isinstance(self.top_image, str): - qp.drawText(rect, Qt.AlignCenter, self.top_image) + qp.drawText(rect, Qt.AlignmentFlag.AlignCenter, self.top_image) # center button rect.moveCenter(QPoint(center.x(), center.y())) if isinstance(self.center_image, QPixmap): pix = self.center_image qp.drawPixmap(rect, pix, pix.rect()) elif isinstance(self.center_image, str): - qp.drawText(rect, Qt.AlignCenter, self.center_image) + qp.drawText(rect, Qt.AlignmentFlag.AlignCenter, self.center_image) def draw_highlight(self, qp, event): rect = QRectF() @@ -544,12 +540,6 @@ class HALPad(JoyPad, _HalWidgetBase, HALPinType): HALPinType = HALPinType Q_ENUM(HALPinType) - # older version of pyqt5 need this as well as Q_ENUM - NONE = 0 - BIT = hal.HAL_BIT - S32 = hal.HAL_S32 - FLOAT = hal.HAL_FLOAT - def __init__(self, parent=None): super(HALPad, self).__init__(parent) self._pin_name = '' @@ -653,7 +643,7 @@ def reset_pin_type(self): ############################# if __name__ == "__main__": import sys - from PyQt5.QtWidgets import QWidget + from PyQt6.QtWidgets import QWidget app = QtWidgets.QApplication(sys.argv) w = QWidget() w.setGeometry(100, 100, 600, 400) @@ -674,5 +664,5 @@ def reset_pin_type(self): layout.addWidget(joy) w.setLayout(layout) w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/led_widget.py b/lib/python/qtvcp/widgets/led_widget.py index 513328e3991..18288858de4 100644 --- a/lib/python/qtvcp/widgets/led_widget.py +++ b/lib/python/qtvcp/widgets/led_widget.py @@ -15,9 +15,9 @@ # ################################################################################# -from PyQt5.QtCore import pyqtProperty, pyqtSlot, Qt, QTimer, QSize -from PyQt5.QtGui import QColor, QPainter, QBrush, QRadialGradient -from PyQt5.QtWidgets import QWidget +from PyQt6.QtCore import pyqtProperty, pyqtSlot, Qt, QTimer, QSize +from PyQt6.QtGui import QColor, QPainter, QBrush, QRadialGradient +from PyQt6.QtWidgets import QWidget from qtvcp.widgets.widget_baseclass import _HalWidgetBase, hal from qtvcp import logger @@ -38,10 +38,10 @@ def __init__(self, parent=None): self._color = QColor("red") self._off_color = QColor("black") self._gradient = True - self._on_gradient_color = Qt.white - self._off_gradient_color = Qt.white + self._on_gradient_color = Qt.GlobalColor.white + self._off_gradient_color = Qt.GlobalColor.white self._border_color = QColor("black") - self._alignment = Qt.AlignCenter + self._alignment = Qt.AlignmentFlag.AlignCenter self.state = False self.flash = False self._state = False @@ -82,20 +82,20 @@ def paintEvent(self, event): painter = QPainter() x = 0 y = 0 - if self._alignment & Qt.AlignLeft: + if self._alignment & Qt.AlignmentFlag.AlignLeft: x = 0 - elif self._alignment & Qt.AlignRight: + elif self._alignment & Qt.AlignmentFlag.AlignRight: x = self.width() - self._diameter - elif self._alignment & Qt.AlignHCenter: + elif self._alignment & Qt.AlignmentFlag.AlignHCenter: x = (self.width() - self._diameter) // 2 - elif self._alignment & Qt.AlignJustify: + elif self._alignment & Qt.AlignmentFlag.AlignJustify: x = 0 - if self._alignment & Qt.AlignTop: + if self._alignment & Qt.AlignmentFlag.AlignTop: y = 0 - elif self._alignment & Qt.AlignBottom: + elif self._alignment & Qt.AlignmentFlag.AlignBottom: y = self.height() - self._diameter - elif self._alignment & Qt.AlignVCenter: + elif self._alignment & Qt.AlignmentFlag.AlignVCenter: y = (self.height() - self._diameter) // 2 if self._gradient: @@ -116,7 +116,7 @@ def paintEvent(self, event): painter.begin(self) painter.setPen(self._border_color) - painter.setRenderHint(QPainter.Antialiasing, True) + painter.setRenderHint(QPainter.RenderHint.Antialiasing, True) painter.setBrush(brush) painter.drawEllipse(x, y, self._diameter - 1, self._diameter - 1) painter.end() @@ -165,7 +165,7 @@ def setOnGradientColor(self, value): self._on_gradient_color = value self.update() def resetOnGradientColor(self, value): - self._on_gradient_color = Qt.white + self._on_gradient_color = Qt.GlobalColor.white self.update() def getOffGradientColor(self): @@ -175,7 +175,7 @@ def setOffGradientColor(self, value): self._off_gradient_color = value self.update() def resetOffGradientColor(self, value): - self._off_gradient_color = Qt.white + self._off_gradient_color = Qt.GlobalColor.white self.update() def getGradient(self): @@ -206,7 +206,7 @@ def setAlignment(self, value): self.update() def resetAlignment(self): - self._alignment = Qt.AlignCenter + self._alignment = Qt.AlignmentFlag.AlignCenter @pyqtSlot(bool) @pyqtSlot(int) @@ -281,7 +281,7 @@ def reset_pin_name(self): if __name__ == "__main__": import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) led = LED() led.show() @@ -296,4 +296,4 @@ def reset_pin_name(self): # only flash when this is true led.change_state(False) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/machine_log.py b/lib/python/qtvcp/widgets/machine_log.py index 2478630536e..668b2832516 100644 --- a/lib/python/qtvcp/widgets/machine_log.py +++ b/lib/python/qtvcp/widgets/machine_log.py @@ -18,10 +18,10 @@ import hashlib import time -from PyQt5.QtWidgets import QWidget, QTextEdit, QTableWidget, QTableWidgetItem, QVBoxLayout -from PyQt5.QtCore import QFile, pyqtProperty -import PyQt5.QtWidgets as QtWidgets -from PyQt5.QtGui import QColor +from PyQt6.QtWidgets import QWidget, QTextEdit, QTableWidget, QTableWidgetItem, QVBoxLayout +from PyQt6.QtCore import QFile, pyqtProperty +import PyQt6.QtWidgets as QtWidgets +from PyQt6.QtGui import QColor from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Info from qtvcp import logger @@ -69,19 +69,19 @@ def __init__(self, parent=None): self.logTable.setColumnCount(3) self.logTable.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) - self.logTable.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) - self.logTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows) + self.logTable.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.NoSelection) + self.logTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) self.logTable.setShowGrid(False) self.logTable.setSortingEnabled(False) horizontalHeader = self.logTable.horizontalHeader() horizontalHeader.resizeSection(0, 100) horizontalHeader.resizeSection(1, 75) - horizontalHeader.setSectionResizeMode(2, QtWidgets.QHeaderView.Stretch) + horizontalHeader.setSectionResizeMode(2, QtWidgets.QHeaderView.ResizeMode.Stretch) horizontalHeader.setVisible(False) verticalHeader = self.logTable.verticalHeader() - verticalHeader.setSectionResizeMode(QtWidgets.QHeaderView.ResizeToContents) + verticalHeader.setSectionResizeMode(QtWidgets.QHeaderView.ResizeMode.ResizeToContents) verticalHeader.setVisible(False) def _hal_init(self): @@ -392,10 +392,10 @@ def __setitem__(self, item, value): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = MachineLog() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/macro_widget.py b/lib/python/qtvcp/widgets/macro_widget.py index 424f9122dcf..e58a7f47788 100644 --- a/lib/python/qtvcp/widgets/macro_widget.py +++ b/lib/python/qtvcp/widgets/macro_widget.py @@ -17,8 +17,8 @@ import os -from PyQt5 import QtWidgets, QtCore, QtGui -from PyQt5.QtWidgets import qApp +from PyQt6 import QtWidgets, QtCore, QtGui +from PyQt6.QtWidgets import QApplication.instance() from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.widgets.entry_widget import TouchInterface from qtvcp.core import Status, Action, Info @@ -39,9 +39,9 @@ if not INFO.LINUXCNC_IS_RUNNING: LOG.setLevel(logger.DEBUG) # One of DEBUG, INFO, WARNING, ERROR, CRITICAL try: - from PyQt5 import QtSvg + from PyQt6 import QtSvg except: - LOG.critical("Qtvcp error with macro_widget - is package python3-pyqt5.qtsvg installed?") + LOG.critical("Qtvcp error with macro_widget - is package python3-pyqt6.qtsvg installed?") ############################################################### # helper widget for SVG display on Button @@ -303,8 +303,8 @@ def checkIfFloat(val): if img_info[0].endswith('.svg'): svgpath = os.path.join(path, img_info[0]) self['sw%d' % i] = CustomSVG(svgpath, int(img_info[1])) - self['sw%d' % i].setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, - QtWidgets.QSizePolicy.MinimumExpanding) + self['sw%d' % i].setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, + QtWidgets.QSizePolicy.Policy.MinimumExpanding) # some other supported image file? else: # get image path @@ -318,8 +318,8 @@ def checkIfFloat(val): self['sw%d' % i] = QtWidgets.QLabel() self['sw%d' % i].setPixmap(QtGui.QPixmap(imgpath)) self['sw%d' % i].setScaledContents(True) - self['sw%d' % i].setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, - QtWidgets.QSizePolicy.MinimumExpanding) + self['sw%d' % i].setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, + QtWidgets.QSizePolicy.Policy.MinimumExpanding) # add image to the main layout for this tab hbox.addWidget(self['sw%d' % i]) @@ -367,8 +367,8 @@ def _buildMenuPage(self, tabNames,path): btn.setToolTip('Macro: {}'.format(tName)) btn.setWhatsThis('This button will select The entry page for the {} macro'.format(tName)) btn.clicked.connect(self.menuButtonPress(i)) - btn.setSizePolicy(QtWidgets.QSizePolicy.Preferred, - QtWidgets.QSizePolicy.Preferred) + btn.setSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, + QtWidgets.QSizePolicy.Policy.Preferred) grid.addWidget(btn, row, col, 1, 1) row += 1 if row > 4: @@ -614,7 +614,7 @@ def getNumbers(self, widget, ktype=None, next=False): self._oldstyle = widget.styleSheet() # change to highlight style widget.setStyleSheet(self.hilightStyle) - qApp.processEvents() + QApplication.instance().processEvents() # dialog call mess = {'NAME':self._request_name, @@ -789,4 +789,4 @@ def __setitem__(self, item, value): sw.buildStack(['~/linuxcnc/nc_files/examples/macros/lathe']) sw.setGeometry(50, 50, 759, 668) sw.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/mdi_history.py b/lib/python/qtvcp/widgets/mdi_history.py index 94102a8c3d7..03dd313adb6 100644 --- a/lib/python/qtvcp/widgets/mdi_history.py +++ b/lib/python/qtvcp/widgets/mdi_history.py @@ -15,9 +15,9 @@ ############################################################################### import os -from PyQt5.QtWidgets import QWidget, QVBoxLayout, QListView -from PyQt5.QtCore import pyqtProperty, QSize, QModelIndex, QItemSelectionModel, QItemSelection, QPoint -from PyQt5.QtGui import QStandardItemModel, QStandardItem +from PyQt6.QtWidgets import QWidget, QVBoxLayout, QListView +from PyQt6.QtCore import pyqtProperty, QSize, QModelIndex, QItemSelectionModel, QItemSelection, QPoint +from PyQt6.QtGui import QStandardItemModel, QStandardItem from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.widgets.mdi_line import MDILine @@ -40,7 +40,7 @@ class MDIHistory(QWidget, _HalWidgetBase): def __init__(self, parent=None): super(MDIHistory, self).__init__(parent) self.setMinimumSize(QSize(200, 150)) - self.setWindowTitle("PyQt5 editor test example") + self.setWindowTitle("PyQt6 editor test example") lay = QVBoxLayout() lay.setContentsMargins(0,0,0,0) @@ -177,12 +177,12 @@ def reset_soft_keyboard(self): if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * import sys app = QApplication(sys.argv) w = MDIHistory() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/mdi_line.py b/lib/python/qtvcp/widgets/mdi_line.py index ea15c505d79..b41a85fe41f 100644 --- a/lib/python/qtvcp/widgets/mdi_line.py +++ b/lib/python/qtvcp/widgets/mdi_line.py @@ -22,8 +22,8 @@ import subprocess -from PyQt5.QtWidgets import QLineEdit, QApplication -from PyQt5.QtCore import Qt, QEvent, pyqtProperty +from PyQt6.QtWidgets import QLineEdit, QApplication +from PyQt6.QtCore import Qt, QEvent, pyqtProperty from qtvcp.core import Status, Action, Info from qtvcp.widgets.entry_widget import SoftInputWidget @@ -153,9 +153,9 @@ def external_line_selected(self, w, text, filename): def keyPressEvent(self, event): super(MDI, self).keyPressEvent(event) - if event.key() == Qt.Key_Up: + if event.key() == Qt.Key.Key_Up: self.line_up() - if event.key() == Qt.Key_Down: + if event.key() == Qt.Key.Key_Down: self.line_down() def line_up(self): @@ -339,10 +339,10 @@ def reset_dialog_keyboard(self): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = MDILine() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/mdi_touchy.py b/lib/python/qtvcp/widgets/mdi_touchy.py index 382ad50336c..08b7486f1fe 100644 --- a/lib/python/qtvcp/widgets/mdi_touchy.py +++ b/lib/python/qtvcp/widgets/mdi_touchy.py @@ -17,7 +17,7 @@ import os -from PyQt5 import QtCore, QtWidgets, uic +from PyQt6 import QtCore, QtWidgets, uic from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Action, Info, Path @@ -331,9 +331,9 @@ def set_text(self, t, n = -1): tail = t[len(head):] self.mdi.set_word(head, tail) if len(t) < 2: - w.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) + w.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight | QtCore.Qt.AlignmentFlag.AlignVCenter) else: - w.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + w.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter) def cycle_ocodes(self): # strip off richText bold encoding @@ -391,13 +391,13 @@ def __setitem__(self, item, value): # Testing #################################### if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * import sys app = QtWidgets.QApplication(sys.argv) w = MDITouchy() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/nurbs_editor.py b/lib/python/qtvcp/widgets/nurbs_editor.py index da2d299d507..595cda07a29 100644 --- a/lib/python/qtvcp/widgets/nurbs_editor.py +++ b/lib/python/qtvcp/widgets/nurbs_editor.py @@ -42,9 +42,9 @@ import os import sys import traceback -from PyQt5 import uic -from PyQt5.QtCore import pyqtSlot, QFile, QTextStream -from PyQt5.QtWidgets import (QApplication, QDialog) +from PyQt6 import uic +from PyQt6.QtCore import pyqtSlot, QFile, QTextStream +from PyQt6.QtWidgets import (QApplication, QDialog) import gcode from qt5_graphics import Lcnc_3dGraphics @@ -302,5 +302,5 @@ def report_gcode_error(self, result, seq, filename): sys.exit(1) window = NurbsEditor(path = inifilename) window.load_dialog() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/offset_tool_button.py b/lib/python/qtvcp/widgets/offset_tool_button.py index c4dd7de2f07..05323afcd13 100644 --- a/lib/python/qtvcp/widgets/offset_tool_button.py +++ b/lib/python/qtvcp/widgets/offset_tool_button.py @@ -14,9 +14,9 @@ # GNU General Public License for more details. ############################################################################### -from PyQt5.QtWidgets import QToolButton, QMenu, QAction -from PyQt5.QtCore import pyqtProperty -from PyQt5.QtGui import QIcon +from PyQt6.QtWidgets import QToolButton, QMenu, QAction +from PyQt6.QtCore import pyqtProperty +from PyQt6.QtGui import QIcon from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Action, Info @@ -200,11 +200,11 @@ def __setitem__(self, item, value): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = OffsetToolButton() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/operator_value_line.py b/lib/python/qtvcp/widgets/operator_value_line.py index f1eafb0beb9..78474ddaa68 100644 --- a/lib/python/qtvcp/widgets/operator_value_line.py +++ b/lib/python/qtvcp/widgets/operator_value_line.py @@ -23,8 +23,8 @@ import subprocess -from PyQt5.QtWidgets import QLineEdit, QApplication -from PyQt5.QtCore import Qt, QEvent, pyqtProperty +from PyQt6.QtWidgets import QLineEdit, QApplication +from PyQt6.QtCore import Qt, QEvent, pyqtProperty from qtvcp.core import Status, Action, Info from qtvcp.widgets.entry_widget import SoftInputWidget @@ -208,10 +208,10 @@ def reset_pending_value(self): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = OperatorValueLine() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/origin_offsetview.py b/lib/python/qtvcp/widgets/origin_offsetview.py index 1a4d10f5309..1fc6d7b31c4 100644 --- a/lib/python/qtvcp/widgets/origin_offsetview.py +++ b/lib/python/qtvcp/widgets/origin_offsetview.py @@ -18,9 +18,9 @@ import os import locale -from PyQt5.QtCore import Qt, QAbstractTableModel, QVariant, pyqtProperty, pyqtSlot -from PyQt5.QtGui import QColor -from PyQt5.QtWidgets import QTableView, QAbstractItemView, qApp +from PyQt6.QtCore import Qt, QAbstractTableModel, pyqtProperty, pyqtSlot +from PyQt6.QtGui import QColor +from PyQt6.QtWidgets import QTableView, QAbstractItemView, QApplication.instance() from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Action, Info @@ -136,7 +136,7 @@ def createTable(self): [0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 'System 9']] # create the view - self.setSelectionMode(QAbstractItemView.SingleSelection) + self.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) # set the table model header = ['X', 'Y', 'Z', 'A', 'B', 'C', 'U', 'V', 'W', 'Rot', 'Name'] @@ -234,7 +234,7 @@ def return_value(self, w, message): text = cellContent # update the screen - qApp.processEvents() + QApplication.instance().processEvents() # update the dialog self.callDialog(text,newobj,True) @@ -246,7 +246,7 @@ def return_value(self, w, message): text = cellContent # update the screen - qApp.processEvents() + QApplication.instance().processEvents() # update the dialog self.callDialog(text,newobj,True) @@ -525,19 +525,19 @@ def columnCount(self, parent): return 0 def data(self, index, role): - if role == Qt.EditRole: + if role == Qt.ItemDataRole.EditRole: return self.arraydata[index.row()][index.column()] - if role == Qt.DisplayRole: - return QVariant(self.arraydata[index.row()][index.column()]) - elif role == Qt.BackgroundRole: + if role == Qt.ItemDataRole.DisplayRole: + return self.arraydata[index.row(][index.column()]) + elif role == Qt.ItemDataRole.BackgroundRole: value = self.arraydata[index.row()][index.column()] if (isinstance(value, int) or isinstance(value, float) or isinstance(value, str)): if int(index.row()) == self.parent()._system_int + 3: return QColor(self._highlightcolor) else: - return QVariant() - return QVariant() + return None + return None def flags(self, index): @@ -545,15 +545,15 @@ def flags(self, index): return None # print(">>> flags() index.column() = ", index.column()) if index.column() == 10 and index.row() in(0, 1, 2, 3): - return Qt.ItemIsEnabled + return Qt.ItemFlag.ItemIsEnabled elif index.row() == 0: - return Qt.ItemIsEnabled + return Qt.ItemFlag.ItemIsEnabled elif index.row() == 1 and not index.column() == 2: - return Qt.NoItemFlags + return Qt.ItemFlag.NoItemFlags elif index.row() in(2, 3) and index.column() == 9: - return Qt.NoItemFlags + return Qt.ItemFlag.NoItemFlags else: - return Qt.ItemIsEditable | Qt.ItemIsEnabled | Qt.ItemIsSelectable + return Qt.ItemFlag.ItemIsEditable | Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable def setData(self, index, value, role): if not index.isValid(): @@ -579,18 +579,18 @@ def setData(self, index, value, role): return True def headerData(self, col, orientation, role): - if orientation == Qt.Horizontal and role == Qt.DisplayRole: - return QVariant(self.headerdata[col]) - if orientation != Qt.Horizontal and role == Qt.DisplayRole: - return QVariant(self.Vheaderdata[col]) - return QVariant() + if orientation == Qt.Orientation.Horizontal and role == Qt.ItemDataRole.DisplayRole: + return self.headerdata[col] + if orientation != Qt.Orientation.Horizontal and role == Qt.ItemDataRole.DisplayRole: + return self.Vheaderdata[col] + return None if __name__ == "__main__": - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication([]) w = OriginOffsetView() w.PREFS_ = None w._hal_init() w.setProperty('styleColorHighlight',QColor('purple')) w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/overlay_widget.py b/lib/python/qtvcp/widgets/overlay_widget.py index 2d903105dcd..6423dc14184 100644 --- a/lib/python/qtvcp/widgets/overlay_widget.py +++ b/lib/python/qtvcp/widgets/overlay_widget.py @@ -16,11 +16,11 @@ import os -from PyQt5.QtWidgets import (QWidget, QLabel, QHBoxLayout, +from PyQt6.QtWidgets import (QWidget, QLabel, QHBoxLayout, QVBoxLayout, QPushButton, QDialog, QProgressBar) -from PyQt5.QtCore import (Qt, QEvent, pyqtSlot, pyqtProperty, QChildEvent, +from PyQt6.QtCore import (Qt, QEvent, pyqtSlot, pyqtProperty, QChildEvent, ) -from PyQt5.QtGui import QColor, QImage, QResizeEvent, QPainter, QMoveEvent +from PyQt6.QtGui import QColor, QImage, QResizeEvent, QPainter, QMoveEvent from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status @@ -49,12 +49,12 @@ def __init__(self, parent=None): self.top_level = parent super(OverlayWidget, self).__init__(parent) self.parent = parent - #self.setAttribute(Qt.WA_NoSystemBackground) - #self.setAttribute(Qt.WA_TransparentForMouseEvents) + #self.setAttribute(Qt.WidgetAttribute.WA_NoSystemBackground) + #self.setAttribute(Qt.WidgetAttribute.WA_TransparentForMouseEvents) - self.setWindowFlags( self.windowFlags() |Qt.Tool | - Qt.FramelessWindowHint | - Qt.WindowStaysOnTopHint ) + self.setWindowFlags( self.windowFlags() |Qt.WindowType.Tool | + Qt.WindowType.FramelessWindowHint | + Qt.WindowType.WindowStaysOnTopHint ) if not self.parent is None: self.parent.installEventFilter(self) @@ -126,7 +126,7 @@ def event(self, event): class FocusOverlay(OverlayWidget, _HalWidgetBase): def __init__(self, parent=None): super(FocusOverlay, self).__init__(parent) - self.setAttribute(Qt.WA_TranslucentBackground) + self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) self.bg_color = QColor(0, 0, 0, 150) self.text = "Loading..." self._state = False @@ -247,7 +247,7 @@ def drawText(self, qp): h = size.height() qp.setPen(self.text_color) qp.setFont(self.font) - qp.drawText(self.rect(), Qt.AlignCenter, self.text) + qp.drawText(self.rect(), Qt.AlignmentFlag.AlignCenter, self.text) # build a black label with text and optionally some buttons # using a label rather then drawing text allows options suck as rich text @@ -260,7 +260,7 @@ def box(self): self.mb = QLabel('

%s

' % self.text, self) self.mb.setStyleSheet("background-color: black; color: white") - self.mb.setAlignment(Qt.AlignVCenter | Qt.AlignCenter) + self.mb.setAlignment(Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignCenter) self.mb.setVisible(self._show_text) hbox2.addWidget(self.mb) @@ -385,12 +385,12 @@ def resetimage_path(self): ################# def main(): import sys - from PyQt5.QtWidgets import QWidget, QApplication - from PyQt5.QtCore import QTimer + from PyQt6.QtWidgets import QWidget, QApplication + from PyQt6.QtCore import QTimer app = QApplication(sys.argv) w = QWidget() - #w.setWindowFlags( Qt.FramelessWindowHint | Qt.Dialog | Qt.WindowStaysOnTopHint ) + #w.setWindowFlags( Qt.WindowType.FramelessWindowHint | Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint ) w.setGeometry(300, 300, 250, 150) w.setWindowTitle('Test') @@ -428,7 +428,7 @@ def pop(): timer2.timeout.connect(lambda:pop() ) timer2.start(1500) - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == '__main__': diff --git a/lib/python/qtvcp/widgets/probe_subprog.py b/lib/python/qtvcp/widgets/probe_subprog.py index bb53223db8b..4aad2c24fa4 100644 --- a/lib/python/qtvcp/widgets/probe_subprog.py +++ b/lib/python/qtvcp/widgets/probe_subprog.py @@ -18,7 +18,7 @@ import time import json -from PyQt5.QtCore import QObject +from PyQt6.QtCore import QObject from qtvcp.core import Status, Action, Info from qtvcp.widgets.probe_routines import ProbeRoutines diff --git a/lib/python/qtvcp/widgets/radio_axis_selector.py b/lib/python/qtvcp/widgets/radio_axis_selector.py index 3fd3525a140..c209df2d796 100644 --- a/lib/python/qtvcp/widgets/radio_axis_selector.py +++ b/lib/python/qtvcp/widgets/radio_axis_selector.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from PyQt5 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Action @@ -62,7 +62,7 @@ def resetJoint(self): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = QtWidgets.QWidget() layout = QtWidgets.QHBoxLayout() @@ -74,6 +74,6 @@ def main(): layout.addWidget(cb2) widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/richtext_selector.py b/lib/python/qtvcp/widgets/richtext_selector.py index 0cf52951018..a2f7272292c 100644 --- a/lib/python/qtvcp/widgets/richtext_selector.py +++ b/lib/python/qtvcp/widgets/richtext_selector.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * -from PyQt5.QtCore import * -from PyQt5.QtPrintSupport import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtPrintSupport import * from qtvcp.core import Info, Path @@ -178,7 +178,7 @@ def __init__(self, *args, **kwargs): self.bold_action.setStatusTip("Bold") self.bold_action.setShortcut(QKeySequence.Bold) self.bold_action.setCheckable(True) - self.bold_action.toggled.connect(lambda x: self.editor.setFontWeight(QFont.Bold if x else QFont.Normal)) + self.bold_action.toggled.connect(lambda x: self.editor.setFontWeight(QFont.Weight.Bold if x else QFont.Weight.Normal)) format_toolbar.addAction(self.bold_action) format_menu.addAction(self.bold_action) @@ -210,28 +210,28 @@ def __init__(self, *args, **kwargs): self.alignl_action = QAction(QIcon(os.path.join(filepath, 'edit-alignment.png')), "Align left", self) self.alignl_action.setStatusTip("Align text left") self.alignl_action.setCheckable(True) - self.alignl_action.triggered.connect(lambda: self.editor.setAlignment(Qt.AlignLeft)) + self.alignl_action.triggered.connect(lambda: self.editor.setAlignment(Qt.AlignmentFlag.AlignLeft)) format_toolbar.addAction(self.alignl_action) format_menu.addAction(self.alignl_action) self.alignc_action = QAction(QIcon(os.path.join(filepath, 'edit-alignment-center.png')), "Align center", self) self.alignc_action.setStatusTip("Align text center") self.alignc_action.setCheckable(True) - self.alignc_action.triggered.connect(lambda: self.editor.setAlignment(Qt.AlignCenter)) + self.alignc_action.triggered.connect(lambda: self.editor.setAlignment(Qt.AlignmentFlag.AlignCenter)) format_toolbar.addAction(self.alignc_action) format_menu.addAction(self.alignc_action) self.alignr_action = QAction(QIcon(os.path.join(filepath, 'edit-alignment-right.png')), "Align right", self) self.alignr_action.setStatusTip("Align text right") self.alignr_action.setCheckable(True) - self.alignr_action.triggered.connect(lambda: self.editor.setAlignment(Qt.AlignRight)) + self.alignr_action.triggered.connect(lambda: self.editor.setAlignment(Qt.AlignmentFlag.AlignRight)) format_toolbar.addAction(self.alignr_action) format_menu.addAction(self.alignr_action) self.alignj_action = QAction(QIcon(os.path.join(filepath, 'edit-alignment-justify.png')), "Justify", self) self.alignj_action.setStatusTip("Justify text") self.alignj_action.setCheckable(True) - self.alignj_action.triggered.connect(lambda: self.editor.setAlignment(Qt.AlignJustify)) + self.alignj_action.triggered.connect(lambda: self.editor.setAlignment(Qt.AlignmentFlag.AlignJustify)) format_toolbar.addAction(self.alignj_action) format_menu.addAction(self.alignj_action) @@ -279,19 +279,19 @@ def update_format(self): self.italic_action.setChecked(self.editor.fontItalic()) self.underline_action.setChecked(self.editor.fontUnderline()) - self.bold_action.setChecked(self.editor.fontWeight() == QFont.Bold) + self.bold_action.setChecked(self.editor.fontWeight() == QFont.Weight.Bold) - self.alignl_action.setChecked(self.editor.alignment() == Qt.AlignLeft) - self.alignc_action.setChecked(self.editor.alignment() == Qt.AlignCenter) - self.alignr_action.setChecked(self.editor.alignment() == Qt.AlignRight) - self.alignj_action.setChecked(self.editor.alignment() == Qt.AlignJustify) + self.alignl_action.setChecked(self.editor.alignment() == Qt.AlignmentFlag.AlignLeft) + self.alignc_action.setChecked(self.editor.alignment() == Qt.AlignmentFlag.AlignCenter) + self.alignr_action.setChecked(self.editor.alignment() == Qt.AlignmentFlag.AlignRight) + self.alignj_action.setChecked(self.editor.alignment() == Qt.AlignmentFlag.AlignJustify) self.block_signals(self._format_actions, False) def dialog_critical(self, s): dlg = QMessageBox(self) dlg.setText(s) - dlg.setIcon(QMessageBox.Critical) + dlg.setIcon(QMessageBox.Icon.Critical) dlg.show() def file_open(self): @@ -367,8 +367,8 @@ def __init__(self, parent=None): l.addWidget(self.window) self.bBox = QDialogButtonBox() - self.bBox.addButton('Apply', QDialogButtonBox.AcceptRole) - self.bBox.addButton('Cancel', QDialogButtonBox.RejectRole) + self.bBox.addButton('Apply', QDialogButtonBox.ButtonRole.AcceptRole) + self.bBox.addButton('Cancel', QDialogButtonBox.ButtonRole.RejectRole) self.bBox.rejected.connect(self.reject) self.bBox.accepted.connect(self.accept) l.addWidget(self.bBox) @@ -377,7 +377,7 @@ def __init__(self, parent=None): def showDialog(self, pretext = None): if pretext: self.window.editor.setText(pretext) - retval = self.exec_() + retval = self.exec() self.hide() if retval: return self.window.editor.toHtml() @@ -399,12 +399,12 @@ def p(): l.addWidget(window) bBox = QDialogButtonBox() - bBox.addButton('Apply', QDialogButtonBox.AcceptRole) - bBox.addButton('Cancel', QDialogButtonBox.RejectRole) + bBox.addButton('Apply', QDialogButtonBox.ButtonRole.AcceptRole) + bBox.addButton('Cancel', QDialogButtonBox.ButtonRole.RejectRole) bBox.rejected.connect(app.exit) bBox.accepted.connect(p) l.addWidget(bBox) d.setLayout(l) d.show() - app.exec_() + app.exec() diff --git a/lib/python/qtvcp/widgets/round_gauge.py b/lib/python/qtvcp/widgets/round_gauge.py index 1f277c9f0fd..71829896e00 100644 --- a/lib/python/qtvcp/widgets/round_gauge.py +++ b/lib/python/qtvcp/widgets/round_gauge.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 import sys import math -from PyQt5 import QtCore, QtWidgets -from PyQt5.QtCore import Qt, QPoint, QPointF, QLine, QRect, QSize, pyqtSlot, pyqtProperty -from PyQt5.QtGui import QPainter, QBrush, QPen, QFont, QColor, QRadialGradient +from PyQt6 import QtCore, QtWidgets +from PyQt6.QtCore import Qt, QPoint, QPointF, QLine, QRect, QSize, pyqtSlot, pyqtProperty +from PyQt6.QtGui import QPainter, QBrush, QPen, QFont, QColor, QRadialGradient from qtvcp.widgets.widget_baseclass import _HalWidgetBase, hal class Gauge(QtWidgets.QWidget, _HalWidgetBase): @@ -101,7 +101,7 @@ def draw_gauge(self, qp, event, w): rect.setSize(QSize(w, w)) rect.moveCenter(event.rect().center()) center = rect.center() - qp.setPen(QPen(Qt.white, self.tick_width, cap = Qt.FlatCap)) + qp.setPen(QPen(Qt.GlobalColor.white, self.tick_width, cap = Qt.FlatCap)) qp.drawArc(rect, (-45 * 16), (270 * 16)) rad = rect.width()/2 inc = 270.0 / (self._num_ticks - 1) @@ -118,7 +118,7 @@ def draw_digits(self, qp, event, w): center = event.rect().center() rect = QRect() rect.setSize(QSize(40,18)) - qp.setPen(QPen(Qt.white, self.tick_width)) + qp.setPen(QPen(Qt.GlobalColor.white, self.tick_width)) qp.setFont(QFont('Lato Heavy', self._dial_font_size)) rad = w/2 inc = 270.0 / (self._num_ticks - 1) @@ -130,7 +130,7 @@ def draw_digits(self, qp, event, w): x = int(rad * math.cos(math.radians(angle)) + center.x()) y = int(rad * math.sin(math.radians(angle)) + center.y()) rect.moveCenter(QPoint(x, y)) - qp.drawText(rect, Qt.AlignCenter, text) + qp.drawText(rect, Qt.AlignmentFlag.AlignCenter, text) def draw_center(self, qp, event, w): w *= 0.2 @@ -154,7 +154,7 @@ def draw_setpoint(self, qp, event, w): p = self._setpoint * rad p += center rect.moveCenter(p.toPoint()) - qp.fillRect(rect, QColor(Qt.yellow)) + qp.fillRect(rect, QColor(Qt.GlobalColor.yellow)) def draw_needle(self, qp, event, w): w *= 0.6 @@ -164,7 +164,7 @@ def draw_needle(self, qp, event, w): x = int(rad * math.cos(math.radians(angle)) + center.x()) y = int(rad * math.sin(math.radians(angle)) + center.y()) line = QLine(center.x(), center.y(), x, y) - qp.setPen(QPen(Qt.red, 4)) + qp.setPen(QPen(Qt.GlobalColor.red, 4)) qp.drawLine(line) def draw_readout(self, qp, event, w): @@ -173,13 +173,13 @@ def draw_readout(self, qp, event, w): rect.setSize(QSize(int(w/4), int(w/8))) rect.moveCenter(QPoint(center.x(), center.y() + int(w/4))) text = "{}".format(self.value) - qp.setPen(QPen(Qt.white, 4)) + qp.setPen(QPen(Qt.GlobalColor.white, 4)) qp.setFont(QFont('Lato Heavy', self._value_font_size)) - qp.drawText(rect, Qt.AlignCenter, text) + qp.drawText(rect, Qt.AlignmentFlag.AlignCenter, text) rect.moveCenter(QPoint(center.x(), center.y() + int(w/3))) text = self._gauge_label qp.setFont(QFont('Lato Heavy', self._label_font_size)) - qp.drawText(rect, Qt.AlignCenter, text) + qp.drawText(rect, Qt.AlignmentFlag.AlignCenter, text) @pyqtSlot(float) @pyqtSlot(int) @@ -409,7 +409,7 @@ def reset_halpin_option(self): ############################# if __name__ == "__main__": import sys - from PyQt5.QtWidgets import QSlider, QWidget, QVBoxLayout + from PyQt6.QtWidgets import QSlider, QWidget, QVBoxLayout app = QtWidgets.QApplication(sys.argv) w = QWidget() w.setGeometry(100, 100, 400, 400) @@ -425,7 +425,7 @@ def reset_halpin_option(self): gauge._value_font_size = 10 gauge._label_font_size = 10 gauge._dial_font_size = 10 - slider = QSlider(Qt.Horizontal) + slider = QSlider(Qt.Orientation.Horizontal) slider.setMinimum(0) slider.setMaximum(20000) slider.setSingleStep(10) @@ -434,4 +434,4 @@ def reset_halpin_option(self): layout.addWidget(gauge) layout.addWidget(slider) w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/round_progress.py b/lib/python/qtvcp/widgets/round_progress.py index 5437f5f9abe..2701a78680f 100644 --- a/lib/python/qtvcp/widgets/round_progress.py +++ b/lib/python/qtvcp/widgets/round_progress.py @@ -1,8 +1,8 @@ -from PyQt5 import QtCore, QtGui, Qt -from PyQt5.QtGui import QColor -from PyQt5.QtCore import pyqtSlot -from PyQt5.QtWidgets import QWidget +from PyQt6 import QtCore, QtGui, Qt +from PyQt6.QtGui import QColor +from PyQt6.QtCore import pyqtSlot +from PyQt6.QtWidgets import QWidget class RoundProgressBar(QWidget): @@ -128,7 +128,7 @@ def paintEvent(self, event): buffer.fill(0) p = QtGui.QPainter(buffer) - p.setRenderHint(QtGui.QPainter.Antialiasing) + p.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing) # data brush self.rebuildDataBrushIfNeeded() @@ -171,7 +171,7 @@ def drawBase(self, p, baseRect): p.drawEllipse(baseRect) elif bs == self.StyleLine: p.setPen(QtGui.QPen(self.palette().base().color(), self.outlinePenWidth)) - p.setBrush(Qt.Qt.NoBrush) + p.setBrush(Qt.Qt.BrushStyle.NoBrush) p.drawEllipse(baseRect.adjusted(self.outlinePenWidth/2, self.outlinePenWidth/2, -self.outlinePenWidth/2, -self.outlinePenWidth/2)) def drawValue(self, p, baseRect, value, arcLength): @@ -182,7 +182,7 @@ def drawValue(self, p, baseRect, value, arcLength): # for Line style if self.barStyle == self.StyleLine: p.setPen(QtGui.QPen(self.palette().highlight().color(), self.dataPenWidth)) - p.setBrush(Qt.Qt.NoBrush) + p.setBrush(Qt.Qt.BrushStyle.NoBrush) p.drawArc(baseRect.adjusted(self.outlinePenWidth/2, self.outlinePenWidth/2, -self.outlinePenWidth/2, -self.outlinePenWidth/2), self.nullPosition * 16, -arcLength * 16) @@ -217,7 +217,7 @@ def drawInnerBackground(self, p, innerRect): p.setBrush(self.palette().alternateBase()) cmod = p.compositionMode() - p.setCompositionMode(QtGui.QPainter.CompositionMode_Source) + p.setCompositionMode(QtGui.QPainter.CompositionMode.CompositionMode_Source) p.drawEllipse(innerRect) @@ -237,7 +237,7 @@ def drawText(self, p, innerRect, innerRadius, value): textRect = innerRect p.setPen(self.palette().text().color()) - p.drawText(textRect, Qt.Qt.AlignCenter, text) + p.drawText(textRect, Qt.Qt.AlignmentFlag.AlignCenter, text) def valueToText(self, value): textToDraw = self.format @@ -291,11 +291,11 @@ def rebuildDataBrushIfNeeded(self): if __name__ == "__main__": import sys - from PyQt5.QtWidgets import QDial, QWidget, QHBoxLayout, QApplication + from PyQt6.QtWidgets import QDial, QWidget, QHBoxLayout, QApplication app = QApplication(sys.argv) w = QWidget() - #w.setWindowFlags( Qt.FramelessWindowHint | Qt.Dialog | Qt.WindowStaysOnTopHint ) + #w.setWindowFlags( Qt.WindowType.FramelessWindowHint | Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint ) w.setGeometry(300, 300, 250, 150) w.setWindowTitle('Test') @@ -321,7 +321,7 @@ def rebuildDataBrushIfNeeded(self): h.addWidget(qd) h.addWidget(gui) w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/runFromLine_dialog.py b/lib/python/qtvcp/widgets/runFromLine_dialog.py index 651f65f33c2..1b3e699d0d5 100644 --- a/lib/python/qtvcp/widgets/runFromLine_dialog.py +++ b/lib/python/qtvcp/widgets/runFromLine_dialog.py @@ -18,7 +18,7 @@ import sys import os -from PyQt5 import QtWidgets, uic +from PyQt6 import QtWidgets, uic from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Action, Info @@ -73,12 +73,12 @@ def __setitem__(self, item, value): # Testing #################################### if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * app = QtWidgets.QApplication(sys.argv) w = RunFromLineDialog() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/screen_options.py b/lib/python/qtvcp/widgets/screen_options.py index 9cf2904ec3e..5cf476734c0 100644 --- a/lib/python/qtvcp/widgets/screen_options.py +++ b/lib/python/qtvcp/widgets/screen_options.py @@ -15,10 +15,9 @@ ############################################################################### import os -from PyQt5 import QtCore, QtWidgets, QtGui -from PyQt5.QtWidgets import (QGraphicsBlurEffect, +from PyQt6 import QtCore, QtWidgets, QtGui +from PyQt6.QtWidgets import (QGraphicsBlurEffect, QGraphicsColorizeEffect) -from PyQt5.QtCore import QVariant import linuxcnc @@ -931,7 +930,7 @@ def get_blurList(self): return self.__blurList def reset_blurList(self): self.__blurList = [] - focusBlurList = QtCore.pyqtProperty(QVariant.typeToName(QVariant.StringList), get_blurList, set_blurList, reset_blurList) + focusBlurList = QtCore.pyqtProperty(.typeToName(.StringList), get_blurList, set_blurList, reset_blurList) def set_focusTint(self, data): self.use_focus_tint = data @@ -949,7 +948,7 @@ def get_tintList(self): return self.__tintList def reset_tintList(self): self.__tintList = [] - focusTintList = QtCore.pyqtProperty(QVariant.typeToName(QVariant.StringList), get_tintList, set_tintList, reset_tintList) + focusTintList = QtCore.pyqtProperty(.typeToName(.StringList), get_tintList, set_tintList, reset_tintList) # Dialogs ########################################## diff --git a/lib/python/qtvcp/widgets/simple_widgets.py b/lib/python/qtvcp/widgets/simple_widgets.py index fb688286d9b..52dd2288099 100644 --- a/lib/python/qtvcp/widgets/simple_widgets.py +++ b/lib/python/qtvcp/widgets/simple_widgets.py @@ -13,14 +13,10 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -try: - from PyQt5.QtCore import Q_ENUM -except: - # before qt5.10 - from PyQt5.QtCore import Q_ENUMS as Q_ENUM - -from PyQt5 import QtCore, QtGui, QtWidgets -from PyQt5.QtCore import pyqtProperty, pyqtSlot +from PyQt6.QtCore import Q_ENUM + +from PyQt6 import QtCore, QtGui, QtWidgets +from PyQt6.QtCore import pyqtProperty, pyqtSlot from qtvcp.widgets.widget_baseclass import (_HalWidgetBase, _HalToggleBase, _HalSensitiveBase, _HalScaleBase) from qtvcp.widgets.indicatorMixIn import IndicatedMixIn @@ -306,8 +302,8 @@ def __init__(self, parent=None): self._text = self.text() self._label = QtWidgets.QLabel(self._text, self) - self._label.setAttribute(QtCore.Qt.WA_TransparentForMouseEvents ) - self._label.setAlignment(QtCore.Qt.AlignCenter|QtCore.Qt.AlignVCenter) + self._label.setAttribute(QtCore.Qt.WidgetAttribute.WA_TransparentForMouseEvents ) + self._label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter|QtCore.Qt.AlignmentFlag.AlignVCenter) self._label.show() def setText(self, text): @@ -364,12 +360,6 @@ class PushButton(QtWidgets.QPushButton, IndicatedMixIn, HALPinType): HALPinType = HALPinType Q_ENUM(HALPinType) - # older version of pyqt5 need this as well as Q_ENUM - NONE = 0 - BIT = hal.HAL_BIT - S32 = hal.HAL_S32 - FLOAT = hal.HAL_FLOAT - def __init__(self, parent=None): super(PushButton, self).__init__(parent) @@ -522,8 +512,8 @@ def __init__(self, parent=None): def _hal_init(self): if self.textFormat() in( 0,1) and self._scaled: - self.setSizePolicy(QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, - QtWidgets.QSizePolicy.Ignored)) + self.setSizePolicy(QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, + QtWidgets.QSizePolicy.Policy.Ignored)) self.setMinSize(15) def textSample(self): @@ -550,10 +540,10 @@ def resizeEvent(self, event): super(ScaledLabel, self).resizeEvent(event) if not self._scaled: return - #if self.textFormat() == QtCore.Qt.RichText: + #if self.textFormat() == QtCore.Qt.TextFormat.RichText: #print(self.text()) #print(self.styleSheet(),self.text(),self.font().pointSizeF()) - if not self.text() or self.textFormat() == QtCore.Qt.AutoText: + if not self.text() or self.textFormat() == QtCore.Qt.TextFormat.AutoText: return #--- fetch current parameters ---- @@ -587,7 +577,7 @@ def resizeEvent(self, event): #print (br, cr) #--- update font size --- - if self.textFormat() == QtCore.Qt.RichText: + if self.textFormat() == QtCore.Qt.TextFormat.RichText: self.setStyleFontSize(f.pointSizeF()) else: self.setFont(f) diff --git a/lib/python/qtvcp/widgets/state_label.py b/lib/python/qtvcp/widgets/state_label.py index 4f5cb9f793e..8b0cf2cf8ab 100644 --- a/lib/python/qtvcp/widgets/state_label.py +++ b/lib/python/qtvcp/widgets/state_label.py @@ -15,7 +15,7 @@ ############################################################################### -from PyQt5 import QtCore +from PyQt6 import QtCore from qtvcp.widgets.simple_widgets import ScaledLabel from qtvcp.widgets.widget_baseclass import _HalWidgetBase @@ -182,4 +182,4 @@ def __setitem__(self, item, value): app = QApplication(sys.argv) label = Lcnc_STATUS_Bool_Label() label.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/state_led.py b/lib/python/qtvcp/widgets/state_led.py index fa57b1186dd..75d89c5d37b 100644 --- a/lib/python/qtvcp/widgets/state_led.py +++ b/lib/python/qtvcp/widgets/state_led.py @@ -15,7 +15,7 @@ # ################################################################################# -from PyQt5.QtCore import pyqtProperty +from PyQt6.QtCore import pyqtProperty import hal from qtvcp.widgets.led_widget import LED from qtvcp.core import Status @@ -556,9 +556,9 @@ def __setitem__(self, item, value): if __name__ == "__main__": import sys - from PyQt5.QtGui import QApplication + from PyQt6.QtGui import QApplication app = QApplication(sys.argv) led = StateLED() led.show() #led.startFlashing() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/status_label.py b/lib/python/qtvcp/widgets/status_label.py index ee54c05b0f0..f50b3570e63 100644 --- a/lib/python/qtvcp/widgets/status_label.py +++ b/lib/python/qtvcp/widgets/status_label.py @@ -16,7 +16,7 @@ import time import os -from PyQt5 import QtCore +from PyQt6 import QtCore from qtvcp import logger from qtvcp.widgets.simple_widgets import ScaledLabel @@ -961,8 +961,8 @@ def reset_halpin_name(self): time_stamp_status = QtCore.pyqtProperty(bool, get_time_stamp, set_time_stamp, reset_time_stamp) halpin_status = QtCore.pyqtProperty(bool, get_halpin, set_halpin, reset_halpin) - state_label_list = QtCore.pyqtProperty(QtCore.QVariant.typeToName(QtCore.QVariant.StringList), get_state_label_l, set_state_label_l, reset_state_label_l) - motion_type_list = QtCore.pyqtProperty(QtCore.QVariant.typeToName(QtCore.QVariant.StringList), get_motion_label_l, set_motion_label_l, reset_motion_label_l) + state_label_list = QtCore.pyqtProperty(QtCore..typeToName(QtCore..StringList), get_state_label_l, set_state_label_l, reset_state_label_l) + motion_type_list = QtCore.pyqtProperty(QtCore..typeToName(QtCore..StringList), get_motion_label_l, set_motion_label_l, reset_motion_label_l) halpin_name = QtCore.pyqtProperty(str, get_halpin_name, set_halpin_name, reset_halpin_name) # boilder code def __getitem__(self, item): @@ -971,9 +971,9 @@ def __setitem__(self, item, value): return setattr(self, item, value) if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * import sys @@ -982,4 +982,4 @@ def __setitem__(self, item, value): label.setProperty('motion_type_status',True) label._hal_init() label.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/status_slider.py b/lib/python/qtvcp/widgets/status_slider.py index 8ccbab52d47..92150cf084c 100644 --- a/lib/python/qtvcp/widgets/status_slider.py +++ b/lib/python/qtvcp/widgets/status_slider.py @@ -17,8 +17,8 @@ import hal -from PyQt5 import QtWidgets -from PyQt5.QtCore import pyqtProperty, pyqtSignal +from PyQt6 import QtWidgets +from PyQt6.QtCore import pyqtProperty, pyqtSignal from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Action, Info from qtvcp import logger diff --git a/lib/python/qtvcp/widgets/status_stacked.py b/lib/python/qtvcp/widgets/status_stacked.py index bf06ef99043..40f4d75cf84 100644 --- a/lib/python/qtvcp/widgets/status_stacked.py +++ b/lib/python/qtvcp/widgets/status_stacked.py @@ -15,7 +15,7 @@ # ################################################################################# -from PyQt5 import QtWidgets +from PyQt6 import QtWidgets from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status diff --git a/lib/python/qtvcp/widgets/stylesheeteditor.py b/lib/python/qtvcp/widgets/stylesheeteditor.py index a87b9aefe21..b82368e5243 100644 --- a/lib/python/qtvcp/widgets/stylesheeteditor.py +++ b/lib/python/qtvcp/widgets/stylesheeteditor.py @@ -40,10 +40,10 @@ ########################################################################### import os -from PyQt5 import uic -from PyQt5.QtCore import pyqtSlot, QFile, QTextStream, QUrl, Qt -from PyQt5.QtGui import QStandardItem, QTextCursor, QTextCharFormat, QTextDocument, QColor -from PyQt5.QtWidgets import QDialog, QFileDialog, QMessageBox, QColorDialog +from PyQt6 import uic +from PyQt6.QtCore import pyqtSlot, QFile, QTextStream, QUrl, Qt +from PyQt6.QtGui import QStandardItem, QTextCursor, QTextCharFormat, QTextDocument, QColor +from PyQt6.QtWidgets import QDialog, QFileDialog, QMessageBox, QColorDialog from qtvcp.core import Path from qtvcp.qt_makegui import VCPWindow @@ -81,7 +81,7 @@ def load_dialog(self): if WIDGETS.PREFS_: path = WIDGETS.PREFS_.getpref('style_QSS_Path', 'DEFAULT' , str, 'BOOK_KEEPING') self.preferencePath = path - self.loadedItem.setData( path, role = Qt.UserRole + 1) + self.loadedItem.setData( path, role = Qt.ItemDataRole.UserRole + 1) self.lineEdit_path.setText(path) self.styleSheetCombo.setToolTip('{}'.format(path)) self.origStyleSheet = self.parent.styleSheet() @@ -99,14 +99,14 @@ def setPath(self): # add an 'As Loaded' entry to follow the preference file's entry self.loadedItem = QStandardItem('As Loaded') - self.loadedItem.setData( 'As Loaded', role = Qt.UserRole + 1) - self.loadedItem.setData("Use the preference loaded Stylesheet", role = Qt.ToolTipRole) + self.loadedItem.setData( 'As Loaded', role = Qt.ItemDataRole.UserRole + 1) + self.loadedItem.setData("Use the preference loaded Stylesheet", role = Qt.ItemDataRole.ToolTipRole) model.appendRow(self.loadedItem) # add 'None' to cancel all stylesheet changes item = QStandardItem('None') - item.setData( 'None', role = Qt.UserRole + 1) - item.setData("Use system default Stylesheet", role = Qt.ToolTipRole) + item.setData( 'None', role = Qt.ItemDataRole.UserRole + 1) + item.setData("Use system default Stylesheet", role = Qt.ItemDataRole.ToolTipRole) model.appendRow(item) # call PATH function to get the found default and local qss files @@ -114,16 +114,16 @@ def setPath(self): for group in (PATH.getQSSPaths(self.addBuiltinStyles)): for directory, name in(group): item = QStandardItem(name) - item.setData(os.path.join(directory, name), role = Qt.UserRole + 1) - item.setData(os.path.join(directory, name), role = Qt.ToolTipRole) + item.setData(os.path.join(directory, name), role = Qt.ItemDataRole.UserRole + 1) + item.setData(os.path.join(directory, name), role = Qt.ItemDataRole.ToolTipRole) model.appendRow(item) except Exception as e: print(e) def selectionChanged(self,i): self.search_box.clear() - path = self.styleSheetCombo.itemData(i,role = Qt.UserRole + 1) - name = self.styleSheetCombo.itemData(i,role = Qt.DisplayRole) + path = self.styleSheetCombo.itemData(i,role = Qt.ItemDataRole.UserRole + 1) + name = self.styleSheetCombo.itemData(i,role = Qt.ItemDataRole.DisplayRole) self.styleSheetCombo.setToolTip('{}'.format(path)) self.loadStyleSheet(path) @@ -135,7 +135,7 @@ def highlight_all_matches(self): return cursor = self.styleTextEdit.textCursor() - cursor.movePosition(QTextCursor.Start) + cursor.movePosition(QTextCursor.MoveOperation.Start) format = QTextCharFormat() format.setBackground(QColor('#808080')) @@ -185,7 +185,7 @@ def on_applyButton_clicked(self): self.parent.setStyleSheet(self.styleTextView.toPlainText()) if WIDGETS.PREFS_: index = self.styleSheetCombo.currentIndex() - path = self.styleSheetCombo.itemData(index,role = Qt.UserRole + 1) + path = self.styleSheetCombo.itemData(index,role = Qt.ItemDataRole.UserRole + 1) WIDGETS.PREFS_.putpref('style_QSS_Path', path , str, 'BOOK_KEEPING') else: self.parent.setStyleSheet(self.styleTextEdit.toPlainText()) @@ -194,7 +194,7 @@ def on_applyButton_clicked(self): # make sure one can still read the combo box self.styleSheetCombo.setFixedWidth(200) try: - path = self.styleSheetCombo.itemData(index,role = Qt.UserRole + 1) + path = self.styleSheetCombo.itemData(index,role = Qt.ItemDataRole.UserRole + 1) self.parent.statusbar.showMessage(f"Stylesheet set to {path}") except: pass @@ -210,10 +210,10 @@ def on_openButton_clicked(self): dialog = QFileDialog(self) options = QFileDialog.Options() - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog dialog.setOptions(options) dialog.setDirectory(DIR) - dialog.setFileMode(QFileDialog.ExistingFile) + dialog.setFileMode(QFileDialog.FileMode.ExistingFile) dialog.setNameFilter("style files (*.qss *.style);;All files (*.*)") dialog.setWindowTitle('Open StyleSheet') @@ -227,7 +227,7 @@ def on_openButton_clicked(self): 'qtvcp/screens',PATH.BASENAME))) dialog.setSidebarUrls(urls) - result = dialog.exec_() + result = dialog.exec() if result: fileName = dialog.selectedFiles()[0] file = QFile(fileName) @@ -236,7 +236,7 @@ def on_openButton_clicked(self): self.styleTextView.setPlainText(str(styleSheet, encoding='utf8')) model = self.styleSheetCombo.model() item = QStandardItem(os.path.basename(fileName)) - item.setData( fileName, role = Qt.UserRole + 1) + item.setData( fileName, role = Qt.ItemDataRole.UserRole + 1) model.appendRow(item) self.styleSheetCombo.setCurrentIndex(self.styleSheetCombo.count()-1) @@ -251,10 +251,10 @@ def on_saveButton_clicked(self): dialog = QFileDialog(self) options = QFileDialog.Options() - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog dialog.setOptions(options) dialog.setDirectory(DIR) - dialog.setFileMode(QFileDialog.AnyFile) + dialog.setFileMode(QFileDialog.FileMode.AnyFile) dialog.setNameFilter("style files (*.qss *.style);;All files (*.*)") dialog.setWindowTitle('Save StyleSheet') dialog.setLabelText( QFileDialog.Accept, "Save" ) @@ -267,7 +267,7 @@ def on_saveButton_clicked(self): dialog.setSidebarUrls(urls) - result = dialog.exec_() + result = dialog.exec() if result: fileName = dialog.selectedFiles()[0] self.saveStyleSheet(fileName) diff --git a/lib/python/qtvcp/widgets/system_tool_button.py b/lib/python/qtvcp/widgets/system_tool_button.py index b34f2eba9d3..875b5829a20 100644 --- a/lib/python/qtvcp/widgets/system_tool_button.py +++ b/lib/python/qtvcp/widgets/system_tool_button.py @@ -15,8 +15,8 @@ ############################################################################### -from PyQt5.QtWidgets import QToolButton, QMenu, QAction -from PyQt5.QtGui import QIcon +from PyQt6.QtWidgets import QToolButton, QMenu, QAction +from PyQt6.QtGui import QIcon from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.widgets.dialog_widget import EntryDialog @@ -52,7 +52,7 @@ def __init__(self, parent=None): self.setMenu(SettingMenu) self.dialog = EntryDialog() - #self.setPopupMode(QToolButton.DelayedPopup) + #self.setPopupMode(QToolButton.ToolButtonPopupMode.DelayedPopup) def _hal_init(self): if not self.text() == '': @@ -121,11 +121,11 @@ def __setitem__(self, item, value): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = SystemToolButton() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/tab_widget.py b/lib/python/qtvcp/widgets/tab_widget.py index 29febd97df2..c56a24a4508 100644 --- a/lib/python/qtvcp/widgets/tab_widget.py +++ b/lib/python/qtvcp/widgets/tab_widget.py @@ -13,8 +13,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -from PyQt5.QtWidgets import (QTabWidget, QTabBar) -from PyQt5.QtCore import pyqtProperty, QSize +from PyQt6.QtWidgets import (QTabWidget, QTabBar) +from PyQt6.QtCore import pyqtProperty, QSize class TabWidget(QTabWidget): def __init__(self, parent=None): diff --git a/lib/python/qtvcp/widgets/tool_chooser.py b/lib/python/qtvcp/widgets/tool_chooser.py index 061ff2474f2..c682bd8053f 100644 --- a/lib/python/qtvcp/widgets/tool_chooser.py +++ b/lib/python/qtvcp/widgets/tool_chooser.py @@ -18,10 +18,10 @@ import sys import os import operator -from PyQt5 import QtGui, QtWidgets, uic -from PyQt5.QtCore import Qt, QAbstractTableModel, QVariant -from PyQt5.QtGui import QColor, QIcon -from PyQt5.QtWidgets import (QTableView, QAbstractItemView, QCheckBox,QStyledItemDelegate, qApp) +from PyQt6 import QtGui, QtWidgets, uic +from PyQt6.QtCore import Qt, QAbstractTableModel +from PyQt6.QtGui import QColor, QIcon +from PyQt6.QtWidgets import (QTableView, QAbstractItemView, QCheckBox,QStyledItemDelegate, QApplication.instance()) from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Action, Info, Tool from qtvcp import logger @@ -75,7 +75,7 @@ def createAllView(self): hh = self.horizontalHeader() hh.setSectionResizeMode(3) hh.setStretchLastSection(True) - hh.setSortIndicator(1,Qt.AscendingOrder) + hh.setSortIndicator(1,Qt.SortOrder.AscendingOrder) vh = self.verticalHeader() vh.setVisible(False) @@ -84,8 +84,8 @@ def createAllView(self): self.setSortingEnabled(True) self.setAlternatingRowColors(True) self.setEditTriggers(QAbstractItemView.NoEditTriggers) - self.setSelectionBehavior(QAbstractItemView.SelectRows) - self.setSelectionMode(QAbstractItemView.SingleSelection) + self.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) + self.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) def getSelectedTool(self): index = self.selectionModel().currentIndex() @@ -131,40 +131,40 @@ def columnCount(self, parent): return len(self.arraydata[0]) return 0 - def data(self, index, role=Qt.DisplayRole): - if role == Qt.DisplayRole: + def data(self, index, role=Qt.ItemDataRole.DisplayRole): + if role == Qt.ItemDataRole.DisplayRole: value = self.arraydata[index.row()][index.column()] if isinstance(value, str): return '%s' % value return value - elif role == Qt.BackgroundRole: + elif role == Qt.ItemDataRole.BackgroundRole: if self.arraydata[index.row()][1] == self.parent()._current_tool: return QColor(self._current_tool_bg_color) - return QVariant() + return None - elif role == Qt.ForegroundRole: + elif role == Qt.ItemDataRole.ForegroundRole: if self.arraydata[index.row()][1] == self.parent()._current_tool: return QColor(self._current_tool_color) - return QVariant() + return None def flags(self, index): if not index.isValid(): return None else: - return Qt.ItemIsEnabled | Qt.ItemIsSelectable + return Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable def headerData(self, col, orientation, role): - if orientation == Qt.Horizontal and role == Qt.DisplayRole: - return QVariant(self.headerdata[col]) - elif orientation != Qt.Horizontal and role == Qt.DisplayRole: - return QVariant('') - return QVariant() + if orientation == Qt.Orientation.Horizontal and role == Qt.ItemDataRole.DisplayRole: + return self.headerdata[col] + elif orientation != Qt.Orientation.Horizontal and role == Qt.ItemDataRole.DisplayRole: + return '' + return None def sort(self, Ncol, order): self.layoutAboutToBeChanged.emit() self.arraydata = sorted(self.arraydata, key=operator.itemgetter(Ncol)) - if order == Qt.DescendingOrder: + if order == Qt.SortOrder.DescendingOrder: self.arraydata.reverse() self.layoutChanged.emit() @@ -172,11 +172,11 @@ def sort(self, Ncol, order): # Testing # ############################# if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * app = QtWidgets.QApplication(sys.argv) w = ToolChooser() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/tool_offsetview.py b/lib/python/qtvcp/widgets/tool_offsetview.py index 241ba26e3fc..1cdeac762ab 100644 --- a/lib/python/qtvcp/widgets/tool_offsetview.py +++ b/lib/python/qtvcp/widgets/tool_offsetview.py @@ -18,10 +18,10 @@ import os import operator -from PyQt5.QtCore import Qt, QAbstractTableModel, QVariant, pyqtProperty, QSize, pyqtSlot -from PyQt5.QtGui import QColor, QIcon -from PyQt5.QtWidgets import (QTableView, QAbstractItemView, QCheckBox, -QItemEditorFactory,QDoubleSpinBox,QSpinBox,QStyledItemDelegate, qApp) +from PyQt6.QtCore import Qt, QAbstractTableModel, pyqtProperty, QSize, pyqtSlot +from PyQt6.QtGui import QColor, QIcon +from PyQt6.QtWidgets import (QTableView, QAbstractItemView, QCheckBox, +QItemEditorFactory,QDoubleSpinBox,QSpinBox,QStyledItemDelegate, QApplication.instance()) from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Action, Info, Tool, Path from qtvcp import logger @@ -53,13 +53,13 @@ def __init__(self): super(ItemEditorFactory,self).__init__() def createEditor(self, userType, parent): - if userType == QVariant.Double: + if userType == .Double: doubleSpinBox = QDoubleSpinBox(parent) doubleSpinBox.setDecimals(4) doubleSpinBox.setMaximum(99999) doubleSpinBox.setMinimum(-99999) return doubleSpinBox - elif userType == QVariant.Int: + elif userType == .Int: spinBox = QSpinBox(parent) spinBox.setMaximum(20000) spinBox.setMinimum(1) @@ -125,8 +125,8 @@ def createAllView(self): self.setItemDelegate(styledItemDelegate) # create the view - self.setSelectionMode(QAbstractItemView.SingleSelection) - #self.setSelectionBehavior(QAbstractItemView.SelectRows) + self.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) + #self.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) # set the table model self.tablemodel = MyTableModel(self) @@ -143,7 +143,7 @@ def createAllView(self): hh.setSectionResizeMode(3) hh.setStretchLastSection(True) - hh.setSortIndicator(1,Qt.AscendingOrder) + hh.setSortIndicator(1,Qt.SortOrder.AscendingOrder) vh = self.verticalHeader() vh.setVisible(False) @@ -228,7 +228,7 @@ def return_value(self, w, message): text = cellContent # update the screen - qApp.processEvents() + QApplication.instance().processEvents() # update the dialog self.callDialog(text,newobj,True) @@ -247,7 +247,7 @@ def return_value(self, w, message): text = cellContent # update the screen - qApp.processEvents() + QApplication.instance().processEvents() # update the dialog self.callDialog(text,newobj,True) @@ -490,16 +490,16 @@ def columnCount(self, parent): return 0 # Returns the data stored under the given role for the item referred to by the index. - def data(self, index, role=Qt.DisplayRole): + def data(self, index, role=Qt.ItemDataRole.DisplayRole): - if role == Qt.EditRole: + if role == Qt.ItemDataRole.EditRole: return self.arraydata[index.row()][index.column()] - elif role == Qt.DecorationRole and index.column() == 18: + elif role == Qt.ItemDataRole.DecorationRole and index.column() == 18: value = self.arraydata[index.row()][index.column()] return QIcon(os.path.join(ICONPATH, "tool_pos_{}.png".format(value))) - elif role == Qt.DisplayRole: + elif role == Qt.ItemDataRole.DisplayRole: value = self.arraydata[index.row()][index.column()] col = index.column() if isinstance(value, float): @@ -530,7 +530,7 @@ def data(self, index, role=Qt.DisplayRole): # Default (anything not captured above: e.g. int) return value - elif role == Qt.BackgroundRole: + elif role == Qt.ItemDataRole.BackgroundRole: value = self.arraydata[index.row()][index.column()] if (isinstance(value, int) or isinstance(value, float) or isinstance(value, str), isinstance(value, QCheckBox)): @@ -539,24 +539,24 @@ def data(self, index, role=Qt.DisplayRole): elif self.arraydata[index.row()][0].isChecked(): return QColor(self._selectedcolor) else: - return QVariant() + return None - elif role == Qt.CheckStateRole: + elif role == Qt.ItemDataRole.CheckStateRole: if index.column() == 0: # print(">>> data() row,col = %d, %d" % (index.row(), index.column())) if self.arraydata[index.row()][index.column()].isChecked(): - return Qt.Checked + return Qt.CheckState.Checked else: - return Qt.Unchecked + return Qt.CheckState.Unchecked - elif role == Qt.ForegroundRole: + elif role == Qt.ItemDataRole.ForegroundRole: value = self.arraydata[index.row()][index.column()] if ((isinstance(value, int) or isinstance(value, float)) and value < 0 ): return QColor('red') - return QVariant() + return None # Returns the item flags for the given index. @@ -564,9 +564,9 @@ def flags(self, index): if not index.isValid(): return None if index.column() == 0: - return Qt.ItemIsEnabled | Qt.ItemIsUserCheckable | Qt.ItemIsSelectable + return Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsUserCheckable | Qt.ItemFlag.ItemIsSelectable else: - return Qt.ItemIsEditable | Qt.ItemIsEnabled | Qt.ItemIsSelectable + return Qt.ItemFlag.ItemIsEditable | Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable # Sets the role data for the item at index to value. # Returns true if successful; otherwise returns false. @@ -581,10 +581,10 @@ def setData(self, index, value, role): LOG.debug("original value:{}".format(self.arraydata[index.row()][col])) LOG.debug(">>> setData() role = {}".format(role)) LOG.debug(">>> setData() column() = {}".format(col)) - if role == Qt.CheckStateRole and index.column() == 0: + if role == Qt.ItemDataRole.CheckStateRole and index.column() == 0: #print(">>> setData() role = ", role) #print(">>> setData() index.column() = ", index.column()) - if value == Qt.Checked: + if value == Qt.CheckState.Checked: self.uncheckAllTools() self.arraydata[index.row()][index.column()].setChecked(True) #self.arraydata[index.row()][index.column()].setText("Delete") @@ -622,11 +622,11 @@ def setData(self, index, value, role): # For horizontal headers, the section number corresponds to the column number. # Similarly, for vertical headers, the section number corresponds to the row number. def headerData(self, col, orientation, role): - if orientation == Qt.Horizontal and role == Qt.DisplayRole: - return QVariant(self.headerdata[col]) - if orientation != Qt.Horizontal and role == Qt.DisplayRole: - return QVariant('') - return QVariant() + if orientation == Qt.Orientation.Horizontal and role == Qt.ItemDataRole.DisplayRole: + return self.headerdata[col] + if orientation != Qt.Orientation.Horizontal and role == Qt.ItemDataRole.DisplayRole: + return '' + return None # Sorts the model by column in the given order. def sort(self, Ncol, order): @@ -637,12 +637,12 @@ def sort(self, Ncol, order): if Ncol != 0: self.layoutAboutToBeChanged.emit() self.arraydata = sorted(self.arraydata, key=operator.itemgetter(Ncol)) - if order == Qt.DescendingOrder: + if order == Qt.SortOrder.DescendingOrder: self.arraydata.reverse() self.layoutChanged.emit() if __name__ == "__main__": - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) w = ToolOffsetView() w.setEnabled(True) @@ -650,4 +650,4 @@ def sort(self, Ncol, order): w.highlight('lightblue') #w.setProperty('styleColorHighlight',QColor('purple')) w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/lib/python/qtvcp/widgets/touchEntry.py b/lib/python/qtvcp/widgets/touchEntry.py index 9e0b0f7ac60..fa5abd5805e 100644 --- a/lib/python/qtvcp/widgets/touchEntry.py +++ b/lib/python/qtvcp/widgets/touchEntry.py @@ -1,6 +1,6 @@ -from PyQt5.QtCore import pyqtProperty, pyqtSignal, QSize, QObject, Qt -from PyQt5.QtGui import QDoubleValidator, QIntValidator -from PyQt5.QtWidgets import QWidget, QPushButton,QLineEdit, QHBoxLayout +from PyQt6.QtCore import pyqtProperty, pyqtSignal, QSize, QObject, Qt +from PyQt6.QtGui import QDoubleValidator, QIntValidator +from PyQt6.QtWidgets import QWidget, QPushButton,QLineEdit, QHBoxLayout import decimal from decimal import Decimal @@ -272,9 +272,9 @@ def entryUpdate(self): # for direct testing if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * import sys app = QApplication(sys.argv) @@ -282,4 +282,4 @@ def entryUpdate(self): w.show() w = TouchDoubleSpinBox() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/user_dro_label.py b/lib/python/qtvcp/widgets/user_dro_label.py index 7e5c9f80e9f..0612e74e111 100644 --- a/lib/python/qtvcp/widgets/user_dro_label.py +++ b/lib/python/qtvcp/widgets/user_dro_label.py @@ -17,9 +17,9 @@ import linuxcnc from math import isclose -from PyQt5 import QtCore -from PyQt5.QtWidgets import QMenu, QAction -from PyQt5.QtGui import QIcon, QColor +from PyQt6 import QtCore +from PyQt6.QtWidgets import QMenu, QAction +from PyQt6.QtGui import QIcon, QColor from qtvcp.widgets.simple_widgets import ScaledLabel from qtvcp.widgets.widget_baseclass import _HalWidgetBase @@ -288,11 +288,11 @@ def __setitem__(self, item, value): # for testing without editor: def main(): import sys - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) widget = UserDROLabel() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": main() diff --git a/lib/python/qtvcp/widgets/versa_probe.py b/lib/python/qtvcp/widgets/versa_probe.py index 8d9fb11518e..12af7532cbb 100644 --- a/lib/python/qtvcp/widgets/versa_probe.py +++ b/lib/python/qtvcp/widgets/versa_probe.py @@ -20,9 +20,9 @@ import hal import json -from PyQt5 import QtGui, QtCore, QtWidgets, uic -from PyQt5.QtCore import QProcess, QEvent, Qt, pyqtProperty -from PyQt5.QtWidgets import QDialogButtonBox, QAbstractSlider +from PyQt6 import QtGui, QtCore, QtWidgets, uic +from PyQt6.QtCore import QProcess, QEvent, Qt, pyqtProperty +from PyQt6.QtWidgets import QDialogButtonBox, QAbstractSlider from qtvcp.widgets.widget_baseclass import _HalWidgetBase from qtvcp.core import Status, Action, Info, Path @@ -63,9 +63,9 @@ def __init__(self, parent=None): STATUS.connect('tool-info-changed', lambda w, data: self._tool_info(data)) if INFO.MACHINE_IS_METRIC: - self.valid = QtGui.QRegExpValidator(QtCore.QRegExp(r'^((\d{1,4}(\.\d{1,3})?)|(\.\d{1,3}))$')) + self.valid = QtGui.QRegularExpressionValidator(QtCore.QRegularExpression(r'^((\d{1,4}(\.\d{1,3})?)|(\.\d{1,3}))$')) else: - self.valid = QtGui.QRegExpValidator(QtCore.QRegExp(r'^((\d{1,3}(\.\d{1,4})?)|(\.\d{1,4}))$')) + self.valid = QtGui.QRegularExpressionValidator(QtCore.QRegularExpression(r'^((\d{1,3}(\.\d{1,4})?)|(\.\d{1,4}))$')) self.setMinimumSize(600, 420) # Load the widgets UI file will use local file if available: self.filename = PATH.find_widget_path('versa_probe.ui') @@ -571,9 +571,9 @@ def pop_help(self): def set_checkableButtons(self, state): if state: - policy = Qt.ClickFocus + policy = Qt.FocusPolicy.ClickFocus else: - policy = Qt.NoFocus + policy = Qt.FocusPolicy.NoFocus for i in self.outside_buttonGroup.buttons(): i.setCheckable(state) for i in self.inside_buttonGroup.buttons(): @@ -622,8 +622,8 @@ class HelpDialog(QtWidgets.QDialog, GeometryMixin): def __init__(self, parent=None): super(HelpDialog, self).__init__(parent) self._title = 'Versa Help' - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint | + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.currentHelpPage=-1 self.setMinimumWidth(600) @@ -672,10 +672,10 @@ def buildWidget(self): self.pageStepDwnbutton.clicked.connect(lambda : self.pageStep(t,True)) bBox = QDialogButtonBox(buttons) - bBox.addButton(self.pageStepUpbutton, QDialogButtonBox.ActionRole) - bBox.addButton(self.pageStepDwnbutton, QDialogButtonBox.ActionRole) - bBox.addButton(previousbutton, QDialogButtonBox.ActionRole) - bBox.addButton(nextbutton, QDialogButtonBox.ActionRole) + bBox.addButton(self.pageStepUpbutton, QDialogButtonBox.ButtonRole.ActionRole) + bBox.addButton(self.pageStepDwnbutton, QDialogButtonBox.ButtonRole.ActionRole) + bBox.addButton(previousbutton, QDialogButtonBox.ButtonRole.ActionRole) + bBox.addButton(nextbutton, QDialogButtonBox.ButtonRole.ActionRole) bBox.addButton(closebutton, QDialogButtonBox.DestructiveRole) bBox.rejected.connect(self.reject) @@ -734,7 +734,7 @@ def close(self): def showDialog(self): self.setWindowTitle(self._title); self.set_geometry() - retval = self.exec_() + retval = self.exec() LOG.debug('Value of pressed button: {}'.format(retval)) # look for a custom version of Versa Probe @@ -750,13 +750,13 @@ def __init__(self, parent=None): # Testing #################################### if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * app = QtWidgets.QApplication(sys.argv) w = VersaProbeParent() w.setObjectName('versaprobeParent') w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/virtualkeyboard.py b/lib/python/qtvcp/widgets/virtualkeyboard.py index 914f7174eeb..1aac4d613fd 100644 --- a/lib/python/qtvcp/widgets/virtualkeyboard.py +++ b/lib/python/qtvcp/widgets/virtualkeyboard.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 import sys import os -from PyQt5 import QtGui, QtWidgets, uic -from PyQt5.QtCore import Qt, QEvent, pyqtSignal +from PyQt6 import QtGui, QtWidgets, uic +from PyQt6.QtCore import Qt, QEvent, pyqtSignal from qtvcp.core import Info, Path from qtvcp import logger @@ -23,63 +23,63 @@ def __init__(self, parent=None): LOG.critical(e) self.NO_ORD_KEY_LIST = list() - self.NO_ORD_KEY_LIST.append(Qt.Key_Backspace) - self.NO_ORD_KEY_LIST.append(Qt.Key_Enter) - self.NO_ORD_KEY_LIST.append(Qt.Key_Escape) - self.NO_ORD_KEY_LIST.append(Qt.Key_Delete) - self.NO_ORD_KEY_LIST.append(Qt.Key_F1) - self.NO_ORD_KEY_LIST.append(Qt.Key_F2) - self.NO_ORD_KEY_LIST.append(Qt.Key_F3) - self.NO_ORD_KEY_LIST.append(Qt.Key_F4) - self.NO_ORD_KEY_LIST.append(Qt.Key_F5) - self.NO_ORD_KEY_LIST.append(Qt.Key_F6) - self.NO_ORD_KEY_LIST.append(Qt.Key_F7) - self.NO_ORD_KEY_LIST.append(Qt.Key_F8) - self.NO_ORD_KEY_LIST.append(Qt.Key_F9) - self.NO_ORD_KEY_LIST.append(Qt.Key_F10) - self.NO_ORD_KEY_LIST.append(Qt.Key_F11) - self.NO_ORD_KEY_LIST.append(Qt.Key_F12) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_Backspace) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_Enter) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_Escape) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_Delete) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F1) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F2) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F3) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F4) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F5) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F6) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F7) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F8) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F9) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F10) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F11) + self.NO_ORD_KEY_LIST.append(Qt.Key.Key_F12) self.letter_list = "abcdefghijklmnopqrstuvwxyz" self.number_list = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'minus', 'equal'] self.shift_number = [')', '!', '@', '#', '$', '%', '^', '&&', '*', '('] self.special_list = { - 'less': Qt.Key_Less, - 'greater': Qt.Key_Greater, - 'question': Qt.Key_Question, - 'colon': Qt.Key_Colon, - 'leftbrace': Qt.Key_BraceLeft, - 'rightbrace': Qt.Key_BraceRight, - 'doublequote': Qt.Key_QuoteDbl, - 'pipe': Qt.Key_Bar, - 'underscore': Qt.Key_Underscore, - 'plus': Qt.Key_Plus, - 'exclamation': Qt.Key_Exclam, - 'at': Qt.Key_At, - 'pound': Qt.Key_NumberSign, - 'dollar': Qt.Key_Dollar, - 'percent': Qt.Key_Percent, - 'carat': Qt.Key_AsciiCircum, - 'ampersand': Qt.Key_Ampersand, - 'asterisk': Qt.Key_Asterisk, - 'leftparenth': Qt.Key_ParenLeft, - 'rightparenth': Qt.Key_ParenRight, - 'space': Qt.Key_Space + 'less': Qt.Key.Key_Less, + 'greater': Qt.Key.Key_Greater, + 'question': Qt.Key.Key_Question, + 'colon': Qt.Key.Key_Colon, + 'leftbrace': Qt.Key.Key_BraceLeft, + 'rightbrace': Qt.Key.Key_BraceRight, + 'doublequote': Qt.Key.Key_QuoteDbl, + 'pipe': Qt.Key.Key_Bar, + 'underscore': Qt.Key.Key_Underscore, + 'plus': Qt.Key.Key_Plus, + 'exclamation': Qt.Key.Key_Exclam, + 'at': Qt.Key.Key_At, + 'pound': Qt.Key.Key_NumberSign, + 'dollar': Qt.Key.Key_Dollar, + 'percent': Qt.Key.Key_Percent, + 'carat': Qt.Key.Key_AsciiCircum, + 'ampersand': Qt.Key.Key_Ampersand, + 'asterisk': Qt.Key.Key_Asterisk, + 'leftparenth': Qt.Key.Key_ParenLeft, + 'rightparenth': Qt.Key.Key_ParenRight, + 'space': Qt.Key.Key_Space } self.function_keys = { - '0': Qt.Key_F10, - '1': Qt.Key_F1, - '2': Qt.Key_F2, - '3': Qt.Key_F3, - '4': Qt.Key_F4, - '5': Qt.Key_F5, - '6': Qt.Key_F6, - '7': Qt.Key_F7, - '8': Qt.Key_F8, - '9': Qt.Key_F9, - 'minus': Qt.Key_F11, - 'equal': Qt.Key_F12 + '0': Qt.Key.Key_F10, + '1': Qt.Key.Key_F1, + '2': Qt.Key.Key_F2, + '3': Qt.Key.Key_F3, + '4': Qt.Key.Key_F4, + '5': Qt.Key.Key_F5, + '6': Qt.Key.Key_F6, + '7': Qt.Key.Key_F7, + '8': Qt.Key.Key_F8, + '9': Qt.Key.Key_F9, + 'minus': Qt.Key.Key_F11, + 'equal': Qt.Key.Key_F12 } self.init_letters() @@ -87,9 +87,9 @@ def __init__(self, parent=None): self.init_special() # control button group - self.btn_back.KEY_CHAR = Qt.Key_Backspace - self.btn_delete.KEY_CHAR = Qt.Key_Delete - self.btn_enter.KEY_CHAR = Qt.Key_Enter + self.btn_back.KEY_CHAR = Qt.Key.Key_Backspace + self.btn_delete.KEY_CHAR = Qt.Key.Key_Delete + self.btn_enter.KEY_CHAR = Qt.Key.Key_Enter self.letters_buttonGroup.buttonClicked.connect(self.letter_clicked) self.numbers_buttonGroup.buttonClicked.connect(self.special_clicked) @@ -107,20 +107,20 @@ def init_numbers(self): self['btn_' + val].setText(self.shift_number[i] + '\n' + val) self['btn_' + val].KEY_CHAR = ord(val) self.btn_minus.setText('_\n-') - self.btn_minus.KEY_CHAR = Qt.Key_Minus + self.btn_minus.KEY_CHAR = Qt.Key.Key_Minus self.btn_equal.setText('+\n=') - self.btn_equal.KEY_CHAR = Qt.Key_Equal + self.btn_equal.KEY_CHAR = Qt.Key.Key_Equal def init_special(self): - self.btn_comma.KEY_CHAR = Qt.Key_Comma - self.btn_period.KEY_CHAR = Qt.Key_Period - self.btn_semicolon.KEY_CHAR = Qt.Key_Semicolon - self.btn_slash.KEY_CHAR = Qt.Key_Slash - self.btn_backslash.KEY_CHAR = Qt.Key_Backslash - self.btn_apostrophe.KEY_CHAR = Qt.Key_Apostrophe - self.btn_left_bracket.KEY_CHAR = Qt.Key_BracketLeft - self.btn_right_bracket.KEY_CHAR = Qt.Key_BracketRight - self.btn_space.KEY_CHAR = Qt.Key_Space + self.btn_comma.KEY_CHAR = Qt.Key.Key_Comma + self.btn_period.KEY_CHAR = Qt.Key.Key_Period + self.btn_semicolon.KEY_CHAR = Qt.Key.Key_Semicolon + self.btn_slash.KEY_CHAR = Qt.Key.Key_Slash + self.btn_backslash.KEY_CHAR = Qt.Key.Key_Backslash + self.btn_apostrophe.KEY_CHAR = Qt.Key.Key_Apostrophe + self.btn_left_bracket.KEY_CHAR = Qt.Key.Key_BracketLeft + self.btn_right_bracket.KEY_CHAR = Qt.Key.Key_BracketRight + self.btn_space.KEY_CHAR = Qt.Key.Key_Space def letter_clicked(self, btn): if self.btn_shift.isChecked(): @@ -181,11 +181,11 @@ def __setitem__(self, item, value): # Testing # ############################# if __name__ == "__main__": - from PyQt5.QtWidgets import * - from PyQt5.QtCore import * - from PyQt5.QtGui import * + from PyQt6.QtWidgets import * + from PyQt6.QtCore import * + from PyQt6.QtGui import * app = QtWidgets.QApplication(sys.argv) w = VirtualKeyboard() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/lib/python/qtvcp/widgets/web_widget.py b/lib/python/qtvcp/widgets/web_widget.py index 277d7531f15..e9356bf396b 100644 --- a/lib/python/qtvcp/widgets/web_widget.py +++ b/lib/python/qtvcp/widgets/web_widget.py @@ -1,7 +1,7 @@ import os -from PyQt5.QtCore import QUrl, QFile, QUrl -from PyQt5.QtWidgets import (QWidget,QVBoxLayout,QLabel) +from PyQt6.QtCore import QUrl, QFile, QUrl +from PyQt6.QtWidgets import (QWidget,QVBoxLayout,QLabel) from qtvcp.core import Path # Set up logging @@ -11,14 +11,14 @@ good = True try: - from PyQt5.QtWebEngineWidgets import QWebEngineView as WebBase + from PyQt6.QtWebEngineWidgets import QWebEngineView as WebBase except: try: - from PyQt5.QtWebKitWidgets import QWebView as WebBase + from PyQt6.QtWebKitWidgets import QWebView as WebBase except: LOG.warning('WebWidget - Is python3-pyqt-QtWebEngine installed?') # fail safe - mostly for designer - # PyQt5.QtWebEngineWidgets must be loaded before QApplication + # PyQt6.QtWebEngineWidgets must be loaded before QApplication # which doesn't happen in designer. Also screen won't immediately # crash if both libraries are not missing WebBase = QWidget diff --git a/lib/python/qtvcp/widgets/widget_baseclass.py b/lib/python/qtvcp/widgets/widget_baseclass.py index 53a134a7a57..6472321e78a 100644 --- a/lib/python/qtvcp/widgets/widget_baseclass.py +++ b/lib/python/qtvcp/widgets/widget_baseclass.py @@ -17,7 +17,7 @@ # the other subclasses are for simple HAL widget functionality import hal -from PyQt5.QtCore import pyqtProperty +from PyQt6.QtCore import pyqtProperty from qtvcp import logger # Instantiate the libraries with global reference diff --git a/lib/python/qtvcp/widgets/widget_switcher.py b/lib/python/qtvcp/widgets/widget_switcher.py index 6b551da6141..412640a220d 100644 --- a/lib/python/qtvcp/widgets/widget_switcher.py +++ b/lib/python/qtvcp/widgets/widget_switcher.py @@ -16,8 +16,8 @@ ################################################################################# -from PyQt5.QtCore import pyqtSignal -from PyQt5.QtWidgets import QStackedWidget, QLayout +from PyQt6.QtCore import pyqtSignal +from PyQt6.QtWidgets import QStackedWidget, QLayout from collections import OrderedDict diff --git a/lib/python/qtvcp/widgets/xembed.py b/lib/python/qtvcp/widgets/xembed.py index 8b4218d5dbb..010a4001677 100644 --- a/lib/python/qtvcp/widgets/xembed.py +++ b/lib/python/qtvcp/widgets/xembed.py @@ -3,9 +3,9 @@ import os import subprocess -from PyQt5.QtCore import QEvent, pyqtProperty -from PyQt5.QtGui import QWindow, QResizeEvent, QMoveEvent -from PyQt5.QtWidgets import QWidget +from PyQt6.QtCore import QEvent, pyqtProperty +from PyQt6.QtGui import QWindow, QResizeEvent, QMoveEvent +from PyQt6.QtWidgets import QWidget from qtvcp.widgets.widget_baseclass import _HalWidgetBase try: @@ -134,10 +134,10 @@ def reset_command(self): command_string = pyqtProperty(str, get_command, set_command, reset_command) if __name__ == '__main__': - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication app = QApplication(sys.argv) ex = XEmbed() ex.embed('halcmd loadusr gladevcp --xid ../../gladevcp/offsetpage.glade') ex.show() ex.setWindowTitle('embed') - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/nc_files/filtertest-gui.py b/nc_files/filtertest-gui.py index 267cd735090..7ae01dabfa9 100644 --- a/nc_files/filtertest-gui.py +++ b/nc_files/filtertest-gui.py @@ -1,17 +1,17 @@ import sys -from PyQt5.QtWidgets import (QApplication, QDialog, QDialogButtonBox, +from PyQt6.QtWidgets import (QApplication, QDialog, QDialogButtonBox, QVBoxLayout,QDialogButtonBox) -from PyQt5.QtCore import QTimer, Qt +from PyQt6.QtCore import QTimer, Qt class CustomDialog(QDialog): def __init__(self, *args, **kwargs): super(CustomDialog, self).__init__(*args, **kwargs) - self.setWindowFlags(self.windowFlags() | Qt.WindowStaysOnTopHint) + self.setWindowFlags(self.windowFlags() | Qt.WindowType.WindowStaysOnTopHint) self.setWindowTitle("Filter-with-GUI Test") - QBtn = QDialogButtonBox.Cancel + QBtn = QDialogButtonBox.StandardButton.Cancel self.buttonBox = QDialogButtonBox(QBtn) self.buttonBox.rejected.connect(self.reject) @@ -60,5 +60,5 @@ def process(self): app = QApplication(sys.argv) w = CustomDialog() w.show() - sys.exit( app.exec_() ) + sys.exit( app.exec() ) diff --git a/scripts/setup_designer.in b/scripts/setup_designer.in index 67a61c4597c..3b06f34539a 100755 --- a/scripts/setup_designer.in +++ b/scripts/setup_designer.in @@ -5,10 +5,10 @@ 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.qtwebkit python3-xlib python3-numpy python3-cairo python3-gi-cairo python3-poppler-qt5 +sudo apt-get install -y python3-opengl python3-pyqt6 python3-pyqt6.qsci python3-pyqt6.qtsvg python3-opencv python3-dbus python3-dbus.mainloop.pyqt6 python3-espeak python3-pyqt6.qtwebkit python3-xlib python3-numpy python3-cairo python3-gi-cairo python3-pyqt6.qtpdf echo -e '\ninstalling python3 tools' -sudo apt-get install -y pyqt5-dev-tools +sudo apt-get install -y pyqt6-dev-tools # prompt to install designer while true; do @@ -31,7 +31,7 @@ done # install tools #clear echo -e '\ninstalling common tools' -sudo apt-get install -y qttools5-dev qttools5-dev-tools +sudo apt-get install -y qt6-tools-dev-tools echo -e '\ninstalling python3 tools' sudo apt-get install -y libpython3-dev @@ -82,34 +82,9 @@ fi echo -e '\ncreate plugin link at:\n~/.designer/plugins/python/\n' ln -s "$pifile" ~/.designer/plugins/python/ -sopath=/usr/lib/x86_64-linux-gnu/qt5/plugins/designer/ -p2sofile=libpyqt5_py2.so -p3sofile=libpyqt5.so - -# ensure we have a python3 .so file -if [ ! -f $sopath/$p3sofile ]; then - # check if we have a python3 .so backup file from a python2 installation - if [ -f $sopath/$p3sofile.old ]; then - echo -e '\nrename libpyqt5.so.old file to libpyqt5.so' - sudo mv $sopath/$p3sofile.old $sopath/$p3sofile - # otherwise report an error - else - echo -e '\nlibpyqt5.so is missing from:' - echo -e '/usr/lib/x86_64-linux-gnu/qt5/plugins/designer/' - echo -e '\ndesigner installation aborted...\n' - exit - fi -fi - -# remove python2 .so file if it exists -if [ -f $sopath/$p2sofile ]; then - echo -e '\nremove python2 .so file' - sudo rm $sopath/$p2sofile -fi - #clear echo -e '\nInstallation complete, designer can be started with:' -echo -e '\ndesigner -qt=5\n' +echo -e '\ndesigner -qt=6\n' if [ "$response" -eq 2 ]; then echo -e 'After setting the rip-environment\n' fi diff --git a/share/qtvcp/panels/copy/copy_handler.py b/share/qtvcp/panels/copy/copy_handler.py index 9b3a123fd3b..764658aa027 100644 --- a/share/qtvcp/panels/copy/copy_handler.py +++ b/share/qtvcp/panels/copy/copy_handler.py @@ -4,9 +4,9 @@ import sys import os import shutil -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.widgets.file_manager import FileManager as FM from qtvcp.core import Info ########################################### @@ -241,7 +241,7 @@ def confirmDialog(self, srcPath, name): more_info=info, details=' To Folder:\n {}'.format(dest), display_type='YESNO', - icon=QMessageBox.Information, pinname=None, + icon=QMessageBox.Icon.Information, pinname=None, focus_text=None, focus_color=None, play_alert=None, @@ -261,7 +261,7 @@ def confirmPathDialog(self, srcPath): more_info=info, details=' To Folder:\n {}'.format(dest), display_type='YESNO', - icon=QMessageBox.Information, pinname=None, + icon=QMessageBox.Icon.Information, pinname=None, focus_text=None, focus_color=None, play_alert=None, @@ -276,8 +276,8 @@ class HelpDialog(QDialog): def __init__(self, parent=None): super(HelpDialog, self).__init__(parent) self._title = 'Copy Help' - self.setWindowFlags(self.windowFlags() | Qt.Tool | - Qt.Dialog | Qt.WindowStaysOnTopHint | + self.setWindowFlags(self.windowFlags() | Qt.WindowType.Tool | + Qt.WindowType.Dialog | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowSystemMenuHint) self.currentHelpPage=-1 self.setMinimumWidth(400) @@ -322,10 +322,10 @@ def buildWidget(self): self.pageStepDwnbutton.clicked.connect(lambda : self.pageStep(t,True)) bBox = QDialogButtonBox(buttons) - #bBox.addButton(self.pageStepUpbutton, QDialogButtonBox.ActionRole) - #bBox.addButton(self.pageStepDwnbutton, QDialogButtonBox.ActionRole) - bBox.addButton(previousbutton, QDialogButtonBox.ActionRole) - bBox.addButton(nextbutton, QDialogButtonBox.ActionRole) + #bBox.addButton(self.pageStepUpbutton, QDialogButtonBox.ButtonRole.ActionRole) + #bBox.addButton(self.pageStepDwnbutton, QDialogButtonBox.ButtonRole.ActionRole) + bBox.addButton(previousbutton, QDialogButtonBox.ButtonRole.ActionRole) + bBox.addButton(nextbutton, QDialogButtonBox.ButtonRole.ActionRole) bBox.addButton(closebutton, QDialogButtonBox.DestructiveRole) bBox.rejected.connect(self.reject) @@ -379,7 +379,7 @@ def pageStep(self, t, state): def showDialog(self): self.setWindowTitle(self._title); - retval = self.exec_() + retval = self.exec() ##################### # KEY BINDING CALLS # diff --git a/share/qtvcp/panels/qtplasmac_sim/qtplasmac_sim_handler.py b/share/qtvcp/panels/qtplasmac_sim/qtplasmac_sim_handler.py index ab1c1ae20fe..05e9c7f16e9 100644 --- a/share/qtvcp/panels/qtplasmac_sim/qtplasmac_sim_handler.py +++ b/share/qtvcp/panels/qtplasmac_sim/qtplasmac_sim_handler.py @@ -24,9 +24,9 @@ import sys import hal from subprocess import run as RUN -from PyQt5 import QtCore -from PyQt5.QtGui import QIcon -from PyQt5.QtWidgets import QMessageBox +from PyQt6 import QtCore +from PyQt6.QtGui import QIcon +from PyQt6.QtWidgets import QMessageBox from qtvcp.core import Info from qtvcp.lib.preferences import Access @@ -39,9 +39,9 @@ def __init__(self, halcomp, widgets, paths): self.w = widgets self.paths = paths self.iniFile = INFO.INI - self.w.setWindowFlags(QtCore.Qt.CustomizeWindowHint | - QtCore.Qt.WindowTitleHint | - QtCore.Qt.WindowStaysOnTopHint) + self.w.setWindowFlags(QtCore.Qt.WindowType.CustomizeWindowHint | + QtCore.Qt.WindowType.WindowTitleHint | + QtCore.Qt.WindowType.WindowStaysOnTopHint) self.machineName = self.iniFile.find('EMC', 'MACHINE') self.styleFile = f'{self.paths.CONFIGPATH}/qtplasmac_sim.qss' self.set_style() @@ -367,10 +367,10 @@ def below_material(self): def help_pressed(self): msg = QMessageBox(self.w) - buttonY = msg.addButton(QMessageBox.Ok) + buttonY = msg.addButton(QMessageBox.StandardButton.Ok) buttonY.setText('OK') - buttonY.setFocusPolicy(QtCore.Qt.NoFocus) - msg.setIcon(QMessageBox.Information) + buttonY.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) + msg.setIcon(QMessageBox.Icon.Information) msg.setWindowTitle('Sim Panel Help') message = 'This panel provides buttons for simulating basic plasma signals.\n' message += '\nThe operating mode of QtPlasmaC determines which widgets appear on the panel.\n' @@ -382,7 +382,7 @@ def help_pressed(self): message += '\nFor Mode 2 the UP and DOWN buttons can be pressed during the "cut" and the "torch" will respond appropriately.\n' message += '\nOther buttons can be pressed at any stage of a program run to show the various effect that they have on a running program.\n' msg.setText(message) - msg.exec_() + msg.exec() def get_handlers(halcomp, widgets, paths): diff --git a/share/qtvcp/panels/sim_panel/sim_panel_handler.py b/share/qtvcp/panels/sim_panel/sim_panel_handler.py index e406a5853f1..8829a5a11d9 100644 --- a/share/qtvcp/panels/sim_panel/sim_panel_handler.py +++ b/share/qtvcp/panels/sim_panel/sim_panel_handler.py @@ -1,8 +1,8 @@ ############################ # **** IMPORT SECTION **** # ############################ -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import QWidget +from PyQt6.QtCore import Qt +from PyQt6.QtWidgets import QWidget from qtvcp.core import Status, Action # Set up logging @@ -41,10 +41,10 @@ def __init__(self, halcomp,widgets,paths): # the widgets are instantiated. # the HAL pins are built but HAL is not set ready def initialized__(self): - self.w.setFocusPolicy(Qt.NoFocus) + self.w.setFocusPolicy(Qt.FocusPolicy.NoFocus) for widget in self.w.children(): try: - widget.setFocusPolicy(QtCore.Qt.NoFocus) + widget.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) except: pass number = 0 diff --git a/share/qtvcp/panels/test_button/test_button_handler.py b/share/qtvcp/panels/test_button/test_button_handler.py index 2dafba94a99..c732df2e0b3 100644 --- a/share/qtvcp/panels/test_button/test_button_handler.py +++ b/share/qtvcp/panels/test_button/test_button_handler.py @@ -2,9 +2,9 @@ # **** IMPORT SECTION **** # ############################ import sys -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.core import Status from qtvcp.widgets.hal_selectionbox import HALSelectionBox from qtvcp.widgets.simple_widgets import PushButton @@ -40,7 +40,7 @@ def __init__(self, halcomp,widgets,paths): # the HAL pins are built but HAL is not set ready def initialized__(self): geom = self.w.frameGeometry() - geom.moveCenter(QDesktopWidget().availableGeometry().center()) + geom.moveCenter(QApplication.primaryScreen().availableGeometry().center()) self.w.setGeometry(geom) if self.w.USEROPTIONS_ is not None: @@ -62,7 +62,7 @@ def initialized__(self): self.w.setMinimumHeight(h) self.addButton() - self.w.setWindowFlags(Qt.WindowStaysOnTopHint) + self.w.setWindowFlags(Qt.WindowType.WindowStaysOnTopHint) self.w.setWindowTitle('{}'.format(self.h.comp.getprefix())) # build a button/controls line diff --git a/share/qtvcp/panels/test_dial/test_dial_handler.py b/share/qtvcp/panels/test_dial/test_dial_handler.py index 2056f1abb3f..b491a42b898 100644 --- a/share/qtvcp/panels/test_dial/test_dial_handler.py +++ b/share/qtvcp/panels/test_dial/test_dial_handler.py @@ -2,9 +2,9 @@ # **** IMPORT SECTION **** # ############################ import sys -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.core import Status from qtvcp.widgets.simple_widgets import DoubleScale from qtvcp.widgets.hal_selectionbox import HALSelectionBox @@ -67,7 +67,7 @@ def initialized__(self): # make sure scalewidgets get proper starting values self.w.dial_1.valueChanged.emit(self.w.dial_1.value()) - self.w.setWindowFlags(Qt.WindowStaysOnTopHint) + self.w.setWindowFlags(Qt.WindowType.WindowStaysOnTopHint) self.w.setWindowTitle('{}'.format(self.h.comp.getprefix())) ######################## diff --git a/share/qtvcp/panels/test_led/test_led_handler.py b/share/qtvcp/panels/test_led/test_led_handler.py index b2b1e45cf44..a374d5f52a2 100644 --- a/share/qtvcp/panels/test_led/test_led_handler.py +++ b/share/qtvcp/panels/test_led/test_led_handler.py @@ -2,9 +2,9 @@ # **** IMPORT SECTION **** # ############################ import sys -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.core import Status from qtvcp.widgets.hal_selectionbox import HALSelectionBox from qtvcp.widgets.led_widget import LED @@ -39,7 +39,7 @@ def __init__(self, halcomp,widgets,paths): # the HAL pins are built but HAL is not set ready def initialized__(self): geom = self.w.frameGeometry() - geom.moveCenter(QDesktopWidget().availableGeometry().center()) + geom.moveCenter(QApplication.primaryScreen().availableGeometry().center()) self.w.setGeometry(geom) if self.w.USEROPTIONS_ is not None: @@ -61,7 +61,7 @@ def initialized__(self): self.w.setMinimumHeight(h) self.addLED() - self.w.setWindowFlags(Qt.WindowStaysOnTopHint) + self.w.setWindowFlags(Qt.WindowType.WindowStaysOnTopHint) self.w.setWindowTitle('{}'.format(self.h.comp.getprefix())) # build a LED/controls line diff --git a/share/qtvcp/panels/test_panel/test_panel_handler.py b/share/qtvcp/panels/test_panel/test_panel_handler.py index e06a7c25fa6..3da6aca05bb 100644 --- a/share/qtvcp/panels/test_panel/test_panel_handler.py +++ b/share/qtvcp/panels/test_panel/test_panel_handler.py @@ -3,9 +3,9 @@ ############################ import sys import shutil -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.core import Status ########################################### # **** instantiate libraries section **** # @@ -173,7 +173,7 @@ def __init__(self, parent=None, name=None): layout = QVBoxLayout(self) layout.addWidget(self.terminal) - size_policy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + size_policy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding) self.setSizePolicy(size_policy) # xterm diff --git a/share/qtvcp/panels/test_probe/test_probe_handler.py b/share/qtvcp/panels/test_probe/test_probe_handler.py index 8044f1df083..30a36cea881 100644 --- a/share/qtvcp/panels/test_probe/test_probe_handler.py +++ b/share/qtvcp/panels/test_probe/test_probe_handler.py @@ -1,7 +1,7 @@ ############################ # **** IMPORT SECTION **** # ############################ -from PyQt5.QtCore import Qt +from PyQt6.QtCore import Qt from qtvcp.core import Status, Action @@ -42,7 +42,7 @@ def __init__(self, halcomp,widgets,paths): # the widgets are instantiated. # the HAL pins are built but HAL is not set ready def initialized__(self): - self.w.setWindowFlags(Qt.WindowStaysOnTopHint) + self.w.setWindowFlags(Qt.WindowType.WindowStaysOnTopHint) ######################## # callbacks from STATUS # diff --git a/share/qtvcp/panels/tool_dialog/tool_dialog_handler.py b/share/qtvcp/panels/tool_dialog/tool_dialog_handler.py index 305477dc451..86178b29de8 100644 --- a/share/qtvcp/panels/tool_dialog/tool_dialog_handler.py +++ b/share/qtvcp/panels/tool_dialog/tool_dialog_handler.py @@ -1,7 +1,7 @@ ############################ # **** IMPORT SECTION **** # ############################ -from PyQt5.QtWidgets import (QMessageBox) +from PyQt6.QtWidgets import (QMessageBox) from qtvcp.core import Status, Action # Set up logging diff --git a/share/qtvcp/panels/vismach_5axis_gantry/vismach_5axis_gantry_handler.py b/share/qtvcp/panels/vismach_5axis_gantry/vismach_5axis_gantry_handler.py index b1f6793f2f7..c0f370ff795 100644 --- a/share/qtvcp/panels/vismach_5axis_gantry/vismach_5axis_gantry_handler.py +++ b/share/qtvcp/panels/vismach_5axis_gantry/vismach_5axis_gantry_handler.py @@ -2,9 +2,9 @@ # **** IMPORT SECTION **** # ############################ import sys -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.core import Status from qtvcp.lib.qt_vismach import gantry_5axis as MILL diff --git a/share/qtvcp/panels/vismach_fanuc_200f/vismach_fanuc_200f_handler.py b/share/qtvcp/panels/vismach_fanuc_200f/vismach_fanuc_200f_handler.py index b4ca1efc826..74da62f8f88 100644 --- a/share/qtvcp/panels/vismach_fanuc_200f/vismach_fanuc_200f_handler.py +++ b/share/qtvcp/panels/vismach_fanuc_200f/vismach_fanuc_200f_handler.py @@ -2,9 +2,9 @@ # **** IMPORT SECTION **** # ############################ import sys -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.core import Status from qtvcp.lib.qt_vismach import fanuc_200f as Robot diff --git a/share/qtvcp/panels/vismach_mill_xyz/vismach_mill_xyz_handler.py b/share/qtvcp/panels/vismach_mill_xyz/vismach_mill_xyz_handler.py index e983c2d1aa6..bfa0968d183 100644 --- a/share/qtvcp/panels/vismach_mill_xyz/vismach_mill_xyz_handler.py +++ b/share/qtvcp/panels/vismach_mill_xyz/vismach_mill_xyz_handler.py @@ -2,9 +2,9 @@ # **** IMPORT SECTION **** # ############################ import sys -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.core import Status from qtvcp.lib.qt_vismach import mill_xyz as MILL diff --git a/share/qtvcp/panels/vismach_millturn/vismach_millturn_handler.py b/share/qtvcp/panels/vismach_millturn/vismach_millturn_handler.py index 1ba4504e2d8..e5ff7522d04 100644 --- a/share/qtvcp/panels/vismach_millturn/vismach_millturn_handler.py +++ b/share/qtvcp/panels/vismach_millturn/vismach_millturn_handler.py @@ -2,9 +2,9 @@ # **** IMPORT SECTION **** # ############################ import sys -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.core import Status from qtvcp.lib.qt_vismach import millturn as MILL diff --git a/share/qtvcp/panels/vismach_router_atc/vismach_router_atc_handler.py b/share/qtvcp/panels/vismach_router_atc/vismach_router_atc_handler.py index 36393763ac1..fede64c58e6 100644 --- a/share/qtvcp/panels/vismach_router_atc/vismach_router_atc_handler.py +++ b/share/qtvcp/panels/vismach_router_atc/vismach_router_atc_handler.py @@ -3,9 +3,9 @@ ############################ import sys import os -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.core import Status, Path from qtvcp.lib.qt_vismach.qt_vismach import * diff --git a/share/qtvcp/panels/vismach_scara/vismach_scara_handler.py b/share/qtvcp/panels/vismach_scara/vismach_scara_handler.py index ea2c781b9cc..4015e964532 100644 --- a/share/qtvcp/panels/vismach_scara/vismach_scara_handler.py +++ b/share/qtvcp/panels/vismach_scara/vismach_scara_handler.py @@ -2,9 +2,9 @@ # **** IMPORT SECTION **** # ############################ import sys -from PyQt5.QtCore import * -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * +from PyQt6.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * from qtvcp.core import Status from qtvcp.lib.qt_vismach import scara as SCARA diff --git a/share/qtvcp/screens/blender/blender_handler.py b/share/qtvcp/screens/blender/blender_handler.py index 2ddcec801af..b3ffcb7a12a 100644 --- a/share/qtvcp/screens/blender/blender_handler.py +++ b/share/qtvcp/screens/blender/blender_handler.py @@ -5,7 +5,7 @@ import os import linuxcnc -from PyQt5 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET from qtvcp.widgets.dialog_widget import CamViewDialog as CAMVIEW @@ -62,8 +62,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to diff --git a/share/qtvcp/screens/qt_cnc/qt_cnc_handler.py b/share/qtvcp/screens/qt_cnc/qt_cnc_handler.py index 929ed1d5b66..3409a502607 100644 --- a/share/qtvcp/screens/qt_cnc/qt_cnc_handler.py +++ b/share/qtvcp/screens/qt_cnc/qt_cnc_handler.py @@ -5,7 +5,7 @@ import os import linuxcnc -from PyQt5 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE @@ -90,9 +90,9 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F6, - QtCore.Qt.Key_F7,QtCore.Qt.Key_F8,QtCore.Qt.Key_F12): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F6, + QtCore.Qt.Key.Key_F7,QtCore.Qt.Key.Key_F8,QtCore.Qt.Key.Key_F12): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to diff --git a/share/qtvcp/screens/qt_cnc_800x600/qt_cnc_800x600_handler.py b/share/qtvcp/screens/qt_cnc_800x600/qt_cnc_800x600_handler.py index 7d9d9b2b312..cdd1d96e7d9 100644 --- a/share/qtvcp/screens/qt_cnc_800x600/qt_cnc_800x600_handler.py +++ b/share/qtvcp/screens/qt_cnc_800x600/qt_cnc_800x600_handler.py @@ -2,9 +2,9 @@ # **** IMPORT SECTION **** # ############################ -from PyQt5 import QtCore -from PyQt5 import QtWidgets -from PyQt5 import QtGui +from PyQt6 import QtCore +from PyQt6 import QtWidgets +from PyQt6 import QtGui from qtvcp.lib.keybindings import Keylookup from qtvcp.lib.aux_program_loader import Aux_program_loader from qtvcp.lib.notify import Notify @@ -132,7 +132,7 @@ def on_jograte_changed(self, w, rate): self.jog_velocity = rate def on_error_message(self, w, message): - NOTE.notify('Error',message,QtWidgets.QMessageBox.Information,10) + NOTE.notify('Error',message,QtWidgets.QMessageBox.Icon.Information,10) def on_periodic(self,w): try: diff --git a/share/qtvcp/screens/qt_cnc_9_axis/qt_cnc_9_axis_handler.py b/share/qtvcp/screens/qt_cnc_9_axis/qt_cnc_9_axis_handler.py index 099756a0475..296f61bb56a 100644 --- a/share/qtvcp/screens/qt_cnc_9_axis/qt_cnc_9_axis_handler.py +++ b/share/qtvcp/screens/qt_cnc_9_axis/qt_cnc_9_axis_handler.py @@ -5,7 +5,7 @@ import os import linuxcnc -from PyQt5 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets from qtvcp.widgets.origin_offsetview import OriginOffsetView as OFFVIEW_WIDGET from qtvcp.widgets.tool_offsetview import ToolOffsetView as TOOLVIEW_WIDGET @@ -73,8 +73,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to diff --git a/share/qtvcp/screens/qtaxis/qtaxis_handler.py b/share/qtvcp/screens/qtaxis/qtaxis_handler.py index efa8f026ed4..744d6336989 100644 --- a/share/qtvcp/screens/qtaxis/qtaxis_handler.py +++ b/share/qtvcp/screens/qtaxis/qtaxis_handler.py @@ -5,8 +5,8 @@ import os import linuxcnc -from PyQt5 import QtCore, QtWidgets -from PyQt5.QtGui import QColor +from PyQt6 import QtCore, QtWidgets +from PyQt6.QtGui import QColor from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET from qtvcp.widgets.mdi_history import MDIHistory as MDI_HISTORY @@ -260,8 +260,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to @@ -412,7 +412,7 @@ def saveSettings(self): # Record the toolbar settings win = self.w self.w.settings.beginGroup("MainWindow-{}".format(win.objectName())) - self.w.settings.setValue('state', QtCore.QVariant(win.saveState().data())) + self.w.settings.setValue('state', QtCore.win.saveState(.data())) self.w.settings.endGroup() def restoreSettings(self): @@ -595,7 +595,7 @@ def quick_reference(self): msg.setLayout(layout) msg.setMinimumSize(700,800) msg.show() - retval = msg.exec_() + retval = msg.exec() def launch_log_dialog(self): ACTION.CALL_DIALOG({'NAME':'MACHINELOG', 'ID':'_qtaxis_handler_'}) @@ -658,7 +658,7 @@ def make_corner_widgets(self): self.w.tool_stat.setProperty('tool_number_status', True) self.w.tool_stat.setProperty('textTemplate', 'Tool %d') self.w.tool_stat.hal_init() - self.w.tool_stat.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.w.tool_stat.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter) self.w.tool_stat.setFixedWidth(60) self.w.leftTab.setCornerWidget(self.w.tool_stat) diff --git a/share/qtvcp/screens/qtdragon/languages/langfile b/share/qtvcp/screens/qtdragon/languages/langfile index 7ed8e59be8d..23294fb3e77 100755 --- a/share/qtvcp/screens/qtdragon/languages/langfile +++ b/share/qtvcp/screens/qtdragon/languages/langfile @@ -10,4 +10,4 @@ fi echo -e '\ncreating language translation file qtdragon_'"$1"'.ts\n' -pylupdate5 ./*.py ../*.py ../../../../../lib/python/qtvcp/widgets/*.py -ts "qtdragon_$1.ts" +pylupdate6 ./*.py ../*.py ../../../../../lib/python/qtvcp/widgets/*.py -ts "qtdragon_$1.ts" diff --git a/share/qtvcp/screens/qtdragon/qtdragon_ABOUT b/share/qtvcp/screens/qtdragon/qtdragon_ABOUT index 249b8aeff7f..9394f86133f 100644 --- a/share/qtvcp/screens/qtdragon/qtdragon_ABOUT +++ b/share/qtvcp/screens/qtdragon/qtdragon_ABOUT @@ -3,7 +3,7 @@ p, li { white-space: pre-wrap; }

QtDragon

-

Is a linuxcnc screen based on PyQt5/Qtvcp

+

Is a linuxcnc screen based on PyQt6/Qtvcp

for running XYZ Mills or Routers, optionally with 4th or 5th axis.

This screen is resizable (1280x768 to 1680x1200)

Optional Z axis lift at spindle pause

diff --git a/share/qtvcp/screens/qtdragon/qtdragon_handler.py b/share/qtvcp/screens/qtdragon/qtdragon_handler.py index 4bb3e2e4932..97fbc05ea00 100644 --- a/share/qtvcp/screens/qtdragon/qtdragon_handler.py +++ b/share/qtvcp/screens/qtdragon/qtdragon_handler.py @@ -1,8 +1,8 @@ import os, time -from PyQt5 import QtCore, QtWidgets, QtGui -from PyQt5.QtWidgets import QAction, QMenu -from PyQt5.QtGui import QIcon -from PyQt5.QtCore import QCoreApplication +from PyQt6 import QtCore, QtWidgets, QtGui +from PyQt6.QtWidgets import QAction, QMenu +from PyQt6.QtGui import QIcon +from PyQt6.QtCore import QCoreApplication 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 @@ -31,9 +31,9 @@ QHAL = Qhal() try: - from PyQt5.QtWebEngineWidgets import QWebEnginePage + from PyQt6.QtWebEngineWidgets import QWebEnginePage except: - LOG.warning('QtDragon Warning with loading QtWebEngineWidget - is python3-pyqt5.qtwebengine installed?') + LOG.warning('QtDragon Warning with loading QtWebEngineWidget - is python3-pyqt6.qtwebengine installed?') _translate = QCoreApplication.translate @@ -76,7 +76,7 @@ def __init__(self, halcomp, widgets, paths): self.w = widgets self.gcodes = GCodes(widgets) # This validator precludes using comma as a decimal - self.valid = QtGui.QRegExpValidator(QtCore.QRegExp('-?[0-9]{0,6}[.][0-9]{0,3}')) + self.valid = QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('-?[0-9]{0,6}[.][0-9]{0,3}')) self.KEYBIND = KEYBIND KEYBIND.add_call('Key_F11','on_keycall_F11') KEYBIND.add_call('Key_F12','on_keycall_F12') @@ -493,7 +493,7 @@ def init_widgets(self): # set to apropriate size for panel d.setMinimumSize(600,400) d.setWindowTitle(name) - d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowStaysOnTopHint) + d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowType.WindowStaysOnTopHint) d.finished.connect(self.onClosePopup) d._lastgeometry = None @@ -649,8 +649,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2): -# QtCore.Qt.Key_F3,QtCore.Qt.Key_F4,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2): +# QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F4,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to @@ -1530,12 +1530,12 @@ def update_gcode_properties(self, props ): return # pop a dialog of the properties msg = QtWidgets.QMessageBox() - msg.setIcon(QtWidgets.QMessageBox.Information) + msg.setIcon(QtWidgets.QMessageBox.Icon.Information) msg.setText(smallmess) msg.setWindowTitle(_translate("HandlerClass","Gcode Properties")) - msg.setStandardButtons(QtWidgets.QMessageBox.Ok) + msg.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok) msg.show() - retval = msg.exec_() + retval = msg.exec() def touchoff(self, selector): if selector == 'touchplate': @@ -1862,7 +1862,7 @@ def adjust_stacked_widgets(self,requestedIndex,mode_change=False): #print ('CURRENT:',name) # record current qsplitter settings self.w.settings.beginGroup("qtdragon-{}".format(self.w.splitter_h.objectName())) - self.w.settings.setValue(name, QtCore.QVariant(self.w.splitter_h.saveState().data())) + self.w.settings.setValue(name, QtCore.self.w.splitter_h.saveState(.data())) self.w.settings.endGroup() # ignore, show or hide jog controls diff --git a/share/qtvcp/screens/qtdragon_hd/languages/langfile b/share/qtvcp/screens/qtdragon_hd/languages/langfile index 1377cca5e1c..54be6440c5e 100755 --- a/share/qtvcp/screens/qtdragon_hd/languages/langfile +++ b/share/qtvcp/screens/qtdragon_hd/languages/langfile @@ -10,4 +10,4 @@ fi echo -e '\ncreating language translation file qtdragon_hd_'"$1"'.ts\n' -pylupdate5 ./*.py ../*.py ../../../../../lib/python/qtvcp/widgets/*.py -ts "qtdragon_hd_$1.ts" +pylupdate6 ./*.py ../*.py ../../../../../lib/python/qtvcp/widgets/*.py -ts "qtdragon_hd_$1.ts" diff --git a/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_ABOUT b/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_ABOUT index 1b8358d4451..5fd2a1bc73c 100644 --- a/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_ABOUT +++ b/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_ABOUT @@ -3,7 +3,7 @@ p, li { white-space: pre-wrap; }

QtDragon HD

-

Is a linuxcnc screen based on PyQt5/Qtvcp

+

Is a linuxcnc screen based on PyQt6/Qtvcp

for running XYZA Mills or Routers

Resolution of 1920x1056 (not resizeable)

Optional Z level compensation

diff --git a/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py b/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py index 907457f279e..e9f52407755 100644 --- a/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py +++ b/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py @@ -1,8 +1,8 @@ import os, time -from PyQt5 import QtCore, QtWidgets, QtGui -from PyQt5.QtWidgets import QAction, QMenu -from PyQt5.QtGui import QIcon -from PyQt5.QtCore import QCoreApplication +from PyQt6 import QtCore, QtWidgets, QtGui +from PyQt6.QtWidgets import QAction, QMenu +from PyQt6.QtGui import QIcon +from PyQt6.QtCore import QCoreApplication 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 @@ -35,9 +35,9 @@ QHAL = Qhal() try: - from PyQt5.QtWebEngineWidgets import QWebEnginePage + from PyQt6.QtWebEngineWidgets import QWebEnginePage except: - LOG.warning('QtDragon warning with loading QtWebEngineWidget - is python3-pyqt5.qtwebengine installed?') + LOG.warning('QtDragon warning with loading QtWebEngineWidget - is python3-pyqt6.qtwebengine installed?') _translate = QCoreApplication.translate @@ -80,7 +80,7 @@ def __init__(self, halcomp, widgets, paths): self.w = widgets self.gcodes = GCodes(widgets) # This validator precludes using comma as a decimal - self.valid = QtGui.QRegExpValidator(QtCore.QRegExp('-?[0-9]{0,6}[.][0-9]{0,3}')) + self.valid = QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('-?[0-9]{0,6}[.][0-9]{0,3}')) self.styleeditor = SSE(widgets, paths) self.KEYBIND = KEYBIND KEYBIND.add_call('Key_F4', 'on_keycall_F4') @@ -238,7 +238,7 @@ def initialized__(self): for i in ["search_vel_units", "probe_vel_units", "jog_linear"]: self.w['lbl_' + i].setText(unit) - self.w.setWindowFlags(QtCore.Qt.FramelessWindowHint) + self.w.setWindowFlags(QtCore.Qt.WindowType.FramelessWindowHint) self.configureMacroButtons() @@ -481,7 +481,7 @@ def init_widgets(self): # set to apropriate size for panel d.setMinimumSize(600,400) d.setWindowTitle(name) - d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowStaysOnTopHint) + d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowType.WindowStaysOnTopHint) d.finished.connect(self.onClosePopup) d._lastgeometry = None @@ -662,8 +662,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2): -# QtCore.Qt.Key_F3,QtCore.Qt.Key_F4,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2): +# QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F4,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to @@ -1587,12 +1587,12 @@ def update_gcode_properties(self, props ): return # pop a dialog of the properties msg = QtWidgets.QMessageBox() - msg.setIcon(QtWidgets.QMessageBox.Information) + msg.setIcon(QtWidgets.QMessageBox.Icon.Information) msg.setText(smallmess) msg.setWindowTitle("Gcode Properties") - msg.setStandardButtons(QtWidgets.QMessageBox.Ok) + msg.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok) msg.show() - retval = msg.exec_() + retval = msg.exec() def touchoff(self, selector): if selector == 'touchplate': diff --git a/share/qtvcp/screens/qtdragon_hd_vert/languages/langfile b/share/qtvcp/screens/qtdragon_hd_vert/languages/langfile index 1377cca5e1c..54be6440c5e 100755 --- a/share/qtvcp/screens/qtdragon_hd_vert/languages/langfile +++ b/share/qtvcp/screens/qtdragon_hd_vert/languages/langfile @@ -10,4 +10,4 @@ fi echo -e '\ncreating language translation file qtdragon_hd_'"$1"'.ts\n' -pylupdate5 ./*.py ../*.py ../../../../../lib/python/qtvcp/widgets/*.py -ts "qtdragon_hd_$1.ts" +pylupdate6 ./*.py ../*.py ../../../../../lib/python/qtvcp/widgets/*.py -ts "qtdragon_hd_$1.ts" diff --git a/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_ABOUT b/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_ABOUT index 1b8358d4451..5fd2a1bc73c 100644 --- a/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_ABOUT +++ b/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_ABOUT @@ -3,7 +3,7 @@ p, li { white-space: pre-wrap; }

QtDragon HD

-

Is a linuxcnc screen based on PyQt5/Qtvcp

+

Is a linuxcnc screen based on PyQt6/Qtvcp

for running XYZA Mills or Routers

Resolution of 1920x1056 (not resizeable)

Optional Z level compensation

diff --git a/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py b/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py index a9227bebcfc..94db447403e 100644 --- a/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py +++ b/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py @@ -1,8 +1,8 @@ import os, time -from PyQt5 import QtCore, QtWidgets, QtGui -from PyQt5.QtWidgets import QAction, QMenu -from PyQt5.QtGui import QIcon -from PyQt5.QtCore import QCoreApplication +from PyQt6 import QtCore, QtWidgets, QtGui +from PyQt6.QtWidgets import QAction, QMenu +from PyQt6.QtGui import QIcon +from PyQt6.QtCore import QCoreApplication 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 @@ -35,9 +35,9 @@ QHAL = Qhal() try: - from PyQt5.QtWebEngineWidgets import QWebEnginePage + from PyQt6.QtWebEngineWidgets import QWebEnginePage except: - LOG.warning('QtDragon warning with loading QtWebEngineWidget - is python3-pyqt5.qtwebengine installed?') + LOG.warning('QtDragon warning with loading QtWebEngineWidget - is python3-pyqt6.qtwebengine installed?') _translate = QCoreApplication.translate @@ -80,7 +80,7 @@ def __init__(self, halcomp, widgets, paths): self.w = widgets self.gcodes = GCodes(widgets) # This validator precludes using comma as a decimal - self.valid = QtGui.QRegExpValidator(QtCore.QRegExp('-?[0-9]{0,6}[.][0-9]{0,3}')) + self.valid = QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('-?[0-9]{0,6}[.][0-9]{0,3}')) self.styleeditor = SSE(widgets, paths) self.KEYBIND = KEYBIND KEYBIND.add_call('Key_F4', 'on_keycall_F4') @@ -238,7 +238,7 @@ def initialized__(self): for i in ["search_vel_units", "probe_vel_units", "jog_linear"]: self.w['lbl_' + i].setText(unit) - self.w.setWindowFlags(QtCore.Qt.FramelessWindowHint) + self.w.setWindowFlags(QtCore.Qt.WindowType.FramelessWindowHint) self.configureMacroButtons() @@ -481,7 +481,7 @@ def init_widgets(self): # set to apropriate size for panel d.setMinimumSize(600,400) d.setWindowTitle(name) - d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowStaysOnTopHint) + d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowType.WindowStaysOnTopHint) d.finished.connect(self.onClosePopup) d._lastgeometry = None @@ -662,8 +662,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2): -# QtCore.Qt.Key_F3,QtCore.Qt.Key_F4,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2): +# QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F4,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to @@ -1587,12 +1587,12 @@ def update_gcode_properties(self, props ): return # pop a dialog of the properties msg = QtWidgets.QMessageBox() - msg.setIcon(QtWidgets.QMessageBox.Information) + msg.setIcon(QtWidgets.QMessageBox.Icon.Information) msg.setText(smallmess) msg.setWindowTitle("Gcode Properties") - msg.setStandardButtons(QtWidgets.QMessageBox.Ok) + msg.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok) msg.show() - retval = msg.exec_() + retval = msg.exec() def touchoff(self, selector): if selector == 'touchplate': diff --git a/share/qtvcp/screens/qtdragon_lathe/languages/langfile b/share/qtvcp/screens/qtdragon_lathe/languages/langfile index d96f3bfdedb..621bd087e77 100755 --- a/share/qtvcp/screens/qtdragon_lathe/languages/langfile +++ b/share/qtvcp/screens/qtdragon_lathe/languages/langfile @@ -10,4 +10,4 @@ fi echo -e '\ncreating language translation file qtdragon_lathe_'"$1"'.ts\n' -pylupdate5 ./*.py ../*.py ../../../../../lib/python/qtvcp/widgets/*.py -ts "qtdragon_lathe_$1.ts" +pylupdate6 ./*.py ../*.py ../../../../../lib/python/qtvcp/widgets/*.py -ts "qtdragon_lathe_$1.ts" diff --git a/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe.py b/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe.py index 28a08b12ca9..62d41f27d10 100644 --- a/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe.py +++ b/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe.py @@ -2,9 +2,7 @@ # Form implementation generated from reading ui file '../qtdragon.ui' # -# Created by: PyQt5 UI code generator 5.15.6 -# -# WARNING: Any manual changes made to this file will be lost when pyuic5 is +# WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. diff --git a/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_ABOUT b/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_ABOUT index 962069188ce..3e092a2fdb0 100644 --- a/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_ABOUT +++ b/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_ABOUT @@ -3,7 +3,7 @@ p, li { white-space: pre-wrap; }

QtDragon Lathe

-

Is a linuxcnc screen based on PyQt5/Qtvcp

+

Is a linuxcnc screen based on PyQt6/Qtvcp

This screen is resizable (1280x768 to 1680x1200)

The is a development version specfically for lathes


diff --git a/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py b/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py index 546002233f8..7be4221f981 100644 --- a/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py +++ b/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py @@ -1,8 +1,8 @@ import os, time -from PyQt5 import QtCore, QtWidgets, QtGui -from PyQt5.QtWidgets import QAction, QMenu -from PyQt5.QtGui import QIcon -from PyQt5.QtCore import QCoreApplication +from PyQt6 import QtCore, QtWidgets, QtGui +from PyQt6.QtWidgets import QAction, QMenu +from PyQt6.QtGui import QIcon +from PyQt6.QtCore import QCoreApplication 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 @@ -31,9 +31,9 @@ QHAL = Qhal() try: - from PyQt5.QtWebEngineWidgets import QWebEnginePage + from PyQt6.QtWebEngineWidgets import QWebEnginePage except: - LOG.warning('QtDragon Warning with loading QtWebEngineWidget - is python3-pyqt5.qtwebengine installed?') + LOG.warning('QtDragon Warning with loading QtWebEngineWidget - is python3-pyqt6.qtwebengine installed?') _translate = QCoreApplication.translate @@ -74,7 +74,7 @@ def __init__(self, halcomp, widgets, paths): self.w = widgets self.gcodes = GCodes(widgets) # This validator precludes using comma as a decimal - self.valid = QtGui.QRegExpValidator(QtCore.QRegExp('-?[0-9]{0,6}[.][0-9]{0,3}')) + self.valid = QtGui.QRegularExpressionValidator(QtCore.QRegularExpression('-?[0-9]{0,6}[.][0-9]{0,3}')) self.KEYBIND = KEYBIND KEYBIND.add_call('Key_F11','on_keycall_F11') KEYBIND.add_call('Key_F12','on_keycall_F12') @@ -479,7 +479,7 @@ def init_widgets(self): # set to apropriate size for panel d.setMinimumSize(600,400) d.setWindowTitle(name) - d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowStaysOnTopHint) + d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowType.WindowStaysOnTopHint) d.finished.connect(self.onClosePopup) d._lastgeometry = None @@ -637,8 +637,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2): -# QtCore.Qt.Key_F3,QtCore.Qt.Key_F4,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2): +# QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F4,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to @@ -1531,12 +1531,12 @@ def update_gcode_properties(self, props ): return # pop a dialog of the properties msg = QtWidgets.QMessageBox() - msg.setIcon(QtWidgets.QMessageBox.Information) + msg.setIcon(QtWidgets.QMessageBox.Icon.Information) msg.setText(smallmess) msg.setWindowTitle(_translate("HandlerClass","Gcode Properties")) - msg.setStandardButtons(QtWidgets.QMessageBox.Ok) + msg.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok) msg.show() - retval = msg.exec_() + retval = msg.exec() def touchoff(self, selector): if selector == 'touchplate': @@ -1863,7 +1863,7 @@ def adjust_stacked_widgets(self,requestedIndex,mode_change=False): #print ('CURRENT:',name) # record current qsplitter settings self.w.settings.beginGroup("qtdragon-{}".format(self.w.splitter_h.objectName())) - self.w.settings.setValue(name, QtCore.QVariant(self.w.splitter_h.saveState().data())) + self.w.settings.setValue(name, QtCore.self.w.splitter_h.saveState(.data())) self.w.settings.endGroup() # ignore, show or hide jog controls diff --git a/share/qtvcp/screens/qtlathe/qtlathe_handler.py b/share/qtvcp/screens/qtlathe/qtlathe_handler.py index 7f4b8f4ffcd..9dd1dfa00af 100644 --- a/share/qtvcp/screens/qtlathe/qtlathe_handler.py +++ b/share/qtvcp/screens/qtlathe/qtlathe_handler.py @@ -6,7 +6,7 @@ import linuxcnc import hal -from PyQt5 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE @@ -136,9 +136,9 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5, - QtCore.Qt.Key_F6,QtCore.Qt.Key_F7,QtCore.Qt.Key_F11,QtCore.Qt.Key_F12): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5, + QtCore.Qt.Key.Key_F6,QtCore.Qt.Key.Key_F7,QtCore.Qt.Key.Key_F11,QtCore.Qt.Key.Key_F12): raise if event.isAutoRepeat():return True diff --git a/share/qtvcp/screens/qtplasmac/language_howto b/share/qtvcp/screens/qtplasmac/language_howto index 4c6d8a959c1..a7883da42d8 100644 --- a/share/qtvcp/screens/qtplasmac/language_howto +++ b/share/qtvcp/screens/qtplasmac/language_howto @@ -14,21 +14,21 @@ The directories qtplasmac_4x3/languages and qtplasmac_9x16/languages are only fo The language is determined by an underscore plus the first two letters of the locale, for example if an Italian translation was being done then it would be "_it". We will refer to it in the following as _xx, so "qtplasmac_xx.ts" for an Italian translation would be "qtplasmac_it.ts". -If any of the following utilities are not installed then you will need to install pyqt5-dev-tools: -$ sudo apt install pyqt5-dev-tools +If any of the following utilities are not installed then you will need to install pyqt6-dev-tools: +$ sudo apt install pyqt6-dev-tools Change to the languages directory: $ cd ~/linuxcnc-dev/share/qtvcp/screens/qtplasmac/languages If any text changes are made to the GUI then run the following to create a GUI python file: -$ pyuic5 ../qtplasmac.ui > qtplasmac.py +$ pyuic6 ../qtplasmac.ui > qtplasmac.py You can either create a new translation source file for a non existing language translation or modify an existing translation source file due to changes being made to some text in a QtPlasmaC source file. If modifying an existing translation that has had no source file changes then this step is not required. Create/edit a .ts file: $ ./langfile xx -(this command is a script which runs the following: $ pylupdate5 *.py ../*.py ../../../../../lib/python/qtvcp/lib/qtplasmac/*.py -ts qtplasmac_xx.ts) +(this command is a script which runs the following: $ pylupdate6 *.py ../*.py ../../../../../lib/python/qtvcp/lib/qtplasmac/*.py -ts qtplasmac_xx.ts) The editing of the translation is done with the linguist application: $ linguist diff --git a/share/qtvcp/screens/qtplasmac/languages/langfile b/share/qtvcp/screens/qtplasmac/languages/langfile index 10700126b28..0128370e508 100755 --- a/share/qtvcp/screens/qtplasmac/languages/langfile +++ b/share/qtvcp/screens/qtplasmac/languages/langfile @@ -12,4 +12,4 @@ fi echo -e "\ncreating language translation file qtplasmac_$1.ts\n" -pylupdate5 ./*.py ../*.py ../../../../../lib/python/qtvcp/widgets/*.py ../../../../../lib/python/qtvcp/lib/qtplasmac/*.py -ts "qtplasmac_$1.ts" +pylupdate6 ./*.py ../*.py ../../../../../lib/python/qtvcp/widgets/*.py ../../../../../lib/python/qtvcp/lib/qtplasmac/*.py -ts "qtplasmac_$1.ts" diff --git a/share/qtvcp/screens/qtplasmac/languages/qtplasmac.py b/share/qtvcp/screens/qtplasmac/languages/qtplasmac.py index 7b237582e04..34da06a750b 100644 --- a/share/qtvcp/screens/qtplasmac/languages/qtplasmac.py +++ b/share/qtvcp/screens/qtplasmac/languages/qtplasmac.py @@ -2,20 +2,18 @@ # Form implementation generated from reading ui file '../qtplasmac.ui' # -# Created by: PyQt5 UI code generator 5.15.9 -# -# WARNING: Any manual changes made to this file will be lost when pyuic5 is +# WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. -from PyQt5 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") MainWindow.resize(1348, 866) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth()) @@ -26,7 +24,7 @@ def setupUi(self, MainWindow): MainWindow.setAutoFillBackground(False) MainWindow.setStyleSheet("") self.central_widget = QtWidgets.QWidget(MainWindow) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.central_widget.sizePolicy().hasHeightForWidth()) @@ -75,13 +73,13 @@ def setupUi(self, MainWindow): self.verticalLayout_16.setObjectName("verticalLayout_16") self.main_tab_widget = QtWidgets.QTabWidget(self.screen_options) self.main_tab_widget.setEnabled(True) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.main_tab_widget.sizePolicy().hasHeightForWidth()) self.main_tab_widget.setSizePolicy(sizePolicy) - self.main_tab_widget.setFocusPolicy(QtCore.Qt.ClickFocus) - self.main_tab_widget.setTabPosition(QtWidgets.QTabWidget.South) + self.main_tab_widget.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) + self.main_tab_widget.setTabPosition(QtWidgets.QTabWidget.TabPosition.South) self.main_tab_widget.setUsesScrollButtons(False) self.main_tab_widget.setObjectName("main_tab_widget") self.main_tab = QtWidgets.QWidget() @@ -91,13 +89,13 @@ def setupUi(self, MainWindow): self.main_tab_Layout.setSpacing(2) self.main_tab_Layout.setObjectName("main_tab_Layout") self.main_c1 = QtWidgets.QFrame(self.main_tab) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.main_c1.sizePolicy().hasHeightForWidth()) self.main_c1.setSizePolicy(sizePolicy) - self.main_c1.setFrameShape(QtWidgets.QFrame.NoFrame) - self.main_c1.setFrameShadow(QtWidgets.QFrame.Plain) + self.main_c1.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.main_c1.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.main_c1.setObjectName("main_c1") self.verticalLayout_31 = QtWidgets.QVBoxLayout(self.main_c1) self.verticalLayout_31.setContentsMargins(0, 0, 0, 0) @@ -112,21 +110,21 @@ def setupUi(self, MainWindow): self.horizontalLayout_18.setSpacing(0) self.horizontalLayout_18.setObjectName("horizontalLayout_18") self.preview_frame = QtWidgets.QFrame(self.preview_page) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.preview_frame.sizePolicy().hasHeightForWidth()) self.preview_frame.setSizePolicy(sizePolicy) - self.preview_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.preview_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.preview_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.preview_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.preview_frame.setObjectName("preview_frame") self.verticalLayout_30 = QtWidgets.QVBoxLayout(self.preview_frame) self.verticalLayout_30.setContentsMargins(0, 0, 0, 2) self.verticalLayout_30.setSpacing(2) self.verticalLayout_30.setObjectName("verticalLayout_30") self.frame_22 = QtWidgets.QFrame(self.preview_frame) - self.frame_22.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_22.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_22.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_22.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_22.setObjectName("frame_22") self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.frame_22) self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0) @@ -138,25 +136,25 @@ def setupUi(self, MainWindow): self.material_label.setObjectName("material_label") self.horizontalLayout_3.addWidget(self.material_label) self.material_selector = QtWidgets.QComboBox(self.frame_22) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.material_selector.sizePolicy().hasHeightForWidth()) self.material_selector.setSizePolicy(sizePolicy) self.material_selector.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.material_selector.setFocusPolicy(QtCore.Qt.ClickFocus) + self.material_selector.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.material_selector.setObjectName("material_selector") self.horizontalLayout_3.addWidget(self.material_selector) self.velocity_label = QtWidgets.QLabel(self.frame_22) self.velocity_label.setMinimumSize(QtCore.QSize(0, 16)) self.velocity_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.velocity_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.velocity_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.velocity_label.setObjectName("velocity_label") self.horizontalLayout_3.addWidget(self.velocity_label) self.velocity_show = StatusLabel(self.frame_22) self.velocity_show.setMinimumSize(QtCore.QSize(48, 16)) self.velocity_show.setMaximumSize(QtCore.QSize(48, 16)) - self.velocity_show.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.velocity_show.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.velocity_show.setProperty("textTemplate", "%0.1f") self.velocity_show.setProperty("alt_textTemplate", "%0.0f") self.velocity_show.setProperty("current_feedrate_status", True) @@ -164,15 +162,15 @@ def setupUi(self, MainWindow): self.horizontalLayout_3.addWidget(self.velocity_show) self.verticalLayout_30.addWidget(self.frame_22) self.preview_place = QtWidgets.QFrame(self.preview_frame) - self.preview_place.setFrameShape(QtWidgets.QFrame.NoFrame) - self.preview_place.setFrameShadow(QtWidgets.QFrame.Plain) + self.preview_place.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.preview_place.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.preview_place.setObjectName("preview_place") self.horizontalLayout_11 = QtWidgets.QHBoxLayout(self.preview_place) self.horizontalLayout_11.setContentsMargins(2, 0, 2, 0) self.horizontalLayout_11.setSpacing(2) self.horizontalLayout_11.setObjectName("horizontalLayout_11") self.gcodegraphics = GCodeGraphics(self.preview_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.gcodegraphics.sizePolicy().hasHeightForWidth()) @@ -188,19 +186,19 @@ def setupUi(self, MainWindow): self.horizontalLayout_11.addWidget(self.gcodegraphics) self.preview_buttons = QtWidgets.QFrame(self.preview_place) self.preview_buttons.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.preview_buttons.setFrameShape(QtWidgets.QFrame.NoFrame) - self.preview_buttons.setFrameShadow(QtWidgets.QFrame.Plain) + self.preview_buttons.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.preview_buttons.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.preview_buttons.setObjectName("preview_buttons") self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.preview_buttons) self.verticalLayout_3.setContentsMargins(0, 2, 0, 2) self.verticalLayout_3.setSpacing(8) self.verticalLayout_3.setObjectName("verticalLayout_3") - spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_3.addItem(spacerItem) self.view_t = QtWidgets.QPushButton(self.preview_buttons) self.view_t.setMinimumSize(QtCore.QSize(40, 28)) self.view_t.setMaximumSize(QtCore.QSize(40, 28)) - self.view_t.setFocusPolicy(QtCore.Qt.ClickFocus) + self.view_t.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.view_t.setText("T") self.view_t.setCheckable(True) self.view_t.setAutoExclusive(True) @@ -209,7 +207,7 @@ def setupUi(self, MainWindow): self.view_p = QtWidgets.QPushButton(self.preview_buttons) self.view_p.setMinimumSize(QtCore.QSize(40, 28)) self.view_p.setMaximumSize(QtCore.QSize(40, 28)) - self.view_p.setFocusPolicy(QtCore.Qt.ClickFocus) + self.view_p.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.view_p.setText("P") self.view_p.setCheckable(True) self.view_p.setAutoExclusive(True) @@ -218,7 +216,7 @@ def setupUi(self, MainWindow): self.view_z = QtWidgets.QPushButton(self.preview_buttons) self.view_z.setMinimumSize(QtCore.QSize(40, 28)) self.view_z.setMaximumSize(QtCore.QSize(40, 28)) - self.view_z.setFocusPolicy(QtCore.Qt.ClickFocus) + self.view_z.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.view_z.setText("Z") self.view_z.setCheckable(True) self.view_z.setChecked(True) @@ -234,7 +232,7 @@ def setupUi(self, MainWindow): self.pan_right = QtWidgets.QPushButton(self.preview_buttons) self.pan_right.setMinimumSize(QtCore.QSize(40, 28)) self.pan_right.setMaximumSize(QtCore.QSize(40, 28)) - self.pan_right.setFocusPolicy(QtCore.Qt.ClickFocus) + self.pan_right.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.pan_right.setText("→") self.pan_right.setAutoRepeat(True) self.pan_right.setObjectName("pan_right") @@ -242,7 +240,7 @@ def setupUi(self, MainWindow): self.pan_left = QtWidgets.QPushButton(self.preview_buttons) self.pan_left.setMinimumSize(QtCore.QSize(40, 28)) self.pan_left.setMaximumSize(QtCore.QSize(40, 28)) - self.pan_left.setFocusPolicy(QtCore.Qt.ClickFocus) + self.pan_left.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.pan_left.setText("←") self.pan_left.setAutoRepeat(True) self.pan_left.setObjectName("pan_left") @@ -250,7 +248,7 @@ def setupUi(self, MainWindow): self.pan_up = QtWidgets.QPushButton(self.preview_buttons) self.pan_up.setMinimumSize(QtCore.QSize(40, 28)) self.pan_up.setMaximumSize(QtCore.QSize(40, 28)) - self.pan_up.setFocusPolicy(QtCore.Qt.ClickFocus) + self.pan_up.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.pan_up.setText("↑") self.pan_up.setAutoRepeat(True) self.pan_up.setObjectName("pan_up") @@ -258,7 +256,7 @@ def setupUi(self, MainWindow): self.pan_down = QtWidgets.QPushButton(self.preview_buttons) self.pan_down.setMinimumSize(QtCore.QSize(40, 28)) self.pan_down.setMaximumSize(QtCore.QSize(40, 28)) - self.pan_down.setFocusPolicy(QtCore.Qt.ClickFocus) + self.pan_down.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.pan_down.setText("↓") self.pan_down.setAutoRepeat(True) self.pan_down.setObjectName("pan_down") @@ -272,7 +270,7 @@ def setupUi(self, MainWindow): self.zoom_in = QtWidgets.QPushButton(self.preview_buttons) self.zoom_in.setMinimumSize(QtCore.QSize(40, 28)) self.zoom_in.setMaximumSize(QtCore.QSize(40, 28)) - self.zoom_in.setFocusPolicy(QtCore.Qt.ClickFocus) + self.zoom_in.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.zoom_in.setText("+") self.zoom_in.setAutoRepeat(True) self.zoom_in.setObjectName("zoom_in") @@ -280,7 +278,7 @@ def setupUi(self, MainWindow): self.zoom_out = QtWidgets.QPushButton(self.preview_buttons) self.zoom_out.setMinimumSize(QtCore.QSize(40, 28)) self.zoom_out.setMaximumSize(QtCore.QSize(40, 28)) - self.zoom_out.setFocusPolicy(QtCore.Qt.ClickFocus) + self.zoom_out.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.zoom_out.setText("-") self.zoom_out.setAutoRepeat(True) self.zoom_out.setObjectName("zoom_out") @@ -294,7 +292,7 @@ def setupUi(self, MainWindow): self.view_clear = QtWidgets.QPushButton(self.preview_buttons) self.view_clear.setMinimumSize(QtCore.QSize(40, 28)) self.view_clear.setMaximumSize(QtCore.QSize(40, 28)) - self.view_clear.setFocusPolicy(QtCore.Qt.ClickFocus) + self.view_clear.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.view_clear.setText("C") self.view_clear.setObjectName("view_clear") self.verticalLayout_3.addWidget(self.view_clear) @@ -310,26 +308,26 @@ def setupUi(self, MainWindow): self.horizontalLayout_22.setSpacing(0) self.horizontalLayout_22.setObjectName("horizontalLayout_22") self.file_frame = QtWidgets.QFrame(self.file_page) - self.file_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.file_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.file_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.file_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.file_frame.setObjectName("file_frame") self.verticalLayout_32 = QtWidgets.QVBoxLayout(self.file_frame) self.verticalLayout_32.setContentsMargins(0, 0, 0, 4) self.verticalLayout_32.setSpacing(4) self.verticalLayout_32.setObjectName("verticalLayout_32") self.open_label = QtWidgets.QLabel(self.file_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.open_label.sizePolicy().hasHeightForWidth()) self.open_label.setSizePolicy(sizePolicy) self.open_label.setMinimumSize(QtCore.QSize(0, 16)) self.open_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.open_label.setAlignment(QtCore.Qt.AlignCenter) + self.open_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.open_label.setObjectName("open_label") self.verticalLayout_32.addWidget(self.open_label) self.filemanager = FileManager(self.file_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.filemanager.sizePolicy().hasHeightForWidth()) @@ -337,15 +335,15 @@ def setupUi(self, MainWindow): self.filemanager.setObjectName("filemanager") self.verticalLayout_32.addWidget(self.filemanager) self.file_buttons_2 = QtWidgets.QFrame(self.file_frame) - self.file_buttons_2.setFrameShape(QtWidgets.QFrame.NoFrame) - self.file_buttons_2.setFrameShadow(QtWidgets.QFrame.Plain) + self.file_buttons_2.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.file_buttons_2.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.file_buttons_2.setObjectName("file_buttons_2") self.horizontalLayout_20 = QtWidgets.QHBoxLayout(self.file_buttons_2) self.horizontalLayout_20.setContentsMargins(4, 0, 4, 0) self.horizontalLayout_20.setSpacing(4) self.horizontalLayout_20.setObjectName("horizontalLayout_20") self.file_select = IndicatedPushButton(self.file_buttons_2) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.file_select.sizePolicy().hasHeightForWidth()) @@ -357,7 +355,7 @@ def setupUi(self, MainWindow): self.file_select.setObjectName("file_select") self.horizontalLayout_20.addWidget(self.file_select) self.file_next = IndicatedPushButton(self.file_buttons_2) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.file_next.sizePolicy().hasHeightForWidth()) @@ -370,7 +368,7 @@ def setupUi(self, MainWindow): self.file_next.setObjectName("file_next") self.horizontalLayout_20.addWidget(self.file_next) self.file_prev = IndicatedPushButton(self.file_buttons_2) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.file_prev.sizePolicy().hasHeightForWidth()) @@ -383,7 +381,7 @@ def setupUi(self, MainWindow): self.file_prev.setObjectName("file_prev") self.horizontalLayout_20.addWidget(self.file_prev) self.file_cancel = QtWidgets.QPushButton(self.file_buttons_2) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.file_cancel.sizePolicy().hasHeightForWidth()) @@ -401,8 +399,8 @@ def setupUi(self, MainWindow): self.horizontalLayout_5.setSpacing(0) self.horizontalLayout_5.setObjectName("horizontalLayout_5") self.edit_frame = QtWidgets.QFrame(self.edit_page) - self.edit_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.edit_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.edit_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.edit_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.edit_frame.setObjectName("edit_frame") self.verticalLayout_22 = QtWidgets.QVBoxLayout(self.edit_frame) self.verticalLayout_22.setContentsMargins(0, 0, 0, 4) @@ -411,7 +409,7 @@ def setupUi(self, MainWindow): self.edit_label = QtWidgets.QLabel(self.edit_frame) self.edit_label.setMinimumSize(QtCore.QSize(0, 16)) self.edit_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.edit_label.setAlignment(QtCore.Qt.AlignCenter) + self.edit_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.edit_label.setObjectName("edit_label") self.verticalLayout_22.addWidget(self.edit_label) self.gcode_editor = GcodeEditor(self.edit_frame) @@ -427,8 +425,8 @@ def setupUi(self, MainWindow): self.horizontalLayout_13.setSpacing(0) self.horizontalLayout_13.setObjectName("horizontalLayout_13") self.camview_frame = QtWidgets.QFrame(self.camview_page) - self.camview_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.camview_frame.setFrameShadow(QtWidgets.QFrame.Raised) + self.camview_frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.camview_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.camview_frame.setObjectName("camview_frame") self.verticalLayout_47 = QtWidgets.QVBoxLayout(self.camview_frame) self.verticalLayout_47.setContentsMargins(0, 0, 0, 4) @@ -437,26 +435,26 @@ def setupUi(self, MainWindow): self.camview_label = QtWidgets.QLabel(self.camview_frame) self.camview_label.setMinimumSize(QtCore.QSize(0, 16)) self.camview_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.camview_label.setAlignment(QtCore.Qt.AlignCenter) + self.camview_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.camview_label.setObjectName("camview_label") self.verticalLayout_47.addWidget(self.camview_label) self.camview_widgets = QtWidgets.QFrame(self.camview_frame) - self.camview_widgets.setFrameShape(QtWidgets.QFrame.NoFrame) - self.camview_widgets.setFrameShadow(QtWidgets.QFrame.Plain) + self.camview_widgets.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.camview_widgets.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.camview_widgets.setObjectName("camview_widgets") self.verticalLayout_49 = QtWidgets.QVBoxLayout(self.camview_widgets) self.verticalLayout_49.setContentsMargins(4, 0, 4, 0) self.verticalLayout_49.setSpacing(4) self.verticalLayout_49.setObjectName("verticalLayout_49") self.frame_15 = QtWidgets.QFrame(self.camview_widgets) - self.frame_15.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_15.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_15.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_15.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_15.setObjectName("frame_15") self.horizontalLayout_31 = QtWidgets.QHBoxLayout(self.frame_15) self.horizontalLayout_31.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_31.setSpacing(4) self.horizontalLayout_31.setObjectName("horizontalLayout_31") - spacerItem1 = QtWidgets.QSpacerItem(69, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem(69, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_31.addItem(spacerItem1) self.cam_dia_plus = PushButton(self.frame_15) self.cam_dia_plus.setMinimumSize(QtCore.QSize(60, 40)) @@ -541,8 +539,8 @@ def setupUi(self, MainWindow): self.verticalLayout_60.setSpacing(0) self.verticalLayout_60.setObjectName("verticalLayout_60") self.webview_frame = QtWidgets.QFrame(self.webview_page) - self.webview_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.webview_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.webview_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.webview_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.webview_frame.setObjectName("webview_frame") self.verticalLayout_61 = QtWidgets.QVBoxLayout(self.webview_frame) self.verticalLayout_61.setContentsMargins(0, 0, 0, 2) @@ -550,15 +548,15 @@ def setupUi(self, MainWindow): self.verticalLayout_61.setObjectName("verticalLayout_61") self.webview_buttons = QtWidgets.QFrame(self.webview_frame) self.webview_buttons.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.webview_buttons.setFrameShape(QtWidgets.QFrame.NoFrame) - self.webview_buttons.setFrameShadow(QtWidgets.QFrame.Plain) + self.webview_buttons.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.webview_buttons.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.webview_buttons.setObjectName("webview_buttons") self.horizontalLayout_10 = QtWidgets.QHBoxLayout(self.webview_buttons) self.horizontalLayout_10.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_10.setSpacing(1) self.horizontalLayout_10.setObjectName("horizontalLayout_10") self.webview_back = QtWidgets.QPushButton(self.webview_buttons) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.webview_back.sizePolicy().hasHeightForWidth()) @@ -567,7 +565,7 @@ def setupUi(self, MainWindow): self.webview_back.setObjectName("webview_back") self.horizontalLayout_10.addWidget(self.webview_back) self.webview_reload = QtWidgets.QPushButton(self.webview_buttons) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.webview_reload.sizePolicy().hasHeightForWidth()) @@ -576,7 +574,7 @@ def setupUi(self, MainWindow): self.webview_reload.setObjectName("webview_reload") self.horizontalLayout_10.addWidget(self.webview_reload) self.webview_forward = QtWidgets.QPushButton(self.webview_buttons) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.webview_forward.sizePolicy().hasHeightForWidth()) @@ -586,8 +584,8 @@ def setupUi(self, MainWindow): self.horizontalLayout_10.addWidget(self.webview_forward) self.verticalLayout_61.addWidget(self.webview_buttons) self.webview_place = QtWidgets.QFrame(self.webview_frame) - self.webview_place.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.webview_place.setFrameShadow(QtWidgets.QFrame.Raised) + self.webview_place.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.webview_place.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.webview_place.setObjectName("webview_place") self.horizontalLayout_40 = QtWidgets.QHBoxLayout(self.webview_place) self.horizontalLayout_40.setContentsMargins(2, 0, 2, 0) @@ -605,8 +603,8 @@ def setupUi(self, MainWindow): self.main_c2 = QtWidgets.QFrame(self.main_tab) self.main_c2.setMinimumSize(QtCore.QSize(136, 0)) self.main_c2.setMaximumSize(QtCore.QSize(136, 16777215)) - self.main_c2.setFrameShape(QtWidgets.QFrame.NoFrame) - self.main_c2.setFrameShadow(QtWidgets.QFrame.Plain) + self.main_c2.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.main_c2.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.main_c2.setObjectName("main_c2") self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.main_c2) self.verticalLayout_7.setContentsMargins(0, 0, 0, 0) @@ -615,34 +613,34 @@ def setupUi(self, MainWindow): self.machine_frame = QtWidgets.QFrame(self.main_c2) self.machine_frame.setMinimumSize(QtCore.QSize(0, 364)) self.machine_frame.setMaximumSize(QtCore.QSize(16777215, 364)) - self.machine_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.machine_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.machine_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.machine_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.machine_frame.setObjectName("machine_frame") self.verticalLayout_8 = QtWidgets.QVBoxLayout(self.machine_frame) self.verticalLayout_8.setContentsMargins(0, 0, 0, 4) self.verticalLayout_8.setSpacing(4) self.verticalLayout_8.setObjectName("verticalLayout_8") self.machine_label = QtWidgets.QLabel(self.machine_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.machine_label.sizePolicy().hasHeightForWidth()) self.machine_label.setSizePolicy(sizePolicy) self.machine_label.setMinimumSize(QtCore.QSize(0, 16)) self.machine_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.machine_label.setAlignment(QtCore.Qt.AlignCenter) + self.machine_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.machine_label.setObjectName("machine_label") self.verticalLayout_8.addWidget(self.machine_label) self.frame_31 = QtWidgets.QFrame(self.machine_frame) - self.frame_31.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_31.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_31.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_31.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_31.setObjectName("frame_31") self.horizontalLayout_8 = QtWidgets.QHBoxLayout(self.frame_31) self.horizontalLayout_8.setContentsMargins(4, 0, 4, 0) self.horizontalLayout_8.setSpacing(4) self.horizontalLayout_8.setObjectName("horizontalLayout_8") self.estop = ActionButton(self.frame_31) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.estop.sizePolicy().hasHeightForWidth()) @@ -650,7 +648,7 @@ def setupUi(self, MainWindow): self.estop.setMinimumSize(QtCore.QSize(60, 40)) self.estop.setMaximumSize(QtCore.QSize(16777215, 40)) self.estop.setBaseSize(QtCore.QSize(0, 0)) - self.estop.setFocusPolicy(QtCore.Qt.ClickFocus) + self.estop.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.estop.setIconSize(QtCore.QSize(0, 0)) self.estop.setCheckable(True) self.estop.setChecked(False) @@ -681,7 +679,7 @@ def setupUi(self, MainWindow): self.estop.setObjectName("estop") self.horizontalLayout_8.addWidget(self.estop) self.power = QtWidgets.QPushButton(self.frame_31) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.power.sizePolicy().hasHeightForWidth()) @@ -689,7 +687,7 @@ def setupUi(self, MainWindow): self.power.setMinimumSize(QtCore.QSize(60, 40)) self.power.setMaximumSize(QtCore.QSize(16777215, 40)) self.power.setBaseSize(QtCore.QSize(0, 0)) - self.power.setFocusPolicy(QtCore.Qt.ClickFocus) + self.power.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.power.setToolTip("") self.power.setIconSize(QtCore.QSize(0, 0)) self.power.setCheckable(True) @@ -697,39 +695,39 @@ def setupUi(self, MainWindow): self.horizontalLayout_8.addWidget(self.power) self.verticalLayout_8.addWidget(self.frame_31) self.machine_buttons = QtWidgets.QFrame(self.machine_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.machine_buttons.sizePolicy().hasHeightForWidth()) self.machine_buttons.setSizePolicy(sizePolicy) self.machine_buttons.setMaximumSize(QtCore.QSize(16777215, 178)) - self.machine_buttons.setFrameShape(QtWidgets.QFrame.NoFrame) - self.machine_buttons.setFrameShadow(QtWidgets.QFrame.Plain) + self.machine_buttons.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.machine_buttons.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.machine_buttons.setObjectName("machine_buttons") self.verticalLayout_17 = QtWidgets.QVBoxLayout(self.machine_buttons) self.verticalLayout_17.setContentsMargins(4, 0, 4, 0) self.verticalLayout_17.setSpacing(4) self.verticalLayout_17.setObjectName("verticalLayout_17") self.run = QtWidgets.QPushButton(self.machine_buttons) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.run.sizePolicy().hasHeightForWidth()) self.run.setSizePolicy(sizePolicy) self.run.setMinimumSize(QtCore.QSize(60, 40)) self.run.setMaximumSize(QtCore.QSize(16777215, 40)) - self.run.setFocusPolicy(QtCore.Qt.ClickFocus) + self.run.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.run.setObjectName("run") self.verticalLayout_17.addWidget(self.run) self.pause_resume = ActionButton(self.machine_buttons) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pause_resume.sizePolicy().hasHeightForWidth()) self.pause_resume.setSizePolicy(sizePolicy) self.pause_resume.setMinimumSize(QtCore.QSize(60, 40)) self.pause_resume.setMaximumSize(QtCore.QSize(16777215, 40)) - self.pause_resume.setFocusPolicy(QtCore.Qt.ClickFocus) + self.pause_resume.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.pause_resume.setProperty("indicator_option", False) self.pause_resume.setProperty("indicator_HAL_pin_option", False) self.pause_resume.setProperty("indicator_status_option", False) @@ -786,64 +784,64 @@ def setupUi(self, MainWindow): self.pause_resume.setObjectName("pause_resume") self.verticalLayout_17.addWidget(self.pause_resume) self.abort = QtWidgets.QPushButton(self.machine_buttons) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.abort.sizePolicy().hasHeightForWidth()) self.abort.setSizePolicy(sizePolicy) self.abort.setMinimumSize(QtCore.QSize(60, 40)) self.abort.setMaximumSize(QtCore.QSize(16777215, 40)) - self.abort.setFocusPolicy(QtCore.Qt.ClickFocus) + self.abort.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.abort.setToolTip("") self.abort.setObjectName("abort") self.verticalLayout_17.addWidget(self.abort) self.verticalLayout_8.addWidget(self.machine_buttons) self.machine_sliders = QtWidgets.QFrame(self.machine_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.machine_sliders.sizePolicy().hasHeightForWidth()) self.machine_sliders.setSizePolicy(sizePolicy) self.machine_sliders.setMinimumSize(QtCore.QSize(0, 0)) self.machine_sliders.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.machine_sliders.setFrameShadow(QtWidgets.QFrame.Plain) + self.machine_sliders.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.machine_sliders.setObjectName("machine_sliders") self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.machine_sliders) self.horizontalLayout_4.setContentsMargins(2, 0, 2, 0) self.horizontalLayout_4.setSpacing(2) self.horizontalLayout_4.setObjectName("horizontalLayout_4") self.frame_4 = QtWidgets.QFrame(self.machine_sliders) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.frame_4.sizePolicy().hasHeightForWidth()) self.frame_4.setSizePolicy(sizePolicy) - self.frame_4.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_4.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_4.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_4.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_4.setObjectName("frame_4") self.verticalLayout_9 = QtWidgets.QVBoxLayout(self.frame_4) self.verticalLayout_9.setContentsMargins(0, 0, 0, 0) self.verticalLayout_9.setSpacing(4) self.verticalLayout_9.setObjectName("verticalLayout_9") self.feed_label = QtWidgets.QPushButton(self.frame_4) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.feed_label.sizePolicy().hasHeightForWidth()) self.feed_label.setSizePolicy(sizePolicy) self.feed_label.setMaximumSize(QtCore.QSize(41, 16777215)) - self.feed_label.setFocusPolicy(QtCore.Qt.ClickFocus) + self.feed_label.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.feed_label.setObjectName("feed_label") self.verticalLayout_9.addWidget(self.feed_label) self.feed_slider = StatusSlider(self.frame_4) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.feed_slider.sizePolicy().hasHeightForWidth()) self.feed_slider.setSizePolicy(sizePolicy) self.feed_slider.setMinimumSize(QtCore.QSize(0, 0)) self.feed_slider.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.feed_slider.setFocusPolicy(QtCore.Qt.ClickFocus) + self.feed_slider.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.feed_slider.setMaximum(100) self.feed_slider.setTickPosition(QtWidgets.QSlider.NoTicks) self.feed_slider.setProperty("feed_rate", True) @@ -851,13 +849,13 @@ def setupUi(self, MainWindow): self.verticalLayout_9.addWidget(self.feed_slider) self.horizontalLayout_4.addWidget(self.frame_4) self.frame_5 = QtWidgets.QFrame(self.machine_sliders) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.frame_5.sizePolicy().hasHeightForWidth()) self.frame_5.setSizePolicy(sizePolicy) - self.frame_5.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_5.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_5.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_5.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_5.setObjectName("frame_5") self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.frame_5) self.verticalLayout_10.setContentsMargins(0, 0, 0, 0) @@ -865,29 +863,29 @@ def setupUi(self, MainWindow): self.verticalLayout_10.setObjectName("verticalLayout_10") self.rapid_label = QtWidgets.QPushButton(self.frame_5) self.rapid_label.setMaximumSize(QtCore.QSize(41, 16777215)) - self.rapid_label.setFocusPolicy(QtCore.Qt.ClickFocus) + self.rapid_label.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.rapid_label.setObjectName("rapid_label") self.verticalLayout_10.addWidget(self.rapid_label) self.rapid_slider = StatusSlider(self.frame_5) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.rapid_slider.sizePolicy().hasHeightForWidth()) self.rapid_slider.setSizePolicy(sizePolicy) self.rapid_slider.setMinimumSize(QtCore.QSize(0, 0)) - self.rapid_slider.setFocusPolicy(QtCore.Qt.ClickFocus) + self.rapid_slider.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.rapid_slider.setMaximum(100) self.rapid_slider.setObjectName("rapid_slider") self.verticalLayout_10.addWidget(self.rapid_slider) self.horizontalLayout_4.addWidget(self.frame_5) self.frame_6 = QtWidgets.QFrame(self.machine_sliders) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.frame_6.sizePolicy().hasHeightForWidth()) self.frame_6.setSizePolicy(sizePolicy) - self.frame_6.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_6.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_6.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_6.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_6.setObjectName("frame_6") self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.frame_6) self.verticalLayout_11.setContentsMargins(0, 0, 0, 0) @@ -895,17 +893,17 @@ def setupUi(self, MainWindow): self.verticalLayout_11.setObjectName("verticalLayout_11") self.jogs_label = QtWidgets.QPushButton(self.frame_6) self.jogs_label.setMaximumSize(QtCore.QSize(41, 16777215)) - self.jogs_label.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jogs_label.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jogs_label.setObjectName("jogs_label") self.verticalLayout_11.addWidget(self.jogs_label) self.jog_slider = StatusSlider(self.frame_6) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_slider.sizePolicy().hasHeightForWidth()) self.jog_slider.setSizePolicy(sizePolicy) self.jog_slider.setMinimumSize(QtCore.QSize(0, 0)) - self.jog_slider.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_slider.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_slider.setMaximum(100) self.jog_slider.setProperty("jograte_rate", True) self.jog_slider.setObjectName("jog_slider") @@ -914,14 +912,14 @@ def setupUi(self, MainWindow): self.verticalLayout_8.addWidget(self.machine_sliders) self.verticalLayout_7.addWidget(self.machine_frame) self.button_frame = QtWidgets.QFrame(self.main_c2) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_frame.sizePolicy().hasHeightForWidth()) self.button_frame.setSizePolicy(sizePolicy) self.button_frame.setMinimumSize(QtCore.QSize(0, 0)) - self.button_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.button_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.button_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.button_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.button_frame.setObjectName("button_frame") self.verticalLayout_24 = QtWidgets.QVBoxLayout(self.button_frame) self.verticalLayout_24.setContentsMargins(0, 0, 0, 4) @@ -930,7 +928,7 @@ def setupUi(self, MainWindow): self.button_label = QtWidgets.QLabel(self.button_frame) self.button_label.setMinimumSize(QtCore.QSize(0, 16)) self.button_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.button_label.setAlignment(QtCore.Qt.AlignCenter) + self.button_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.button_label.setObjectName("button_label") self.verticalLayout_24.addWidget(self.button_label) self.button_grid = QtWidgets.QGridLayout() @@ -940,197 +938,197 @@ def setupUi(self, MainWindow): self.button_10 = QtWidgets.QPushButton(self.button_frame) self.button_10.setMinimumSize(QtCore.QSize(60, 40)) self.button_10.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_10.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_10.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_10.setText("10") self.button_10.setObjectName("button_10") self.button_grid.addWidget(self.button_10, 5, 1, 1, 1) self.button_18 = QtWidgets.QPushButton(self.button_frame) self.button_18.setMinimumSize(QtCore.QSize(60, 40)) self.button_18.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_18.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_18.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_18.setText("18") self.button_18.setObjectName("button_18") self.button_grid.addWidget(self.button_18, 9, 1, 1, 1) self.button_8 = QtWidgets.QPushButton(self.button_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_8.sizePolicy().hasHeightForWidth()) self.button_8.setSizePolicy(sizePolicy) self.button_8.setMinimumSize(QtCore.QSize(60, 40)) self.button_8.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_8.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_8.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_8.setText("8") self.button_8.setObjectName("button_8") self.button_grid.addWidget(self.button_8, 4, 1, 1, 1) self.button_7 = QtWidgets.QPushButton(self.button_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_7.sizePolicy().hasHeightForWidth()) self.button_7.setSizePolicy(sizePolicy) self.button_7.setMinimumSize(QtCore.QSize(60, 40)) self.button_7.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_7.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_7.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_7.setText("7") self.button_7.setObjectName("button_7") self.button_grid.addWidget(self.button_7, 4, 0, 1, 1) self.button_9 = QtWidgets.QPushButton(self.button_frame) self.button_9.setMinimumSize(QtCore.QSize(60, 40)) self.button_9.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_9.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_9.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_9.setText("9") self.button_9.setObjectName("button_9") self.button_grid.addWidget(self.button_9, 5, 0, 1, 1) self.button_12 = QtWidgets.QPushButton(self.button_frame) self.button_12.setMinimumSize(QtCore.QSize(60, 40)) self.button_12.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_12.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_12.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_12.setText("12") self.button_12.setObjectName("button_12") self.button_grid.addWidget(self.button_12, 6, 1, 1, 1) self.button_14 = QtWidgets.QPushButton(self.button_frame) self.button_14.setMinimumSize(QtCore.QSize(60, 40)) self.button_14.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_14.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_14.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_14.setText("14") self.button_14.setObjectName("button_14") self.button_grid.addWidget(self.button_14, 7, 1, 1, 1) self.button_13 = QtWidgets.QPushButton(self.button_frame) self.button_13.setMinimumSize(QtCore.QSize(60, 40)) self.button_13.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_13.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_13.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_13.setText("13") self.button_13.setObjectName("button_13") self.button_grid.addWidget(self.button_13, 7, 0, 1, 1) self.button_17 = QtWidgets.QPushButton(self.button_frame) self.button_17.setMinimumSize(QtCore.QSize(60, 40)) self.button_17.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_17.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_17.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_17.setText("17") self.button_17.setObjectName("button_17") self.button_grid.addWidget(self.button_17, 9, 0, 1, 1) self.button_4 = QtWidgets.QPushButton(self.button_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_4.sizePolicy().hasHeightForWidth()) self.button_4.setSizePolicy(sizePolicy) self.button_4.setMinimumSize(QtCore.QSize(60, 40)) self.button_4.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_4.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_4.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_4.setText("4") self.button_4.setObjectName("button_4") self.button_grid.addWidget(self.button_4, 2, 1, 1, 1) self.button_5 = QtWidgets.QPushButton(self.button_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_5.sizePolicy().hasHeightForWidth()) self.button_5.setSizePolicy(sizePolicy) self.button_5.setMinimumSize(QtCore.QSize(60, 40)) self.button_5.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_5.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_5.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_5.setText("5") self.button_5.setObjectName("button_5") self.button_grid.addWidget(self.button_5, 3, 0, 1, 1) self.file_edit = PushButton(self.button_frame) self.file_edit.setMinimumSize(QtCore.QSize(60, 40)) self.file_edit.setMaximumSize(QtCore.QSize(16777215, 40)) - self.file_edit.setFocusPolicy(QtCore.Qt.ClickFocus) + self.file_edit.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.file_edit.setObjectName("file_edit") self.button_grid.addWidget(self.file_edit, 0, 0, 1, 1) self.button_16 = QtWidgets.QPushButton(self.button_frame) self.button_16.setMinimumSize(QtCore.QSize(60, 40)) self.button_16.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_16.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_16.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_16.setText("16") self.button_16.setObjectName("button_16") self.button_grid.addWidget(self.button_16, 8, 1, 1, 1) self.button_11 = QtWidgets.QPushButton(self.button_frame) self.button_11.setMinimumSize(QtCore.QSize(60, 40)) self.button_11.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_11.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_11.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_11.setText("11") self.button_11.setObjectName("button_11") self.button_grid.addWidget(self.button_11, 6, 0, 1, 1) self.button_2 = QtWidgets.QPushButton(self.button_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_2.sizePolicy().hasHeightForWidth()) self.button_2.setSizePolicy(sizePolicy) self.button_2.setMinimumSize(QtCore.QSize(60, 40)) self.button_2.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_2.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_2.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_2.setText("2") self.button_2.setObjectName("button_2") self.button_grid.addWidget(self.button_2, 1, 1, 1, 1) self.button_1 = QtWidgets.QPushButton(self.button_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_1.sizePolicy().hasHeightForWidth()) self.button_1.setSizePolicy(sizePolicy) self.button_1.setMinimumSize(QtCore.QSize(60, 40)) self.button_1.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_1.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_1.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_1.setText("1") self.button_1.setObjectName("button_1") self.button_grid.addWidget(self.button_1, 1, 0, 1, 1) self.button_15 = QtWidgets.QPushButton(self.button_frame) self.button_15.setMinimumSize(QtCore.QSize(60, 40)) self.button_15.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_15.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_15.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_15.setText("15") self.button_15.setObjectName("button_15") self.button_grid.addWidget(self.button_15, 8, 0, 1, 1) self.button_6 = QtWidgets.QPushButton(self.button_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_6.sizePolicy().hasHeightForWidth()) self.button_6.setSizePolicy(sizePolicy) self.button_6.setMinimumSize(QtCore.QSize(60, 40)) self.button_6.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_6.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_6.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_6.setText("6") self.button_6.setObjectName("button_6") self.button_grid.addWidget(self.button_6, 3, 1, 1, 1) self.mdi_show = PushButton(self.button_frame) self.mdi_show.setMinimumSize(QtCore.QSize(60, 40)) self.mdi_show.setMaximumSize(QtCore.QSize(16777215, 40)) - self.mdi_show.setFocusPolicy(QtCore.Qt.ClickFocus) + self.mdi_show.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.mdi_show.setObjectName("mdi_show") self.button_grid.addWidget(self.mdi_show, 0, 1, 1, 1) self.button_3 = QtWidgets.QPushButton(self.button_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_3.sizePolicy().hasHeightForWidth()) self.button_3.setSizePolicy(sizePolicy) self.button_3.setMinimumSize(QtCore.QSize(60, 40)) self.button_3.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_3.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_3.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_3.setText("3") self.button_3.setObjectName("button_3") self.button_grid.addWidget(self.button_3, 2, 0, 1, 1) self.button_19 = QtWidgets.QPushButton(self.button_frame) self.button_19.setMinimumSize(QtCore.QSize(60, 40)) self.button_19.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_19.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_19.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_19.setText("19") self.button_19.setObjectName("button_19") self.button_grid.addWidget(self.button_19, 10, 0, 1, 1) self.button_20 = QtWidgets.QPushButton(self.button_frame) self.button_20.setMinimumSize(QtCore.QSize(60, 40)) self.button_20.setMaximumSize(QtCore.QSize(16777215, 40)) - self.button_20.setFocusPolicy(QtCore.Qt.ClickFocus) + self.button_20.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.button_20.setText("20") self.button_20.setObjectName("button_20") self.button_grid.addWidget(self.button_20, 10, 1, 1, 1) self.verticalLayout_24.addLayout(self.button_grid) - spacerItem2 = QtWidgets.QSpacerItem(20, 1, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem2 = QtWidgets.QSpacerItem(20, 1, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_24.addItem(spacerItem2) self.verticalLayout_7.addWidget(self.button_frame) self.verticalLayout_7.setStretch(0, 1) @@ -1138,23 +1136,23 @@ def setupUi(self, MainWindow): self.main_c3 = QtWidgets.QFrame(self.main_tab) self.main_c3.setMinimumSize(QtCore.QSize(0, 0)) self.main_c3.setMaximumSize(QtCore.QSize(268, 16777215)) - self.main_c3.setFrameShape(QtWidgets.QFrame.NoFrame) - self.main_c3.setFrameShadow(QtWidgets.QFrame.Plain) + self.main_c3.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.main_c3.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.main_c3.setObjectName("main_c3") self.verticalLayout_15 = QtWidgets.QVBoxLayout(self.main_c3) self.verticalLayout_15.setContentsMargins(0, 0, 0, 0) self.verticalLayout_15.setSpacing(2) self.verticalLayout_15.setObjectName("verticalLayout_15") self.plasma_frame = QtWidgets.QFrame(self.main_c3) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.plasma_frame.sizePolicy().hasHeightForWidth()) self.plasma_frame.setSizePolicy(sizePolicy) self.plasma_frame.setMinimumSize(QtCore.QSize(0, 291)) self.plasma_frame.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.plasma_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.plasma_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.plasma_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.plasma_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.plasma_frame.setObjectName("plasma_frame") self.verticalLayout_33 = QtWidgets.QVBoxLayout(self.plasma_frame) self.verticalLayout_33.setContentsMargins(0, 0, 0, 0) @@ -1163,35 +1161,35 @@ def setupUi(self, MainWindow): self.arc_frame = QtWidgets.QFrame(self.plasma_frame) self.arc_frame.setMinimumSize(QtCore.QSize(0, 0)) self.arc_frame.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.arc_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.arc_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.arc_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.arc_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.arc_frame.setObjectName("arc_frame") self.gridLayout_11 = QtWidgets.QGridLayout(self.arc_frame) self.gridLayout_11.setContentsMargins(0, 0, 0, 4) self.gridLayout_11.setSpacing(2) self.gridLayout_11.setObjectName("gridLayout_11") self.arc_label = QtWidgets.QLabel(self.arc_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_label.sizePolicy().hasHeightForWidth()) self.arc_label.setSizePolicy(sizePolicy) self.arc_label.setMinimumSize(QtCore.QSize(0, 16)) self.arc_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.arc_label.setAlignment(QtCore.Qt.AlignCenter) + self.arc_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.arc_label.setObjectName("arc_label") self.gridLayout_11.addWidget(self.arc_label, 0, 0, 1, 2) self.frame_24 = QtWidgets.QFrame(self.arc_frame) self.frame_24.setMinimumSize(QtCore.QSize(0, 0)) - self.frame_24.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_24.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_24.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_24.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_24.setObjectName("frame_24") self.horizontalLayout_44 = QtWidgets.QHBoxLayout(self.frame_24) self.horizontalLayout_44.setContentsMargins(4, 2, 4, 0) self.horizontalLayout_44.setSpacing(0) self.horizontalLayout_44.setObjectName("horizontalLayout_44") self.arc_voltage = HALLabel(self.frame_24) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_voltage.sizePolicy().hasHeightForWidth()) @@ -1202,21 +1200,21 @@ def setupUi(self, MainWindow): font.setFamily("DejaVuSans") font.setPointSize(40) self.arc_voltage.setFont(font) - self.arc_voltage.setFrameShape(QtWidgets.QFrame.NoFrame) + self.arc_voltage.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) self.arc_voltage.setText("300") - self.arc_voltage.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.arc_voltage.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.arc_voltage.setProperty("pin_name", "") self.arc_voltage.setProperty("float_pin_type", True) self.arc_voltage.setProperty("textTemplate", "%0.0f") self.arc_voltage.setObjectName("arc_voltage") self.horizontalLayout_44.addWidget(self.arc_voltage) - spacerItem3 = QtWidgets.QSpacerItem(10, 17, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem3 = QtWidgets.QSpacerItem(10, 17, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_44.addItem(spacerItem3) self.frame_25 = QtWidgets.QFrame(self.frame_24) self.frame_25.setMinimumSize(QtCore.QSize(0, 0)) self.frame_25.setMaximumSize(QtCore.QSize(16777215, 44)) - self.frame_25.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_25.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_25.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_25.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_25.setObjectName("frame_25") self.verticalLayout_34 = QtWidgets.QVBoxLayout(self.frame_25) self.verticalLayout_34.setContentsMargins(0, 0, 0, 0) @@ -1225,7 +1223,7 @@ def setupUi(self, MainWindow): self.label_47 = QtWidgets.QLabel(self.frame_25) self.label_47.setMinimumSize(QtCore.QSize(0, 0)) self.label_47.setMaximumSize(QtCore.QSize(16777215, 17)) - self.label_47.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.label_47.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_47.setObjectName("label_47") self.verticalLayout_34.addWidget(self.label_47) self.led_arc_ok = LED(self.frame_25) @@ -1235,13 +1233,13 @@ def setupUi(self, MainWindow): self.led_arc_ok.setObjectName("led_arc_ok") self.verticalLayout_34.addWidget(self.led_arc_ok) self.horizontalLayout_44.addWidget(self.frame_25) - spacerItem4 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem4 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_44.addItem(spacerItem4) self.arc_override_frm = QtWidgets.QFrame(self.frame_24) self.arc_override_frm.setMinimumSize(QtCore.QSize(68, 44)) self.arc_override_frm.setMaximumSize(QtCore.QSize(16777215, 44)) - self.arc_override_frm.setFrameShape(QtWidgets.QFrame.NoFrame) - self.arc_override_frm.setFrameShadow(QtWidgets.QFrame.Plain) + self.arc_override_frm.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.arc_override_frm.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.arc_override_frm.setObjectName("arc_override_frm") self.verticalLayout_25 = QtWidgets.QVBoxLayout(self.arc_override_frm) self.verticalLayout_25.setContentsMargins(0, 0, 0, 0) @@ -1250,26 +1248,26 @@ def setupUi(self, MainWindow): self.height_reset = QtWidgets.QPushButton(self.arc_override_frm) self.height_reset.setMinimumSize(QtCore.QSize(82, 16)) self.height_reset.setMaximumSize(QtCore.QSize(82, 16)) - self.height_reset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.height_reset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.height_reset.setObjectName("height_reset") self.verticalLayout_25.addWidget(self.height_reset) self.frame_26 = QtWidgets.QFrame(self.arc_override_frm) self.frame_26.setMaximumSize(QtCore.QSize(82, 16777215)) - self.frame_26.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_26.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_26.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_26.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_26.setObjectName("frame_26") self.horizontalLayout_23 = QtWidgets.QHBoxLayout(self.frame_26) self.horizontalLayout_23.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_23.setSpacing(4) self.horizontalLayout_23.setObjectName("horizontalLayout_23") self.height_lower = QtWidgets.QPushButton(self.frame_26) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.height_lower.sizePolicy().hasHeightForWidth()) self.height_lower.setSizePolicy(sizePolicy) self.height_lower.setMaximumSize(QtCore.QSize(24, 24)) - self.height_lower.setFocusPolicy(QtCore.Qt.ClickFocus) + self.height_lower.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.height_lower.setText("-") self.height_lower.setAutoRepeat(True) self.height_lower.setAutoRepeatInterval(250) @@ -1278,17 +1276,17 @@ def setupUi(self, MainWindow): self.height_ovr_label = QtWidgets.QLabel(self.frame_26) self.height_ovr_label.setMaximumSize(QtCore.QSize(30, 30)) self.height_ovr_label.setText("0.0") - self.height_ovr_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.height_ovr_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.height_ovr_label.setObjectName("height_ovr_label") self.horizontalLayout_23.addWidget(self.height_ovr_label) self.height_raise = QtWidgets.QPushButton(self.frame_26) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.height_raise.sizePolicy().hasHeightForWidth()) self.height_raise.setSizePolicy(sizePolicy) self.height_raise.setMaximumSize(QtCore.QSize(24, 24)) - self.height_raise.setFocusPolicy(QtCore.Qt.ClickFocus) + self.height_raise.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.height_raise.setText("+") self.height_raise.setAutoRepeat(True) self.height_raise.setAutoRepeatInterval(250) @@ -1299,13 +1297,13 @@ def setupUi(self, MainWindow): self.gridLayout_11.addWidget(self.frame_24, 1, 0, 2, 2) self.verticalLayout_33.addWidget(self.arc_frame) self.control_frame = QtWidgets.QFrame(self.plasma_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.control_frame.sizePolicy().hasHeightForWidth()) self.control_frame.setSizePolicy(sizePolicy) - self.control_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.control_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.control_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.control_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.control_frame.setObjectName("control_frame") self.gridLayout_12 = QtWidgets.QGridLayout(self.control_frame) self.gridLayout_12.setContentsMargins(0, 0, 0, 4) @@ -1314,22 +1312,22 @@ def setupUi(self, MainWindow): self.frame_28 = QtWidgets.QFrame(self.control_frame) self.frame_28.setMinimumSize(QtCore.QSize(0, 18)) self.frame_28.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.frame_28.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_28.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_28.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_28.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_28.setObjectName("frame_28") self.horizontalLayout_25 = QtWidgets.QHBoxLayout(self.frame_28) self.horizontalLayout_25.setContentsMargins(4, 0, 4, 0) self.horizontalLayout_25.setSpacing(2) self.horizontalLayout_25.setObjectName("horizontalLayout_25") self.ignore_arc_ok = CheckBox(self.frame_28) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ignore_arc_ok.sizePolicy().hasHeightForWidth()) self.ignore_arc_ok.setSizePolicy(sizePolicy) self.ignore_arc_ok.setMinimumSize(QtCore.QSize(0, 0)) self.ignore_arc_ok.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.ignore_arc_ok.setFocusPolicy(QtCore.Qt.ClickFocus) + self.ignore_arc_ok.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.ignore_arc_ok.setLayoutDirection(QtCore.Qt.LeftToRight) self.ignore_arc_ok.setText("") self.ignore_arc_ok.setObjectName("ignore_arc_ok") @@ -1337,26 +1335,26 @@ def setupUi(self, MainWindow): self.label_64 = QtWidgets.QLabel(self.frame_28) self.label_64.setMinimumSize(QtCore.QSize(0, 0)) self.label_64.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.label_64.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_64.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_64.setObjectName("label_64") self.horizontalLayout_25.addWidget(self.label_64) - spacerItem5 = QtWidgets.QSpacerItem(32, 18, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem5 = QtWidgets.QSpacerItem(32, 18, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_25.addItem(spacerItem5) self.label_67 = QtWidgets.QLabel(self.frame_28) self.label_67.setMinimumSize(QtCore.QSize(0, 0)) self.label_67.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.label_67.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_67.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_67.setObjectName("label_67") self.horizontalLayout_25.addWidget(self.label_67) self.ohmic_probe_enable = CheckBox(self.frame_28) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ohmic_probe_enable.sizePolicy().hasHeightForWidth()) self.ohmic_probe_enable.setSizePolicy(sizePolicy) self.ohmic_probe_enable.setMinimumSize(QtCore.QSize(0, 0)) self.ohmic_probe_enable.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.ohmic_probe_enable.setFocusPolicy(QtCore.Qt.ClickFocus) + self.ohmic_probe_enable.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.ohmic_probe_enable.setLayoutDirection(QtCore.Qt.LeftToRight) self.ohmic_probe_enable.setText("") self.ohmic_probe_enable.setObjectName("ohmic_probe_enable") @@ -1365,14 +1363,14 @@ def setupUi(self, MainWindow): self.control_label = QtWidgets.QLabel(self.control_frame) self.control_label.setMinimumSize(QtCore.QSize(0, 16)) self.control_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.control_label.setAlignment(QtCore.Qt.AlignCenter) + self.control_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.control_label.setObjectName("control_label") self.gridLayout_12.addWidget(self.control_label, 0, 0, 1, 2) self.frame_29 = QtWidgets.QFrame(self.control_frame) self.frame_29.setMinimumSize(QtCore.QSize(0, 18)) self.frame_29.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.frame_29.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_29.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_29.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_29.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_29.setObjectName("frame_29") self.horizontalLayout_27 = QtWidgets.QHBoxLayout(self.frame_29) self.horizontalLayout_27.setContentsMargins(4, 0, 4, 0) @@ -1387,26 +1385,26 @@ def setupUi(self, MainWindow): self.label_68 = QtWidgets.QLabel(self.frame_29) self.label_68.setMinimumSize(QtCore.QSize(0, 0)) self.label_68.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.label_68.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.label_68.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_68.setObjectName("label_68") self.horizontalLayout_27.addWidget(self.label_68) - spacerItem6 = QtWidgets.QSpacerItem(60, 15, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem6 = QtWidgets.QSpacerItem(60, 15, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_27.addItem(spacerItem6) self.label_69 = QtWidgets.QLabel(self.frame_29) self.label_69.setMinimumSize(QtCore.QSize(0, 0)) self.label_69.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.label_69.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_69.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_69.setObjectName("label_69") self.horizontalLayout_27.addWidget(self.label_69) self.torch_enable = CheckBox(self.frame_29) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.torch_enable.sizePolicy().hasHeightForWidth()) self.torch_enable.setSizePolicy(sizePolicy) self.torch_enable.setMinimumSize(QtCore.QSize(0, 0)) self.torch_enable.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.torch_enable.setFocusPolicy(QtCore.Qt.ClickFocus) + self.torch_enable.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.torch_enable.setLayoutDirection(QtCore.Qt.LeftToRight) self.torch_enable.setText("") self.torch_enable.setObjectName("torch_enable") @@ -1414,22 +1412,22 @@ def setupUi(self, MainWindow): self.gridLayout_12.addWidget(self.frame_29, 1, 1, 1, 1) self.frame_27 = QtWidgets.QFrame(self.control_frame) self.frame_27.setMinimumSize(QtCore.QSize(0, 18)) - self.frame_27.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_27.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_27.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_27.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_27.setObjectName("frame_27") self.horizontalLayout_24 = QtWidgets.QHBoxLayout(self.frame_27) self.horizontalLayout_24.setContentsMargins(4, 0, 4, 0) self.horizontalLayout_24.setSpacing(2) self.horizontalLayout_24.setObjectName("horizontalLayout_24") self.mesh_enable = CheckBox(self.frame_27) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.mesh_enable.sizePolicy().hasHeightForWidth()) self.mesh_enable.setSizePolicy(sizePolicy) self.mesh_enable.setMinimumSize(QtCore.QSize(0, 0)) self.mesh_enable.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.mesh_enable.setFocusPolicy(QtCore.Qt.ClickFocus) + self.mesh_enable.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.mesh_enable.setLayoutDirection(QtCore.Qt.LeftToRight) self.mesh_enable.setText("") self.mesh_enable.setObjectName("mesh_enable") @@ -1437,25 +1435,25 @@ def setupUi(self, MainWindow): self.label_59 = QtWidgets.QLabel(self.frame_27) self.label_59.setMinimumSize(QtCore.QSize(0, 0)) self.label_59.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.label_59.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.label_59.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_59.setObjectName("label_59") self.horizontalLayout_24.addWidget(self.label_59) - spacerItem7 = QtWidgets.QSpacerItem(40, 13, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem7 = QtWidgets.QSpacerItem(40, 13, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_24.addItem(spacerItem7) self.use_auto_volts_lbl = QtWidgets.QLabel(self.frame_27) self.use_auto_volts_lbl.setMinimumSize(QtCore.QSize(0, 0)) self.use_auto_volts_lbl.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.use_auto_volts_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.use_auto_volts_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.use_auto_volts_lbl.setObjectName("use_auto_volts_lbl") self.horizontalLayout_24.addWidget(self.use_auto_volts_lbl) self.use_auto_volts = CheckBox(self.frame_27) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.use_auto_volts.sizePolicy().hasHeightForWidth()) self.use_auto_volts.setSizePolicy(sizePolicy) self.use_auto_volts.setMinimumSize(QtCore.QSize(0, 0)) - self.use_auto_volts.setFocusPolicy(QtCore.Qt.ClickFocus) + self.use_auto_volts.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.use_auto_volts.setChecked(False) self.use_auto_volts.setObjectName("use_auto_volts") self.horizontalLayout_24.addWidget(self.use_auto_volts) @@ -1463,8 +1461,8 @@ def setupUi(self, MainWindow): self.voidlock_frm = QtWidgets.QFrame(self.control_frame) self.voidlock_frm.setMinimumSize(QtCore.QSize(18, 0)) self.voidlock_frm.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.voidlock_frm.setFrameShape(QtWidgets.QFrame.NoFrame) - self.voidlock_frm.setFrameShadow(QtWidgets.QFrame.Plain) + self.voidlock_frm.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.voidlock_frm.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.voidlock_frm.setObjectName("voidlock_frm") self.horizontalLayout_29 = QtWidgets.QHBoxLayout(self.voidlock_frm) self.horizontalLayout_29.setContentsMargins(4, 0, 4, 0) @@ -1479,26 +1477,26 @@ def setupUi(self, MainWindow): self.label_72 = QtWidgets.QLabel(self.voidlock_frm) self.label_72.setMinimumSize(QtCore.QSize(0, 0)) self.label_72.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.label_72.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.label_72.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_72.setObjectName("label_72") self.horizontalLayout_29.addWidget(self.label_72) - spacerItem8 = QtWidgets.QSpacerItem(51, 15, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem8 = QtWidgets.QSpacerItem(51, 15, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_29.addItem(spacerItem8) self.label_73 = QtWidgets.QLabel(self.voidlock_frm) self.label_73.setMinimumSize(QtCore.QSize(0, 0)) self.label_73.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.label_73.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_73.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_73.setObjectName("label_73") self.horizontalLayout_29.addWidget(self.label_73) self.voidlock_enable = CheckBox(self.voidlock_frm) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.voidlock_enable.sizePolicy().hasHeightForWidth()) self.voidlock_enable.setSizePolicy(sizePolicy) self.voidlock_enable.setMinimumSize(QtCore.QSize(0, 0)) self.voidlock_enable.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.voidlock_enable.setFocusPolicy(QtCore.Qt.ClickFocus) + self.voidlock_enable.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.voidlock_enable.setLayoutDirection(QtCore.Qt.LeftToRight) self.voidlock_enable.setText("") self.voidlock_enable.setChecked(False) @@ -1507,37 +1505,37 @@ def setupUi(self, MainWindow): self.gridLayout_12.addWidget(self.voidlock_frm, 3, 1, 1, 1) self.pmx485_frame = QtWidgets.QFrame(self.control_frame) self.pmx485_frame.setMinimumSize(QtCore.QSize(18, 0)) - self.pmx485_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.pmx485_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.pmx485_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.pmx485_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.pmx485_frame.setObjectName("pmx485_frame") self.horizontalLayout_30 = QtWidgets.QHBoxLayout(self.pmx485_frame) self.horizontalLayout_30.setContentsMargins(4, 0, 4, 0) self.horizontalLayout_30.setSpacing(2) self.horizontalLayout_30.setObjectName("horizontalLayout_30") self.pmx485_label = QtWidgets.QLabel(self.pmx485_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pmx485_label.sizePolicy().hasHeightForWidth()) self.pmx485_label.setSizePolicy(sizePolicy) self.pmx485_label.setText("") - self.pmx485_label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.pmx485_label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pmx485_label.setObjectName("pmx485_label") self.horizontalLayout_30.addWidget(self.pmx485_label) self.pmx485_label1 = QtWidgets.QLabel(self.pmx485_frame) self.pmx485_label1.setText("RS485") - self.pmx485_label1.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pmx485_label1.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pmx485_label1.setObjectName("pmx485_label1") self.horizontalLayout_30.addWidget(self.pmx485_label1) self.pmx485_enable = CheckBox(self.pmx485_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pmx485_enable.sizePolicy().hasHeightForWidth()) self.pmx485_enable.setSizePolicy(sizePolicy) self.pmx485_enable.setMinimumSize(QtCore.QSize(0, 0)) self.pmx485_enable.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.pmx485_enable.setFocusPolicy(QtCore.Qt.ClickFocus) + self.pmx485_enable.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.pmx485_enable.setText("") self.pmx485_enable.setObjectName("pmx485_enable") self.horizontalLayout_30.addWidget(self.pmx485_enable) @@ -1545,8 +1543,8 @@ def setupUi(self, MainWindow): self.frame_30 = QtWidgets.QFrame(self.control_frame) self.frame_30.setMinimumSize(QtCore.QSize(18, 0)) self.frame_30.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.frame_30.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_30.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_30.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_30.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_30.setObjectName("frame_30") self.horizontalLayout_28 = QtWidgets.QHBoxLayout(self.frame_30) self.horizontalLayout_28.setContentsMargins(4, 0, 4, 0) @@ -1561,26 +1559,26 @@ def setupUi(self, MainWindow): self.label_70 = QtWidgets.QLabel(self.frame_30) self.label_70.setMinimumSize(QtCore.QSize(0, 0)) self.label_70.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.label_70.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.label_70.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_70.setObjectName("label_70") self.horizontalLayout_28.addWidget(self.label_70) - spacerItem9 = QtWidgets.QSpacerItem(21, 15, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem9 = QtWidgets.QSpacerItem(21, 15, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_28.addItem(spacerItem9) self.label_71 = QtWidgets.QLabel(self.frame_30) self.label_71.setMinimumSize(QtCore.QSize(0, 0)) self.label_71.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.label_71.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_71.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_71.setObjectName("label_71") self.horizontalLayout_28.addWidget(self.label_71) self.cornerlock_enable = CheckBox(self.frame_30) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cornerlock_enable.sizePolicy().hasHeightForWidth()) self.cornerlock_enable.setSizePolicy(sizePolicy) self.cornerlock_enable.setMinimumSize(QtCore.QSize(0, 0)) self.cornerlock_enable.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.cornerlock_enable.setFocusPolicy(QtCore.Qt.ClickFocus) + self.cornerlock_enable.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.cornerlock_enable.setLayoutDirection(QtCore.Qt.LeftToRight) self.cornerlock_enable.setText("") self.cornerlock_enable.setChecked(False) @@ -1591,48 +1589,48 @@ def setupUi(self, MainWindow): self.verticalLayout_33.setStretch(1, 1) self.verticalLayout_15.addWidget(self.plasma_frame) self.frame_3 = QtWidgets.QFrame(self.main_c3) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.frame_3.sizePolicy().hasHeightForWidth()) self.frame_3.setSizePolicy(sizePolicy) self.frame_3.setMinimumSize(QtCore.QSize(0, 117)) self.frame_3.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.frame_3.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_3.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_3.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_3.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_3.setObjectName("frame_3") self.horizontalLayout_21 = QtWidgets.QHBoxLayout(self.frame_3) self.horizontalLayout_21.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_21.setSpacing(2) self.horizontalLayout_21.setObjectName("horizontalLayout_21") self.sensor_frame = QtWidgets.QFrame(self.frame_3) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.MinimumExpanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.sensor_frame.sizePolicy().hasHeightForWidth()) self.sensor_frame.setSizePolicy(sizePolicy) self.sensor_frame.setMinimumSize(QtCore.QSize(0, 0)) - self.sensor_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.sensor_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.sensor_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.sensor_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.sensor_frame.setObjectName("sensor_frame") self.verticalLayout_36 = QtWidgets.QVBoxLayout(self.sensor_frame) self.verticalLayout_36.setContentsMargins(0, 0, 0, 4) self.verticalLayout_36.setSpacing(3) self.verticalLayout_36.setObjectName("verticalLayout_36") self.sensor_label = QtWidgets.QLabel(self.sensor_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.sensor_label.sizePolicy().hasHeightForWidth()) self.sensor_label.setSizePolicy(sizePolicy) self.sensor_label.setMinimumSize(QtCore.QSize(0, 17)) self.sensor_label.setMaximumSize(QtCore.QSize(16777215, 17)) - self.sensor_label.setAlignment(QtCore.Qt.AlignCenter) + self.sensor_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.sensor_label.setObjectName("sensor_label") self.verticalLayout_36.addWidget(self.sensor_label) self.frame_9 = QtWidgets.QFrame(self.sensor_frame) - self.frame_9.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_9.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_9.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_9.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_9.setObjectName("frame_9") self.gridLayout_10 = QtWidgets.QGridLayout(self.frame_9) self.gridLayout_10.setContentsMargins(4, 0, 0, 0) @@ -1648,7 +1646,7 @@ def setupUi(self, MainWindow): self.label_49 = QtWidgets.QLabel(self.frame_9) self.label_49.setMinimumSize(QtCore.QSize(48, 17)) self.label_49.setMaximumSize(QtCore.QSize(48, 17)) - self.label_49.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.label_49.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_49.setObjectName("label_49") self.gridLayout_10.addWidget(self.label_49, 0, 1, 1, 1) self.led_ohmic_probe = LED(self.frame_9) @@ -1660,7 +1658,7 @@ def setupUi(self, MainWindow): self.label_52 = QtWidgets.QLabel(self.frame_9) self.label_52.setMinimumSize(QtCore.QSize(48, 17)) self.label_52.setMaximumSize(QtCore.QSize(48, 17)) - self.label_52.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.label_52.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_52.setObjectName("label_52") self.gridLayout_10.addWidget(self.label_52, 1, 1, 1, 1) self.led_breakaway_switch = LED(self.frame_9) @@ -1672,66 +1670,66 @@ def setupUi(self, MainWindow): self.label_53 = QtWidgets.QLabel(self.frame_9) self.label_53.setMinimumSize(QtCore.QSize(48, 17)) self.label_53.setMaximumSize(QtCore.QSize(48, 17)) - self.label_53.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.label_53.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_53.setObjectName("label_53") self.gridLayout_10.addWidget(self.label_53, 2, 1, 1, 1) self.verticalLayout_36.addWidget(self.frame_9) self.horizontalLayout_21.addWidget(self.sensor_frame) self.thc_frame = QtWidgets.QFrame(self.frame_3) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_frame.sizePolicy().hasHeightForWidth()) self.thc_frame.setSizePolicy(sizePolicy) self.thc_frame.setMinimumSize(QtCore.QSize(0, 0)) self.thc_frame.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.thc_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.thc_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.thc_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.thc_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.thc_frame.setObjectName("thc_frame") self.verticalLayout_35 = QtWidgets.QVBoxLayout(self.thc_frame) self.verticalLayout_35.setContentsMargins(0, 0, 0, 4) self.verticalLayout_35.setSpacing(4) self.verticalLayout_35.setObjectName("verticalLayout_35") self.thc_label = QtWidgets.QLabel(self.thc_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_label.sizePolicy().hasHeightForWidth()) self.thc_label.setSizePolicy(sizePolicy) self.thc_label.setMinimumSize(QtCore.QSize(0, 16)) self.thc_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.thc_label.setAlignment(QtCore.Qt.AlignCenter) + self.thc_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.thc_label.setObjectName("thc_label") self.verticalLayout_35.addWidget(self.thc_label) self.frame_14 = QtWidgets.QFrame(self.thc_frame) - self.frame_14.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_14.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_14.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_14.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_14.setObjectName("frame_14") self.horizontalLayout = QtWidgets.QHBoxLayout(self.frame_14) self.horizontalLayout.setContentsMargins(4, 0, 4, 0) self.horizontalLayout.setSpacing(2) self.horizontalLayout.setObjectName("horizontalLayout") - spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout.addItem(spacerItem10) self.label_11 = QtWidgets.QLabel(self.frame_14) self.label_11.setMinimumSize(QtCore.QSize(0, 17)) self.label_11.setMaximumSize(QtCore.QSize(16777215, 17)) - self.label_11.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTop|QtCore.Qt.AlignTrailing) + self.label_11.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTop|QtCore.Qt.AlignTrailing) self.label_11.setObjectName("label_11") self.horizontalLayout.addWidget(self.label_11) self.thc_enable = CheckBox(self.frame_14) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_enable.sizePolicy().hasHeightForWidth()) self.thc_enable.setSizePolicy(sizePolicy) - self.thc_enable.setFocusPolicy(QtCore.Qt.ClickFocus) + self.thc_enable.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.thc_enable.setObjectName("thc_enable") self.horizontalLayout.addWidget(self.thc_enable) self.verticalLayout_35.addWidget(self.frame_14) self.frame_37 = QtWidgets.QFrame(self.thc_frame) - self.frame_37.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_37.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_37.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_37.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_37.setObjectName("frame_37") self.horizontalLayout_6 = QtWidgets.QHBoxLayout(self.frame_37) self.horizontalLayout_6.setContentsMargins(4, 0, 4, 0) @@ -1746,15 +1744,15 @@ def setupUi(self, MainWindow): self.label_44 = QtWidgets.QLabel(self.frame_37) self.label_44.setMinimumSize(QtCore.QSize(0, 17)) self.label_44.setMaximumSize(QtCore.QSize(1677215, 17)) - self.label_44.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.label_44.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_44.setObjectName("label_44") self.horizontalLayout_6.addWidget(self.label_44) - spacerItem11 = QtWidgets.QSpacerItem(6, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem11 = QtWidgets.QSpacerItem(6, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_6.addItem(spacerItem11) self.label_43 = QtWidgets.QLabel(self.frame_37) self.label_43.setMinimumSize(QtCore.QSize(0, 17)) self.label_43.setMaximumSize(QtCore.QSize(16777215, 17)) - self.label_43.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_43.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_43.setObjectName("label_43") self.horizontalLayout_6.addWidget(self.label_43) self.led_thc_enabled = LED(self.frame_37) @@ -1766,8 +1764,8 @@ def setupUi(self, MainWindow): self.horizontalLayout_6.addWidget(self.led_thc_enabled) self.verticalLayout_35.addWidget(self.frame_37) self.frame_2 = QtWidgets.QFrame(self.thc_frame) - self.frame_2.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_2.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_2.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_2.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_2.setObjectName("frame_2") self.horizontalLayout_9 = QtWidgets.QHBoxLayout(self.frame_2) self.horizontalLayout_9.setContentsMargins(4, 0, 4, 0) @@ -1782,15 +1780,15 @@ def setupUi(self, MainWindow): self.label_45 = QtWidgets.QLabel(self.frame_2) self.label_45.setMinimumSize(QtCore.QSize(0, 17)) self.label_45.setMaximumSize(QtCore.QSize(16777215, 17)) - self.label_45.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.label_45.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_45.setObjectName("label_45") self.horizontalLayout_9.addWidget(self.label_45) - spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_9.addItem(spacerItem12) self.led_thc_active_lbl = QtWidgets.QLabel(self.frame_2) self.led_thc_active_lbl.setMinimumSize(QtCore.QSize(0, 17)) self.led_thc_active_lbl.setMaximumSize(QtCore.QSize(16777215, 17)) - self.led_thc_active_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.led_thc_active_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.led_thc_active_lbl.setObjectName("led_thc_active_lbl") self.horizontalLayout_9.addWidget(self.led_thc_active_lbl) self.led_thc_active = LED(self.frame_2) @@ -1804,7 +1802,7 @@ def setupUi(self, MainWindow): self.horizontalLayout_21.addWidget(self.thc_frame) self.verticalLayout_15.addWidget(self.frame_3) self.jog_stack = QtWidgets.QStackedWidget(self.main_c3) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_stack.sizePolicy().hasHeightForWidth()) @@ -1819,27 +1817,27 @@ def setupUi(self, MainWindow): self.verticalLayout_21.setSpacing(0) self.verticalLayout_21.setObjectName("verticalLayout_21") self.jog_frame = QtWidgets.QFrame(self.jog_page) - self.jog_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.jog_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.jog_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.jog_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.jog_frame.setObjectName("jog_frame") self.verticalLayout_18 = QtWidgets.QVBoxLayout(self.jog_frame) self.verticalLayout_18.setContentsMargins(0, 0, 0, 4) self.verticalLayout_18.setSpacing(2) self.verticalLayout_18.setObjectName("verticalLayout_18") self.jog_label = QtWidgets.QLabel(self.jog_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_label.sizePolicy().hasHeightForWidth()) self.jog_label.setSizePolicy(sizePolicy) self.jog_label.setMinimumSize(QtCore.QSize(0, 16)) self.jog_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.jog_label.setAlignment(QtCore.Qt.AlignCenter) + self.jog_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.jog_label.setObjectName("jog_label") self.verticalLayout_18.addWidget(self.jog_label) self.frame_18 = QtWidgets.QFrame(self.jog_frame) - self.frame_18.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_18.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_18.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_18.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_18.setObjectName("frame_18") self.horizontalLayout_16 = QtWidgets.QHBoxLayout(self.frame_18) self.horizontalLayout_16.setContentsMargins(0, 2, 0, 0) @@ -1847,18 +1845,18 @@ def setupUi(self, MainWindow): self.jogincrements = JogIncrements(self.frame_18) self.jogincrements.setMinimumSize(QtCore.QSize(128, 40)) self.jogincrements.setMaximumSize(QtCore.QSize(128, 40)) - self.jogincrements.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jogincrements.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jogincrements.setObjectName("jogincrements") self.horizontalLayout_16.addWidget(self.jogincrements) self.jog_slow = PushButton(self.frame_18) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_slow.sizePolicy().hasHeightForWidth()) self.jog_slow.setSizePolicy(sizePolicy) self.jog_slow.setMinimumSize(QtCore.QSize(40, 40)) self.jog_slow.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_slow.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_slow.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_slow.setToolTip("") self.jog_slow.setCheckable(True) self.jog_slow.setProperty("checked_state_text_option", False) @@ -1872,152 +1870,152 @@ def setupUi(self, MainWindow): self.verticalLayout_18.addWidget(self.frame_18) self.jog_grid = QtWidgets.QFrame(self.jog_frame) self.jog_grid.setMinimumSize(QtCore.QSize(0, 0)) - self.jog_grid.setFrameShape(QtWidgets.QFrame.NoFrame) - self.jog_grid.setFrameShadow(QtWidgets.QFrame.Plain) + self.jog_grid.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.jog_grid.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.jog_grid.setObjectName("jog_grid") self.gridLayout = QtWidgets.QGridLayout(self.jog_grid) self.gridLayout.setContentsMargins(4, 0, 4, 0) self.gridLayout.setSpacing(4) self.gridLayout.setObjectName("gridLayout") self.jog_b_minus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_b_minus.sizePolicy().hasHeightForWidth()) self.jog_b_minus.setSizePolicy(sizePolicy) self.jog_b_minus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_b_minus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_b_minus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_b_minus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_b_minus.setText("") self.jog_b_minus.setIconSize(QtCore.QSize(32, 32)) self.jog_b_minus.setObjectName("jog_b_minus") self.gridLayout.addWidget(self.jog_b_minus, 4, 0, 1, 1) self.jog_x_minus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_x_minus.sizePolicy().hasHeightForWidth()) self.jog_x_minus.setSizePolicy(sizePolicy) self.jog_x_minus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_x_minus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_x_minus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_x_minus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_x_minus.setIconSize(QtCore.QSize(40, 40)) self.jog_x_minus.setObjectName("jog_x_minus") self.gridLayout.addWidget(self.jog_x_minus, 2, 0, 1, 1) self.jog_a_minus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_a_minus.sizePolicy().hasHeightForWidth()) self.jog_a_minus.setSizePolicy(sizePolicy) self.jog_a_minus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_a_minus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_a_minus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_a_minus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_a_minus.setIconSize(QtCore.QSize(32, 32)) self.jog_a_minus.setObjectName("jog_a_minus") self.gridLayout.addWidget(self.jog_a_minus, 3, 0, 1, 1) self.jog_x_plus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_x_plus.sizePolicy().hasHeightForWidth()) self.jog_x_plus.setSizePolicy(sizePolicy) self.jog_x_plus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_x_plus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_x_plus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_x_plus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_x_plus.setIconSize(QtCore.QSize(40, 40)) self.jog_x_plus.setObjectName("jog_x_plus") self.gridLayout.addWidget(self.jog_x_plus, 2, 2, 1, 1) self.jog_y_minus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_y_minus.sizePolicy().hasHeightForWidth()) self.jog_y_minus.setSizePolicy(sizePolicy) self.jog_y_minus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_y_minus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_y_minus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_y_minus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_y_minus.setIconSize(QtCore.QSize(40, 40)) self.jog_y_minus.setObjectName("jog_y_minus") self.gridLayout.addWidget(self.jog_y_minus, 3, 1, 1, 1) self.jog_b_plus = QtWidgets.QPushButton(self.jog_grid) self.jog_b_plus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_b_plus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_b_plus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_b_plus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_b_plus.setText("") self.jog_b_plus.setIconSize(QtCore.QSize(32, 32)) self.jog_b_plus.setObjectName("jog_b_plus") self.gridLayout.addWidget(self.jog_b_plus, 4, 2, 1, 1) self.jog_z_plus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_z_plus.sizePolicy().hasHeightForWidth()) self.jog_z_plus.setSizePolicy(sizePolicy) self.jog_z_plus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_z_plus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_z_plus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_z_plus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_z_plus.setIconSize(QtCore.QSize(40, 40)) self.jog_z_plus.setObjectName("jog_z_plus") self.gridLayout.addWidget(self.jog_z_plus, 1, 3, 1, 1) self.jog_y_plus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_y_plus.sizePolicy().hasHeightForWidth()) self.jog_y_plus.setSizePolicy(sizePolicy) self.jog_y_plus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_y_plus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_y_plus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_y_plus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_y_plus.setIconSize(QtCore.QSize(40, 40)) self.jog_y_plus.setObjectName("jog_y_plus") self.gridLayout.addWidget(self.jog_y_plus, 1, 1, 1, 1) self.jog_a_plus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_a_plus.sizePolicy().hasHeightForWidth()) self.jog_a_plus.setSizePolicy(sizePolicy) self.jog_a_plus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_a_plus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_a_plus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_a_plus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_a_plus.setIconSize(QtCore.QSize(32, 32)) self.jog_a_plus.setObjectName("jog_a_plus") self.gridLayout.addWidget(self.jog_a_plus, 1, 0, 1, 1) self.jog_z_minus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_z_minus.sizePolicy().hasHeightForWidth()) self.jog_z_minus.setSizePolicy(sizePolicy) self.jog_z_minus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_z_minus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_z_minus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_z_minus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_z_minus.setIconSize(QtCore.QSize(40, 40)) self.jog_z_minus.setObjectName("jog_z_minus") self.gridLayout.addWidget(self.jog_z_minus, 3, 3, 1, 1) self.jog_c_plus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_c_plus.sizePolicy().hasHeightForWidth()) self.jog_c_plus.setSizePolicy(sizePolicy) self.jog_c_plus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_c_plus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_c_plus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_c_plus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_c_plus.setText("") self.jog_c_plus.setIconSize(QtCore.QSize(32, 32)) self.jog_c_plus.setObjectName("jog_c_plus") self.gridLayout.addWidget(self.jog_c_plus, 1, 4, 1, 1) self.jog_c_minus = QtWidgets.QPushButton(self.jog_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.jog_c_minus.sizePolicy().hasHeightForWidth()) self.jog_c_minus.setSizePolicy(sizePolicy) self.jog_c_minus.setMinimumSize(QtCore.QSize(40, 40)) self.jog_c_minus.setMaximumSize(QtCore.QSize(40, 40)) - self.jog_c_minus.setFocusPolicy(QtCore.Qt.ClickFocus) + self.jog_c_minus.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.jog_c_minus.setText("") self.jog_c_minus.setIconSize(QtCore.QSize(32, 32)) self.jog_c_minus.setObjectName("jog_c_minus") @@ -2033,8 +2031,8 @@ def setupUi(self, MainWindow): self.verticalLayout_19.setSpacing(0) self.verticalLayout_19.setObjectName("verticalLayout_19") self.cut_rec_frame = QtWidgets.QFrame(self.cut_rec_page) - self.cut_rec_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.cut_rec_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.cut_rec_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.cut_rec_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.cut_rec_frame.setObjectName("cut_rec_frame") self.verticalLayout_20 = QtWidgets.QVBoxLayout(self.cut_rec_frame) self.verticalLayout_20.setContentsMargins(0, 0, 0, 4) @@ -2043,12 +2041,12 @@ def setupUi(self, MainWindow): self.cut_rec_label = QtWidgets.QLabel(self.cut_rec_frame) self.cut_rec_label.setMinimumSize(QtCore.QSize(0, 16)) self.cut_rec_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.cut_rec_label.setAlignment(QtCore.Qt.AlignCenter) + self.cut_rec_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.cut_rec_label.setObjectName("cut_rec_label") self.verticalLayout_20.addWidget(self.cut_rec_label) self.frame_8 = QtWidgets.QFrame(self.cut_rec_frame) - self.frame_8.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_8.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_8.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_8.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_8.setObjectName("frame_8") self.horizontalLayout_7 = QtWidgets.QHBoxLayout(self.frame_8) self.horizontalLayout_7.setContentsMargins(0, 0, 0, 0) @@ -2056,18 +2054,18 @@ def setupUi(self, MainWindow): self.horizontalLayout_7.setObjectName("horizontalLayout_7") self.frame_7 = QtWidgets.QFrame(self.frame_8) self.frame_7.setMaximumSize(QtCore.QSize(59, 16777215)) - self.frame_7.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_7.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_7.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_7.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_7.setObjectName("frame_7") self.gridLayout_9 = QtWidgets.QGridLayout(self.frame_7) self.gridLayout_9.setContentsMargins(4, 0, 0, 0) self.gridLayout_9.setHorizontalSpacing(0) self.gridLayout_9.setVerticalSpacing(2) self.gridLayout_9.setObjectName("gridLayout_9") - spacerItem13 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem13 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.gridLayout_9.addItem(spacerItem13, 2, 0, 1, 1) self.cut_rec_cancel = QtWidgets.QPushButton(self.frame_7) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_cancel.sizePolicy().hasHeightForWidth()) @@ -2078,15 +2076,15 @@ def setupUi(self, MainWindow): self.gridLayout_9.addWidget(self.cut_rec_cancel, 3, 0, 1, 1) self.frame_17 = QtWidgets.QFrame(self.frame_7) self.frame_17.setMaximumSize(QtCore.QSize(50, 16777215)) - self.frame_17.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_17.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_17.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_17.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_17.setObjectName("frame_17") self.horizontalLayout_15 = QtWidgets.QHBoxLayout(self.frame_17) self.horizontalLayout_15.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_15.setSpacing(0) self.horizontalLayout_15.setObjectName("horizontalLayout_15") self.cut_rec_rev = QtWidgets.QPushButton(self.frame_17) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_rev.sizePolicy().hasHeightForWidth()) @@ -2096,14 +2094,14 @@ def setupUi(self, MainWindow): self.cut_rec_rev.setCheckable(False) self.cut_rec_rev.setObjectName("cut_rec_rev") self.horizontalLayout_15.addWidget(self.cut_rec_rev) - spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_15.addItem(spacerItem14) self.gridLayout_9.addWidget(self.frame_17, 0, 0, 1, 1) self.horizontalLayout_7.addWidget(self.frame_7) - spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_7.addItem(spacerItem15) self.cut_rec_speed = QtWidgets.QSlider(self.frame_8) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_speed.sizePolicy().hasHeightForWidth()) @@ -2112,31 +2110,31 @@ def setupUi(self, MainWindow): self.cut_rec_speed.setMaximum(100) self.cut_rec_speed.setProperty("value", 50) self.cut_rec_speed.setSliderPosition(50) - self.cut_rec_speed.setOrientation(QtCore.Qt.Vertical) + self.cut_rec_speed.setOrientation(QtCore.Qt.Orientation.Vertical) self.cut_rec_speed.setObjectName("cut_rec_speed") self.horizontalLayout_7.addWidget(self.cut_rec_speed) - spacerItem16 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem16 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_7.addItem(spacerItem16) self.frame = QtWidgets.QFrame(self.frame_8) self.frame.setMaximumSize(QtCore.QSize(59, 16777215)) - self.frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame.setObjectName("frame") self.gridLayout_8 = QtWidgets.QGridLayout(self.frame) self.gridLayout_8.setContentsMargins(0, 0, 0, 0) self.gridLayout_8.setSpacing(0) self.gridLayout_8.setObjectName("gridLayout_8") self.frame_16 = QtWidgets.QFrame(self.frame) - self.frame_16.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_16.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_16.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_16.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_16.setObjectName("frame_16") self.horizontalLayout_14 = QtWidgets.QHBoxLayout(self.frame_16) self.horizontalLayout_14.setContentsMargins(0, 0, 4, 0) self.horizontalLayout_14.setObjectName("horizontalLayout_14") - spacerItem17 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem17 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_14.addItem(spacerItem17) self.cut_rec_fwd = QtWidgets.QPushButton(self.frame_16) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_fwd.sizePolicy().hasHeightForWidth()) @@ -2152,23 +2150,23 @@ def setupUi(self, MainWindow): self.cut_rec_feed.setMinimumSize(QtCore.QSize(55, 40)) self.cut_rec_feed.setMaximumSize(QtCore.QSize(55, 40)) self.cut_rec_feed.setText("1") - self.cut_rec_feed.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_rec_feed.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_rec_feed.setObjectName("cut_rec_feed") self.gridLayout_8.addWidget(self.cut_rec_feed, 4, 0, 1, 1) - spacerItem18 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem18 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.gridLayout_8.addItem(spacerItem18, 3, 0, 1, 1) self.horizontalLayout_7.addWidget(self.frame) self.verticalLayout_20.addWidget(self.frame_8) self.arrow_frame = QtWidgets.QFrame(self.cut_rec_frame) - self.arrow_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.arrow_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.arrow_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.arrow_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.arrow_frame.setObjectName("arrow_frame") self.gridLayout_7 = QtWidgets.QGridLayout(self.arrow_frame) self.gridLayout_7.setContentsMargins(0, 0, 0, 0) self.gridLayout_7.setSpacing(4) self.gridLayout_7.setObjectName("gridLayout_7") self.cut_rec_se = QtWidgets.QPushButton(self.arrow_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_se.sizePolicy().hasHeightForWidth()) @@ -2180,7 +2178,7 @@ def setupUi(self, MainWindow): self.cut_rec_se.setObjectName("cut_rec_se") self.gridLayout_7.addWidget(self.cut_rec_se, 2, 2, 1, 1) self.cut_rec_s = QtWidgets.QPushButton(self.arrow_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_s.sizePolicy().hasHeightForWidth()) @@ -2192,7 +2190,7 @@ def setupUi(self, MainWindow): self.cut_rec_s.setObjectName("cut_rec_s") self.gridLayout_7.addWidget(self.cut_rec_s, 2, 1, 1, 1) self.cut_rec_nw = QtWidgets.QPushButton(self.arrow_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_nw.sizePolicy().hasHeightForWidth()) @@ -2205,7 +2203,7 @@ def setupUi(self, MainWindow): self.cut_rec_nw.setObjectName("cut_rec_nw") self.gridLayout_7.addWidget(self.cut_rec_nw, 0, 0, 1, 1) self.cut_rec_e = QtWidgets.QPushButton(self.arrow_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_e.sizePolicy().hasHeightForWidth()) @@ -2217,7 +2215,7 @@ def setupUi(self, MainWindow): self.cut_rec_e.setObjectName("cut_rec_e") self.gridLayout_7.addWidget(self.cut_rec_e, 1, 2, 1, 1) self.cut_rec_sw = QtWidgets.QPushButton(self.arrow_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_sw.sizePolicy().hasHeightForWidth()) @@ -2229,7 +2227,7 @@ def setupUi(self, MainWindow): self.cut_rec_sw.setObjectName("cut_rec_sw") self.gridLayout_7.addWidget(self.cut_rec_sw, 2, 0, 1, 1) self.cut_rec_w = QtWidgets.QPushButton(self.arrow_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_w.sizePolicy().hasHeightForWidth()) @@ -2241,7 +2239,7 @@ def setupUi(self, MainWindow): self.cut_rec_w.setObjectName("cut_rec_w") self.gridLayout_7.addWidget(self.cut_rec_w, 1, 0, 1, 1) self.cut_rec_n = QtWidgets.QPushButton(self.arrow_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_n.sizePolicy().hasHeightForWidth()) @@ -2253,7 +2251,7 @@ def setupUi(self, MainWindow): self.cut_rec_n.setObjectName("cut_rec_n") self.gridLayout_7.addWidget(self.cut_rec_n, 0, 1, 1, 1) self.cut_rec_ne = QtWidgets.QPushButton(self.arrow_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_rec_ne.sizePolicy().hasHeightForWidth()) @@ -2265,7 +2263,7 @@ def setupUi(self, MainWindow): self.cut_rec_ne.setObjectName("cut_rec_ne") self.gridLayout_7.addWidget(self.cut_rec_ne, 0, 2, 1, 1) self.cut_rec_move_label = QtWidgets.QLabel(self.arrow_frame) - self.cut_rec_move_label.setAlignment(QtCore.Qt.AlignCenter) + self.cut_rec_move_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.cut_rec_move_label.setObjectName("cut_rec_move_label") self.gridLayout_7.addWidget(self.cut_rec_move_label, 1, 1, 1, 1) self.verticalLayout_20.addWidget(self.arrow_frame) @@ -2279,22 +2277,22 @@ def setupUi(self, MainWindow): self.dro_gcode_frame = QtWidgets.QFrame(self.main_tab) self.dro_gcode_frame.setMinimumSize(QtCore.QSize(320, 0)) self.dro_gcode_frame.setMaximumSize(QtCore.QSize(320, 16777215)) - self.dro_gcode_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.dro_gcode_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.dro_gcode_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.dro_gcode_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.dro_gcode_frame.setObjectName("dro_gcode_frame") self.dro_gcode_layout = QtWidgets.QVBoxLayout(self.dro_gcode_frame) self.dro_gcode_layout.setContentsMargins(0, 0, 0, 0) self.dro_gcode_layout.setSpacing(2) self.dro_gcode_layout.setObjectName("dro_gcode_layout") self.gcode_frame = QtWidgets.QFrame(self.dro_gcode_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.gcode_frame.sizePolicy().hasHeightForWidth()) self.gcode_frame.setSizePolicy(sizePolicy) self.gcode_frame.setMinimumSize(QtCore.QSize(0, 0)) - self.gcode_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.gcode_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.gcode_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.gcode_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.gcode_frame.setObjectName("gcode_frame") self.verticalLayout_14 = QtWidgets.QVBoxLayout(self.gcode_frame) self.verticalLayout_14.setContentsMargins(0, 0, 0, 2) @@ -2310,47 +2308,47 @@ def setupUi(self, MainWindow): self.verticalLayout_12.setSpacing(0) self.verticalLayout_12.setObjectName("verticalLayout_12") self.frame_21 = QtWidgets.QFrame(self.gcode_page) - self.frame_21.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_21.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_21.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_21.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_21.setObjectName("frame_21") self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.frame_21) self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_2.setSpacing(1) self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.file_clear = PushButton(self.frame_21) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.file_clear.sizePolicy().hasHeightForWidth()) self.file_clear.setSizePolicy(sizePolicy) self.file_clear.setMinimumSize(QtCore.QSize(60, 16)) self.file_clear.setMaximumSize(QtCore.QSize(60, 16)) - self.file_clear.setFocusPolicy(QtCore.Qt.ClickFocus) + self.file_clear.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.file_clear.setProperty("python_command_option", False) self.file_clear.setProperty("true_python_cmd_string", "") self.file_clear.setProperty("false_python_cmd_string", "") self.file_clear.setObjectName("file_clear") self.horizontalLayout_2.addWidget(self.file_clear) self.file_open = QtWidgets.QPushButton(self.frame_21) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.file_open.sizePolicy().hasHeightForWidth()) self.file_open.setSizePolicy(sizePolicy) self.file_open.setMinimumSize(QtCore.QSize(60, 16)) self.file_open.setMaximumSize(QtCore.QSize(16777215, 16)) - self.file_open.setFocusPolicy(QtCore.Qt.ClickFocus) + self.file_open.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.file_open.setObjectName("file_open") self.horizontalLayout_2.addWidget(self.file_open) self.file_reload = PushButton(self.frame_21) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.file_reload.sizePolicy().hasHeightForWidth()) self.file_reload.setSizePolicy(sizePolicy) self.file_reload.setMinimumSize(QtCore.QSize(60, 16)) self.file_reload.setMaximumSize(QtCore.QSize(60, 16)) - self.file_reload.setFocusPolicy(QtCore.Qt.ClickFocus) + self.file_reload.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.file_reload.setProperty("python_command_option", False) self.file_reload.setProperty("true_python_cmd_string", "") self.file_reload.setProperty("false_python_cmd_string", "") @@ -2358,16 +2356,16 @@ def setupUi(self, MainWindow): self.horizontalLayout_2.addWidget(self.file_reload) self.verticalLayout_12.addWidget(self.frame_21) self.gcode_place = QtWidgets.QFrame(self.gcode_page) - self.gcode_place.setFrameShape(QtWidgets.QFrame.NoFrame) - self.gcode_place.setFrameShadow(QtWidgets.QFrame.Plain) + self.gcode_place.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.gcode_place.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.gcode_place.setObjectName("gcode_place") self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.gcode_place) self.verticalLayout_6.setContentsMargins(4, 4, 4, 2) self.verticalLayout_6.setSpacing(4) self.verticalLayout_6.setObjectName("verticalLayout_6") self.gcode_display = GcodeDisplay(self.gcode_place) - self.gcode_display.setFrameShape(QtWidgets.QFrame.NoFrame) - self.gcode_display.setFrameShadow(QtWidgets.QFrame.Plain) + self.gcode_display.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.gcode_display.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.gcode_display.setProperty("auto_show_mdi_status", False) self.gcode_display.setObjectName("gcode_display") self.verticalLayout_6.addWidget(self.gcode_display) @@ -2381,8 +2379,8 @@ def setupUi(self, MainWindow): self.verticalLayout_13.setObjectName("verticalLayout_13") self.mdi_frame = QtWidgets.QFrame(self.mdi_page) self.mdi_frame.setMinimumSize(QtCore.QSize(0, 60)) - self.mdi_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.mdi_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.mdi_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.mdi_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.mdi_frame.setObjectName("mdi_frame") self.verticalLayout_38 = QtWidgets.QVBoxLayout(self.mdi_frame) self.verticalLayout_38.setContentsMargins(0, 0, 0, 4) @@ -2391,12 +2389,12 @@ def setupUi(self, MainWindow): self.mdi_label = QtWidgets.QLabel(self.mdi_frame) self.mdi_label.setMinimumSize(QtCore.QSize(0, 16)) self.mdi_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.mdi_label.setAlignment(QtCore.Qt.AlignCenter) + self.mdi_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.mdi_label.setObjectName("mdi_label") self.verticalLayout_38.addWidget(self.mdi_label) self.frame_20 = QtWidgets.QFrame(self.mdi_frame) - self.frame_20.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_20.setFrameShadow(QtWidgets.QFrame.Raised) + self.frame_20.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_20.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.frame_20.setObjectName("frame_20") self.horizontalLayout_26 = QtWidgets.QHBoxLayout(self.frame_20) self.horizontalLayout_26.setContentsMargins(4, 0, 4, 0) @@ -2412,47 +2410,47 @@ def setupUi(self, MainWindow): self.verticalLayout_14.addWidget(self.gcode_stack) self.dro_gcode_layout.addWidget(self.gcode_frame) self.dro_frame = QtWidgets.QFrame(self.dro_gcode_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.dro_frame.sizePolicy().hasHeightForWidth()) self.dro_frame.setSizePolicy(sizePolicy) self.dro_frame.setMinimumSize(QtCore.QSize(0, 0)) self.dro_frame.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.dro_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.dro_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.dro_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.dro_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.dro_frame.setObjectName("dro_frame") self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.dro_frame) self.verticalLayout_2.setContentsMargins(0, 0, 0, 4) self.verticalLayout_2.setSpacing(4) self.verticalLayout_2.setObjectName("verticalLayout_2") self.dro_label = QtWidgets.QLabel(self.dro_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.dro_label.sizePolicy().hasHeightForWidth()) self.dro_label.setSizePolicy(sizePolicy) self.dro_label.setMinimumSize(QtCore.QSize(0, 16)) self.dro_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.dro_label.setAlignment(QtCore.Qt.AlignCenter) + self.dro_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.dro_label.setObjectName("dro_label") self.verticalLayout_2.addWidget(self.dro_label) self.dro_place = QtWidgets.QFrame(self.dro_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.dro_place.sizePolicy().hasHeightForWidth()) self.dro_place.setSizePolicy(sizePolicy) self.dro_place.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.dro_place.setFrameShape(QtWidgets.QFrame.NoFrame) - self.dro_place.setFrameShadow(QtWidgets.QFrame.Plain) + self.dro_place.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.dro_place.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.dro_place.setObjectName("dro_place") self.gridLayout_2 = QtWidgets.QGridLayout(self.dro_place) self.gridLayout_2.setContentsMargins(4, 0, 4, 0) self.gridLayout_2.setSpacing(4) self.gridLayout_2.setObjectName("gridLayout_2") self.dro_y = DROLabel(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.dro_y.sizePolicy().hasHeightForWidth()) @@ -2460,56 +2458,56 @@ def setupUi(self, MainWindow): self.dro_y.setMinimumSize(QtCore.QSize(0, 40)) self.dro_y.setMaximumSize(QtCore.QSize(16777215, 40)) self.dro_y.setStyleSheet("") - self.dro_y.setFrameShape(QtWidgets.QFrame.NoFrame) - self.dro_y.setFrameShadow(QtWidgets.QFrame.Plain) - self.dro_y.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.dro_y.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.dro_y.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) + self.dro_y.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.dro_y.setProperty("Qjoint_number", 1) self.dro_y.setProperty("homed", False) self.dro_y.setObjectName("dro_y") self.gridLayout_2.addWidget(self.dro_y, 2, 3, 1, 1) self.frame_10 = QtWidgets.QFrame(self.dro_place) - self.frame_10.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_10.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_10.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_10.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_10.setObjectName("frame_10") self.horizontalLayout_46 = QtWidgets.QHBoxLayout(self.frame_10) self.horizontalLayout_46.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_46.setSpacing(4) self.horizontalLayout_46.setObjectName("horizontalLayout_46") self.wcs_button = SystemToolButton(self.frame_10) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.wcs_button.sizePolicy().hasHeightForWidth()) self.wcs_button.setSizePolicy(sizePolicy) self.wcs_button.setMinimumSize(QtCore.QSize(48, 40)) self.wcs_button.setMaximumSize(QtCore.QSize(48, 40)) - self.wcs_button.setFocusPolicy(QtCore.Qt.ClickFocus) + self.wcs_button.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.wcs_button.setText("") - self.wcs_button.setPopupMode(QtWidgets.QToolButton.InstantPopup) + self.wcs_button.setPopupMode(QtWidgets.QToolButton.ToolButtonPopupMode.InstantPopup) self.wcs_button.setObjectName("wcs_button") self.horizontalLayout_46.addWidget(self.wcs_button) - spacerItem19 = QtWidgets.QSpacerItem(64, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem19 = QtWidgets.QSpacerItem(64, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_46.addItem(spacerItem19) self.camera = PushButton(self.frame_10) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.camera.sizePolicy().hasHeightForWidth()) self.camera.setSizePolicy(sizePolicy) self.camera.setMinimumSize(QtCore.QSize(60, 40)) self.camera.setMaximumSize(QtCore.QSize(60, 40)) - self.camera.setFocusPolicy(QtCore.Qt.ClickFocus) + self.camera.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.camera.setObjectName("camera") self.horizontalLayout_46.addWidget(self.camera) self.laser = PushButton(self.frame_10) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.laser.sizePolicy().hasHeightForWidth()) self.laser.setSizePolicy(sizePolicy) self.laser.setMinimumSize(QtCore.QSize(60, 40)) self.laser.setMaximumSize(QtCore.QSize(60, 40)) - self.laser.setFocusPolicy(QtCore.Qt.ClickFocus) + self.laser.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.laser.setObjectName("laser") self.horizontalLayout_46.addWidget(self.laser) self.gridLayout_2.addWidget(self.frame_10, 0, 3, 1, 1) @@ -2517,25 +2515,25 @@ def setupUi(self, MainWindow): self.dro_label_a.setMinimumSize(QtCore.QSize(30, 40)) self.dro_label_a.setMaximumSize(QtCore.QSize(30, 40)) self.dro_label_a.setText("A") - self.dro_label_a.setAlignment(QtCore.Qt.AlignCenter) + self.dro_label_a.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.dro_label_a.setObjectName("dro_label_a") self.gridLayout_2.addWidget(self.dro_label_a, 4, 2, 1, 1) self.dro_label_z = QtWidgets.QLabel(self.dro_place) self.dro_label_z.setMinimumSize(QtCore.QSize(30, 40)) self.dro_label_z.setMaximumSize(QtCore.QSize(40, 40)) self.dro_label_z.setText("Z") - self.dro_label_z.setAlignment(QtCore.Qt.AlignCenter) + self.dro_label_z.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.dro_label_z.setObjectName("dro_label_z") self.gridLayout_2.addWidget(self.dro_label_z, 3, 2, 1, 1) self.home_b = ActionButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.home_b.sizePolicy().hasHeightForWidth()) self.home_b.setSizePolicy(sizePolicy) self.home_b.setMinimumSize(QtCore.QSize(48, 40)) self.home_b.setMaximumSize(QtCore.QSize(48, 40)) - self.home_b.setFocusPolicy(QtCore.Qt.ClickFocus) + self.home_b.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.home_b.setProperty("home_action", True) self.home_b.setProperty("joint_number", 4) self.home_b.setProperty("axis_letter", "B") @@ -2548,18 +2546,18 @@ def setupUi(self, MainWindow): self.dro_label_y.setMinimumSize(QtCore.QSize(30, 40)) self.dro_label_y.setMaximumSize(QtCore.QSize(40, 40)) self.dro_label_y.setText("Y") - self.dro_label_y.setAlignment(QtCore.Qt.AlignCenter) + self.dro_label_y.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.dro_label_y.setObjectName("dro_label_y") self.gridLayout_2.addWidget(self.dro_label_y, 2, 2, 1, 1) self.dro_b = DROLabel(self.dro_place) self.dro_b.setMinimumSize(QtCore.QSize(0, 40)) self.dro_b.setMaximumSize(QtCore.QSize(200, 40)) - self.dro_b.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.dro_b.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.dro_b.setProperty("Qjoint_number", 4) self.dro_b.setObjectName("dro_b") self.gridLayout_2.addWidget(self.dro_b, 5, 3, 1, 1) self.dro_a = DROLabel(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.dro_a.sizePolicy().hasHeightForWidth()) @@ -2567,41 +2565,41 @@ def setupUi(self, MainWindow): self.dro_a.setMinimumSize(QtCore.QSize(0, 40)) self.dro_a.setMaximumSize(QtCore.QSize(200, 40)) self.dro_a.setStyleSheet("") - self.dro_a.setFrameShape(QtWidgets.QFrame.NoFrame) - self.dro_a.setFrameShadow(QtWidgets.QFrame.Plain) - self.dro_a.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.dro_a.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.dro_a.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) + self.dro_a.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.dro_a.setProperty("Qjoint_number", 3) self.dro_a.setProperty("Qreference_type", 0) self.dro_a.setProperty("homed", False) self.dro_a.setObjectName("dro_a") self.gridLayout_2.addWidget(self.dro_a, 4, 3, 1, 1) self.touch_x = AxisToolButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.touch_x.sizePolicy().hasHeightForWidth()) self.touch_x.setSizePolicy(sizePolicy) self.touch_x.setMinimumSize(QtCore.QSize(40, 40)) self.touch_x.setMaximumSize(QtCore.QSize(40, 40)) - self.touch_x.setFocusPolicy(QtCore.Qt.ClickFocus) + self.touch_x.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.touch_x.setText("0") - self.touch_x.setPopupMode(QtWidgets.QToolButton.InstantPopup) + self.touch_x.setPopupMode(QtWidgets.QToolButton.ToolButtonPopupMode.InstantPopup) self.touch_x.setArrowType(QtCore.Qt.NoArrow) self.touch_x.setProperty("axis_letter", "X") self.touch_x.setProperty("halpin_option", False) self.touch_x.setObjectName("touch_x") self.gridLayout_2.addWidget(self.touch_x, 1, 4, 1, 1) self.touch_y = AxisToolButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.touch_y.sizePolicy().hasHeightForWidth()) self.touch_y.setSizePolicy(sizePolicy) self.touch_y.setMinimumSize(QtCore.QSize(40, 40)) self.touch_y.setMaximumSize(QtCore.QSize(40, 40)) - self.touch_y.setFocusPolicy(QtCore.Qt.ClickFocus) + self.touch_y.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.touch_y.setText("0") - self.touch_y.setPopupMode(QtWidgets.QToolButton.InstantPopup) + self.touch_y.setPopupMode(QtWidgets.QToolButton.ToolButtonPopupMode.InstantPopup) self.touch_y.setArrowType(QtCore.Qt.NoArrow) self.touch_y.setProperty("joint_number", 1) self.touch_y.setProperty("axis_letter", "Y") @@ -2609,16 +2607,16 @@ def setupUi(self, MainWindow): self.touch_y.setObjectName("touch_y") self.gridLayout_2.addWidget(self.touch_y, 2, 4, 1, 1) self.touch_z = AxisToolButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.touch_z.sizePolicy().hasHeightForWidth()) self.touch_z.setSizePolicy(sizePolicy) self.touch_z.setMinimumSize(QtCore.QSize(40, 40)) self.touch_z.setMaximumSize(QtCore.QSize(40, 40)) - self.touch_z.setFocusPolicy(QtCore.Qt.ClickFocus) + self.touch_z.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.touch_z.setText("0") - self.touch_z.setPopupMode(QtWidgets.QToolButton.InstantPopup) + self.touch_z.setPopupMode(QtWidgets.QToolButton.ToolButtonPopupMode.InstantPopup) self.touch_z.setArrowType(QtCore.Qt.NoArrow) self.touch_z.setProperty("joint_number", 2) self.touch_z.setProperty("axis_letter", "Z") @@ -2626,7 +2624,7 @@ def setupUi(self, MainWindow): self.touch_z.setObjectName("touch_z") self.gridLayout_2.addWidget(self.touch_z, 3, 4, 1, 1) self.dro_z = DROLabel(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.dro_z.sizePolicy().hasHeightForWidth()) @@ -2634,9 +2632,9 @@ def setupUi(self, MainWindow): self.dro_z.setMinimumSize(QtCore.QSize(0, 40)) self.dro_z.setMaximumSize(QtCore.QSize(16777215, 40)) self.dro_z.setStyleSheet("") - self.dro_z.setFrameShape(QtWidgets.QFrame.NoFrame) - self.dro_z.setFrameShadow(QtWidgets.QFrame.Plain) - self.dro_z.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.dro_z.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.dro_z.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) + self.dro_z.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.dro_z.setProperty("Qjoint_number", 2) self.dro_z.setProperty("homed", False) self.dro_z.setObjectName("dro_z") @@ -2645,20 +2643,20 @@ def setupUi(self, MainWindow): self.dro_label_b.setMinimumSize(QtCore.QSize(30, 40)) self.dro_label_b.setMaximumSize(QtCore.QSize(30, 40)) self.dro_label_b.setText("B") - self.dro_label_b.setAlignment(QtCore.Qt.AlignCenter) + self.dro_label_b.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.dro_label_b.setObjectName("dro_label_b") self.gridLayout_2.addWidget(self.dro_label_b, 5, 2, 1, 1) self.touch_b = AxisToolButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.touch_b.sizePolicy().hasHeightForWidth()) self.touch_b.setSizePolicy(sizePolicy) self.touch_b.setMinimumSize(QtCore.QSize(40, 40)) self.touch_b.setMaximumSize(QtCore.QSize(40, 40)) - self.touch_b.setFocusPolicy(QtCore.Qt.ClickFocus) + self.touch_b.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.touch_b.setText("0") - self.touch_b.setPopupMode(QtWidgets.QToolButton.InstantPopup) + self.touch_b.setPopupMode(QtWidgets.QToolButton.ToolButtonPopupMode.InstantPopup) self.touch_b.setProperty("joint_number", 4) self.touch_b.setProperty("axis_letter", "B") self.touch_b.setProperty("halpin_option", False) @@ -2666,14 +2664,14 @@ def setupUi(self, MainWindow): self.gridLayout_2.addWidget(self.touch_b, 5, 4, 1, 1) self.home_a = ActionButton(self.dro_place) self.home_a.setEnabled(True) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.home_a.sizePolicy().hasHeightForWidth()) self.home_a.setSizePolicy(sizePolicy) self.home_a.setMinimumSize(QtCore.QSize(48, 40)) self.home_a.setMaximumSize(QtCore.QSize(48, 40)) - self.home_a.setFocusPolicy(QtCore.Qt.ClickFocus) + self.home_a.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.home_a.setProperty("indicator_option", False) self.home_a.setProperty("indicator_HAL_pin_option", False) self.home_a.setProperty("indicator_status_option", False) @@ -2701,14 +2699,14 @@ def setupUi(self, MainWindow): self.home_a.setObjectName("home_a") self.gridLayout_2.addWidget(self.home_a, 4, 1, 1, 1) self.home_y = ActionButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.home_y.sizePolicy().hasHeightForWidth()) self.home_y.setSizePolicy(sizePolicy) self.home_y.setMinimumSize(QtCore.QSize(48, 40)) self.home_y.setMaximumSize(QtCore.QSize(48, 40)) - self.home_y.setFocusPolicy(QtCore.Qt.ClickFocus) + self.home_y.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.home_y.setProperty("indicator_option", False) self.home_y.setProperty("indicator_HAL_pin_option", False) self.home_y.setProperty("indicator_status_option", False) @@ -2738,19 +2736,19 @@ def setupUi(self, MainWindow): self.touch_xy = PushButton(self.dro_place) self.touch_xy.setMinimumSize(QtCore.QSize(40, 40)) self.touch_xy.setMaximumSize(QtCore.QSize(40, 40)) - self.touch_xy.setFocusPolicy(QtCore.Qt.ClickFocus) + self.touch_xy.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.touch_xy.setText("X0Y0") self.touch_xy.setObjectName("touch_xy") self.gridLayout_2.addWidget(self.touch_xy, 0, 4, 1, 1) self.home_x = ActionButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.home_x.sizePolicy().hasHeightForWidth()) self.home_x.setSizePolicy(sizePolicy) self.home_x.setMinimumSize(QtCore.QSize(48, 40)) self.home_x.setMaximumSize(QtCore.QSize(48, 40)) - self.home_x.setFocusPolicy(QtCore.Qt.ClickFocus) + self.home_x.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.home_x.setProperty("indicator_option", False) self.home_x.setProperty("indicator_HAL_pin_option", False) self.home_x.setProperty("indicator_status_option", False) @@ -2779,14 +2777,14 @@ def setupUi(self, MainWindow): self.home_x.setObjectName("home_x") self.gridLayout_2.addWidget(self.home_x, 1, 1, 1, 1) self.home_z = ActionButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.home_z.sizePolicy().hasHeightForWidth()) self.home_z.setSizePolicy(sizePolicy) self.home_z.setMinimumSize(QtCore.QSize(48, 40)) self.home_z.setMaximumSize(QtCore.QSize(48, 40)) - self.home_z.setFocusPolicy(QtCore.Qt.ClickFocus) + self.home_z.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.home_z.setProperty("indicator_option", False) self.home_z.setProperty("indicator_HAL_pin_option", False) self.home_z.setProperty("indicator_status_option", False) @@ -2805,16 +2803,16 @@ def setupUi(self, MainWindow): self.home_z.setObjectName("home_z") self.gridLayout_2.addWidget(self.home_z, 3, 1, 1, 1) self.touch_a = AxisToolButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.touch_a.sizePolicy().hasHeightForWidth()) self.touch_a.setSizePolicy(sizePolicy) self.touch_a.setMinimumSize(QtCore.QSize(40, 40)) self.touch_a.setMaximumSize(QtCore.QSize(40, 40)) - self.touch_a.setFocusPolicy(QtCore.Qt.ClickFocus) + self.touch_a.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.touch_a.setText("0") - self.touch_a.setPopupMode(QtWidgets.QToolButton.InstantPopup) + self.touch_a.setPopupMode(QtWidgets.QToolButton.ToolButtonPopupMode.InstantPopup) self.touch_a.setArrowType(QtCore.Qt.NoArrow) self.touch_a.setProperty("joint_number", 3) self.touch_a.setProperty("axis_letter", "A") @@ -2822,14 +2820,14 @@ def setupUi(self, MainWindow): self.touch_a.setObjectName("touch_a") self.gridLayout_2.addWidget(self.touch_a, 4, 4, 1, 1) self.home_all = ActionButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.home_all.sizePolicy().hasHeightForWidth()) self.home_all.setSizePolicy(sizePolicy) self.home_all.setMinimumSize(QtCore.QSize(48, 40)) self.home_all.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.home_all.setFocusPolicy(QtCore.Qt.ClickFocus) + self.home_all.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.home_all.setToolTip("") self.home_all.setProperty("indicator_option", False) self.home_all.setProperty("indicator_HAL_pin_option", False) @@ -2887,11 +2885,11 @@ def setupUi(self, MainWindow): self.dro_label_x.setMinimumSize(QtCore.QSize(30, 40)) self.dro_label_x.setMaximumSize(QtCore.QSize(30, 40)) self.dro_label_x.setText("X") - self.dro_label_x.setAlignment(QtCore.Qt.AlignCenter) + self.dro_label_x.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.dro_label_x.setObjectName("dro_label_x") self.gridLayout_2.addWidget(self.dro_label_x, 1, 2, 1, 1) self.dro_x = DROLabel(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.dro_x.sizePolicy().hasHeightForWidth()) @@ -2899,22 +2897,22 @@ def setupUi(self, MainWindow): self.dro_x.setMinimumSize(QtCore.QSize(0, 40)) self.dro_x.setMaximumSize(QtCore.QSize(16777215, 40)) self.dro_x.setStyleSheet("") - self.dro_x.setFrameShape(QtWidgets.QFrame.NoFrame) - self.dro_x.setFrameShadow(QtWidgets.QFrame.Plain) - self.dro_x.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.dro_x.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.dro_x.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) + self.dro_x.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.dro_x.setProperty("Qjoint_number", 0) self.dro_x.setProperty("homed", False) self.dro_x.setObjectName("dro_x") self.gridLayout_2.addWidget(self.dro_x, 1, 3, 1, 1) self.home_c = ActionButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.home_c.sizePolicy().hasHeightForWidth()) self.home_c.setSizePolicy(sizePolicy) self.home_c.setMinimumSize(QtCore.QSize(48, 40)) self.home_c.setMaximumSize(QtCore.QSize(48, 40)) - self.home_c.setFocusPolicy(QtCore.Qt.ClickFocus) + self.home_c.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.home_c.setProperty("home_action", True) self.home_c.setProperty("joint_number", 5) self.home_c.setProperty("axis_letter", "C") @@ -2923,26 +2921,26 @@ def setupUi(self, MainWindow): self.dro_label_c = QtWidgets.QLabel(self.dro_place) self.dro_label_c.setMinimumSize(QtCore.QSize(30, 40)) self.dro_label_c.setMaximumSize(QtCore.QSize(30, 40)) - self.dro_label_c.setAlignment(QtCore.Qt.AlignCenter) + self.dro_label_c.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.dro_label_c.setObjectName("dro_label_c") self.gridLayout_2.addWidget(self.dro_label_c, 6, 2, 1, 1) self.dro_c = DROLabel(self.dro_place) self.dro_c.setMinimumSize(QtCore.QSize(0, 40)) self.dro_c.setMaximumSize(QtCore.QSize(200, 40)) - self.dro_c.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.dro_c.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.dro_c.setProperty("Qjoint_number", 5) self.dro_c.setObjectName("dro_c") self.gridLayout_2.addWidget(self.dro_c, 6, 3, 1, 1) self.touch_c = AxisToolButton(self.dro_place) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.touch_c.sizePolicy().hasHeightForWidth()) self.touch_c.setSizePolicy(sizePolicy) self.touch_c.setMinimumSize(QtCore.QSize(40, 40)) self.touch_c.setMaximumSize(QtCore.QSize(40, 40)) - self.touch_c.setFocusPolicy(QtCore.Qt.ClickFocus) - self.touch_c.setPopupMode(QtWidgets.QToolButton.InstantPopup) + self.touch_c.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) + self.touch_c.setPopupMode(QtWidgets.QToolButton.ToolButtonPopupMode.InstantPopup) self.touch_c.setProperty("joint_number", 5) self.touch_c.setProperty("halpin_option", False) self.touch_c.setObjectName("touch_c") @@ -2958,8 +2956,8 @@ def setupUi(self, MainWindow): self.horizontalLayout_32.setSpacing(2) self.horizontalLayout_32.setObjectName("horizontalLayout_32") self.conv_frame = QtWidgets.QFrame(self.conv_tab) - self.conv_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.conv_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.conv_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.conv_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.conv_frame.setObjectName("conv_frame") self.verticalLayout_50 = QtWidgets.QVBoxLayout(self.conv_frame) self.verticalLayout_50.setContentsMargins(0, 0, 0, 4) @@ -2968,199 +2966,199 @@ def setupUi(self, MainWindow): self.conv_label = QtWidgets.QLabel(self.conv_frame) self.conv_label.setMinimumSize(QtCore.QSize(0, 16)) self.conv_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.conv_label.setAlignment(QtCore.Qt.AlignCenter) + self.conv_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.conv_label.setObjectName("conv_label") self.verticalLayout_50.addWidget(self.conv_label) self.conv_main = QtWidgets.QFrame(self.conv_frame) - self.conv_main.setFrameShape(QtWidgets.QFrame.NoFrame) - self.conv_main.setFrameShadow(QtWidgets.QFrame.Plain) + self.conv_main.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.conv_main.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.conv_main.setObjectName("conv_main") self.verticalLayout_51 = QtWidgets.QVBoxLayout(self.conv_main) self.verticalLayout_51.setContentsMargins(4, 0, 4, 0) self.verticalLayout_51.setSpacing(4) self.verticalLayout_51.setObjectName("verticalLayout_51") self.conv_top = QtWidgets.QFrame(self.conv_main) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_top.sizePolicy().hasHeightForWidth()) self.conv_top.setSizePolicy(sizePolicy) - self.conv_top.setFrameShape(QtWidgets.QFrame.NoFrame) - self.conv_top.setFrameShadow(QtWidgets.QFrame.Plain) + self.conv_top.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.conv_top.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.conv_top.setObjectName("conv_top") self.horizontalLayout_33 = QtWidgets.QHBoxLayout(self.conv_top) self.horizontalLayout_33.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_33.setObjectName("horizontalLayout_33") self.conv_line = PushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_line.sizePolicy().hasHeightForWidth()) self.conv_line.setSizePolicy(sizePolicy) self.conv_line.setMinimumSize(QtCore.QSize(60, 60)) self.conv_line.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.conv_line.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_line.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_line.setIconSize(QtCore.QSize(48, 48)) self.conv_line.setCheckable(False) self.conv_line.setAutoExclusive(True) self.conv_line.setObjectName("conv_line") self.horizontalLayout_33.addWidget(self.conv_line) self.conv_circle = PushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_circle.sizePolicy().hasHeightForWidth()) self.conv_circle.setSizePolicy(sizePolicy) self.conv_circle.setMinimumSize(QtCore.QSize(60, 60)) self.conv_circle.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.conv_circle.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_circle.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_circle.setIconSize(QtCore.QSize(48, 48)) self.conv_circle.setCheckable(False) self.conv_circle.setAutoExclusive(True) self.conv_circle.setObjectName("conv_circle") self.horizontalLayout_33.addWidget(self.conv_circle) self.conv_ellipse = QtWidgets.QPushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_ellipse.sizePolicy().hasHeightForWidth()) self.conv_ellipse.setSizePolicy(sizePolicy) self.conv_ellipse.setMinimumSize(QtCore.QSize(60, 60)) - self.conv_ellipse.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_ellipse.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_ellipse.setText("") self.conv_ellipse.setIconSize(QtCore.QSize(48, 48)) self.conv_ellipse.setObjectName("conv_ellipse") self.horizontalLayout_33.addWidget(self.conv_ellipse) self.conv_triangle = PushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_triangle.sizePolicy().hasHeightForWidth()) self.conv_triangle.setSizePolicy(sizePolicy) self.conv_triangle.setMinimumSize(QtCore.QSize(60, 60)) self.conv_triangle.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.conv_triangle.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_triangle.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_triangle.setIconSize(QtCore.QSize(48, 48)) self.conv_triangle.setCheckable(False) self.conv_triangle.setAutoExclusive(True) self.conv_triangle.setObjectName("conv_triangle") self.horizontalLayout_33.addWidget(self.conv_triangle) self.conv_rectangle = PushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_rectangle.sizePolicy().hasHeightForWidth()) self.conv_rectangle.setSizePolicy(sizePolicy) self.conv_rectangle.setMinimumSize(QtCore.QSize(60, 60)) self.conv_rectangle.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.conv_rectangle.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_rectangle.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_rectangle.setIconSize(QtCore.QSize(48, 48)) self.conv_rectangle.setCheckable(False) self.conv_rectangle.setAutoExclusive(True) self.conv_rectangle.setObjectName("conv_rectangle") self.horizontalLayout_33.addWidget(self.conv_rectangle) self.conv_polygon = PushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_polygon.sizePolicy().hasHeightForWidth()) self.conv_polygon.setSizePolicy(sizePolicy) self.conv_polygon.setMinimumSize(QtCore.QSize(60, 60)) self.conv_polygon.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.conv_polygon.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_polygon.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_polygon.setIconSize(QtCore.QSize(48, 48)) self.conv_polygon.setCheckable(False) self.conv_polygon.setAutoExclusive(True) self.conv_polygon.setObjectName("conv_polygon") self.horizontalLayout_33.addWidget(self.conv_polygon) self.conv_bolt = PushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_bolt.sizePolicy().hasHeightForWidth()) self.conv_bolt.setSizePolicy(sizePolicy) self.conv_bolt.setMinimumSize(QtCore.QSize(60, 60)) self.conv_bolt.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.conv_bolt.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_bolt.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_bolt.setIconSize(QtCore.QSize(48, 48)) self.conv_bolt.setCheckable(False) self.conv_bolt.setAutoExclusive(True) self.conv_bolt.setObjectName("conv_bolt") self.horizontalLayout_33.addWidget(self.conv_bolt) self.conv_slot = PushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_slot.sizePolicy().hasHeightForWidth()) self.conv_slot.setSizePolicy(sizePolicy) self.conv_slot.setMinimumSize(QtCore.QSize(60, 60)) self.conv_slot.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.conv_slot.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_slot.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_slot.setIconSize(QtCore.QSize(48, 48)) self.conv_slot.setCheckable(False) self.conv_slot.setAutoExclusive(True) self.conv_slot.setObjectName("conv_slot") self.horizontalLayout_33.addWidget(self.conv_slot) self.conv_star = PushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_star.sizePolicy().hasHeightForWidth()) self.conv_star.setSizePolicy(sizePolicy) self.conv_star.setMinimumSize(QtCore.QSize(60, 60)) self.conv_star.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.conv_star.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_star.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_star.setIconSize(QtCore.QSize(48, 48)) self.conv_star.setCheckable(False) self.conv_star.setAutoExclusive(True) self.conv_star.setObjectName("conv_star") self.horizontalLayout_33.addWidget(self.conv_star) self.conv_gusset = PushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_gusset.sizePolicy().hasHeightForWidth()) self.conv_gusset.setSizePolicy(sizePolicy) self.conv_gusset.setMinimumSize(QtCore.QSize(60, 60)) self.conv_gusset.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.conv_gusset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_gusset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_gusset.setIconSize(QtCore.QSize(48, 48)) self.conv_gusset.setCheckable(False) self.conv_gusset.setAutoExclusive(True) self.conv_gusset.setObjectName("conv_gusset") self.horizontalLayout_33.addWidget(self.conv_gusset) self.conv_sector = PushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_sector.sizePolicy().hasHeightForWidth()) self.conv_sector.setSizePolicy(sizePolicy) self.conv_sector.setMinimumSize(QtCore.QSize(60, 60)) self.conv_sector.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.conv_sector.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_sector.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_sector.setIconSize(QtCore.QSize(48, 48)) self.conv_sector.setCheckable(False) self.conv_sector.setAutoExclusive(True) self.conv_sector.setObjectName("conv_sector") self.horizontalLayout_33.addWidget(self.conv_sector) - spacerItem20 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem20 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_33.addItem(spacerItem20) self.conv_block = QtWidgets.QPushButton(self.conv_top) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_block.sizePolicy().hasHeightForWidth()) self.conv_block.setSizePolicy(sizePolicy) self.conv_block.setMinimumSize(QtCore.QSize(60, 60)) - self.conv_block.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_block.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_block.setText("") self.conv_block.setIconSize(QtCore.QSize(48, 48)) self.conv_block.setObjectName("conv_block") self.horizontalLayout_33.addWidget(self.conv_block) self.verticalLayout_51.addWidget(self.conv_top) self.conv_bottom = QtWidgets.QFrame(self.conv_main) - self.conv_bottom.setFrameShape(QtWidgets.QFrame.NoFrame) - self.conv_bottom.setFrameShadow(QtWidgets.QFrame.Plain) + self.conv_bottom.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.conv_bottom.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.conv_bottom.setObjectName("conv_bottom") self.horizontalLayout_34 = QtWidgets.QHBoxLayout(self.conv_bottom) self.horizontalLayout_34.setContentsMargins(0, 0, 0, 0) @@ -3169,8 +3167,8 @@ def setupUi(self, MainWindow): self.conv_left = QtWidgets.QFrame(self.conv_bottom) self.conv_left.setMinimumSize(QtCore.QSize(440, 0)) self.conv_left.setMaximumSize(QtCore.QSize(440, 16777215)) - self.conv_left.setFrameShape(QtWidgets.QFrame.NoFrame) - self.conv_left.setFrameShadow(QtWidgets.QFrame.Plain) + self.conv_left.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.conv_left.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.conv_left.setObjectName("conv_left") self.verticalLayout_53 = QtWidgets.QVBoxLayout(self.conv_left) self.verticalLayout_53.setContentsMargins(0, 0, 0, 0) @@ -3178,13 +3176,13 @@ def setupUi(self, MainWindow): self.verticalLayout_53.setObjectName("verticalLayout_53") self.frame_34 = QtWidgets.QFrame(self.conv_left) self.frame_34.setMinimumSize(QtCore.QSize(0, 0)) - self.frame_34.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_34.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_34.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_34.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_34.setObjectName("frame_34") self.verticalLayout_54 = QtWidgets.QVBoxLayout(self.frame_34) self.verticalLayout_54.setObjectName("verticalLayout_54") self.conv_material = QtWidgets.QComboBox(self.frame_34) - self.conv_material.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_material.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_material.setObjectName("conv_material") self.verticalLayout_54.addWidget(self.conv_material) self.entries = QtWidgets.QGridLayout() @@ -3192,57 +3190,57 @@ def setupUi(self, MainWindow): self.entries.setObjectName("entries") self.verticalLayout_54.addLayout(self.entries) self.verticalLayout_53.addWidget(self.frame_34) - spacerItem21 = QtWidgets.QSpacerItem(20, 505, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem21 = QtWidgets.QSpacerItem(20, 505, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_53.addItem(spacerItem21) self.frame_38 = QtWidgets.QFrame(self.conv_left) - self.frame_38.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_38.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_38.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_38.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_38.setObjectName("frame_38") self.horizontalLayout_35 = QtWidgets.QHBoxLayout(self.frame_38) self.horizontalLayout_35.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_35.setObjectName("horizontalLayout_35") self.conv_new = PushButton(self.frame_38) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_new.sizePolicy().hasHeightForWidth()) self.conv_new.setSizePolicy(sizePolicy) self.conv_new.setMinimumSize(QtCore.QSize(90, 0)) self.conv_new.setMaximumSize(QtCore.QSize(90, 16777215)) - self.conv_new.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_new.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_new.setObjectName("conv_new") self.horizontalLayout_35.addWidget(self.conv_new) self.conv_save = PushButton(self.frame_38) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_save.sizePolicy().hasHeightForWidth()) self.conv_save.setSizePolicy(sizePolicy) self.conv_save.setMinimumSize(QtCore.QSize(90, 0)) self.conv_save.setMaximumSize(QtCore.QSize(90, 16777215)) - self.conv_save.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_save.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_save.setObjectName("conv_save") self.horizontalLayout_35.addWidget(self.conv_save) self.conv_settings = PushButton(self.frame_38) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_settings.sizePolicy().hasHeightForWidth()) self.conv_settings.setSizePolicy(sizePolicy) self.conv_settings.setMinimumSize(QtCore.QSize(90, 0)) self.conv_settings.setMaximumSize(QtCore.QSize(90, 16777215)) - self.conv_settings.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_settings.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_settings.setObjectName("conv_settings") self.horizontalLayout_35.addWidget(self.conv_settings) self.conv_send = PushButton(self.frame_38) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_send.sizePolicy().hasHeightForWidth()) self.conv_send.setSizePolicy(sizePolicy) self.conv_send.setMinimumSize(QtCore.QSize(90, 0)) self.conv_send.setMaximumSize(QtCore.QSize(90, 16777215)) - self.conv_send.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_send.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_send.setObjectName("conv_send") self.horizontalLayout_35.addWidget(self.conv_send) self.horizontalLayout_35.setStretch(0, 1) @@ -3252,8 +3250,8 @@ def setupUi(self, MainWindow): self.verticalLayout_53.addWidget(self.frame_38) self.horizontalLayout_34.addWidget(self.conv_left) self.conv_right = QtWidgets.QFrame(self.conv_bottom) - self.conv_right.setFrameShape(QtWidgets.QFrame.NoFrame) - self.conv_right.setFrameShadow(QtWidgets.QFrame.Plain) + self.conv_right.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.conv_right.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.conv_right.setObjectName("conv_right") self.horizontalLayout_43 = QtWidgets.QHBoxLayout(self.conv_right) self.horizontalLayout_43.setObjectName("horizontalLayout_43") @@ -3262,7 +3260,7 @@ def setupUi(self, MainWindow): self.horizontalLayout_43.addWidget(self.conv_preview) self.conv_preview_buttons = QtWidgets.QFrame(self.conv_right) self.conv_preview_buttons.setEnabled(True) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.conv_preview_buttons.sizePolicy().hasHeightForWidth()) @@ -3274,12 +3272,12 @@ def setupUi(self, MainWindow): self.verticalLayout_52.setContentsMargins(0, 2, 0, 2) self.verticalLayout_52.setSpacing(8) self.verticalLayout_52.setObjectName("verticalLayout_52") - spacerItem22 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem22 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_52.addItem(spacerItem22) self.conv_view_t = QtWidgets.QPushButton(self.conv_preview_buttons) self.conv_view_t.setMinimumSize(QtCore.QSize(40, 28)) self.conv_view_t.setMaximumSize(QtCore.QSize(40, 28)) - self.conv_view_t.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_view_t.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_view_t.setText("T") self.conv_view_t.setCheckable(True) self.conv_view_t.setAutoExclusive(True) @@ -3288,7 +3286,7 @@ def setupUi(self, MainWindow): self.conv_view_z = QtWidgets.QPushButton(self.conv_preview_buttons) self.conv_view_z.setMinimumSize(QtCore.QSize(40, 28)) self.conv_view_z.setMaximumSize(QtCore.QSize(40, 28)) - self.conv_view_z.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_view_z.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_view_z.setText("Z") self.conv_view_z.setCheckable(True) self.conv_view_z.setChecked(True) @@ -3304,7 +3302,7 @@ def setupUi(self, MainWindow): self.conv_pan_right = QtWidgets.QPushButton(self.conv_preview_buttons) self.conv_pan_right.setMinimumSize(QtCore.QSize(40, 28)) self.conv_pan_right.setMaximumSize(QtCore.QSize(40, 28)) - self.conv_pan_right.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_pan_right.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_pan_right.setText("→") self.conv_pan_right.setAutoRepeat(True) self.conv_pan_right.setObjectName("conv_pan_right") @@ -3312,7 +3310,7 @@ def setupUi(self, MainWindow): self.conv_pan_left = QtWidgets.QPushButton(self.conv_preview_buttons) self.conv_pan_left.setMinimumSize(QtCore.QSize(40, 28)) self.conv_pan_left.setMaximumSize(QtCore.QSize(40, 28)) - self.conv_pan_left.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_pan_left.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_pan_left.setText("←") self.conv_pan_left.setAutoRepeat(True) self.conv_pan_left.setObjectName("conv_pan_left") @@ -3320,7 +3318,7 @@ def setupUi(self, MainWindow): self.conv_pan_up = QtWidgets.QPushButton(self.conv_preview_buttons) self.conv_pan_up.setMinimumSize(QtCore.QSize(40, 28)) self.conv_pan_up.setMaximumSize(QtCore.QSize(40, 28)) - self.conv_pan_up.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_pan_up.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_pan_up.setText("↑") self.conv_pan_up.setAutoRepeat(True) self.conv_pan_up.setObjectName("conv_pan_up") @@ -3328,7 +3326,7 @@ def setupUi(self, MainWindow): self.conv_pan_down = QtWidgets.QPushButton(self.conv_preview_buttons) self.conv_pan_down.setMinimumSize(QtCore.QSize(40, 28)) self.conv_pan_down.setMaximumSize(QtCore.QSize(40, 28)) - self.conv_pan_down.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_pan_down.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_pan_down.setText("↓") self.conv_pan_down.setAutoRepeat(True) self.conv_pan_down.setObjectName("conv_pan_down") @@ -3342,7 +3340,7 @@ def setupUi(self, MainWindow): self.conv_zoom_in = QtWidgets.QPushButton(self.conv_preview_buttons) self.conv_zoom_in.setMinimumSize(QtCore.QSize(40, 28)) self.conv_zoom_in.setMaximumSize(QtCore.QSize(40, 28)) - self.conv_zoom_in.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_zoom_in.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_zoom_in.setText("+") self.conv_zoom_in.setAutoRepeat(True) self.conv_zoom_in.setObjectName("conv_zoom_in") @@ -3350,7 +3348,7 @@ def setupUi(self, MainWindow): self.conv_zoom_out = QtWidgets.QPushButton(self.conv_preview_buttons) self.conv_zoom_out.setMinimumSize(QtCore.QSize(40, 28)) self.conv_zoom_out.setMaximumSize(QtCore.QSize(40, 28)) - self.conv_zoom_out.setFocusPolicy(QtCore.Qt.ClickFocus) + self.conv_zoom_out.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.conv_zoom_out.setText("-") self.conv_zoom_out.setAutoRepeat(True) self.conv_zoom_out.setObjectName("conv_zoom_out") @@ -3369,8 +3367,8 @@ def setupUi(self, MainWindow): self.horizontalLayout_12.setSpacing(2) self.horizontalLayout_12.setObjectName("horizontalLayout_12") self.config_frame = QtWidgets.QFrame(self.param_tab) - self.config_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.config_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.config_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.config_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.config_frame.setObjectName("config_frame") self.verticalLayout_48 = QtWidgets.QVBoxLayout(self.config_frame) self.verticalLayout_48.setContentsMargins(0, 0, 0, 4) @@ -3378,8 +3376,8 @@ def setupUi(self, MainWindow): self.verticalLayout_48.setObjectName("verticalLayout_48") self.frame_44 = QtWidgets.QFrame(self.config_frame) self.frame_44.setMinimumSize(QtCore.QSize(0, 0)) - self.frame_44.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_44.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_44.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_44.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_44.setObjectName("frame_44") self.horizontalLayout_42 = QtWidgets.QHBoxLayout(self.frame_44) self.horizontalLayout_42.setContentsMargins(0, 0, 0, 0) @@ -3388,41 +3386,41 @@ def setupUi(self, MainWindow): self.save_plasma = PushButton(self.frame_44) self.save_plasma.setMinimumSize(QtCore.QSize(60, 16)) self.save_plasma.setMaximumSize(QtCore.QSize(60, 16)) - self.save_plasma.setFocusPolicy(QtCore.Qt.ClickFocus) + self.save_plasma.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.save_plasma.setObjectName("save_plasma") self.horizontalLayout_42.addWidget(self.save_plasma) self.config_label = QtWidgets.QLabel(self.frame_44) self.config_label.setMinimumSize(QtCore.QSize(0, 16)) self.config_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.config_label.setAlignment(QtCore.Qt.AlignCenter) + self.config_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.config_label.setObjectName("config_label") self.horizontalLayout_42.addWidget(self.config_label) self.reload_plasma = PushButton(self.frame_44) self.reload_plasma.setMinimumSize(QtCore.QSize(60, 16)) self.reload_plasma.setMaximumSize(QtCore.QSize(60, 16)) - self.reload_plasma.setFocusPolicy(QtCore.Qt.ClickFocus) + self.reload_plasma.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.reload_plasma.setObjectName("reload_plasma") self.horizontalLayout_42.addWidget(self.reload_plasma) self.verticalLayout_48.addWidget(self.frame_44) self.frame_33 = QtWidgets.QFrame(self.config_frame) - self.frame_33.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_33.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_33.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_33.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_33.setObjectName("frame_33") self.horizontalLayout_17 = QtWidgets.QHBoxLayout(self.frame_33) self.horizontalLayout_17.setContentsMargins(4, 0, 4, 0) self.horizontalLayout_17.setSpacing(4) self.horizontalLayout_17.setObjectName("horizontalLayout_17") self.frame_12 = QtWidgets.QFrame(self.frame_33) - self.frame_12.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_12.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_12.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_12.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_12.setObjectName("frame_12") self.verticalLayout_46 = QtWidgets.QVBoxLayout(self.frame_12) self.verticalLayout_46.setContentsMargins(0, 0, 0, 0) self.verticalLayout_46.setSpacing(4) self.verticalLayout_46.setObjectName("verticalLayout_46") self.arc_config = QtWidgets.QFrame(self.frame_12) - self.arc_config.setFrameShape(QtWidgets.QFrame.NoFrame) - self.arc_config.setFrameShadow(QtWidgets.QFrame.Raised) + self.arc_config.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.arc_config.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.arc_config.setObjectName("arc_config") self.verticalLayout_28 = QtWidgets.QVBoxLayout(self.arc_config) self.verticalLayout_28.setContentsMargins(0, 0, 0, 4) @@ -3431,12 +3429,12 @@ def setupUi(self, MainWindow): self.arc_conf_lbl = QtWidgets.QLabel(self.arc_config) self.arc_conf_lbl.setMinimumSize(QtCore.QSize(0, 16)) self.arc_conf_lbl.setMaximumSize(QtCore.QSize(16777215, 16)) - self.arc_conf_lbl.setAlignment(QtCore.Qt.AlignCenter) + self.arc_conf_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.arc_conf_lbl.setObjectName("arc_conf_lbl") self.verticalLayout_28.addWidget(self.arc_conf_lbl) self.arc_grid = QtWidgets.QFrame(self.arc_config) - self.arc_grid.setFrameShape(QtWidgets.QFrame.NoFrame) - self.arc_grid.setFrameShadow(QtWidgets.QFrame.Raised) + self.arc_grid.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.arc_grid.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.arc_grid.setObjectName("arc_grid") self.gridLayout_4 = QtWidgets.QGridLayout(self.arc_grid) self.gridLayout_4.setContentsMargins(4, 0, 4, 0) @@ -3444,7 +3442,7 @@ def setupUi(self, MainWindow): self.gridLayout_4.setVerticalSpacing(7) self.gridLayout_4.setObjectName("gridLayout_4") self.arc_fail_delay = DoubleScale(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_fail_delay.sizePolicy().hasHeightForWidth()) @@ -3452,7 +3450,7 @@ def setupUi(self, MainWindow): self.arc_fail_delay.setMinimumSize(QtCore.QSize(136, 0)) self.arc_fail_delay.setMaximumSize(QtCore.QSize(176, 16777215)) self.arc_fail_delay.setWrapping(True) - self.arc_fail_delay.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.arc_fail_delay.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.arc_fail_delay.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.arc_fail_delay.setAccelerated(True) self.arc_fail_delay.setDecimals(1) @@ -3463,7 +3461,7 @@ def setupUi(self, MainWindow): self.arc_fail_delay.setObjectName("arc_fail_delay") self.gridLayout_4.addWidget(self.arc_fail_delay, 0, 0, 1, 1) self.label_19 = QtWidgets.QLabel(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_19.sizePolicy().hasHeightForWidth()) @@ -3473,7 +3471,7 @@ def setupUi(self, MainWindow): self.label_19.setObjectName("label_19") self.gridLayout_4.addWidget(self.label_19, 0, 1, 1, 1) self.arc_max_starts = DoubleScale(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_max_starts.sizePolicy().hasHeightForWidth()) @@ -3481,7 +3479,7 @@ def setupUi(self, MainWindow): self.arc_max_starts.setMinimumSize(QtCore.QSize(136, 0)) self.arc_max_starts.setMaximumSize(QtCore.QSize(176, 16777215)) self.arc_max_starts.setWrapping(True) - self.arc_max_starts.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.arc_max_starts.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.arc_max_starts.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.arc_max_starts.setAccelerated(True) self.arc_max_starts.setDecimals(0) @@ -3490,7 +3488,7 @@ def setupUi(self, MainWindow): self.arc_max_starts.setObjectName("arc_max_starts") self.gridLayout_4.addWidget(self.arc_max_starts, 1, 0, 1, 1) self.label_21 = QtWidgets.QLabel(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_21.sizePolicy().hasHeightForWidth()) @@ -3500,7 +3498,7 @@ def setupUi(self, MainWindow): self.label_21.setObjectName("label_21") self.gridLayout_4.addWidget(self.label_21, 1, 1, 1, 1) self.arc_restart_delay = DoubleScale(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_restart_delay.sizePolicy().hasHeightForWidth()) @@ -3508,7 +3506,7 @@ def setupUi(self, MainWindow): self.arc_restart_delay.setMinimumSize(QtCore.QSize(136, 0)) self.arc_restart_delay.setMaximumSize(QtCore.QSize(176, 16777215)) self.arc_restart_delay.setWrapping(True) - self.arc_restart_delay.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.arc_restart_delay.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.arc_restart_delay.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.arc_restart_delay.setAccelerated(True) self.arc_restart_delay.setDecimals(0) @@ -3517,7 +3515,7 @@ def setupUi(self, MainWindow): self.arc_restart_delay.setObjectName("arc_restart_delay") self.gridLayout_4.addWidget(self.arc_restart_delay, 2, 0, 1, 1) self.label_24 = QtWidgets.QLabel(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_24.sizePolicy().hasHeightForWidth()) @@ -3527,7 +3525,7 @@ def setupUi(self, MainWindow): self.label_24.setObjectName("label_24") self.gridLayout_4.addWidget(self.label_24, 2, 1, 1, 1) self.arc_voltage_scale = DoubleScale(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_voltage_scale.sizePolicy().hasHeightForWidth()) @@ -3535,7 +3533,7 @@ def setupUi(self, MainWindow): self.arc_voltage_scale.setMinimumSize(QtCore.QSize(136, 0)) self.arc_voltage_scale.setMaximumSize(QtCore.QSize(176, 16777215)) self.arc_voltage_scale.setWrapping(True) - self.arc_voltage_scale.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.arc_voltage_scale.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.arc_voltage_scale.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.arc_voltage_scale.setAccelerated(True) self.arc_voltage_scale.setDecimals(6) @@ -3546,7 +3544,7 @@ def setupUi(self, MainWindow): self.arc_voltage_scale.setObjectName("arc_voltage_scale") self.gridLayout_4.addWidget(self.arc_voltage_scale, 3, 0, 1, 1) self.arc_voltage_scale_lbl = QtWidgets.QLabel(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_voltage_scale_lbl.sizePolicy().hasHeightForWidth()) @@ -3556,7 +3554,7 @@ def setupUi(self, MainWindow): self.arc_voltage_scale_lbl.setObjectName("arc_voltage_scale_lbl") self.gridLayout_4.addWidget(self.arc_voltage_scale_lbl, 3, 1, 1, 1) self.arc_voltage_offset = DoubleScale(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_voltage_offset.sizePolicy().hasHeightForWidth()) @@ -3564,7 +3562,7 @@ def setupUi(self, MainWindow): self.arc_voltage_offset.setMinimumSize(QtCore.QSize(136, 0)) self.arc_voltage_offset.setMaximumSize(QtCore.QSize(176, 16777215)) self.arc_voltage_offset.setWrapping(True) - self.arc_voltage_offset.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.arc_voltage_offset.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.arc_voltage_offset.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.arc_voltage_offset.setAccelerated(True) self.arc_voltage_offset.setDecimals(3) @@ -3575,7 +3573,7 @@ def setupUi(self, MainWindow): self.arc_voltage_offset.setObjectName("arc_voltage_offset") self.gridLayout_4.addWidget(self.arc_voltage_offset, 4, 0, 1, 1) self.arc_voltage_offset_lbl = QtWidgets.QLabel(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_voltage_offset_lbl.sizePolicy().hasHeightForWidth()) @@ -3585,7 +3583,7 @@ def setupUi(self, MainWindow): self.arc_voltage_offset_lbl.setObjectName("arc_voltage_offset_lbl") self.gridLayout_4.addWidget(self.arc_voltage_offset_lbl, 4, 1, 1, 1) self.height_per_volt = DoubleScale(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.height_per_volt.sizePolicy().hasHeightForWidth()) @@ -3593,7 +3591,7 @@ def setupUi(self, MainWindow): self.height_per_volt.setMinimumSize(QtCore.QSize(136, 0)) self.height_per_volt.setMaximumSize(QtCore.QSize(176, 16777215)) self.height_per_volt.setWrapping(True) - self.height_per_volt.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.height_per_volt.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.height_per_volt.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.height_per_volt.setAccelerated(True) self.height_per_volt.setDecimals(3) @@ -3603,7 +3601,7 @@ def setupUi(self, MainWindow): self.height_per_volt.setObjectName("height_per_volt") self.gridLayout_4.addWidget(self.height_per_volt, 5, 0, 1, 1) self.height_per_volt_lbl = QtWidgets.QLabel(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.height_per_volt_lbl.sizePolicy().hasHeightForWidth()) @@ -3613,7 +3611,7 @@ def setupUi(self, MainWindow): self.height_per_volt_lbl.setObjectName("height_per_volt_lbl") self.gridLayout_4.addWidget(self.height_per_volt_lbl, 5, 1, 1, 1) self.arc_ok_high = DoubleScale(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_ok_high.sizePolicy().hasHeightForWidth()) @@ -3621,7 +3619,7 @@ def setupUi(self, MainWindow): self.arc_ok_high.setMinimumSize(QtCore.QSize(136, 0)) self.arc_ok_high.setMaximumSize(QtCore.QSize(176, 16777215)) self.arc_ok_high.setWrapping(True) - self.arc_ok_high.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.arc_ok_high.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.arc_ok_high.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.arc_ok_high.setAccelerated(True) self.arc_ok_high.setDecimals(0) @@ -3630,7 +3628,7 @@ def setupUi(self, MainWindow): self.arc_ok_high.setObjectName("arc_ok_high") self.gridLayout_4.addWidget(self.arc_ok_high, 6, 0, 1, 1) self.arc_ok_high_lbl = QtWidgets.QLabel(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_ok_high_lbl.sizePolicy().hasHeightForWidth()) @@ -3640,7 +3638,7 @@ def setupUi(self, MainWindow): self.arc_ok_high_lbl.setObjectName("arc_ok_high_lbl") self.gridLayout_4.addWidget(self.arc_ok_high_lbl, 6, 1, 1, 1) self.arc_ok_low = DoubleScale(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_ok_low.sizePolicy().hasHeightForWidth()) @@ -3648,7 +3646,7 @@ def setupUi(self, MainWindow): self.arc_ok_low.setMinimumSize(QtCore.QSize(136, 0)) self.arc_ok_low.setMaximumSize(QtCore.QSize(176, 16777215)) self.arc_ok_low.setWrapping(True) - self.arc_ok_low.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.arc_ok_low.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.arc_ok_low.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.arc_ok_low.setAccelerated(True) self.arc_ok_low.setDecimals(0) @@ -3656,7 +3654,7 @@ def setupUi(self, MainWindow): self.arc_ok_low.setObjectName("arc_ok_low") self.gridLayout_4.addWidget(self.arc_ok_low, 7, 0, 1, 1) self.arc_ok_low_lbl = QtWidgets.QLabel(self.arc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.arc_ok_low_lbl.sizePolicy().hasHeightForWidth()) @@ -3668,13 +3666,13 @@ def setupUi(self, MainWindow): self.verticalLayout_28.addWidget(self.arc_grid) self.verticalLayout_46.addWidget(self.arc_config) self.thc_config = QtWidgets.QFrame(self.frame_12) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_config.sizePolicy().hasHeightForWidth()) self.thc_config.setSizePolicy(sizePolicy) - self.thc_config.setFrameShape(QtWidgets.QFrame.NoFrame) - self.thc_config.setFrameShadow(QtWidgets.QFrame.Raised) + self.thc_config.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.thc_config.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.thc_config.setObjectName("thc_config") self.verticalLayout_29 = QtWidgets.QVBoxLayout(self.thc_config) self.verticalLayout_29.setContentsMargins(0, 0, 0, 4) @@ -3683,12 +3681,12 @@ def setupUi(self, MainWindow): self.thc_conf_lbl = QtWidgets.QLabel(self.thc_config) self.thc_conf_lbl.setMinimumSize(QtCore.QSize(0, 16)) self.thc_conf_lbl.setMaximumSize(QtCore.QSize(16777215, 16)) - self.thc_conf_lbl.setAlignment(QtCore.Qt.AlignCenter) + self.thc_conf_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.thc_conf_lbl.setObjectName("thc_conf_lbl") self.verticalLayout_29.addWidget(self.thc_conf_lbl) self.thc_grid = QtWidgets.QFrame(self.thc_config) - self.thc_grid.setFrameShape(QtWidgets.QFrame.NoFrame) - self.thc_grid.setFrameShadow(QtWidgets.QFrame.Raised) + self.thc_grid.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.thc_grid.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.thc_grid.setObjectName("thc_grid") self.gridLayout_18 = QtWidgets.QGridLayout(self.thc_grid) self.gridLayout_18.setContentsMargins(4, 0, 4, 0) @@ -3696,7 +3694,7 @@ def setupUi(self, MainWindow): self.gridLayout_18.setVerticalSpacing(7) self.gridLayout_18.setObjectName("gridLayout_18") self.thc_sample_threshold_lbl = QtWidgets.QLabel(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_sample_threshold_lbl.sizePolicy().hasHeightForWidth()) @@ -3706,7 +3704,7 @@ def setupUi(self, MainWindow): self.thc_sample_threshold_lbl.setObjectName("thc_sample_threshold_lbl") self.gridLayout_18.addWidget(self.thc_sample_threshold_lbl, 4, 1, 1, 1) self.thc_delay_lbl = QtWidgets.QLabel(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_delay_lbl.sizePolicy().hasHeightForWidth()) @@ -3716,7 +3714,7 @@ def setupUi(self, MainWindow): self.thc_delay_lbl.setObjectName("thc_delay_lbl") self.gridLayout_18.addWidget(self.thc_delay_lbl, 2, 1, 1, 1) self.pid_d_gain = DoubleScale(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pid_d_gain.sizePolicy().hasHeightForWidth()) @@ -3724,7 +3722,7 @@ def setupUi(self, MainWindow): self.pid_d_gain.setMinimumSize(QtCore.QSize(136, 0)) self.pid_d_gain.setMaximumSize(QtCore.QSize(176, 16777215)) self.pid_d_gain.setWrapping(True) - self.pid_d_gain.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pid_d_gain.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pid_d_gain.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.pid_d_gain.setAccelerated(True) self.pid_d_gain.setDecimals(0) @@ -3733,7 +3731,7 @@ def setupUi(self, MainWindow): self.pid_d_gain.setObjectName("pid_d_gain") self.gridLayout_18.addWidget(self.pid_d_gain, 10, 0, 1, 1) self.thc_threshold = DoubleScale(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_threshold.sizePolicy().hasHeightForWidth()) @@ -3741,7 +3739,7 @@ def setupUi(self, MainWindow): self.thc_threshold.setMinimumSize(QtCore.QSize(136, 0)) self.thc_threshold.setMaximumSize(QtCore.QSize(176, 16777215)) self.thc_threshold.setWrapping(True) - self.thc_threshold.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.thc_threshold.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.thc_threshold.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.thc_threshold.setAccelerated(True) self.thc_threshold.setSuffix(" V") @@ -3752,7 +3750,7 @@ def setupUi(self, MainWindow): self.thc_threshold.setObjectName("thc_threshold") self.gridLayout_18.addWidget(self.thc_threshold, 5, 0, 1, 1) self.voidlock_slope = DoubleScale(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.voidlock_slope.sizePolicy().hasHeightForWidth()) @@ -3760,7 +3758,7 @@ def setupUi(self, MainWindow): self.voidlock_slope.setMinimumSize(QtCore.QSize(136, 0)) self.voidlock_slope.setMaximumSize(QtCore.QSize(176, 16777215)) self.voidlock_slope.setWrapping(True) - self.voidlock_slope.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.voidlock_slope.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.voidlock_slope.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.voidlock_slope.setAccelerated(True) self.voidlock_slope.setSuffix(" V/sec") @@ -3770,21 +3768,21 @@ def setupUi(self, MainWindow): self.voidlock_slope.setObjectName("voidlock_slope") self.gridLayout_18.addWidget(self.voidlock_slope, 8, 0, 1, 1) self.thc_sample_counts = DoubleScale(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_sample_counts.sizePolicy().hasHeightForWidth()) self.thc_sample_counts.setSizePolicy(sizePolicy) self.thc_sample_counts.setMinimumSize(QtCore.QSize(136, 0)) self.thc_sample_counts.setMaximumSize(QtCore.QSize(176, 16777215)) - self.thc_sample_counts.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.thc_sample_counts.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.thc_sample_counts.setDecimals(0) self.thc_sample_counts.setMaximum(1000.0) self.thc_sample_counts.setProperty("value", 50.0) self.thc_sample_counts.setObjectName("thc_sample_counts") self.gridLayout_18.addWidget(self.thc_sample_counts, 3, 0, 1, 1) self.pid_d_gain_lbl = QtWidgets.QLabel(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pid_d_gain_lbl.sizePolicy().hasHeightForWidth()) @@ -3794,21 +3792,21 @@ def setupUi(self, MainWindow): self.pid_d_gain_lbl.setObjectName("pid_d_gain_lbl") self.gridLayout_18.addWidget(self.pid_d_gain_lbl, 10, 1, 1, 1) self.thc_sample_threshold = DoubleScale(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_sample_threshold.sizePolicy().hasHeightForWidth()) self.thc_sample_threshold.setSizePolicy(sizePolicy) self.thc_sample_threshold.setMinimumSize(QtCore.QSize(136, 0)) self.thc_sample_threshold.setMaximumSize(QtCore.QSize(176, 16777215)) - self.thc_sample_threshold.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.thc_sample_threshold.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.thc_sample_threshold.setAccelerated(True) self.thc_sample_threshold.setMaximum(99.0) self.thc_sample_threshold.setSingleStep(0.01) self.thc_sample_threshold.setObjectName("thc_sample_threshold") self.gridLayout_18.addWidget(self.thc_sample_threshold, 4, 0, 1, 1) self.cornerlock_threshold = DoubleScale(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cornerlock_threshold.sizePolicy().hasHeightForWidth()) @@ -3816,7 +3814,7 @@ def setupUi(self, MainWindow): self.cornerlock_threshold.setMinimumSize(QtCore.QSize(136, 0)) self.cornerlock_threshold.setMaximumSize(QtCore.QSize(176, 16777215)) self.cornerlock_threshold.setWrapping(True) - self.cornerlock_threshold.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cornerlock_threshold.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cornerlock_threshold.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.cornerlock_threshold.setAccelerated(True) self.cornerlock_threshold.setSuffix(" %") @@ -3827,7 +3825,7 @@ def setupUi(self, MainWindow): self.cornerlock_threshold.setObjectName("cornerlock_threshold") self.gridLayout_18.addWidget(self.cornerlock_threshold, 7, 0, 1, 1) self.thc_auto_lbl = QtWidgets.QLabel(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_auto_lbl.sizePolicy().hasHeightForWidth()) @@ -3837,7 +3835,7 @@ def setupUi(self, MainWindow): self.thc_auto_lbl.setObjectName("thc_auto_lbl") self.gridLayout_18.addWidget(self.thc_auto_lbl, 1, 1, 1, 1) self.pid_p_gain_lbl = QtWidgets.QLabel(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pid_p_gain_lbl.sizePolicy().hasHeightForWidth()) @@ -3847,7 +3845,7 @@ def setupUi(self, MainWindow): self.pid_p_gain_lbl.setObjectName("pid_p_gain_lbl") self.gridLayout_18.addWidget(self.pid_p_gain_lbl, 6, 1, 1, 1) self.label_41 = QtWidgets.QLabel(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_41.sizePolicy().hasHeightForWidth()) @@ -3857,7 +3855,7 @@ def setupUi(self, MainWindow): self.label_41.setObjectName("label_41") self.gridLayout_18.addWidget(self.label_41, 7, 1, 1, 1) self.thc_threshold_lbl = QtWidgets.QLabel(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_threshold_lbl.sizePolicy().hasHeightForWidth()) @@ -3867,7 +3865,7 @@ def setupUi(self, MainWindow): self.thc_threshold_lbl.setObjectName("thc_threshold_lbl") self.gridLayout_18.addWidget(self.thc_threshold_lbl, 5, 1, 1, 1) self.voidlock_slope_lbl = QtWidgets.QLabel(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.voidlock_slope_lbl.sizePolicy().hasHeightForWidth()) @@ -3877,7 +3875,7 @@ def setupUi(self, MainWindow): self.voidlock_slope_lbl.setObjectName("voidlock_slope_lbl") self.gridLayout_18.addWidget(self.voidlock_slope_lbl, 8, 1, 1, 1) self.pid_p_gain = DoubleScale(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pid_p_gain.sizePolicy().hasHeightForWidth()) @@ -3885,7 +3883,7 @@ def setupUi(self, MainWindow): self.pid_p_gain.setMinimumSize(QtCore.QSize(136, 0)) self.pid_p_gain.setMaximumSize(QtCore.QSize(176, 16777215)) self.pid_p_gain.setWrapping(True) - self.pid_p_gain.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pid_p_gain.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pid_p_gain.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.pid_p_gain.setAccelerated(True) self.pid_p_gain.setDecimals(0) @@ -3894,7 +3892,7 @@ def setupUi(self, MainWindow): self.pid_p_gain.setObjectName("pid_p_gain") self.gridLayout_18.addWidget(self.pid_p_gain, 6, 0, 1, 1) self.pid_i_gain_lbl = QtWidgets.QLabel(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pid_i_gain_lbl.sizePolicy().hasHeightForWidth()) @@ -3904,7 +3902,7 @@ def setupUi(self, MainWindow): self.pid_i_gain_lbl.setObjectName("pid_i_gain_lbl") self.gridLayout_18.addWidget(self.pid_i_gain_lbl, 9, 1, 1, 1) self.thc_sample_counts_lbl = QtWidgets.QLabel(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_sample_counts_lbl.sizePolicy().hasHeightForWidth()) @@ -3914,7 +3912,7 @@ def setupUi(self, MainWindow): self.thc_sample_counts_lbl.setObjectName("thc_sample_counts_lbl") self.gridLayout_18.addWidget(self.thc_sample_counts_lbl, 3, 1, 1, 1) self.pid_i_gain = DoubleScale(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pid_i_gain.sizePolicy().hasHeightForWidth()) @@ -3922,7 +3920,7 @@ def setupUi(self, MainWindow): self.pid_i_gain.setMinimumSize(QtCore.QSize(136, 0)) self.pid_i_gain.setMaximumSize(QtCore.QSize(176, 16777215)) self.pid_i_gain.setWrapping(True) - self.pid_i_gain.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pid_i_gain.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pid_i_gain.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.pid_i_gain.setAccelerated(True) self.pid_i_gain.setDecimals(0) @@ -3931,7 +3929,7 @@ def setupUi(self, MainWindow): self.pid_i_gain.setObjectName("pid_i_gain") self.gridLayout_18.addWidget(self.pid_i_gain, 9, 0, 1, 1) self.thc_delay = DoubleScale(self.thc_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.thc_delay.sizePolicy().hasHeightForWidth()) @@ -3939,7 +3937,7 @@ def setupUi(self, MainWindow): self.thc_delay.setMinimumSize(QtCore.QSize(136, 0)) self.thc_delay.setMaximumSize(QtCore.QSize(176, 16777215)) self.thc_delay.setWrapping(True) - self.thc_delay.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.thc_delay.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.thc_delay.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.thc_delay.setAccelerated(True) self.thc_delay.setDecimals(2) @@ -3949,26 +3947,26 @@ def setupUi(self, MainWindow): self.thc_delay.setObjectName("thc_delay") self.gridLayout_18.addWidget(self.thc_delay, 2, 0, 1, 1) self.thc_auto = CheckBox(self.thc_grid) - self.thc_auto.setFocusPolicy(QtCore.Qt.ClickFocus) + self.thc_auto.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.thc_auto.setLayoutDirection(QtCore.Qt.RightToLeft) self.thc_auto.setObjectName("thc_auto") self.gridLayout_18.addWidget(self.thc_auto, 1, 0, 1, 1) self.verticalLayout_29.addWidget(self.thc_grid) self.verticalLayout_46.addWidget(self.thc_config) - spacerItem23 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem23 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_46.addItem(spacerItem23) self.horizontalLayout_17.addWidget(self.frame_12) self.frame_32 = QtWidgets.QFrame(self.frame_33) - self.frame_32.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_32.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_32.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_32.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_32.setObjectName("frame_32") self.verticalLayout_45 = QtWidgets.QVBoxLayout(self.frame_32) self.verticalLayout_45.setContentsMargins(0, 0, 0, 0) self.verticalLayout_45.setSpacing(4) self.verticalLayout_45.setObjectName("verticalLayout_45") self.probe_config = QtWidgets.QFrame(self.frame_32) - self.probe_config.setFrameShape(QtWidgets.QFrame.NoFrame) - self.probe_config.setFrameShadow(QtWidgets.QFrame.Raised) + self.probe_config.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.probe_config.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.probe_config.setObjectName("probe_config") self.verticalLayout_39 = QtWidgets.QVBoxLayout(self.probe_config) self.verticalLayout_39.setContentsMargins(0, 0, 0, 4) @@ -3977,12 +3975,12 @@ def setupUi(self, MainWindow): self.probe_conf_lbl = QtWidgets.QLabel(self.probe_config) self.probe_conf_lbl.setMinimumSize(QtCore.QSize(0, 16)) self.probe_conf_lbl.setMaximumSize(QtCore.QSize(16777215, 16)) - self.probe_conf_lbl.setAlignment(QtCore.Qt.AlignCenter) + self.probe_conf_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.probe_conf_lbl.setObjectName("probe_conf_lbl") self.verticalLayout_39.addWidget(self.probe_conf_lbl) self.probe_grid = QtWidgets.QFrame(self.probe_config) - self.probe_grid.setFrameShape(QtWidgets.QFrame.NoFrame) - self.probe_grid.setFrameShadow(QtWidgets.QFrame.Raised) + self.probe_grid.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.probe_grid.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.probe_grid.setObjectName("probe_grid") self.gridLayout_19 = QtWidgets.QGridLayout(self.probe_grid) self.gridLayout_19.setContentsMargins(4, 0, 4, 0) @@ -3990,7 +3988,7 @@ def setupUi(self, MainWindow): self.gridLayout_19.setVerticalSpacing(7) self.gridLayout_19.setObjectName("gridLayout_19") self.skip_ihs_distance = DoubleScale(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.skip_ihs_distance.sizePolicy().hasHeightForWidth()) @@ -3998,7 +3996,7 @@ def setupUi(self, MainWindow): self.skip_ihs_distance.setMinimumSize(QtCore.QSize(120, 0)) self.skip_ihs_distance.setMaximumSize(QtCore.QSize(160, 16777215)) self.skip_ihs_distance.setWrapping(True) - self.skip_ihs_distance.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.skip_ihs_distance.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.skip_ihs_distance.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.skip_ihs_distance.setAccelerated(True) self.skip_ihs_distance.setDecimals(0) @@ -4007,7 +4005,7 @@ def setupUi(self, MainWindow): self.skip_ihs_distance.setObjectName("skip_ihs_distance") self.gridLayout_19.addWidget(self.skip_ihs_distance, 5, 0, 1, 1) self.probe_feed_rate = DoubleScale(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.probe_feed_rate.sizePolicy().hasHeightForWidth()) @@ -4015,7 +4013,7 @@ def setupUi(self, MainWindow): self.probe_feed_rate.setMinimumSize(QtCore.QSize(120, 0)) self.probe_feed_rate.setMaximumSize(QtCore.QSize(160, 16777215)) self.probe_feed_rate.setWrapping(True) - self.probe_feed_rate.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.probe_feed_rate.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.probe_feed_rate.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.probe_feed_rate.setAccelerated(True) self.probe_feed_rate.setDecimals(0) @@ -4024,7 +4022,7 @@ def setupUi(self, MainWindow): self.probe_feed_rate.setObjectName("probe_feed_rate") self.gridLayout_19.addWidget(self.probe_feed_rate, 1, 0, 1, 1) self.ohmic_probe_offset = DoubleScale(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ohmic_probe_offset.sizePolicy().hasHeightForWidth()) @@ -4032,7 +4030,7 @@ def setupUi(self, MainWindow): self.ohmic_probe_offset.setMinimumSize(QtCore.QSize(120, 0)) self.ohmic_probe_offset.setMaximumSize(QtCore.QSize(160, 16777215)) self.ohmic_probe_offset.setWrapping(True) - self.ohmic_probe_offset.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ohmic_probe_offset.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ohmic_probe_offset.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.ohmic_probe_offset.setAccelerated(True) self.ohmic_probe_offset.setDecimals(2) @@ -4043,7 +4041,7 @@ def setupUi(self, MainWindow): self.ohmic_probe_offset.setObjectName("ohmic_probe_offset") self.gridLayout_19.addWidget(self.ohmic_probe_offset, 3, 0, 1, 1) self.label_16 = QtWidgets.QLabel(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_16.sizePolicy().hasHeightForWidth()) @@ -4053,7 +4051,7 @@ def setupUi(self, MainWindow): self.label_16.setObjectName("label_16") self.gridLayout_19.addWidget(self.label_16, 3, 1, 1, 1) self.label_17 = QtWidgets.QLabel(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_17.sizePolicy().hasHeightForWidth()) @@ -4063,7 +4061,7 @@ def setupUi(self, MainWindow): self.label_17.setObjectName("label_17") self.gridLayout_19.addWidget(self.label_17, 4, 1, 1, 1) self.float_switch_travel = DoubleScale(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.float_switch_travel.sizePolicy().hasHeightForWidth()) @@ -4072,7 +4070,7 @@ def setupUi(self, MainWindow): self.float_switch_travel.setMaximumSize(QtCore.QSize(160, 16777215)) self.float_switch_travel.setLayoutDirection(QtCore.Qt.LeftToRight) self.float_switch_travel.setWrapping(True) - self.float_switch_travel.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.float_switch_travel.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.float_switch_travel.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.float_switch_travel.setAccelerated(True) self.float_switch_travel.setDecimals(2) @@ -4083,7 +4081,7 @@ def setupUi(self, MainWindow): self.float_switch_travel.setObjectName("float_switch_travel") self.gridLayout_19.addWidget(self.float_switch_travel, 0, 0, 1, 1) self.label_2 = QtWidgets.QLabel(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth()) @@ -4093,7 +4091,7 @@ def setupUi(self, MainWindow): self.label_2.setObjectName("label_2") self.gridLayout_19.addWidget(self.label_2, 0, 1, 1, 1) self.probe_start_height = DoubleScale(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.probe_start_height.sizePolicy().hasHeightForWidth()) @@ -4101,7 +4099,7 @@ def setupUi(self, MainWindow): self.probe_start_height.setMinimumSize(QtCore.QSize(120, 0)) self.probe_start_height.setMaximumSize(QtCore.QSize(160, 16777215)) self.probe_start_height.setWrapping(True) - self.probe_start_height.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.probe_start_height.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.probe_start_height.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.probe_start_height.setAccelerated(True) self.probe_start_height.setDecimals(0) @@ -4110,7 +4108,7 @@ def setupUi(self, MainWindow): self.probe_start_height.setObjectName("probe_start_height") self.gridLayout_19.addWidget(self.probe_start_height, 2, 0, 1, 1) self.label_15 = QtWidgets.QLabel(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_15.sizePolicy().hasHeightForWidth()) @@ -4120,7 +4118,7 @@ def setupUi(self, MainWindow): self.label_15.setObjectName("label_15") self.gridLayout_19.addWidget(self.label_15, 2, 1, 1, 1) self.ohmic_max_attempts = DoubleScale(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ohmic_max_attempts.sizePolicy().hasHeightForWidth()) @@ -4128,7 +4126,7 @@ def setupUi(self, MainWindow): self.ohmic_max_attempts.setMinimumSize(QtCore.QSize(120, 0)) self.ohmic_max_attempts.setMaximumSize(QtCore.QSize(160, 16777215)) self.ohmic_max_attempts.setWrapping(True) - self.ohmic_max_attempts.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ohmic_max_attempts.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ohmic_max_attempts.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.ohmic_max_attempts.setAccelerated(True) self.ohmic_max_attempts.setDecimals(0) @@ -4137,7 +4135,7 @@ def setupUi(self, MainWindow): self.ohmic_max_attempts.setObjectName("ohmic_max_attempts") self.gridLayout_19.addWidget(self.ohmic_max_attempts, 4, 0, 1, 1) self.label_14 = QtWidgets.QLabel(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_14.sizePolicy().hasHeightForWidth()) @@ -4147,7 +4145,7 @@ def setupUi(self, MainWindow): self.label_14.setObjectName("label_14") self.gridLayout_19.addWidget(self.label_14, 1, 1, 1, 1) self.label_18 = QtWidgets.QLabel(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_18.sizePolicy().hasHeightForWidth()) @@ -4157,7 +4155,7 @@ def setupUi(self, MainWindow): self.label_18.setObjectName("label_18") self.gridLayout_19.addWidget(self.label_18, 5, 1, 1, 1) self.offset_feed_rate = DoubleScale(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.offset_feed_rate.sizePolicy().hasHeightForWidth()) @@ -4165,7 +4163,7 @@ def setupUi(self, MainWindow): self.offset_feed_rate.setMinimumSize(QtCore.QSize(120, 0)) self.offset_feed_rate.setMaximumSize(QtCore.QSize(160, 16777215)) self.offset_feed_rate.setWrapping(True) - self.offset_feed_rate.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.offset_feed_rate.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.offset_feed_rate.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.offset_feed_rate.setAccelerated(True) self.offset_feed_rate.setDecimals(0) @@ -4173,7 +4171,7 @@ def setupUi(self, MainWindow): self.offset_feed_rate.setObjectName("offset_feed_rate") self.gridLayout_19.addWidget(self.offset_feed_rate, 6, 0, 1, 1) self.offset_feed_rate_lbl = QtWidgets.QLabel(self.probe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.offset_feed_rate_lbl.sizePolicy().hasHeightForWidth()) @@ -4185,8 +4183,8 @@ def setupUi(self, MainWindow): self.verticalLayout_39.addWidget(self.probe_grid) self.verticalLayout_45.addWidget(self.probe_config) self.safety_config = QtWidgets.QFrame(self.frame_32) - self.safety_config.setFrameShape(QtWidgets.QFrame.NoFrame) - self.safety_config.setFrameShadow(QtWidgets.QFrame.Raised) + self.safety_config.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.safety_config.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.safety_config.setObjectName("safety_config") self.verticalLayout_40 = QtWidgets.QVBoxLayout(self.safety_config) self.verticalLayout_40.setContentsMargins(0, 0, 0, 4) @@ -4195,12 +4193,12 @@ def setupUi(self, MainWindow): self.safety_conf_lbl = QtWidgets.QLabel(self.safety_config) self.safety_conf_lbl.setMinimumSize(QtCore.QSize(0, 16)) self.safety_conf_lbl.setMaximumSize(QtCore.QSize(16777215, 16)) - self.safety_conf_lbl.setAlignment(QtCore.Qt.AlignCenter) + self.safety_conf_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.safety_conf_lbl.setObjectName("safety_conf_lbl") self.verticalLayout_40.addWidget(self.safety_conf_lbl) self.safety_grid = QtWidgets.QFrame(self.safety_config) - self.safety_grid.setFrameShape(QtWidgets.QFrame.NoFrame) - self.safety_grid.setFrameShadow(QtWidgets.QFrame.Raised) + self.safety_grid.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.safety_grid.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.safety_grid.setObjectName("safety_grid") self.gridLayout_23 = QtWidgets.QGridLayout(self.safety_grid) self.gridLayout_23.setContentsMargins(4, 0, 4, 0) @@ -4208,7 +4206,7 @@ def setupUi(self, MainWindow): self.gridLayout_23.setVerticalSpacing(7) self.gridLayout_23.setObjectName("gridLayout_23") self.safe_height = DoubleScale(self.safety_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.safe_height.sizePolicy().hasHeightForWidth()) @@ -4216,7 +4214,7 @@ def setupUi(self, MainWindow): self.safe_height.setMinimumSize(QtCore.QSize(120, 0)) self.safe_height.setMaximumSize(QtCore.QSize(160, 16777215)) self.safe_height.setWrapping(True) - self.safe_height.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.safe_height.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.safe_height.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.safe_height.setAccelerated(True) self.safe_height.setDecimals(0) @@ -4225,7 +4223,7 @@ def setupUi(self, MainWindow): self.safe_height.setObjectName("safe_height") self.gridLayout_23.addWidget(self.safe_height, 0, 0, 1, 1) self.label_54 = QtWidgets.QLabel(self.safety_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_54.sizePolicy().hasHeightForWidth()) @@ -4237,8 +4235,8 @@ def setupUi(self, MainWindow): self.verticalLayout_40.addWidget(self.safety_grid) self.verticalLayout_45.addWidget(self.safety_config) self.scribe_config = QtWidgets.QFrame(self.frame_32) - self.scribe_config.setFrameShape(QtWidgets.QFrame.NoFrame) - self.scribe_config.setFrameShadow(QtWidgets.QFrame.Raised) + self.scribe_config.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.scribe_config.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.scribe_config.setObjectName("scribe_config") self.verticalLayout_41 = QtWidgets.QVBoxLayout(self.scribe_config) self.verticalLayout_41.setContentsMargins(0, 0, 0, 4) @@ -4247,12 +4245,12 @@ def setupUi(self, MainWindow): self.scribe_conf_lbl = QtWidgets.QLabel(self.scribe_config) self.scribe_conf_lbl.setMinimumSize(QtCore.QSize(0, 16)) self.scribe_conf_lbl.setMaximumSize(QtCore.QSize(16777215, 16)) - self.scribe_conf_lbl.setAlignment(QtCore.Qt.AlignCenter) + self.scribe_conf_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.scribe_conf_lbl.setObjectName("scribe_conf_lbl") self.verticalLayout_41.addWidget(self.scribe_conf_lbl) self.scribe_grid = QtWidgets.QFrame(self.scribe_config) - self.scribe_grid.setFrameShape(QtWidgets.QFrame.NoFrame) - self.scribe_grid.setFrameShadow(QtWidgets.QFrame.Raised) + self.scribe_grid.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.scribe_grid.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.scribe_grid.setObjectName("scribe_grid") self.gridLayout_20 = QtWidgets.QGridLayout(self.scribe_grid) self.gridLayout_20.setContentsMargins(4, 0, 4, 0) @@ -4260,7 +4258,7 @@ def setupUi(self, MainWindow): self.gridLayout_20.setVerticalSpacing(7) self.gridLayout_20.setObjectName("gridLayout_20") self.scribe_arm_delay = DoubleScale(self.scribe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.scribe_arm_delay.sizePolicy().hasHeightForWidth()) @@ -4268,7 +4266,7 @@ def setupUi(self, MainWindow): self.scribe_arm_delay.setMinimumSize(QtCore.QSize(120, 0)) self.scribe_arm_delay.setMaximumSize(QtCore.QSize(160, 16777215)) self.scribe_arm_delay.setWrapping(True) - self.scribe_arm_delay.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.scribe_arm_delay.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.scribe_arm_delay.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.scribe_arm_delay.setAccelerated(True) self.scribe_arm_delay.setDecimals(1) @@ -4278,7 +4276,7 @@ def setupUi(self, MainWindow): self.scribe_arm_delay.setObjectName("scribe_arm_delay") self.gridLayout_20.addWidget(self.scribe_arm_delay, 0, 0, 1, 1) self.label_55 = QtWidgets.QLabel(self.scribe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_55.sizePolicy().hasHeightForWidth()) @@ -4288,7 +4286,7 @@ def setupUi(self, MainWindow): self.label_55.setObjectName("label_55") self.gridLayout_20.addWidget(self.label_55, 0, 1, 1, 1) self.scribe_on_delay = DoubleScale(self.scribe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.scribe_on_delay.sizePolicy().hasHeightForWidth()) @@ -4296,7 +4294,7 @@ def setupUi(self, MainWindow): self.scribe_on_delay.setMinimumSize(QtCore.QSize(120, 0)) self.scribe_on_delay.setMaximumSize(QtCore.QSize(160, 16777215)) self.scribe_on_delay.setWrapping(True) - self.scribe_on_delay.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.scribe_on_delay.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.scribe_on_delay.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.scribe_on_delay.setAccelerated(True) self.scribe_on_delay.setDecimals(1) @@ -4306,7 +4304,7 @@ def setupUi(self, MainWindow): self.scribe_on_delay.setObjectName("scribe_on_delay") self.gridLayout_20.addWidget(self.scribe_on_delay, 1, 0, 1, 1) self.label_56 = QtWidgets.QLabel(self.scribe_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_56.sizePolicy().hasHeightForWidth()) @@ -4318,8 +4316,8 @@ def setupUi(self, MainWindow): self.verticalLayout_41.addWidget(self.scribe_grid) self.verticalLayout_45.addWidget(self.scribe_config) self.spotting_config = QtWidgets.QFrame(self.frame_32) - self.spotting_config.setFrameShape(QtWidgets.QFrame.NoFrame) - self.spotting_config.setFrameShadow(QtWidgets.QFrame.Raised) + self.spotting_config.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.spotting_config.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.spotting_config.setObjectName("spotting_config") self.verticalLayout_42 = QtWidgets.QVBoxLayout(self.spotting_config) self.verticalLayout_42.setContentsMargins(0, 0, 0, 4) @@ -4328,12 +4326,12 @@ def setupUi(self, MainWindow): self.spotting_conf_lbl = QtWidgets.QLabel(self.spotting_config) self.spotting_conf_lbl.setMinimumSize(QtCore.QSize(0, 16)) self.spotting_conf_lbl.setMaximumSize(QtCore.QSize(16777215, 16)) - self.spotting_conf_lbl.setAlignment(QtCore.Qt.AlignCenter) + self.spotting_conf_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.spotting_conf_lbl.setObjectName("spotting_conf_lbl") self.verticalLayout_42.addWidget(self.spotting_conf_lbl) self.spotting_grid = QtWidgets.QFrame(self.spotting_config) - self.spotting_grid.setFrameShape(QtWidgets.QFrame.NoFrame) - self.spotting_grid.setFrameShadow(QtWidgets.QFrame.Raised) + self.spotting_grid.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.spotting_grid.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.spotting_grid.setObjectName("spotting_grid") self.gridLayout_21 = QtWidgets.QGridLayout(self.spotting_grid) self.gridLayout_21.setContentsMargins(4, 0, 4, 0) @@ -4341,7 +4339,7 @@ def setupUi(self, MainWindow): self.gridLayout_21.setVerticalSpacing(7) self.gridLayout_21.setObjectName("gridLayout_21") self.spotting_threshold = DoubleScale(self.spotting_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.spotting_threshold.sizePolicy().hasHeightForWidth()) @@ -4349,7 +4347,7 @@ def setupUi(self, MainWindow): self.spotting_threshold.setMinimumSize(QtCore.QSize(120, 0)) self.spotting_threshold.setMaximumSize(QtCore.QSize(160, 16777215)) self.spotting_threshold.setWrapping(True) - self.spotting_threshold.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.spotting_threshold.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.spotting_threshold.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.spotting_threshold.setAccelerated(True) self.spotting_threshold.setSuffix(" V") @@ -4359,7 +4357,7 @@ def setupUi(self, MainWindow): self.spotting_threshold.setObjectName("spotting_threshold") self.gridLayout_21.addWidget(self.spotting_threshold, 0, 0, 1, 1) self.label_58 = QtWidgets.QLabel(self.spotting_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_58.sizePolicy().hasHeightForWidth()) @@ -4369,7 +4367,7 @@ def setupUi(self, MainWindow): self.label_58.setObjectName("label_58") self.gridLayout_21.addWidget(self.label_58, 0, 1, 1, 1) self.spotting_time = DoubleScale(self.spotting_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.spotting_time.sizePolicy().hasHeightForWidth()) @@ -4377,7 +4375,7 @@ def setupUi(self, MainWindow): self.spotting_time.setMinimumSize(QtCore.QSize(120, 0)) self.spotting_time.setMaximumSize(QtCore.QSize(160, 16777215)) self.spotting_time.setWrapping(True) - self.spotting_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.spotting_time.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.spotting_time.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.spotting_time.setAccelerated(True) self.spotting_time.setSuffix(" mS") @@ -4387,7 +4385,7 @@ def setupUi(self, MainWindow): self.spotting_time.setObjectName("spotting_time") self.gridLayout_21.addWidget(self.spotting_time, 1, 0, 1, 1) self.label_60 = QtWidgets.QLabel(self.spotting_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_60.sizePolicy().hasHeightForWidth()) @@ -4400,8 +4398,8 @@ def setupUi(self, MainWindow): self.verticalLayout_45.addWidget(self.spotting_config) self.pierce_config = QtWidgets.QFrame(self.frame_32) self.pierce_config.setMinimumSize(QtCore.QSize(0, 0)) - self.pierce_config.setFrameShape(QtWidgets.QFrame.NoFrame) - self.pierce_config.setFrameShadow(QtWidgets.QFrame.Raised) + self.pierce_config.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.pierce_config.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.pierce_config.setObjectName("pierce_config") self.verticalLayout_62 = QtWidgets.QVBoxLayout(self.pierce_config) self.verticalLayout_62.setContentsMargins(0, 0, 0, 4) @@ -4410,12 +4408,12 @@ def setupUi(self, MainWindow): self.pierce_conf_lbl = QtWidgets.QLabel(self.pierce_config) self.pierce_conf_lbl.setMinimumSize(QtCore.QSize(0, 16)) self.pierce_conf_lbl.setMaximumSize(QtCore.QSize(16777215, 16)) - self.pierce_conf_lbl.setAlignment(QtCore.Qt.AlignCenter) + self.pierce_conf_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.pierce_conf_lbl.setObjectName("pierce_conf_lbl") self.verticalLayout_62.addWidget(self.pierce_conf_lbl) self.pierce_grid = QtWidgets.QFrame(self.pierce_config) - self.pierce_grid.setFrameShape(QtWidgets.QFrame.NoFrame) - self.pierce_grid.setFrameShadow(QtWidgets.QFrame.Raised) + self.pierce_grid.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.pierce_grid.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.pierce_grid.setObjectName("pierce_grid") self.gridLayout_16 = QtWidgets.QGridLayout(self.pierce_grid) self.gridLayout_16.setContentsMargins(4, 0, 4, 0) @@ -4423,7 +4421,7 @@ def setupUi(self, MainWindow): self.gridLayout_16.setVerticalSpacing(7) self.gridLayout_16.setObjectName("gridLayout_16") self.x_pierce_offset = DoubleScale(self.pierce_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.x_pierce_offset.sizePolicy().hasHeightForWidth()) @@ -4431,7 +4429,7 @@ def setupUi(self, MainWindow): self.x_pierce_offset.setMinimumSize(QtCore.QSize(120, 0)) self.x_pierce_offset.setMaximumSize(QtCore.QSize(160, 16777215)) self.x_pierce_offset.setWrapping(True) - self.x_pierce_offset.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.x_pierce_offset.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.x_pierce_offset.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.x_pierce_offset.setAccelerated(True) self.x_pierce_offset.setDecimals(1) @@ -4442,7 +4440,7 @@ def setupUi(self, MainWindow): self.x_pierce_offset.setObjectName("x_pierce_offset") self.gridLayout_16.addWidget(self.x_pierce_offset, 0, 0, 1, 1) self.label_63 = QtWidgets.QLabel(self.pierce_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_63.sizePolicy().hasHeightForWidth()) @@ -4452,7 +4450,7 @@ def setupUi(self, MainWindow): self.label_63.setObjectName("label_63") self.gridLayout_16.addWidget(self.label_63, 0, 1, 1, 1) self.y_pierce_offset = DoubleScale(self.pierce_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.y_pierce_offset.sizePolicy().hasHeightForWidth()) @@ -4460,7 +4458,7 @@ def setupUi(self, MainWindow): self.y_pierce_offset.setMinimumSize(QtCore.QSize(120, 0)) self.y_pierce_offset.setMaximumSize(QtCore.QSize(160, 16777215)) self.y_pierce_offset.setWrapping(True) - self.y_pierce_offset.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.y_pierce_offset.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.y_pierce_offset.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.y_pierce_offset.setDecimals(1) self.y_pierce_offset.setMinimum(-5.0) @@ -4470,7 +4468,7 @@ def setupUi(self, MainWindow): self.y_pierce_offset.setObjectName("y_pierce_offset") self.gridLayout_16.addWidget(self.y_pierce_offset, 1, 0, 1, 1) self.label_66 = QtWidgets.QLabel(self.pierce_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_66.sizePolicy().hasHeightForWidth()) @@ -4482,8 +4480,8 @@ def setupUi(self, MainWindow): self.verticalLayout_62.addWidget(self.pierce_grid) self.verticalLayout_45.addWidget(self.pierce_config) self.motion_config = QtWidgets.QFrame(self.frame_32) - self.motion_config.setFrameShape(QtWidgets.QFrame.NoFrame) - self.motion_config.setFrameShadow(QtWidgets.QFrame.Raised) + self.motion_config.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.motion_config.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.motion_config.setObjectName("motion_config") self.verticalLayout_43 = QtWidgets.QVBoxLayout(self.motion_config) self.verticalLayout_43.setContentsMargins(0, 0, 0, 4) @@ -4492,12 +4490,12 @@ def setupUi(self, MainWindow): self.motion_conf_lbl = QtWidgets.QLabel(self.motion_config) self.motion_conf_lbl.setMinimumSize(QtCore.QSize(0, 16)) self.motion_conf_lbl.setMaximumSize(QtCore.QSize(16777215, 16)) - self.motion_conf_lbl.setAlignment(QtCore.Qt.AlignCenter) + self.motion_conf_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.motion_conf_lbl.setObjectName("motion_conf_lbl") self.verticalLayout_43.addWidget(self.motion_conf_lbl) self.motion_grid = QtWidgets.QFrame(self.motion_config) - self.motion_grid.setFrameShape(QtWidgets.QFrame.NoFrame) - self.motion_grid.setFrameShadow(QtWidgets.QFrame.Raised) + self.motion_grid.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.motion_grid.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.motion_grid.setObjectName("motion_grid") self.gridLayout_22 = QtWidgets.QGridLayout(self.motion_grid) self.gridLayout_22.setContentsMargins(4, 0, 4, 0) @@ -4505,7 +4503,7 @@ def setupUi(self, MainWindow): self.gridLayout_22.setVerticalSpacing(7) self.gridLayout_22.setObjectName("gridLayout_22") self.setup_feed_rate = DoubleScale(self.motion_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.setup_feed_rate.sizePolicy().hasHeightForWidth()) @@ -4513,7 +4511,7 @@ def setupUi(self, MainWindow): self.setup_feed_rate.setMinimumSize(QtCore.QSize(120, 0)) self.setup_feed_rate.setMaximumSize(QtCore.QSize(160, 16777215)) self.setup_feed_rate.setWrapping(True) - self.setup_feed_rate.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.setup_feed_rate.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.setup_feed_rate.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.setup_feed_rate.setAccelerated(True) self.setup_feed_rate.setDecimals(0) @@ -4523,7 +4521,7 @@ def setupUi(self, MainWindow): self.setup_feed_rate.setObjectName("setup_feed_rate") self.gridLayout_22.addWidget(self.setup_feed_rate, 0, 0, 1, 1) self.label_61 = QtWidgets.QLabel(self.motion_grid) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_61.sizePolicy().hasHeightForWidth()) @@ -4534,24 +4532,24 @@ def setupUi(self, MainWindow): self.gridLayout_22.addWidget(self.label_61, 0, 2, 1, 1) self.verticalLayout_43.addWidget(self.motion_grid) self.verticalLayout_45.addWidget(self.motion_config) - spacerItem24 = QtWidgets.QSpacerItem(20, 4, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem24 = QtWidgets.QSpacerItem(20, 4, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_45.addItem(spacerItem24) self.horizontalLayout_17.addWidget(self.frame_32) self.horizontalLayout_17.setStretch(0, 1) self.horizontalLayout_17.setStretch(1, 1) self.verticalLayout_48.addWidget(self.frame_33) self.horizontalLayout_12.addWidget(self.config_frame) - spacerItem25 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem25 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_12.addItem(spacerItem25) self.materials_frame = QtWidgets.QFrame(self.param_tab) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.materials_frame.sizePolicy().hasHeightForWidth()) self.materials_frame.setSizePolicy(sizePolicy) self.materials_frame.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.materials_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.materials_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.materials_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.materials_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.materials_frame.setObjectName("materials_frame") self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.materials_frame) self.verticalLayout_4.setContentsMargins(0, 0, 0, 4) @@ -4559,8 +4557,8 @@ def setupUi(self, MainWindow): self.verticalLayout_4.setObjectName("verticalLayout_4") self.frame_45 = QtWidgets.QFrame(self.materials_frame) self.frame_45.setMinimumSize(QtCore.QSize(0, 0)) - self.frame_45.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_45.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_45.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_45.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_45.setObjectName("frame_45") self.horizontalLayout_45 = QtWidgets.QHBoxLayout(self.frame_45) self.horizontalLayout_45.setContentsMargins(0, 0, 0, 0) @@ -4569,38 +4567,38 @@ def setupUi(self, MainWindow): self.save_material = PushButton(self.frame_45) self.save_material.setMinimumSize(QtCore.QSize(60, 16)) self.save_material.setMaximumSize(QtCore.QSize(60, 16)) - self.save_material.setFocusPolicy(QtCore.Qt.ClickFocus) + self.save_material.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.save_material.setObjectName("save_material") self.horizontalLayout_45.addWidget(self.save_material) self.new_material = PushButton(self.frame_45) self.new_material.setMinimumSize(QtCore.QSize(60, 16)) self.new_material.setMaximumSize(QtCore.QSize(60, 16)) - self.new_material.setFocusPolicy(QtCore.Qt.ClickFocus) + self.new_material.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.new_material.setObjectName("new_material") self.horizontalLayout_45.addWidget(self.new_material) self.materials_label = QtWidgets.QLabel(self.frame_45) self.materials_label.setMinimumSize(QtCore.QSize(0, 16)) self.materials_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.materials_label.setAlignment(QtCore.Qt.AlignCenter) + self.materials_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.materials_label.setObjectName("materials_label") self.horizontalLayout_45.addWidget(self.materials_label) self.delete_material = PushButton(self.frame_45) self.delete_material.setMinimumSize(QtCore.QSize(60, 16)) self.delete_material.setMaximumSize(QtCore.QSize(60, 16)) - self.delete_material.setFocusPolicy(QtCore.Qt.ClickFocus) + self.delete_material.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.delete_material.setObjectName("delete_material") self.horizontalLayout_45.addWidget(self.delete_material) self.reload_material = PushButton(self.frame_45) self.reload_material.setMinimumSize(QtCore.QSize(60, 16)) self.reload_material.setMaximumSize(QtCore.QSize(60, 16)) - self.reload_material.setFocusPolicy(QtCore.Qt.ClickFocus) + self.reload_material.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.reload_material.setObjectName("reload_material") self.horizontalLayout_45.addWidget(self.reload_material) self.verticalLayout_4.addWidget(self.frame_45) self.frame_49 = QtWidgets.QFrame(self.materials_frame) self.frame_49.setMinimumSize(QtCore.QSize(0, 247)) - self.frame_49.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_49.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_49.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_49.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_49.setObjectName("frame_49") self.gridLayout_13 = QtWidgets.QGridLayout(self.frame_49) self.gridLayout_13.setContentsMargins(4, 0, 4, 0) @@ -4608,7 +4606,7 @@ def setupUi(self, MainWindow): self.gridLayout_13.setVerticalSpacing(8) self.gridLayout_13.setObjectName("gridLayout_13") self.label_9 = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_9.sizePolicy().hasHeightForWidth()) @@ -4618,7 +4616,7 @@ def setupUi(self, MainWindow): self.label_9.setObjectName("label_9") self.gridLayout_13.addWidget(self.label_9, 5, 1, 1, 1) self.label_65 = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_65.sizePolicy().hasHeightForWidth()) @@ -4628,7 +4626,7 @@ def setupUi(self, MainWindow): self.label_65.setObjectName("label_65") self.gridLayout_13.addWidget(self.label_65, 6, 1, 1, 1) self.label_5 = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_5.sizePolicy().hasHeightForWidth()) @@ -4638,7 +4636,7 @@ def setupUi(self, MainWindow): self.label_5.setObjectName("label_5") self.gridLayout_13.addWidget(self.label_5, 2, 1, 1, 1) self.label_76 = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_76.sizePolicy().hasHeightForWidth()) @@ -4648,7 +4646,7 @@ def setupUi(self, MainWindow): self.label_76.setObjectName("label_76") self.gridLayout_13.addWidget(self.label_76, 9, 1, 1, 1) self.cut_height = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_height.sizePolicy().hasHeightForWidth()) @@ -4657,7 +4655,7 @@ def setupUi(self, MainWindow): self.cut_height.setMaximumSize(QtCore.QSize(160, 16777215)) self.cut_height.setLayoutDirection(QtCore.Qt.LeftToRight) self.cut_height.setWrapping(True) - self.cut_height.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_height.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_height.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.cut_height.setAccelerated(True) self.cut_height.setDecimals(2) @@ -4667,7 +4665,7 @@ def setupUi(self, MainWindow): self.cut_height.setObjectName("cut_height") self.gridLayout_13.addWidget(self.cut_height, 4, 0, 1, 1) self.label_75 = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_75.sizePolicy().hasHeightForWidth()) @@ -4677,7 +4675,7 @@ def setupUi(self, MainWindow): self.label_75.setObjectName("label_75") self.gridLayout_13.addWidget(self.label_75, 8, 1, 1, 1) self.puddle_jump_delay = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.puddle_jump_delay.sizePolicy().hasHeightForWidth()) @@ -4686,7 +4684,7 @@ def setupUi(self, MainWindow): self.puddle_jump_delay.setMaximumSize(QtCore.QSize(160, 16777215)) self.puddle_jump_delay.setLayoutDirection(QtCore.Qt.LeftToRight) self.puddle_jump_delay.setWrapping(True) - self.puddle_jump_delay.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.puddle_jump_delay.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.puddle_jump_delay.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.puddle_jump_delay.setAccelerated(True) self.puddle_jump_delay.setDecimals(2) @@ -4696,7 +4694,7 @@ def setupUi(self, MainWindow): self.puddle_jump_delay.setObjectName("puddle_jump_delay") self.gridLayout_13.addWidget(self.puddle_jump_delay, 9, 0, 1, 1) self.pause_at_end = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pause_at_end.sizePolicy().hasHeightForWidth()) @@ -4705,7 +4703,7 @@ def setupUi(self, MainWindow): self.pause_at_end.setMaximumSize(QtCore.QSize(160, 16777215)) self.pause_at_end.setLayoutDirection(QtCore.Qt.LeftToRight) self.pause_at_end.setWrapping(True) - self.pause_at_end.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pause_at_end.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pause_at_end.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.pause_at_end.setAccelerated(True) self.pause_at_end.setDecimals(1) @@ -4715,7 +4713,7 @@ def setupUi(self, MainWindow): self.pause_at_end.setObjectName("pause_at_end") self.gridLayout_13.addWidget(self.pause_at_end, 10, 0, 1, 1) self.label_77 = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_77.sizePolicy().hasHeightForWidth()) @@ -4725,7 +4723,7 @@ def setupUi(self, MainWindow): self.label_77.setObjectName("label_77") self.gridLayout_13.addWidget(self.label_77, 10, 1, 1, 1) self.label_4 = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth()) @@ -4735,7 +4733,7 @@ def setupUi(self, MainWindow): self.label_4.setObjectName("label_4") self.gridLayout_13.addWidget(self.label_4, 1, 1, 1, 1) self.label_7 = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_7.sizePolicy().hasHeightForWidth()) @@ -4745,7 +4743,7 @@ def setupUi(self, MainWindow): self.label_7.setObjectName("label_7") self.gridLayout_13.addWidget(self.label_7, 4, 1, 1, 1) self.gas_pressure = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.gas_pressure.sizePolicy().hasHeightForWidth()) @@ -4754,7 +4752,7 @@ def setupUi(self, MainWindow): self.gas_pressure.setMaximumSize(QtCore.QSize(160, 16777215)) self.gas_pressure.setLayoutDirection(QtCore.Qt.LeftToRight) self.gas_pressure.setWrapping(True) - self.gas_pressure.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.gas_pressure.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.gas_pressure.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.gas_pressure.setAccelerated(True) self.gas_pressure.setSuffix(" psi") @@ -4766,7 +4764,7 @@ def setupUi(self, MainWindow): self.gas_pressure.setObjectName("gas_pressure") self.gridLayout_13.addWidget(self.gas_pressure, 11, 0, 1, 1) self.puddle_jump_height = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.puddle_jump_height.sizePolicy().hasHeightForWidth()) @@ -4775,7 +4773,7 @@ def setupUi(self, MainWindow): self.puddle_jump_height.setMaximumSize(QtCore.QSize(160, 16777215)) self.puddle_jump_height.setLayoutDirection(QtCore.Qt.LeftToRight) self.puddle_jump_height.setWrapping(True) - self.puddle_jump_height.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.puddle_jump_height.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.puddle_jump_height.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.puddle_jump_height.setAccelerated(True) self.puddle_jump_height.setSuffix(" %") @@ -4785,7 +4783,7 @@ def setupUi(self, MainWindow): self.puddle_jump_height.setObjectName("puddle_jump_height") self.gridLayout_13.addWidget(self.puddle_jump_height, 8, 0, 1, 1) self.pierce_delay = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pierce_delay.sizePolicy().hasHeightForWidth()) @@ -4794,7 +4792,7 @@ def setupUi(self, MainWindow): self.pierce_delay.setMaximumSize(QtCore.QSize(160, 16777215)) self.pierce_delay.setLayoutDirection(QtCore.Qt.LeftToRight) self.pierce_delay.setWrapping(True) - self.pierce_delay.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pierce_delay.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pierce_delay.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.pierce_delay.setAccelerated(True) self.pierce_delay.setDecimals(1) @@ -4804,7 +4802,7 @@ def setupUi(self, MainWindow): self.pierce_delay.setObjectName("pierce_delay") self.gridLayout_13.addWidget(self.pierce_delay, 3, 0, 1, 1) self.label_6 = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_6.sizePolicy().hasHeightForWidth()) @@ -4814,7 +4812,7 @@ def setupUi(self, MainWindow): self.label_6.setObjectName("label_6") self.gridLayout_13.addWidget(self.label_6, 3, 1, 1, 1) self.cut_mode_label = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_mode_label.sizePolicy().hasHeightForWidth()) @@ -4824,7 +4822,7 @@ def setupUi(self, MainWindow): self.cut_mode_label.setObjectName("cut_mode_label") self.gridLayout_13.addWidget(self.cut_mode_label, 12, 1, 1, 1) self.cut_feed_rate = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_feed_rate.sizePolicy().hasHeightForWidth()) @@ -4833,7 +4831,7 @@ def setupUi(self, MainWindow): self.cut_feed_rate.setMaximumSize(QtCore.QSize(160, 16777215)) self.cut_feed_rate.setLayoutDirection(QtCore.Qt.LeftToRight) self.cut_feed_rate.setWrapping(True) - self.cut_feed_rate.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_feed_rate.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_feed_rate.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.cut_feed_rate.setAccelerated(True) self.cut_feed_rate.setDecimals(0) @@ -4842,7 +4840,7 @@ def setupUi(self, MainWindow): self.cut_feed_rate.setObjectName("cut_feed_rate") self.gridLayout_13.addWidget(self.cut_feed_rate, 5, 0, 1, 1) self.cut_amps = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_amps.sizePolicy().hasHeightForWidth()) @@ -4851,7 +4849,7 @@ def setupUi(self, MainWindow): self.cut_amps.setMaximumSize(QtCore.QSize(160, 16777215)) self.cut_amps.setLayoutDirection(QtCore.Qt.LeftToRight) self.cut_amps.setWrapping(True) - self.cut_amps.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_amps.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_amps.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.cut_amps.setAccelerated(True) self.cut_amps.setDecimals(0) @@ -4861,7 +4859,7 @@ def setupUi(self, MainWindow): self.cut_amps.setObjectName("cut_amps") self.gridLayout_13.addWidget(self.cut_amps, 6, 0, 1, 1) self.gas_pressure_label = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.gas_pressure_label.sizePolicy().hasHeightForWidth()) @@ -4871,7 +4869,7 @@ def setupUi(self, MainWindow): self.gas_pressure_label.setObjectName("gas_pressure_label") self.gridLayout_13.addWidget(self.gas_pressure_label, 11, 1, 1, 1) self.cut_mode = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_mode.sizePolicy().hasHeightForWidth()) @@ -4880,7 +4878,7 @@ def setupUi(self, MainWindow): self.cut_mode.setMaximumSize(QtCore.QSize(160, 16777215)) self.cut_mode.setLayoutDirection(QtCore.Qt.LeftToRight) self.cut_mode.setWrapping(True) - self.cut_mode.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_mode.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_mode.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.cut_mode.setAccelerated(True) self.cut_mode.setDecimals(0) @@ -4890,7 +4888,7 @@ def setupUi(self, MainWindow): self.cut_mode.setObjectName("cut_mode") self.gridLayout_13.addWidget(self.cut_mode, 12, 0, 1, 1) self.cut_volts = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_volts.sizePolicy().hasHeightForWidth()) @@ -4900,7 +4898,7 @@ def setupUi(self, MainWindow): self.cut_volts.setLayoutDirection(QtCore.Qt.LeftToRight) self.cut_volts.setWrapping(True) self.cut_volts.setFrame(True) - self.cut_volts.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_volts.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_volts.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.cut_volts.setAccelerated(True) self.cut_volts.setDecimals(1) @@ -4911,7 +4909,7 @@ def setupUi(self, MainWindow): self.cut_volts.setObjectName("cut_volts") self.gridLayout_13.addWidget(self.cut_volts, 7, 0, 1, 1) self.label_74 = QtWidgets.QLabel(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_74.sizePolicy().hasHeightForWidth()) @@ -4921,7 +4919,7 @@ def setupUi(self, MainWindow): self.label_74.setObjectName("label_74") self.gridLayout_13.addWidget(self.label_74, 7, 1, 1, 1) self.pierce_height = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pierce_height.sizePolicy().hasHeightForWidth()) @@ -4930,7 +4928,7 @@ def setupUi(self, MainWindow): self.pierce_height.setMaximumSize(QtCore.QSize(160, 16777215)) self.pierce_height.setLayoutDirection(QtCore.Qt.LeftToRight) self.pierce_height.setWrapping(True) - self.pierce_height.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pierce_height.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pierce_height.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.pierce_height.setAccelerated(True) self.pierce_height.setDecimals(2) @@ -4940,12 +4938,12 @@ def setupUi(self, MainWindow): self.pierce_height.setObjectName("pierce_height") self.gridLayout_13.addWidget(self.pierce_height, 2, 0, 1, 1) self.materials_box = QtWidgets.QComboBox(self.frame_49) - self.materials_box.setFocusPolicy(QtCore.Qt.ClickFocus) + self.materials_box.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.materials_box.setCurrentText("") self.materials_box.setObjectName("materials_box") self.gridLayout_13.addWidget(self.materials_box, 0, 0, 1, 2) self.kerf_width = DoubleScale(self.frame_49) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.kerf_width.sizePolicy().hasHeightForWidth()) @@ -4954,7 +4952,7 @@ def setupUi(self, MainWindow): self.kerf_width.setMaximumSize(QtCore.QSize(160, 16777215)) self.kerf_width.setLayoutDirection(QtCore.Qt.LeftToRight) self.kerf_width.setWrapping(True) - self.kerf_width.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.kerf_width.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.kerf_width.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.kerf_width.setAccelerated(True) self.kerf_width.setDecimals(2) @@ -4964,7 +4962,7 @@ def setupUi(self, MainWindow): self.kerf_width.setObjectName("kerf_width") self.gridLayout_13.addWidget(self.kerf_width, 1, 0, 1, 1) self.verticalLayout_4.addWidget(self.frame_49) - spacerItem26 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem26 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_4.addItem(spacerItem26) self.horizontalLayout_12.addWidget(self.materials_frame) self.horizontalLayout_12.setStretch(1, 1) @@ -4976,13 +4974,13 @@ def setupUi(self, MainWindow): self.horizontalLayout_37.setSpacing(2) self.horizontalLayout_37.setObjectName("horizontalLayout_37") self.gui_frame = QtWidgets.QFrame(self.settings_tab) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.gui_frame.sizePolicy().hasHeightForWidth()) self.gui_frame.setSizePolicy(sizePolicy) - self.gui_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.gui_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.gui_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.gui_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.gui_frame.setObjectName("gui_frame") self.verticalLayout_44 = QtWidgets.QVBoxLayout(self.gui_frame) self.verticalLayout_44.setContentsMargins(0, 0, 0, 4) @@ -4991,14 +4989,14 @@ def setupUi(self, MainWindow): self.gui_label = QtWidgets.QLabel(self.gui_frame) self.gui_label.setMinimumSize(QtCore.QSize(0, 16)) self.gui_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.gui_label.setAlignment(QtCore.Qt.AlignCenter) + self.gui_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.gui_label.setObjectName("gui_label") self.verticalLayout_44.addWidget(self.gui_label) self.frame_19 = QtWidgets.QFrame(self.gui_frame) self.frame_19.setMinimumSize(QtCore.QSize(0, 0)) self.frame_19.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.frame_19.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_19.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_19.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_19.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_19.setObjectName("frame_19") self.gridLayout_3 = QtWidgets.QGridLayout(self.frame_19) self.gridLayout_3.setContentsMargins(4, 0, 4, 0) @@ -5006,41 +5004,41 @@ def setupUi(self, MainWindow): self.gridLayout_3.setVerticalSpacing(10) self.gridLayout_3.setObjectName("gridLayout_3") self.color_estop = PushButton(self.frame_19) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.color_estop.sizePolicy().hasHeightForWidth()) self.color_estop.setSizePolicy(sizePolicy) self.color_estop.setMinimumSize(QtCore.QSize(0, 0)) self.color_estop.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_estop.setFocusPolicy(QtCore.Qt.ClickFocus) + self.color_estop.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.color_estop.setObjectName("color_estop") self.gridLayout_3.addWidget(self.color_estop, 1, 4, 1, 1) self.color_preview_lbl = QtWidgets.QLabel(self.frame_19) - self.color_preview_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.color_preview_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.color_preview_lbl.setObjectName("color_preview_lbl") self.gridLayout_3.addWidget(self.color_preview_lbl, 3, 3, 1, 1) self.color_led = PushButton(self.frame_19) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.color_led.sizePolicy().hasHeightForWidth()) self.color_led.setSizePolicy(sizePolicy) self.color_led.setMinimumSize(QtCore.QSize(0, 0)) self.color_led.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_led.setFocusPolicy(QtCore.Qt.ClickFocus) + self.color_led.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.color_led.setObjectName("color_led") self.gridLayout_3.addWidget(self.color_led, 2, 0, 1, 1) self.color_estop_lbl = QtWidgets.QLabel(self.frame_19) self.color_estop_lbl.setMinimumSize(QtCore.QSize(0, 24)) self.color_estop_lbl.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_estop_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.color_estop_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.color_estop_lbl.setObjectName("color_estop_lbl") self.gridLayout_3.addWidget(self.color_estop_lbl, 1, 3, 1, 1) self.color_frams_lbl = QtWidgets.QLabel(self.frame_19) self.color_frams_lbl.setMinimumSize(QtCore.QSize(0, 24)) self.color_frams_lbl.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_frams_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.color_frams_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.color_frams_lbl.setObjectName("color_frams_lbl") self.gridLayout_3.addWidget(self.color_frams_lbl, 0, 3, 1, 1) self.color_led_lbl = QtWidgets.QLabel(self.frame_19) @@ -5054,36 +5052,36 @@ def setupUi(self, MainWindow): self.color_backgrnd_lbl.setObjectName("color_backgrnd_lbl") self.gridLayout_3.addWidget(self.color_backgrnd_lbl, 3, 1, 1, 1) self.color_disabled = PushButton(self.frame_19) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.color_disabled.sizePolicy().hasHeightForWidth()) self.color_disabled.setSizePolicy(sizePolicy) self.color_disabled.setMinimumSize(QtCore.QSize(0, 0)) self.color_disabled.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_disabled.setFocusPolicy(QtCore.Qt.ClickFocus) + self.color_disabled.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.color_disabled.setObjectName("color_disabled") self.gridLayout_3.addWidget(self.color_disabled, 2, 4, 1, 1) self.color_backgrnd = PushButton(self.frame_19) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.color_backgrnd.sizePolicy().hasHeightForWidth()) self.color_backgrnd.setSizePolicy(sizePolicy) self.color_backgrnd.setMinimumSize(QtCore.QSize(0, 0)) self.color_backgrnd.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_backgrnd.setFocusPolicy(QtCore.Qt.ClickFocus) + self.color_backgrnd.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.color_backgrnd.setObjectName("color_backgrnd") self.gridLayout_3.addWidget(self.color_backgrnd, 3, 0, 1, 1) self.color_frams = PushButton(self.frame_19) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.color_frams.sizePolicy().hasHeightForWidth()) self.color_frams.setSizePolicy(sizePolicy) self.color_frams.setMinimumSize(QtCore.QSize(0, 0)) self.color_frams.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_frams.setFocusPolicy(QtCore.Qt.ClickFocus) + self.color_frams.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.color_frams.setObjectName("color_frams") self.gridLayout_3.addWidget(self.color_frams, 0, 4, 1, 1) self.color_backgalt_lbl = QtWidgets.QLabel(self.frame_19) @@ -5092,42 +5090,42 @@ def setupUi(self, MainWindow): self.color_backgalt_lbl.setObjectName("color_backgalt_lbl") self.gridLayout_3.addWidget(self.color_backgalt_lbl, 4, 1, 1, 1) self.color_preview = PushButton(self.frame_19) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.color_preview.sizePolicy().hasHeightForWidth()) self.color_preview.setSizePolicy(sizePolicy) self.color_preview.setMinimumSize(QtCore.QSize(0, 0)) self.color_preview.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_preview.setFocusPolicy(QtCore.Qt.ClickFocus) + self.color_preview.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.color_preview.setObjectName("color_preview") self.gridLayout_3.addWidget(self.color_preview, 3, 4, 1, 1) self.color_backgalt = PushButton(self.frame_19) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.color_backgalt.sizePolicy().hasHeightForWidth()) self.color_backgalt.setSizePolicy(sizePolicy) self.color_backgalt.setMinimumSize(QtCore.QSize(0, 0)) self.color_backgalt.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_backgalt.setFocusPolicy(QtCore.Qt.ClickFocus) + self.color_backgalt.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.color_backgalt.setObjectName("color_backgalt") self.gridLayout_3.addWidget(self.color_backgalt, 4, 0, 1, 1) self.color_foregalt = PushButton(self.frame_19) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.color_foregalt.sizePolicy().hasHeightForWidth()) self.color_foregalt.setSizePolicy(sizePolicy) self.color_foregalt.setMinimumSize(QtCore.QSize(0, 0)) self.color_foregalt.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_foregalt.setFocusPolicy(QtCore.Qt.ClickFocus) + self.color_foregalt.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.color_foregalt.setObjectName("color_foregalt") self.gridLayout_3.addWidget(self.color_foregalt, 1, 0, 1, 1) self.color_disabled_lbl = QtWidgets.QLabel(self.frame_19) self.color_disabled_lbl.setMinimumSize(QtCore.QSize(0, 24)) self.color_disabled_lbl.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_disabled_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.color_disabled_lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.color_disabled_lbl.setObjectName("color_disabled_lbl") self.gridLayout_3.addWidget(self.color_disabled_lbl, 2, 3, 1, 1) self.color_foregalt_lbl = QtWidgets.QLabel(self.frame_19) @@ -5141,25 +5139,25 @@ def setupUi(self, MainWindow): self.color_foregrnd_lbl.setObjectName("color_foregrnd_lbl") self.gridLayout_3.addWidget(self.color_foregrnd_lbl, 0, 1, 1, 1) self.color_foregrnd = PushButton(self.frame_19) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.color_foregrnd.sizePolicy().hasHeightForWidth()) self.color_foregrnd.setSizePolicy(sizePolicy) self.color_foregrnd.setMinimumSize(QtCore.QSize(0, 0)) self.color_foregrnd.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.color_foregrnd.setFocusPolicy(QtCore.Qt.ClickFocus) + self.color_foregrnd.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.color_foregrnd.setObjectName("color_foregrnd") self.gridLayout_3.addWidget(self.color_foregrnd, 0, 0, 1, 1) - spacerItem27 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem27 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.gridLayout_3.addItem(spacerItem27, 0, 2, 1, 1) self.verticalLayout_44.addWidget(self.frame_19) - spacerItem28 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem28 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_44.addItem(spacerItem28) self.frame_13 = QtWidgets.QFrame(self.gui_frame) self.frame_13.setMinimumSize(QtCore.QSize(0, 0)) - self.frame_13.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_13.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_13.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_13.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_13.setObjectName("frame_13") self.gridLayout_15 = QtWidgets.QGridLayout(self.frame_13) self.gridLayout_15.setContentsMargins(4, 0, 4, 0) @@ -5167,18 +5165,18 @@ def setupUi(self, MainWindow): self.gridLayout_15.setVerticalSpacing(10) self.gridLayout_15.setObjectName("gridLayout_15") self.label_33 = QtWidgets.QLabel(self.frame_13) - self.label_33.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_33.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_33.setObjectName("label_33") self.gridLayout_15.addWidget(self.label_33, 1, 3, 1, 1) self.opt_stp = ActionButton(self.frame_13) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.opt_stp.sizePolicy().hasHeightForWidth()) self.opt_stp.setSizePolicy(sizePolicy) self.opt_stp.setMinimumSize(QtCore.QSize(0, 0)) self.opt_stp.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.opt_stp.setFocusPolicy(QtCore.Qt.ClickFocus) + self.opt_stp.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.opt_stp.setText("") self.opt_stp.setCheckable(True) self.opt_stp.setProperty("indicator_option", False) @@ -5191,23 +5189,23 @@ def setupUi(self, MainWindow): self.opt_stp.setObjectName("opt_stp") self.gridLayout_15.addWidget(self.opt_stp, 7, 0, 1, 1) self.chk_keyboard_shortcuts = QtWidgets.QCheckBox(self.frame_13) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.chk_keyboard_shortcuts.sizePolicy().hasHeightForWidth()) self.chk_keyboard_shortcuts.setSizePolicy(sizePolicy) self.chk_keyboard_shortcuts.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.chk_keyboard_shortcuts.setFocusPolicy(QtCore.Qt.ClickFocus) + self.chk_keyboard_shortcuts.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.chk_keyboard_shortcuts.setText("") self.chk_keyboard_shortcuts.setObjectName("chk_keyboard_shortcuts") self.gridLayout_15.addWidget(self.chk_keyboard_shortcuts, 1, 4, 1, 1) - spacerItem29 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) + spacerItem29 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Minimum) self.gridLayout_15.addItem(spacerItem29, 7, 2, 1, 1) self.label_20 = QtWidgets.QLabel(self.frame_13) self.label_20.setObjectName("label_20") self.gridLayout_15.addWidget(self.label_20, 2, 1, 1, 1) self.chk_overlay = QtWidgets.QCheckBox(self.frame_13) - self.chk_overlay.setFocusPolicy(QtCore.Qt.ClickFocus) + self.chk_overlay.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.chk_overlay.setText("") self.chk_overlay.setObjectName("chk_overlay") self.gridLayout_15.addWidget(self.chk_overlay, 2, 0, 1, 1) @@ -5215,25 +5213,25 @@ def setupUi(self, MainWindow): self.label_36.setObjectName("label_36") self.gridLayout_15.addWidget(self.label_36, 7, 1, 1, 1) self.chk_soft_keyboard = QtWidgets.QCheckBox(self.frame_13) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.chk_soft_keyboard.sizePolicy().hasHeightForWidth()) self.chk_soft_keyboard.setSizePolicy(sizePolicy) self.chk_soft_keyboard.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.chk_soft_keyboard.setFocusPolicy(QtCore.Qt.ClickFocus) + self.chk_soft_keyboard.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.chk_soft_keyboard.setText("") self.chk_soft_keyboard.setObjectName("chk_soft_keyboard") self.gridLayout_15.addWidget(self.chk_soft_keyboard, 1, 0, 1, 1) self.opt_blk = ActionButton(self.frame_13) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.opt_blk.sizePolicy().hasHeightForWidth()) self.opt_blk.setSizePolicy(sizePolicy) self.opt_blk.setMinimumSize(QtCore.QSize(0, 0)) self.opt_blk.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.opt_blk.setFocusPolicy(QtCore.Qt.ClickFocus) + self.opt_blk.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.opt_blk.setText("") self.opt_blk.setCheckable(True) self.opt_blk.setProperty("indicator_option", False) @@ -5249,17 +5247,17 @@ def setupUi(self, MainWindow): self.label_46.setObjectName("label_46") self.gridLayout_15.addWidget(self.label_46, 3, 1, 1, 1) self.label_37 = QtWidgets.QLabel(self.frame_13) - self.label_37.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_37.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_37.setObjectName("label_37") self.gridLayout_15.addWidget(self.label_37, 7, 3, 1, 1) self.chk_run_from_line = QtWidgets.QCheckBox(self.frame_13) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.chk_run_from_line.sizePolicy().hasHeightForWidth()) self.chk_run_from_line.setSizePolicy(sizePolicy) self.chk_run_from_line.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.chk_run_from_line.setFocusPolicy(QtCore.Qt.ClickFocus) + self.chk_run_from_line.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.chk_run_from_line.setText("") self.chk_run_from_line.setObjectName("chk_run_from_line") self.gridLayout_15.addWidget(self.chk_run_from_line, 4, 0, 1, 1) @@ -5267,59 +5265,59 @@ def setupUi(self, MainWindow): self.label_26.setObjectName("label_26") self.gridLayout_15.addWidget(self.label_26, 1, 1, 1, 1) self.chk_exit_warning = QtWidgets.QCheckBox(self.frame_13) - self.chk_exit_warning.setFocusPolicy(QtCore.Qt.ClickFocus) + self.chk_exit_warning.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.chk_exit_warning.setText("") self.chk_exit_warning.setObjectName("chk_exit_warning") self.gridLayout_15.addWidget(self.chk_exit_warning, 3, 0, 1, 1) self.chk_tool_tips = QtWidgets.QCheckBox(self.frame_13) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.chk_tool_tips.sizePolicy().hasHeightForWidth()) self.chk_tool_tips.setSizePolicy(sizePolicy) - self.chk_tool_tips.setFocusPolicy(QtCore.Qt.ClickFocus) + self.chk_tool_tips.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.chk_tool_tips.setText("") self.chk_tool_tips.setObjectName("chk_tool_tips") self.gridLayout_15.addWidget(self.chk_tool_tips, 2, 4, 1, 1) self.label_38 = QtWidgets.QLabel(self.frame_13) - self.label_38.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_38.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_38.setObjectName("label_38") self.gridLayout_15.addWidget(self.label_38, 2, 3, 1, 1) self.chk_override_limits = QtWidgets.QCheckBox(self.frame_13) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.chk_override_limits.sizePolicy().hasHeightForWidth()) self.chk_override_limits.setSizePolicy(sizePolicy) self.chk_override_limits.setMinimumSize(QtCore.QSize(0, 0)) self.chk_override_limits.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.chk_override_limits.setFocusPolicy(QtCore.Qt.ClickFocus) + self.chk_override_limits.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.chk_override_limits.setText("") self.chk_override_limits.setObjectName("chk_override_limits") self.gridLayout_15.addWidget(self.chk_override_limits, 3, 4, 1, 1) self.label_42 = QtWidgets.QLabel(self.frame_13) - self.label_42.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_42.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_42.setObjectName("label_42") self.gridLayout_15.addWidget(self.label_42, 3, 3, 1, 1) self.chk_override_jog = QtWidgets.QCheckBox(self.frame_13) - self.chk_override_jog.setFocusPolicy(QtCore.Qt.ClickFocus) + self.chk_override_jog.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.chk_override_jog.setText("") self.chk_override_jog.setObjectName("chk_override_jog") self.gridLayout_15.addWidget(self.chk_override_jog, 4, 4, 1, 1) self.label_48 = QtWidgets.QLabel(self.frame_13) - self.label_48.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_48.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_48.setObjectName("label_48") self.gridLayout_15.addWidget(self.label_48, 4, 3, 1, 1) self.label_39 = QtWidgets.QLabel(self.frame_13) - self.label_39.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_39.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_39.setObjectName("label_39") self.gridLayout_15.addWidget(self.label_39, 4, 1, 1, 1) self.verticalLayout_44.addWidget(self.frame_13) - spacerItem30 = QtWidgets.QSpacerItem(20, 82, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem30 = QtWidgets.QSpacerItem(20, 82, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_44.addItem(spacerItem30) self.frame_11 = QtWidgets.QFrame(self.gui_frame) - self.frame_11.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_11.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_11.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_11.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_11.setObjectName("frame_11") self.gridLayout_14 = QtWidgets.QGridLayout(self.frame_11) self.gridLayout_14.setContentsMargins(4, 0, 4, 0) @@ -5333,7 +5331,7 @@ def setupUi(self, MainWindow): self.label_40.setObjectName("label_40") self.gridLayout_14.addWidget(self.label_40, 4, 1, 1, 1) self.grid_size = DoubleScale(self.frame_11) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.grid_size.sizePolicy().hasHeightForWidth()) @@ -5341,7 +5339,7 @@ def setupUi(self, MainWindow): self.grid_size.setMinimumSize(QtCore.QSize(120, 0)) self.grid_size.setMaximumSize(QtCore.QSize(120, 16777215)) self.grid_size.setWrapping(True) - self.grid_size.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.grid_size.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.grid_size.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.grid_size.setAccelerated(True) self.grid_size.setDecimals(2) @@ -5351,7 +5349,7 @@ def setupUi(self, MainWindow): self.grid_size.setObjectName("grid_size") self.gridLayout_14.addWidget(self.grid_size, 0, 0, 1, 1) self.table_zoom_scale = DoubleScale(self.frame_11) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.table_zoom_scale.sizePolicy().hasHeightForWidth()) @@ -5359,7 +5357,7 @@ def setupUi(self, MainWindow): self.table_zoom_scale.setMinimumSize(QtCore.QSize(120, 0)) self.table_zoom_scale.setMaximumSize(QtCore.QSize(120, 16777215)) self.table_zoom_scale.setWrapping(True) - self.table_zoom_scale.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.table_zoom_scale.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.table_zoom_scale.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.table_zoom_scale.setAccelerated(True) self.table_zoom_scale.setSuffix("") @@ -5371,7 +5369,7 @@ def setupUi(self, MainWindow): self.table_zoom_scale.setObjectName("table_zoom_scale") self.gridLayout_14.addWidget(self.table_zoom_scale, 4, 0, 1, 1) self.cone_size = DoubleScale(self.frame_11) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cone_size.sizePolicy().hasHeightForWidth()) @@ -5379,7 +5377,7 @@ def setupUi(self, MainWindow): self.cone_size.setMinimumSize(QtCore.QSize(120, 0)) self.cone_size.setMaximumSize(QtCore.QSize(120, 16777215)) self.cone_size.setWrapping(True) - self.cone_size.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cone_size.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cone_size.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus) self.cone_size.setAccelerated(True) self.cone_size.setSuffix("") @@ -5394,63 +5392,63 @@ def setupUi(self, MainWindow): self.label_10.setObjectName("label_10") self.gridLayout_14.addWidget(self.label_10, 1, 1, 1, 1) self.default_material = QtWidgets.QComboBox(self.frame_11) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.default_material.sizePolicy().hasHeightForWidth()) self.default_material.setSizePolicy(sizePolicy) self.default_material.setMinimumSize(QtCore.QSize(120, 0)) self.default_material.setMaximumSize(QtCore.QSize(120, 16777215)) - self.default_material.setFocusPolicy(QtCore.Qt.ClickFocus) + self.default_material.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.default_material.setObjectName("default_material") self.gridLayout_14.addWidget(self.default_material, 5, 0, 1, 1) self.label_51 = QtWidgets.QLabel(self.frame_11) self.label_51.setObjectName("label_51") self.gridLayout_14.addWidget(self.label_51, 5, 1, 1, 1) self.verticalLayout_44.addWidget(self.frame_11) - spacerItem31 = QtWidgets.QSpacerItem(20, 82, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem31 = QtWidgets.QSpacerItem(20, 82, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_44.addItem(spacerItem31) self.horizontalLayout_37.addWidget(self.gui_frame) - spacerItem32 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem32 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_37.addItem(spacerItem32) self.entries_frame = QtWidgets.QFrame(self.settings_tab) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.entries_frame.sizePolicy().hasHeightForWidth()) self.entries_frame.setSizePolicy(sizePolicy) self.entries_frame.setMinimumSize(QtCore.QSize(0, 0)) - self.entries_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.entries_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.entries_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.entries_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.entries_frame.setObjectName("entries_frame") self.verticalLayout_56 = QtWidgets.QVBoxLayout(self.entries_frame) self.verticalLayout_56.setContentsMargins(0, 0, 0, 0) self.verticalLayout_56.setSpacing(4) self.verticalLayout_56.setObjectName("verticalLayout_56") self.ub_frame = QtWidgets.QFrame(self.entries_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_frame.sizePolicy().hasHeightForWidth()) self.ub_frame.setSizePolicy(sizePolicy) self.ub_frame.setMinimumSize(QtCore.QSize(720, 0)) self.ub_frame.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.ub_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.ub_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.ub_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.ub_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.ub_frame.setObjectName("ub_frame") self.verticalLayout_57 = QtWidgets.QVBoxLayout(self.ub_frame) self.verticalLayout_57.setContentsMargins(0, 0, 0, 4) self.verticalLayout_57.setSpacing(4) self.verticalLayout_57.setObjectName("verticalLayout_57") self.frame_42 = QtWidgets.QFrame(self.ub_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.frame_42.sizePolicy().hasHeightForWidth()) self.frame_42.setSizePolicy(sizePolicy) self.frame_42.setMinimumSize(QtCore.QSize(0, 0)) - self.frame_42.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_42.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_42.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_42.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_42.setObjectName("frame_42") self.horizontalLayout_38 = QtWidgets.QHBoxLayout(self.frame_42) self.horizontalLayout_38.setContentsMargins(0, 0, 0, 0) @@ -5459,31 +5457,31 @@ def setupUi(self, MainWindow): self.ub_save = QtWidgets.QPushButton(self.frame_42) self.ub_save.setMinimumSize(QtCore.QSize(60, 16)) self.ub_save.setMaximumSize(QtCore.QSize(60, 16)) - self.ub_save.setFocusPolicy(QtCore.Qt.ClickFocus) + self.ub_save.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.ub_save.setObjectName("ub_save") self.horizontalLayout_38.addWidget(self.ub_save) self.ub_label = QtWidgets.QLabel(self.frame_42) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_label.sizePolicy().hasHeightForWidth()) self.ub_label.setSizePolicy(sizePolicy) self.ub_label.setMinimumSize(QtCore.QSize(60, 16)) self.ub_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.ub_label.setAlignment(QtCore.Qt.AlignCenter) + self.ub_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.ub_label.setObjectName("ub_label") self.horizontalLayout_38.addWidget(self.ub_label) self.ub_reload = QtWidgets.QPushButton(self.frame_42) self.ub_reload.setMinimumSize(QtCore.QSize(60, 16)) self.ub_reload.setMaximumSize(QtCore.QSize(60, 16)) - self.ub_reload.setFocusPolicy(QtCore.Qt.ClickFocus) + self.ub_reload.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.ub_reload.setObjectName("ub_reload") self.horizontalLayout_38.addWidget(self.ub_reload) self.verticalLayout_57.addWidget(self.frame_42) self.frame_40 = QtWidgets.QFrame(self.ub_frame) self.frame_40.setMinimumSize(QtCore.QSize(0, 30)) - self.frame_40.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_40.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_40.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_40.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_40.setObjectName("frame_40") self.horizontalLayout_41 = QtWidgets.QHBoxLayout(self.frame_40) self.horizontalLayout_41.setContentsMargins(4, 0, 4, 0) @@ -5493,38 +5491,38 @@ def setupUi(self, MainWindow): self.ub_num.setMinimumSize(QtCore.QSize(17, 20)) self.ub_num.setMaximumSize(QtCore.QSize(17, 20)) self.ub_num.setText("") - self.ub_num.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num.setObjectName("ub_num") self.horizontalLayout_41.addWidget(self.ub_num) self.ub_name = QtWidgets.QLabel(self.frame_40) self.ub_name.setMinimumSize(QtCore.QSize(142, 16)) self.ub_name.setMaximumSize(QtCore.QSize(142, 16)) - self.ub_name.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ub_name.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_name.setObjectName("ub_name") self.horizontalLayout_41.addWidget(self.ub_name) self.ub_code = QtWidgets.QLabel(self.frame_40) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_code.sizePolicy().hasHeightForWidth()) self.ub_code.setSizePolicy(sizePolicy) self.ub_code.setMinimumSize(QtCore.QSize(0, 16)) self.ub_code.setMaximumSize(QtCore.QSize(16777215, 16)) - self.ub_code.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ub_code.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_code.setObjectName("ub_code") self.horizontalLayout_41.addWidget(self.ub_code) self.horizontalLayout_41.setStretch(2, 1) self.verticalLayout_57.addWidget(self.frame_40) self.scrollArea = QtWidgets.QScrollArea(self.ub_frame) self.scrollArea.setMinimumSize(QtCore.QSize(0, 20)) - self.scrollArea.setFocusPolicy(QtCore.Qt.ClickFocus) - self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame) - self.scrollArea.setFrameShadow(QtWidgets.QFrame.Plain) + self.scrollArea.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) + self.scrollArea.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.scrollArea.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.scrollArea.setWidgetResizable(True) self.scrollArea.setObjectName("scrollArea") self.scrollAreaWidgetContents = QtWidgets.QWidget() self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 720, 695)) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.scrollAreaWidgetContents.sizePolicy().hasHeightForWidth()) @@ -5536,7 +5534,7 @@ def setupUi(self, MainWindow): self.gridLayout_17.setVerticalSpacing(12) self.gridLayout_17.setObjectName("gridLayout_17") self.ub_name_16 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_16.sizePolicy().hasHeightForWidth()) @@ -5546,7 +5544,7 @@ def setupUi(self, MainWindow): self.ub_name_16.setObjectName("ub_name_16") self.gridLayout_17.addWidget(self.ub_name_16, 16, 1, 1, 1) self.ub_name_9 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_9.sizePolicy().hasHeightForWidth()) @@ -5558,7 +5556,7 @@ def setupUi(self, MainWindow): self.ub_num_9 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_9.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_9.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_9.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_9.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_9.setObjectName("ub_num_9") self.gridLayout_17.addWidget(self.ub_num_9, 9, 0, 1, 1) self.ub_code_9 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) @@ -5574,7 +5572,7 @@ def setupUi(self, MainWindow): self.ub_num_17 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_17.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_17.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_17.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_17.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_17.setObjectName("ub_num_17") self.gridLayout_17.addWidget(self.ub_num_17, 17, 0, 1, 1) self.ub_code_2 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) @@ -5585,7 +5583,7 @@ def setupUi(self, MainWindow): self.ub_num_14 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_14.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_14.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_14.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_14.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_14.setObjectName("ub_num_14") self.gridLayout_17.addWidget(self.ub_num_14, 14, 0, 1, 1) self.ub_code_8 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) @@ -5594,7 +5592,7 @@ def setupUi(self, MainWindow): self.ub_code_8.setObjectName("ub_code_8") self.gridLayout_17.addWidget(self.ub_code_8, 8, 2, 1, 1) self.ub_name_10 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_10.sizePolicy().hasHeightForWidth()) @@ -5614,7 +5612,7 @@ def setupUi(self, MainWindow): self.ub_code_18.setObjectName("ub_code_18") self.gridLayout_17.addWidget(self.ub_code_18, 18, 2, 1, 1) self.ub_name_3 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_3.sizePolicy().hasHeightForWidth()) @@ -5624,7 +5622,7 @@ def setupUi(self, MainWindow): self.ub_name_3.setObjectName("ub_name_3") self.gridLayout_17.addWidget(self.ub_name_3, 3, 1, 1, 1) self.ub_name_13 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_13.sizePolicy().hasHeightForWidth()) @@ -5636,7 +5634,7 @@ def setupUi(self, MainWindow): self.ub_num_19 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_19.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_19.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_19.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_19.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_19.setObjectName("ub_num_19") self.gridLayout_17.addWidget(self.ub_num_19, 19, 0, 1, 1) self.ub_code_6 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) @@ -5645,7 +5643,7 @@ def setupUi(self, MainWindow): self.ub_code_6.setObjectName("ub_code_6") self.gridLayout_17.addWidget(self.ub_code_6, 6, 2, 1, 1) self.ub_name_19 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_19.sizePolicy().hasHeightForWidth()) @@ -5660,7 +5658,7 @@ def setupUi(self, MainWindow): self.ub_code_13.setObjectName("ub_code_13") self.gridLayout_17.addWidget(self.ub_code_13, 13, 2, 1, 1) self.ub_name_1 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_1.sizePolicy().hasHeightForWidth()) @@ -5672,11 +5670,11 @@ def setupUi(self, MainWindow): self.ub_num_2 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_2.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_2.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_2.setObjectName("ub_num_2") self.gridLayout_17.addWidget(self.ub_num_2, 2, 0, 1, 1) self.ub_name_7 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_7.sizePolicy().hasHeightForWidth()) @@ -5686,7 +5684,7 @@ def setupUi(self, MainWindow): self.ub_name_7.setObjectName("ub_name_7") self.gridLayout_17.addWidget(self.ub_name_7, 7, 1, 1, 1) self.ub_name_5 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_5.sizePolicy().hasHeightForWidth()) @@ -5701,7 +5699,7 @@ def setupUi(self, MainWindow): self.ub_code_3.setObjectName("ub_code_3") self.gridLayout_17.addWidget(self.ub_code_3, 3, 2, 1, 1) self.ub_name_4 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_4.sizePolicy().hasHeightForWidth()) @@ -5721,7 +5719,7 @@ def setupUi(self, MainWindow): self.ub_code_1.setObjectName("ub_code_1") self.gridLayout_17.addWidget(self.ub_code_1, 1, 2, 1, 1) self.ub_name_17 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_17.sizePolicy().hasHeightForWidth()) @@ -5731,7 +5729,7 @@ def setupUi(self, MainWindow): self.ub_name_17.setObjectName("ub_name_17") self.gridLayout_17.addWidget(self.ub_name_17, 17, 1, 1, 1) self.ub_name_20 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_20.sizePolicy().hasHeightForWidth()) @@ -5743,23 +5741,23 @@ def setupUi(self, MainWindow): self.ub_num_6 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_6.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_6.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_6.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_6.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_6.setObjectName("ub_num_6") self.gridLayout_17.addWidget(self.ub_num_6, 6, 0, 1, 1) self.ub_num_15 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_15.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_15.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_15.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_15.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_15.setObjectName("ub_num_15") self.gridLayout_17.addWidget(self.ub_num_15, 15, 0, 1, 1) self.ub_num_12 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_12.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_12.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_12.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_12.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_12.setObjectName("ub_num_12") self.gridLayout_17.addWidget(self.ub_num_12, 12, 0, 1, 1) self.ub_name_15 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_15.sizePolicy().hasHeightForWidth()) @@ -5771,13 +5769,13 @@ def setupUi(self, MainWindow): self.ub_num_11 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_11.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_11.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_11.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_11.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_11.setObjectName("ub_num_11") self.gridLayout_17.addWidget(self.ub_num_11, 11, 0, 1, 1) self.ub_num_1 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_1.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_1.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_1.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_1.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_1.setObjectName("ub_num_1") self.gridLayout_17.addWidget(self.ub_num_1, 1, 0, 1, 1) self.ub_code_17 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) @@ -5793,7 +5791,7 @@ def setupUi(self, MainWindow): self.ub_num_20 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_20.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_20.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_20.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_20.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_20.setObjectName("ub_num_20") self.gridLayout_17.addWidget(self.ub_num_20, 20, 0, 1, 1) self.ub_code_15 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) @@ -5809,35 +5807,35 @@ def setupUi(self, MainWindow): self.ub_num_16 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_16.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_16.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_16.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_16.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_16.setObjectName("ub_num_16") self.gridLayout_17.addWidget(self.ub_num_16, 16, 0, 1, 1) self.ub_num_10 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_10.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_10.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_10.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_10.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_10.setObjectName("ub_num_10") self.gridLayout_17.addWidget(self.ub_num_10, 10, 0, 1, 1) self.ub_num_18 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_18.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_18.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_18.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_18.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_18.setObjectName("ub_num_18") self.gridLayout_17.addWidget(self.ub_num_18, 18, 0, 1, 1) self.ub_num_3 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_3.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_3.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_3.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_3.setObjectName("ub_num_3") self.gridLayout_17.addWidget(self.ub_num_3, 3, 0, 1, 1) self.ub_num_13 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_13.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_13.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_13.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_13.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_13.setObjectName("ub_num_13") self.gridLayout_17.addWidget(self.ub_num_13, 13, 0, 1, 1) self.ub_name_2 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_2.sizePolicy().hasHeightForWidth()) @@ -5847,7 +5845,7 @@ def setupUi(self, MainWindow): self.ub_name_2.setObjectName("ub_name_2") self.gridLayout_17.addWidget(self.ub_name_2, 2, 1, 1, 1) self.ub_name_8 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_8.sizePolicy().hasHeightForWidth()) @@ -5864,7 +5862,7 @@ def setupUi(self, MainWindow): self.ub_num_7 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_7.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_7.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_7.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_7.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_7.setObjectName("ub_num_7") self.gridLayout_17.addWidget(self.ub_num_7, 7, 0, 1, 1) self.ub_code_5 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) @@ -5873,7 +5871,7 @@ def setupUi(self, MainWindow): self.ub_code_5.setObjectName("ub_code_5") self.gridLayout_17.addWidget(self.ub_code_5, 5, 2, 1, 1) self.ub_name_18 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_18.sizePolicy().hasHeightForWidth()) @@ -5888,7 +5886,7 @@ def setupUi(self, MainWindow): self.ub_code_12.setObjectName("ub_code_12") self.gridLayout_17.addWidget(self.ub_code_12, 12, 2, 1, 1) self.ub_name_6 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_6.sizePolicy().hasHeightForWidth()) @@ -5910,17 +5908,17 @@ def setupUi(self, MainWindow): self.ub_num_8 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_8.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_8.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_8.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_8.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_8.setObjectName("ub_num_8") self.gridLayout_17.addWidget(self.ub_num_8, 8, 0, 1, 1) self.ub_num_5 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_5.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_5.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_5.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_5.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_5.setObjectName("ub_num_5") self.gridLayout_17.addWidget(self.ub_num_5, 5, 0, 1, 1) self.ub_name_14 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_14.sizePolicy().hasHeightForWidth()) @@ -5930,7 +5928,7 @@ def setupUi(self, MainWindow): self.ub_name_14.setObjectName("ub_name_14") self.gridLayout_17.addWidget(self.ub_name_14, 14, 1, 1, 1) self.ub_name_12 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_12.sizePolicy().hasHeightForWidth()) @@ -5940,7 +5938,7 @@ def setupUi(self, MainWindow): self.ub_name_12.setObjectName("ub_name_12") self.gridLayout_17.addWidget(self.ub_name_12, 12, 1, 1, 1) self.ub_name_11 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ub_name_11.sizePolicy().hasHeightForWidth()) @@ -5952,34 +5950,34 @@ def setupUi(self, MainWindow): self.ub_num_4 = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.ub_num_4.setMinimumSize(QtCore.QSize(0, 20)) self.ub_num_4.setMaximumSize(QtCore.QSize(16777215, 20)) - self.ub_num_4.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.ub_num_4.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.ub_num_4.setObjectName("ub_num_4") self.gridLayout_17.addWidget(self.ub_num_4, 4, 0, 1, 1) self.scrollArea.setWidget(self.scrollAreaWidgetContents) self.verticalLayout_57.addWidget(self.scrollArea) self.verticalLayout_56.addWidget(self.ub_frame) self.sd_frame = QtWidgets.QFrame(self.entries_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.sd_frame.sizePolicy().hasHeightForWidth()) self.sd_frame.setSizePolicy(sizePolicy) - self.sd_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.sd_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.sd_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.sd_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.sd_frame.setObjectName("sd_frame") self.verticalLayout_58 = QtWidgets.QVBoxLayout(self.sd_frame) self.verticalLayout_58.setContentsMargins(0, 0, 0, 4) self.verticalLayout_58.setSpacing(4) self.verticalLayout_58.setObjectName("verticalLayout_58") self.frame_43 = QtWidgets.QFrame(self.sd_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.frame_43.sizePolicy().hasHeightForWidth()) self.frame_43.setSizePolicy(sizePolicy) self.frame_43.setMinimumSize(QtCore.QSize(0, 0)) - self.frame_43.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_43.setFrameShadow(QtWidgets.QFrame.Raised) + self.frame_43.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_43.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.frame_43.setObjectName("frame_43") self.horizontalLayout_39 = QtWidgets.QHBoxLayout(self.frame_43) self.horizontalLayout_39.setContentsMargins(0, 0, 0, 0) @@ -5988,35 +5986,35 @@ def setupUi(self, MainWindow): self.sd_save = QtWidgets.QPushButton(self.frame_43) self.sd_save.setMinimumSize(QtCore.QSize(60, 16)) self.sd_save.setMaximumSize(QtCore.QSize(60, 16)) - self.sd_save.setFocusPolicy(QtCore.Qt.ClickFocus) + self.sd_save.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.sd_save.setObjectName("sd_save") self.horizontalLayout_39.addWidget(self.sd_save) self.sd_label = QtWidgets.QLabel(self.frame_43) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.sd_label.sizePolicy().hasHeightForWidth()) self.sd_label.setSizePolicy(sizePolicy) self.sd_label.setMinimumSize(QtCore.QSize(60, 16)) self.sd_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.sd_label.setAlignment(QtCore.Qt.AlignCenter) + self.sd_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.sd_label.setObjectName("sd_label") self.horizontalLayout_39.addWidget(self.sd_label) self.sd_reload = QtWidgets.QPushButton(self.frame_43) self.sd_reload.setMinimumSize(QtCore.QSize(60, 16)) self.sd_reload.setMaximumSize(QtCore.QSize(60, 16)) - self.sd_reload.setFocusPolicy(QtCore.Qt.ClickFocus) + self.sd_reload.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.sd_reload.setObjectName("sd_reload") self.horizontalLayout_39.addWidget(self.sd_reload) self.verticalLayout_58.addWidget(self.frame_43) self.frame_41 = QtWidgets.QFrame(self.sd_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.frame_41.sizePolicy().hasHeightForWidth()) self.frame_41.setSizePolicy(sizePolicy) - self.frame_41.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_41.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_41.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_41.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_41.setObjectName("frame_41") self.verticalLayout_59 = QtWidgets.QVBoxLayout(self.frame_41) self.verticalLayout_59.setContentsMargins(4, 4, 4, 0) @@ -6030,16 +6028,16 @@ def setupUi(self, MainWindow): self.verticalLayout_58.addWidget(self.frame_41) self.verticalLayout_56.addWidget(self.sd_frame) self.horizontalLayout_37.addWidget(self.entries_frame) - spacerItem33 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem33 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_37.addItem(spacerItem33) self.utility_frame = QtWidgets.QFrame(self.settings_tab) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.utility_frame.sizePolicy().hasHeightForWidth()) self.utility_frame.setSizePolicy(sizePolicy) - self.utility_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.utility_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.utility_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.utility_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.utility_frame.setObjectName("utility_frame") self.verticalLayout_37 = QtWidgets.QVBoxLayout(self.utility_frame) self.verticalLayout_37.setContentsMargins(0, 0, 0, 4) @@ -6048,7 +6046,7 @@ def setupUi(self, MainWindow): self.utility_label = QtWidgets.QLabel(self.utility_frame) self.utility_label.setMinimumSize(QtCore.QSize(0, 16)) self.utility_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.utility_label.setAlignment(QtCore.Qt.AlignCenter) + self.utility_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.utility_label.setObjectName("utility_label") self.verticalLayout_37.addWidget(self.utility_label) self.frame_48 = QtWidgets.QFrame(self.utility_frame) @@ -6057,14 +6055,14 @@ def setupUi(self, MainWindow): self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.frame_48) self.verticalLayout_5.setObjectName("verticalLayout_5") self.actionbutton_halshow = ActionButton(self.frame_48) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.actionbutton_halshow.sizePolicy().hasHeightForWidth()) self.actionbutton_halshow.setSizePolicy(sizePolicy) self.actionbutton_halshow.setMinimumSize(QtCore.QSize(90, 50)) self.actionbutton_halshow.setMaximumSize(QtCore.QSize(90, 50)) - self.actionbutton_halshow.setFocusPolicy(QtCore.Qt.ClickFocus) + self.actionbutton_halshow.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.actionbutton_halshow.setProperty("launch_halshow_action", True) self.actionbutton_halshow.setProperty("template_label_option", False) self.actionbutton_halshow.setProperty("joint_number", 0) @@ -6083,14 +6081,14 @@ def setupUi(self, MainWindow): self.actionbutton_halshow.setObjectName("actionbutton_halshow") self.verticalLayout_5.addWidget(self.actionbutton_halshow) self.actionbutton_halscope = ActionButton(self.frame_48) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.actionbutton_halscope.sizePolicy().hasHeightForWidth()) self.actionbutton_halscope.setSizePolicy(sizePolicy) self.actionbutton_halscope.setMinimumSize(QtCore.QSize(90, 50)) self.actionbutton_halscope.setMaximumSize(QtCore.QSize(90, 50)) - self.actionbutton_halscope.setFocusPolicy(QtCore.Qt.ClickFocus) + self.actionbutton_halscope.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.actionbutton_halscope.setProperty("launch_halscope_action", True) self.actionbutton_halscope.setProperty("template_label_option", False) self.actionbutton_halscope.setProperty("joint_number", 0) @@ -6109,14 +6107,14 @@ def setupUi(self, MainWindow): self.actionbutton_halscope.setObjectName("actionbutton_halscope") self.verticalLayout_5.addWidget(self.actionbutton_halscope) self.actionbutton_halmeter = ActionButton(self.frame_48) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.actionbutton_halmeter.sizePolicy().hasHeightForWidth()) self.actionbutton_halmeter.setSizePolicy(sizePolicy) self.actionbutton_halmeter.setMinimumSize(QtCore.QSize(90, 50)) self.actionbutton_halmeter.setMaximumSize(QtCore.QSize(90, 50)) - self.actionbutton_halmeter.setFocusPolicy(QtCore.Qt.ClickFocus) + self.actionbutton_halmeter.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.actionbutton_halmeter.setProperty("launch_halmeter_action", True) self.actionbutton_halmeter.setProperty("template_label_option", False) self.actionbutton_halmeter.setProperty("joint_number", 0) @@ -6135,14 +6133,14 @@ def setupUi(self, MainWindow): self.actionbutton_halmeter.setObjectName("actionbutton_halmeter") self.verticalLayout_5.addWidget(self.actionbutton_halmeter) self.actionbutton_calibration = ActionButton(self.frame_48) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.actionbutton_calibration.sizePolicy().hasHeightForWidth()) self.actionbutton_calibration.setSizePolicy(sizePolicy) self.actionbutton_calibration.setMinimumSize(QtCore.QSize(90, 50)) self.actionbutton_calibration.setMaximumSize(QtCore.QSize(90, 50)) - self.actionbutton_calibration.setFocusPolicy(QtCore.Qt.ClickFocus) + self.actionbutton_calibration.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.actionbutton_calibration.setProperty("launch_calibration_action", True) self.actionbutton_calibration.setProperty("view_type_string", "p") self.actionbutton_calibration.setProperty("textTemplate", "%1.3f in") @@ -6150,14 +6148,14 @@ def setupUi(self, MainWindow): self.actionbutton_calibration.setObjectName("actionbutton_calibration") self.verticalLayout_5.addWidget(self.actionbutton_calibration) self.actionbutton_lcnc_status = ActionButton(self.frame_48) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.actionbutton_lcnc_status.sizePolicy().hasHeightForWidth()) self.actionbutton_lcnc_status.setSizePolicy(sizePolicy) self.actionbutton_lcnc_status.setMinimumSize(QtCore.QSize(90, 50)) self.actionbutton_lcnc_status.setMaximumSize(QtCore.QSize(90, 50)) - self.actionbutton_lcnc_status.setFocusPolicy(QtCore.Qt.ClickFocus) + self.actionbutton_lcnc_status.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.actionbutton_lcnc_status.setProperty("launch_status_action", True) self.actionbutton_lcnc_status.setProperty("template_label_option", False) self.actionbutton_lcnc_status.setProperty("joint_number", 0) @@ -6175,28 +6173,28 @@ def setupUi(self, MainWindow): self.actionbutton_lcnc_status.setProperty("actionName", "tool.status") self.actionbutton_lcnc_status.setObjectName("actionbutton_lcnc_status") self.verticalLayout_5.addWidget(self.actionbutton_lcnc_status) - spacerItem34 = QtWidgets.QSpacerItem(20, 286, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem34 = QtWidgets.QSpacerItem(20, 286, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_5.addItem(spacerItem34) self.set_offsets = QtWidgets.QPushButton(self.frame_48) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.set_offsets.sizePolicy().hasHeightForWidth()) self.set_offsets.setSizePolicy(sizePolicy) self.set_offsets.setMinimumSize(QtCore.QSize(90, 50)) self.set_offsets.setMaximumSize(QtCore.QSize(90, 50)) - self.set_offsets.setFocusPolicy(QtCore.Qt.ClickFocus) + self.set_offsets.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.set_offsets.setObjectName("set_offsets") self.verticalLayout_5.addWidget(self.set_offsets) self.backup = QtWidgets.QPushButton(self.frame_48) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.backup.sizePolicy().hasHeightForWidth()) self.backup.setSizePolicy(sizePolicy) self.backup.setMinimumSize(QtCore.QSize(90, 50)) self.backup.setMaximumSize(QtCore.QSize(90, 50)) - self.backup.setFocusPolicy(QtCore.Qt.ClickFocus) + self.backup.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.backup.setObjectName("backup") self.verticalLayout_5.addWidget(self.backup) self.verticalLayout_37.addWidget(self.frame_48) @@ -6212,8 +6210,8 @@ def setupUi(self, MainWindow): self.horizontalLayout_19.setObjectName("horizontalLayout_19") self.stats_frame = QtWidgets.QFrame(self.stats_tab) self.stats_frame.setMinimumSize(QtCore.QSize(480, 0)) - self.stats_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.stats_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.stats_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.stats_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.stats_frame.setObjectName("stats_frame") self.verticalLayout_26 = QtWidgets.QVBoxLayout(self.stats_frame) self.verticalLayout_26.setContentsMargins(0, 0, 0, 0) @@ -6221,12 +6219,12 @@ def setupUi(self, MainWindow): self.verticalLayout_26.setObjectName("verticalLayout_26") self.stats_label = QtWidgets.QLabel(self.stats_frame) self.stats_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.stats_label.setAlignment(QtCore.Qt.AlignCenter) + self.stats_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.stats_label.setObjectName("stats_label") self.verticalLayout_26.addWidget(self.stats_label) self.frame_36 = QtWidgets.QFrame(self.stats_frame) - self.frame_36.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_36.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_36.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_36.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_36.setObjectName("frame_36") self.gridLayout_5 = QtWidgets.QGridLayout(self.frame_36) self.gridLayout_5.setContentsMargins(4, 0, 4, 0) @@ -6234,155 +6232,155 @@ def setupUi(self, MainWindow): self.gridLayout_5.setVerticalSpacing(16) self.gridLayout_5.setObjectName("gridLayout_5") self.cut_length_reset = QtWidgets.QPushButton(self.frame_36) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_length_reset.sizePolicy().hasHeightForWidth()) self.cut_length_reset.setSizePolicy(sizePolicy) - self.cut_length_reset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.cut_length_reset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.cut_length_reset.setObjectName("cut_length_reset") self.gridLayout_5.addWidget(self.cut_length_reset, 2, 0, 1, 1) self.torch_time_t = QtWidgets.QLabel(self.frame_36) self.torch_time_t.setText("0:00:00") - self.torch_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.torch_time_t.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.torch_time_t.setObjectName("torch_time_t") self.gridLayout_5.addWidget(self.torch_time_t, 6, 3, 1, 1) self.pierce_count_t = QtWidgets.QLabel(self.frame_36) self.pierce_count_t.setText("0") - self.pierce_count_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pierce_count_t.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pierce_count_t.setObjectName("pierce_count_t") self.gridLayout_5.addWidget(self.pierce_count_t, 3, 3, 1, 1) self.cut_length = QtWidgets.QLabel(self.frame_36) self.cut_length.setText("0.00") - self.cut_length.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_length.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_length.setObjectName("cut_length") self.gridLayout_5.addWidget(self.cut_length, 2, 2, 1, 1) self.cut_time_reset = QtWidgets.QPushButton(self.frame_36) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cut_time_reset.sizePolicy().hasHeightForWidth()) self.cut_time_reset.setSizePolicy(sizePolicy) - self.cut_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.cut_time_reset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.cut_time_reset.setObjectName("cut_time_reset") self.gridLayout_5.addWidget(self.cut_time_reset, 7, 0, 1, 1) self.torch_time = QtWidgets.QLabel(self.frame_36) self.torch_time.setText("0:00:00") - self.torch_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.torch_time.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.torch_time.setObjectName("torch_time") self.gridLayout_5.addWidget(self.torch_time, 6, 2, 1, 1) self.label_30 = QtWidgets.QLabel(self.frame_36) - self.label_30.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_30.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_30.setObjectName("label_30") self.gridLayout_5.addWidget(self.label_30, 7, 1, 1, 1) self.label_23 = QtWidgets.QLabel(self.frame_36) self.label_23.setMinimumSize(QtCore.QSize(80, 0)) self.label_23.setMaximumSize(QtCore.QSize(80, 16777215)) - self.label_23.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_23.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_23.setObjectName("label_23") self.gridLayout_5.addWidget(self.label_23, 1, 2, 1, 1) self.run_time_reset = QtWidgets.QPushButton(self.frame_36) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.run_time_reset.sizePolicy().hasHeightForWidth()) self.run_time_reset.setSizePolicy(sizePolicy) - self.run_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.run_time_reset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.run_time_reset.setObjectName("run_time_reset") self.gridLayout_5.addWidget(self.run_time_reset, 9, 0, 1, 1) self.rapid_time_reset = QtWidgets.QPushButton(self.frame_36) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.rapid_time_reset.sizePolicy().hasHeightForWidth()) self.rapid_time_reset.setSizePolicy(sizePolicy) - self.rapid_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.rapid_time_reset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.rapid_time_reset.setObjectName("rapid_time_reset") self.gridLayout_5.addWidget(self.rapid_time_reset, 4, 0, 1, 1) self.label_34 = QtWidgets.QLabel(self.frame_36) - self.label_34.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_34.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_34.setObjectName("label_34") self.gridLayout_5.addWidget(self.label_34, 4, 1, 1, 1) self.label_25 = QtWidgets.QLabel(self.frame_36) self.label_25.setMinimumSize(QtCore.QSize(80, 0)) self.label_25.setMaximumSize(QtCore.QSize(80, 16777215)) - self.label_25.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_25.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_25.setObjectName("label_25") self.gridLayout_5.addWidget(self.label_25, 1, 3, 1, 1) self.run_time_t = QtWidgets.QLabel(self.frame_36) self.run_time_t.setText("0:00:00") - self.run_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.run_time_t.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.run_time_t.setObjectName("run_time_t") self.gridLayout_5.addWidget(self.run_time_t, 9, 3, 1, 1) self.torch_time_reset = QtWidgets.QPushButton(self.frame_36) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.torch_time_reset.sizePolicy().hasHeightForWidth()) self.torch_time_reset.setSizePolicy(sizePolicy) - self.torch_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.torch_time_reset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.torch_time_reset.setObjectName("torch_time_reset") self.gridLayout_5.addWidget(self.torch_time_reset, 6, 0, 1, 1) self.cut_time_t = QtWidgets.QLabel(self.frame_36) self.cut_time_t.setText("0:00:00") - self.cut_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_time_t.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_time_t.setObjectName("cut_time_t") self.gridLayout_5.addWidget(self.cut_time_t, 7, 3, 1, 1) self.cut_length_t = QtWidgets.QLabel(self.frame_36) self.cut_length_t.setText("0.00") - self.cut_length_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_length_t.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_length_t.setObjectName("cut_length_t") self.gridLayout_5.addWidget(self.cut_length_t, 2, 3, 1, 1) self.pierce_count = QtWidgets.QLabel(self.frame_36) self.pierce_count.setText("0") - self.pierce_count.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pierce_count.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pierce_count.setObjectName("pierce_count") self.gridLayout_5.addWidget(self.pierce_count, 3, 2, 1, 1) self.label_32 = QtWidgets.QLabel(self.frame_36) - self.label_32.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_32.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_32.setObjectName("label_32") self.gridLayout_5.addWidget(self.label_32, 9, 1, 1, 1) self.rapid_time = QtWidgets.QLabel(self.frame_36) self.rapid_time.setText("0:00:00") - self.rapid_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.rapid_time.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.rapid_time.setObjectName("rapid_time") self.gridLayout_5.addWidget(self.rapid_time, 4, 2, 1, 1) self.cut_time = QtWidgets.QLabel(self.frame_36) self.cut_time.setText("0:00:00") - self.cut_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_time.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_time.setObjectName("cut_time") self.gridLayout_5.addWidget(self.cut_time, 7, 2, 1, 1) self.cut_length_label = QtWidgets.QLabel(self.frame_36) - self.cut_length_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.cut_length_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.cut_length_label.setObjectName("cut_length_label") self.gridLayout_5.addWidget(self.cut_length_label, 2, 1, 1, 1) self.rapid_time_t = QtWidgets.QLabel(self.frame_36) self.rapid_time_t.setText("0:00:00") - self.rapid_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.rapid_time_t.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.rapid_time_t.setObjectName("rapid_time_t") self.gridLayout_5.addWidget(self.rapid_time_t, 4, 3, 1, 1) self.run_time = QtWidgets.QLabel(self.frame_36) self.run_time.setText("0:00:00") - self.run_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.run_time.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.run_time.setObjectName("run_time") self.gridLayout_5.addWidget(self.run_time, 9, 2, 1, 1) self.all_reset = QtWidgets.QPushButton(self.frame_36) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.all_reset.sizePolicy().hasHeightForWidth()) self.all_reset.setSizePolicy(sizePolicy) - self.all_reset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.all_reset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.all_reset.setObjectName("all_reset") self.gridLayout_5.addWidget(self.all_reset, 13, 0, 1, 1) self.label_28 = QtWidgets.QLabel(self.frame_36) - self.label_28.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_28.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_28.setObjectName("label_28") self.gridLayout_5.addWidget(self.label_28, 3, 1, 1, 1) self.label_22 = QtWidgets.QLabel(self.frame_36) self.label_22.setMinimumSize(QtCore.QSize(180, 0)) self.label_22.setMaximumSize(QtCore.QSize(180, 16777215)) - self.label_22.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_22.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_22.setObjectName("label_22") self.gridLayout_5.addWidget(self.label_22, 1, 1, 1, 1) self.label_27 = QtWidgets.QLabel(self.frame_36) @@ -6390,60 +6388,60 @@ def setupUi(self, MainWindow): self.label_27.setObjectName("label_27") self.gridLayout_5.addWidget(self.label_27, 12, 0, 1, 1) self.pierce_reset = QtWidgets.QPushButton(self.frame_36) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pierce_reset.sizePolicy().hasHeightForWidth()) self.pierce_reset.setSizePolicy(sizePolicy) - self.pierce_reset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.pierce_reset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.pierce_reset.setObjectName("pierce_reset") self.gridLayout_5.addWidget(self.pierce_reset, 3, 0, 1, 1) self.label_31 = QtWidgets.QLabel(self.frame_36) - self.label_31.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_31.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_31.setObjectName("label_31") self.gridLayout_5.addWidget(self.label_31, 6, 1, 1, 1) self.probe_time_reset = QtWidgets.QPushButton(self.frame_36) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.probe_time_reset.sizePolicy().hasHeightForWidth()) self.probe_time_reset.setSizePolicy(sizePolicy) - self.probe_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.probe_time_reset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.probe_time_reset.setObjectName("probe_time_reset") self.gridLayout_5.addWidget(self.probe_time_reset, 5, 0, 1, 1) self.label_35 = QtWidgets.QLabel(self.frame_36) - self.label_35.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_35.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_35.setObjectName("label_35") self.gridLayout_5.addWidget(self.label_35, 5, 1, 1, 1) self.probe_time = QtWidgets.QLabel(self.frame_36) self.probe_time.setText("0:00:00") - self.probe_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.probe_time.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.probe_time.setObjectName("probe_time") self.gridLayout_5.addWidget(self.probe_time, 5, 2, 1, 1) self.probe_time_t = QtWidgets.QLabel(self.frame_36) self.probe_time_t.setText("0:00:00") - self.probe_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.probe_time_t.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.probe_time_t.setObjectName("probe_time_t") self.gridLayout_5.addWidget(self.probe_time_t, 5, 3, 1, 1) self.paused_time_reset = QtWidgets.QPushButton(self.frame_36) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.paused_time_reset.sizePolicy().hasHeightForWidth()) self.paused_time_reset.setSizePolicy(sizePolicy) - self.paused_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus) + self.paused_time_reset.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.paused_time_reset.setObjectName("paused_time_reset") self.gridLayout_5.addWidget(self.paused_time_reset, 8, 0, 1, 1) self.label_50 = QtWidgets.QLabel(self.frame_36) - self.label_50.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_50.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_50.setObjectName("label_50") self.gridLayout_5.addWidget(self.label_50, 8, 1, 1, 1) self.paused_time = QtWidgets.QLabel(self.frame_36) - self.paused_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.paused_time.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.paused_time.setObjectName("paused_time") self.gridLayout_5.addWidget(self.paused_time, 8, 2, 1, 1) self.paused_time_t = QtWidgets.QLabel(self.frame_36) - self.paused_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.paused_time_t.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.paused_time_t.setObjectName("paused_time_t") self.gridLayout_5.addWidget(self.paused_time_t, 8, 3, 1, 1) self.gridLayout_5.setColumnStretch(0, 1) @@ -6451,15 +6449,15 @@ def setupUi(self, MainWindow): self.gridLayout_5.setColumnStretch(2, 1) self.gridLayout_5.setColumnStretch(3, 1) self.verticalLayout_26.addWidget(self.frame_36) - spacerItem35 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem35 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_26.addItem(spacerItem35) self.horizontalLayout_19.addWidget(self.stats_frame) - spacerItem36 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem36 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_19.addItem(spacerItem36) self.pmx_stats_frame = QtWidgets.QFrame(self.stats_tab) self.pmx_stats_frame.setMinimumSize(QtCore.QSize(100, 0)) - self.pmx_stats_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.pmx_stats_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.pmx_stats_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.pmx_stats_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.pmx_stats_frame.setObjectName("pmx_stats_frame") self.verticalLayout_27 = QtWidgets.QVBoxLayout(self.pmx_stats_frame) self.verticalLayout_27.setContentsMargins(0, 0, 0, 0) @@ -6468,13 +6466,13 @@ def setupUi(self, MainWindow): self.pmx_stats_label = QtWidgets.QLabel(self.pmx_stats_frame) self.pmx_stats_label.setMinimumSize(QtCore.QSize(0, 0)) self.pmx_stats_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.pmx_stats_label.setAlignment(QtCore.Qt.AlignCenter) + self.pmx_stats_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.pmx_stats_label.setObjectName("pmx_stats_label") self.verticalLayout_27.addWidget(self.pmx_stats_label) self.frame_35 = QtWidgets.QFrame(self.pmx_stats_frame) self.frame_35.setMinimumSize(QtCore.QSize(100, 0)) - self.frame_35.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_35.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_35.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_35.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_35.setObjectName("frame_35") self.gridLayout_6 = QtWidgets.QGridLayout(self.frame_35) self.gridLayout_6.setContentsMargins(4, 0, 4, 0) @@ -6483,33 +6481,33 @@ def setupUi(self, MainWindow): self.gridLayout_6.setObjectName("gridLayout_6") self.label_29 = QtWidgets.QLabel(self.frame_35) self.label_29.setMinimumSize(QtCore.QSize(80, 0)) - self.label_29.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_29.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_29.setObjectName("label_29") self.gridLayout_6.addWidget(self.label_29, 0, 1, 1, 1) self.pmx_arc_time_label = QtWidgets.QLabel(self.frame_35) - self.pmx_arc_time_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pmx_arc_time_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pmx_arc_time_label.setObjectName("pmx_arc_time_label") self.gridLayout_6.addWidget(self.pmx_arc_time_label, 1, 0, 1, 1) self.label_8 = QtWidgets.QLabel(self.frame_35) self.label_8.setMinimumSize(QtCore.QSize(100, 0)) - self.label_8.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_8.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_8.setObjectName("label_8") self.gridLayout_6.addWidget(self.label_8, 0, 0, 1, 1) self.pmx_arc_time_t = QtWidgets.QLabel(self.frame_35) self.pmx_arc_time_t.setText("0.00") - self.pmx_arc_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.pmx_arc_time_t.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.pmx_arc_time_t.setObjectName("pmx_arc_time_t") self.gridLayout_6.addWidget(self.pmx_arc_time_t, 1, 1, 1, 1) self.verticalLayout_27.addWidget(self.frame_35) - spacerItem37 = QtWidgets.QSpacerItem(20, 701, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem37 = QtWidgets.QSpacerItem(20, 701, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_27.addItem(spacerItem37) self.horizontalLayout_19.addWidget(self.pmx_stats_frame) - spacerItem38 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem38 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_19.addItem(spacerItem38) self.machinelog_frame = QtWidgets.QFrame(self.stats_tab) self.machinelog_frame.setMinimumSize(QtCore.QSize(480, 0)) - self.machinelog_frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.machinelog_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.machinelog_frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.machinelog_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.machinelog_frame.setObjectName("machinelog_frame") self.verticalLayout_23 = QtWidgets.QVBoxLayout(self.machinelog_frame) self.verticalLayout_23.setContentsMargins(0, 0, 0, 4) @@ -6518,22 +6516,22 @@ def setupUi(self, MainWindow): self.machinelog_label = QtWidgets.QLabel(self.machinelog_frame) self.machinelog_label.setMinimumSize(QtCore.QSize(0, 0)) self.machinelog_label.setMaximumSize(QtCore.QSize(16777215, 16)) - self.machinelog_label.setAlignment(QtCore.Qt.AlignCenter) + self.machinelog_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.machinelog_label.setObjectName("machinelog_label") self.verticalLayout_23.addWidget(self.machinelog_label) self.frame_39 = QtWidgets.QFrame(self.machinelog_frame) self.frame_39.setMinimumSize(QtCore.QSize(0, 200)) - self.frame_39.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame_39.setFrameShadow(QtWidgets.QFrame.Plain) + self.frame_39.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame_39.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.frame_39.setObjectName("frame_39") self.verticalLayout_55 = QtWidgets.QVBoxLayout(self.frame_39) self.verticalLayout_55.setContentsMargins(4, 0, 4, 4) self.verticalLayout_55.setSpacing(4) self.verticalLayout_55.setObjectName("verticalLayout_55") self.machinelog = MachineLog(self.frame_39) - self.machinelog.setFocusPolicy(QtCore.Qt.ClickFocus) - self.machinelog.setFrameShape(QtWidgets.QFrame.NoFrame) - self.machinelog.setFrameShadow(QtWidgets.QFrame.Plain) + self.machinelog.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) + self.machinelog.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.machinelog.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) self.machinelog.setObjectName("machinelog") self.verticalLayout_55.addWidget(self.machinelog) self.verticalLayout_23.addWidget(self.frame_39) diff --git a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py index f5a35148c2a..3a97a46e28d 100644 --- a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py +++ b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py @@ -36,11 +36,11 @@ import linuxcnc import hal from OpenGL.GL import glTranslatef -from PyQt5 import QtCore, QtWidgets, QtGui -from PyQt5.QtCore import * -from PyQt5.QtWidgets import * -from PyQt5.QtGui import * -from PyQt5.Qsci import QsciScintilla +from PyQt6 import QtCore, QtWidgets, QtGui +from PyQt6.QtCore import * +from PyQt6.QtWidgets import * +from PyQt6.QtGui import * +from PyQt6.Qsci import QsciScintilla from qtvcp import logger from qtvcp.core import Status, Action, Info, Tool from qtvcp.lib.gcodes import GCodes @@ -65,7 +65,7 @@ from qtvcp.lib.aux_program_loader import Aux_program_loader from plasmac import run_from_line as RFL from rs274.glcanon import GlCanonDraw as DRAW -from qt5_graphics import Lcnc_3dGraphics as DRO +from qtvcp.widgets.gcode_graphics import GCodeGraphics as DRO LOG = logger.getLogger(__name__) KEYBIND = Keylookup() @@ -654,7 +654,7 @@ def new_returnFromDialog(self, w, message): head = _translate('HandlerClass', 'Save Error') msg0 = _translate('HandlerClass', 'The file name') msg1 = _translate('HandlerClass', 'is not allowed') - self.dialog_show_ok(QMessageBox.Warning, f'{head}', f'\n{msg0} "{os.path.basename(path)}" {msg1}\n\n') + self.dialog_show_ok(QMessageBox.Icon.Warning, f'{head}', f'\n{msg0} "{os.path.basename(path)}" {msg1}\n\n') self.w.gcode_editor.getSaveFileName() return @@ -687,24 +687,24 @@ def new_drawText(self, event, qp): qp.setPen(self.w.camview.text_color) qp.setFont(self.w.camview.font) if self.w.camview.pix: - qp.drawText(self.w.camview.rect(), QtCore.Qt.AlignTop, f'{self.w.camview.rotation:0.3f}{self.degreeSymbol}') + qp.drawText(self.w.camview.rect(), QtCore.Qt.AlignmentFlag.AlignTop, f'{self.w.camview.rotation:0.3f}{self.degreeSymbol}') else: - qp.drawText(self.w.camview.rect(), QtCore.Qt.AlignCenter, self.w.camview.text) + qp.drawText(self.w.camview.rect(), QtCore.Qt.AlignmentFlag.AlignCenter, self.w.camview.text) # limit scale and diameter, don't allow mouse rotation def new_wheelEvent(self, event): - mouseState = qApp.mouseButtons() + mouseState = QApplication.instance().mouseButtons() w = self.w.camview.size().width() h = self.w.camview.size().height() if event.angleDelta().y() < 0: - if mouseState == QtCore.Qt.NoButton: + if mouseState == QtCore.Qt.MouseButton.NoButton: self.w.camview.diameter -= 2 - if mouseState == QtCore.Qt.LeftButton: + if mouseState == QtCore.Qt.MouseButton.LeftButton: self.w.camview.scale -= .1 else: - if mouseState == QtCore.Qt.NoButton: + if mouseState == QtCore.Qt.MouseButton.NoButton: self.w.camview.diameter += 2 - if mouseState == QtCore.Qt.LeftButton: + if mouseState == QtCore.Qt.MouseButton.LeftButton: self.w.camview.scale += .1 if self.w.camview.diameter < 2: self.w.camview.diameter = 2 @@ -723,9 +723,9 @@ def new_mousePressEvent(self, event): # don't reset rotation with double click def new_mouseDoubleClickEvent(self, event): - if event.button() & QtCore.Qt.LeftButton: + if event.button() & QtCore.Qt.MouseButton.LeftButton: self.w.camview.scale = 1 - elif event.button() & QtCore.Qt.MiddleButton: + elif event.button() & QtCore.Qt.MouseButton.MiddleButton: self.w.camview.diameter = 20 # patched offset table functions @@ -738,19 +738,19 @@ def new_flags(self, index): if not index.isValid(): return None if index.column() == 9 and index.row() in (0, 1, 2, 3): - return Qt.ItemIsEnabled + return Qt.ItemFlag.ItemIsEnabled elif index.row() == 0: - return Qt.ItemIsEnabled + return Qt.ItemFlag.ItemIsEnabled elif index.row() == 1 and not index.column() == 2: - return Qt.NoItemFlags + return Qt.ItemFlag.NoItemFlags # prevent z axis offset editing elif index.column() == 2: - return Qt.ItemIsEnabled + return Qt.ItemFlag.ItemIsEnabled # prevent g92 offset editing elif index.row() == 2: - return Qt.ItemIsEnabled + return Qt.ItemFlag.ItemIsEnabled else: - return Qt.ItemIsEditable | Qt.ItemIsEnabled | Qt.ItemIsSelectable + return Qt.ItemFlag.ItemIsEditable | Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable # patched qt5_graphics functions def qt5_graphics_patch(self): @@ -1126,12 +1126,12 @@ def init_widgets(self): # for copy/paste control if required self.w.filemanager.copy_control.hide() # add vertical and horizontal scroll bars to the materials QComboBoxs - self.w.material_selector.view().setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded) - self.w.material_selector.view().setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded) - self.w.conv_material.view().setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded) - self.w.conv_material.view().setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded) - self.w.materials_box.view().setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded) - self.w.materials_box.view().setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded) + self.w.material_selector.view().setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded) + self.w.material_selector.view().setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded) + self.w.conv_material.view().setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded) + self.w.conv_material.view().setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded) + self.w.materials_box.view().setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded) + self.w.materials_box.view().setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded) self.w.gcode_display.set_margin_metric(3) self.w.gcode_display.setBraceMatching(False) self.w.gcode_display.setCaretWidth(0) @@ -1167,8 +1167,8 @@ def init_widgets(self): self.w.estop.setEnabled(False) if self.w.estopButton == 1: self.w.estop.hide() - self.w.camview.cross_color = QtCore.Qt.red - self.w.camview.cross_pointer_color = QtCore.Qt.red + self.w.camview.cross_color = QtCore.Qt.GlobalColor.red + self.w.camview.cross_pointer_color = QtCore.Qt.GlobalColor.red self.w.camview.font = QFont('arial,helvetica', 16) self.flashState = False self.flashRate = 4 @@ -1184,7 +1184,7 @@ def init_widgets(self): self.laserButtonState = 'laser' self.camButtonState = 'markedge' self.overlayProgress = QProgressBar(self.w.gcode_display) - self.overlayProgress.setOrientation(Qt.Vertical) + self.overlayProgress.setOrientation(Qt.Orientation.Vertical) self.overlayProgress.setInvertedAppearance(True) self.overlayProgress.setFormat('') self.overlayProgress.hide() @@ -1313,7 +1313,7 @@ def processed_key_event__(self, receiver, event, is_pressed, key, code, shift, c # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in (Qt.Key_Escape, Qt.Key_F1, Qt.Key_F2): + if code not in (Qt.Key.Key_Escape, Qt.Key.Key_F1, Qt.Key.Key_F2): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to flag = False @@ -1356,11 +1356,11 @@ def processed_key_event__(self, receiver, event, is_pressed, key, code, shift, c receiver2 = receiver2.parent() if flag: if is_pressed: - if allowTab and (code == Qt.Key_Tab or code == Qt.Key_BackTab): + if allowTab and (code == Qt.Key.Key_Tab or code == Qt.Key.Key_BackTab): self.keyPressEvent(event) else: receiver.keyPressEvent(event) - if mdiBlank and (code == Qt.Key_Return or code == Qt.Key_Enter): + if mdiBlank and (code == Qt.Key.Key_Return or code == Qt.Key.Key_Enter): self.keyPressEvent(event) event.accept() return True @@ -1529,15 +1529,15 @@ def progress_changed(self, object, percent): if percent < 0: self.overlayProgress.setValue(0) self.overlayProgress.hide() - self.w.gcode_display.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded) - self.w.gcode_display.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded) + self.w.gcode_display.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded) + self.w.gcode_display.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded) else: self.overlayProgress.setValue(percent) self.overlayProgress.show() self.overlayProgress.setFixedHeight(self.w.gcode_display.geometry().height()) self.overlayProgress.move(self.w.gcode_display.geometry().width() - 20, 0) - self.w.gcode_display.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) - self.w.gcode_display.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff) + self.w.gcode_display.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff) + self.w.gcode_display.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff) def user_system_changed(self, obj, data): userSys = self.systemList[int(data)] @@ -1598,7 +1598,7 @@ def file_loaded(self, obj, filename): self.w.gcode_editor.set_margin_metric(3) ACTION.SET_MANUAL_MODE() if not len(self.w.gcode_display.text()): - self.w.gcode_display.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) + self.w.gcode_display.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff) if self.w.main_tab_widget.currentIndex() != self.MAIN: self.w.main_tab_widget.setCurrentIndex(self.MAIN) # forces the view to remain "table view" if T is checked when a file is loaded, or change to table view upon clicking CLEAR @@ -2072,7 +2072,7 @@ def backup_clicked(self): head = _translate('HandlerClass', 'Backup Complete') msg0 = _translate('HandlerClass', 'A compressed backup of the machine configuration including the machine logs has been saved in your home directory as') msg1 = _translate('HandlerClass', 'It is safe to delete this file at any time') - self.dialog_show_ok(QMessageBox.Information, head, f'\n{msg0}:\n{bkpName}\n\n{msg1}\n') + self.dialog_show_ok(QMessageBox.Icon.Information, head, f'\n{msg0}:\n{bkpName}\n\n{msg1}\n') def set_offsets_clicked(self): if self.developmentPin.get(): @@ -2402,7 +2402,7 @@ def web_reload_pressed(self): def closeEvent(self, event): O = self.w.screen_options if self.w.chk_exit_warning.isChecked() or not STATUS.is_interp_idle(): - icon = QMessageBox.Question if STATUS.is_interp_idle() else QMessageBox.Critical + icon = QMessageBox.Icon.Question if STATUS.is_interp_idle() else QMessageBox.Icon.Critical head = _translate('HandlerClass', 'Shutdown') if not STATUS.is_interp_idle(): msg0 = _translate('HandlerClass', 'Current operation is not complete') @@ -2626,7 +2626,7 @@ def editor_close_check(self): head = _translate('HandlerClass', 'Unsaved Editor Changes') msg0 = _translate('HandlerClass', 'Unsaved changes will be lost') msg1 = _translate('HandlerClass', 'Do you want to proceed') - if not self.dialog_show_yesno(QMessageBox.Question, head, f'\n{msg0}\n\n{msg1}?\n'): + if not self.dialog_show_yesno(QMessageBox.Icon.Question, head, f'\n{msg0}\n\n{msg1}?\n'): self.w.preview_stack.setCurrentIndex(self.EDIT) self.w.gcode_editor.editor.setFocus() return False @@ -3284,31 +3284,31 @@ def overlay_update(self, state): def dialog_show_ok(self, icon, title, error, bText=_translate('HandlerClass', 'OK')): msg = QMessageBox(self.w) - buttonY = msg.addButton(QMessageBox.Yes) + buttonY = msg.addButton(QMessageBox.StandardButton.Yes) buttonY.setText(bText) buttonY.setIcon(QIcon()) msg.setIcon(icon) msg.setWindowTitle(title) msg.setText(error) - msg.setWindowFlag(Qt.Popup) - msg.exec_() + msg.setWindowFlag(Qt.WindowType.Popup) + msg.exec() self.dialogError = False return msg def dialog_show_yesno(self, icon, title, error, bY=_translate('HandlerClass', 'YES'), bN=_translate('HandlerClass', 'NO')): msg = QMessageBox(self.w) - buttonY = msg.addButton(QMessageBox.Yes) + buttonY = msg.addButton(QMessageBox.StandardButton.Yes) buttonY.setText(bY) buttonY.setIcon(QIcon()) - buttonN = msg.addButton(QMessageBox.No) + buttonN = msg.addButton(QMessageBox.StandardButton.No) buttonN.setText(bN) buttonN.setIcon(QIcon()) msg.setIcon(icon) msg.setWindowTitle(title) msg.setText(error) - msg.setWindowFlag(Qt.WindowStaysOnTopHint) if 'shutdown' in error else msg.setWindowFlag(Qt.Popup) - choice = msg.exec_() - if choice == QMessageBox.Yes: + msg.setWindowFlag(Qt.WindowType.WindowStaysOnTopHint) if 'shutdown' in error else msg.setWindowFlag(Qt.WindowType.Popup) + choice = msg.exec() + if choice == QMessageBox.StandardButton.Yes: return True else: return False @@ -3330,7 +3330,7 @@ def dialog_input(self, virtkb, title, text, btn1, btn2, delay=None): self.vkb_show(False) elif virtkb in (2, 4, 6): self.vkb_show(True) - valid = dialog.exec_() + valid = dialog.exec() if virtkb < 3: self.vkb_hide() elif virtkb in (3, 4): @@ -3350,14 +3350,14 @@ def dialog_run_from_line(self): leadinDo = QCheckBox() leadinLength = QDoubleSpinBox() leadinAngle = QDoubleSpinBox() - buttons = QDialogButtonBox.Ok | QDialogButtonBox.Cancel + buttons = QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel buttonBox = QDialogButtonBox(buttons) buttonBox.accepted.connect(rFl.accept) buttonBox.rejected.connect(rFl.reject) - buttonBox.button(QDialogButtonBox.Ok).setText(_translate('HandlerClass', 'LOAD')) - buttonBox.button(QDialogButtonBox.Ok).setIcon(QIcon()) - buttonBox.button(QDialogButtonBox.Cancel).setText(_translate('HandlerClass', 'CANCEL')) - buttonBox.button(QDialogButtonBox.Cancel).setIcon(QIcon()) + buttonBox.button(QDialogButtonBox.StandardButton.Ok).setText(_translate('HandlerClass', 'LOAD')) + buttonBox.button(QDialogButtonBox.StandardButton.Ok).setIcon(QIcon()) + buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setText(_translate('HandlerClass', 'CANCEL')) + buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setIcon(QIcon()) layout = QGridLayout() layout.addWidget(lbl1, 0, 0) layout.addWidget(lbl2, 1, 0) @@ -3368,9 +3368,9 @@ def dialog_run_from_line(self): layout.addWidget(leadinAngle, 2, 1) layout.addWidget(buttonBox, 4, 0, 1, 2) rFl.setLayout(layout) - lbl1.setAlignment(Qt.AlignRight | Qt.AlignBottom) - lbl2.setAlignment(Qt.AlignRight | Qt.AlignBottom) - lbl3.setAlignment(Qt.AlignRight | Qt.AlignBottom) + lbl1.setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignBottom) + lbl2.setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignBottom) + lbl3.setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignBottom) if self.units == 'in': leadinLength.setDecimals(2) leadinLength.setSingleStep(0.05) @@ -3387,7 +3387,7 @@ def dialog_run_from_line(self): leadinAngle.setRange(-359, 359) leadinAngle.setWrapping(True) self.vkb_show(True) - result = rFl.exec_() + result = rFl.exec() self.vkb_hide() # load clicked if result: @@ -3402,14 +3402,14 @@ def dialog_rfl_type(self): run = QRadioButton(_translate('HandlerClass', 'HERE TO END')) cut = QRadioButton(_translate('HandlerClass', 'THIS CUTPATH')) lbl = QLabel('') - buttons = QDialogButtonBox.Ok | QDialogButtonBox.Cancel + buttons = QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel buttonBox = QDialogButtonBox(buttons) buttonBox.accepted.connect(rflT.accept) buttonBox.rejected.connect(rflT.reject) - buttonBox.button(QDialogButtonBox.Ok).setText(_translate('HandlerClass', 'OK')) - buttonBox.button(QDialogButtonBox.Ok).setIcon(QIcon()) - buttonBox.button(QDialogButtonBox.Cancel).setText(_translate('HandlerClass', 'CANCEL')) - buttonBox.button(QDialogButtonBox.Cancel).setIcon(QIcon()) + buttonBox.button(QDialogButtonBox.StandardButton.Ok).setText(_translate('HandlerClass', 'OK')) + buttonBox.button(QDialogButtonBox.StandardButton.Ok).setIcon(QIcon()) + buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setText(_translate('HandlerClass', 'CANCEL')) + buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setIcon(QIcon()) layout = QGridLayout() layout.addWidget(run, 0, 0) layout.addWidget(cut, 1, 0) @@ -3418,7 +3418,7 @@ def dialog_rfl_type(self): rflT.setLayout(layout) run.setChecked(True) self.vkb_show(True) - result = rflT.exec_() + result = rflT.exec() self.vkb_hide() # ok clicked if result: @@ -3436,7 +3436,7 @@ def show_cut_critical_dialog(self, rcButtonList): QCheckBox { font-size: 11pt; }' ccr = QDialog(self.w) ccr.setWindowTitle(_translate('HandlerClass', 'Untoggled Cut Critical Buttons')) - icon = QApplication.style().standardIcon(QStyle.SP_MessageBoxWarning) + icon = QApplication.style().standardIcon(QStyle.StandardPixmap.SP_MessageBoxWarning) iconLabel = QLabel() iconLabel.setPixmap(icon.pixmap(32, 32)) msg0 = _translate('HandlerClass', 'The following buttons have not been toggled') @@ -3445,14 +3445,14 @@ def show_cut_critical_dialog(self, rcButtonList): lbl1 = QLabel('') lbl2 = QLabel(f'\n{msg1}\n') lbl2.setStyleSheet("padding-left: 1px;") - buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) + buttonBox = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel) buttonBox.accepted.connect(ccr.accept) buttonBox.rejected.connect(ccr.reject) - buttonBox.button(QDialogButtonBox.Ok).setText(_translate('HandlerClass', 'CONTINUE')) - buttonBox.button(QDialogButtonBox.Ok).setIcon(QIcon()) - buttonBox.button(QDialogButtonBox.Ok).setMinimumWidth(120) - buttonBox.button(QDialogButtonBox.Cancel).setText(_translate('HandlerClass', 'CANCEL')) - buttonBox.button(QDialogButtonBox.Cancel).setIcon(QIcon()) + buttonBox.button(QDialogButtonBox.StandardButton.Ok).setText(_translate('HandlerClass', 'CONTINUE')) + buttonBox.button(QDialogButtonBox.StandardButton.Ok).setIcon(QIcon()) + buttonBox.button(QDialogButtonBox.StandardButton.Ok).setMinimumWidth(120) + buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setText(_translate('HandlerClass', 'CANCEL')) + buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setIcon(QIcon()) hLayout = QHBoxLayout() hLayout.addWidget(iconLabel) hLayout.addWidget(lbl0) @@ -3470,11 +3470,11 @@ def show_cut_critical_dialog(self, rcButtonList): toggleAll.setStyleSheet(checkStyle) vLayout.addWidget(lbl1) vLayout.addWidget(toggleAll) - toggleAll.stateChanged.connect(lambda state: [checkBox.setChecked(state == Qt.Checked) for checkBox in checkBoxes]) + toggleAll.stateChanged.connect(lambda state: [checkBox.setChecked(state == Qt.CheckState.Checked) for checkBox in checkBoxes]) vLayout.addWidget(lbl2) vLayout.addWidget(buttonBox) ccr.setLayout(vLayout) - result = ccr.exec_() + result = ccr.exec() checkList = [checkBox.text() for checkBox in checkBoxes if checkBox.isChecked()] return result, checkList @@ -3669,7 +3669,7 @@ def shutdown_timeout(self): def startup_timeout(self): if STATUS.stat.estop: self.estop_state(True) - self.w.gcode_display.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) + self.w.gcode_display.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff) self.view_t_pressed(self.w.gcodegraphics) self.set_signal_connections() if self.firstRun is True: @@ -4107,14 +4107,14 @@ def user_button_setup(self): elif code == 'user-manual': self.umButton = f'button_{bNum}' self.interlockRules[self.umButton] = self.interlockRules['user-manual_template'].copy() - if util.find_spec("PyQt5.QtWebEngineWidgets") is not None: + if util.find_spec("PyQt6.QtWebEngineWidgets") is not None: self.w.webview.page().loadFinished.connect(self.style_user_manual) self.w.webview.page().setBackgroundColor(QColor(self.backColor)) else: head = _translate('HandlerClass', 'User Button Warning') msg1 = _translate('HandlerClass', 'QtWebEngine dependency missing for user button') msg2 = _translate('HandlerClass', 'User Manual styling will not match GUI') - msg3 = _translate('HandlerClass', 'Fix using "sudo apt install python3-pyqt5.qtwebengine"') + msg3 = _translate('HandlerClass', 'Fix using "sudo apt install python3-pyqt6.qtwebengine"') STATUS.emit('error', linuxcnc.OPERATOR_ERROR, f'{head}:\n{msg1} #{bNum}\n{msg2}\n{msg3}\n') self.w.webview.load(self.umUrl) elif code == 'toggle-joint': @@ -4602,7 +4602,7 @@ def frame_job(self, state): if framingError: head = _translate('HandlerClass', 'Axis Limit Error') framingError += _translate('HandlerClass', '\n\nFrame the job using the torch instead?\n') - response = self.dialog_show_yesno(QMessageBox.Warning, f'{head}', f'\n{framingError}') + response = self.dialog_show_yesno(QMessageBox.Icon.Warning, f'{head}', f'\n{framingError}') if response: framePoints = self.bounds_check_framing()[1] else: @@ -4644,25 +4644,25 @@ def single_cut(self): sC.setWindowTitle(_translate('HandlerClass', 'Single Cut')) l1 = QLabel(_translate('HandlerClass', 'X LENGTH:')) xLength = QDoubleSpinBox() - xLength.setAlignment(Qt.AlignRight) + xLength.setAlignment(Qt.AlignmentFlag.AlignRight) xLength.setMinimum(-9999) xLength.setMaximum(9999) xLength.setDecimals(1) l2 = QLabel(_translate('HandlerClass', 'Y LENGTH:')) yLength = QDoubleSpinBox() - yLength.setAlignment(Qt.AlignRight) + yLength.setAlignment(Qt.AlignmentFlag.AlignRight) yLength.setMinimum(-9999) yLength.setMaximum(9999) yLength.setDecimals(1) l3 = QLabel('') - buttons = QDialogButtonBox.Ok | QDialogButtonBox.Cancel + buttons = QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel buttonBox = QDialogButtonBox(buttons) buttonBox.accepted.connect(sC.accept) buttonBox.rejected.connect(sC.reject) - buttonBox.button(QDialogButtonBox.Ok).setText(_translate('HandlerClass', 'CUT')) - buttonBox.button(QDialogButtonBox.Ok).setIcon(QIcon()) - buttonBox.button(QDialogButtonBox.Cancel).setText(_translate('HandlerClass', 'CANCEL')) - buttonBox.button(QDialogButtonBox.Cancel).setIcon(QIcon()) + buttonBox.button(QDialogButtonBox.StandardButton.Ok).setText(_translate('HandlerClass', 'CUT')) + buttonBox.button(QDialogButtonBox.StandardButton.Ok).setIcon(QIcon()) + buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setText(_translate('HandlerClass', 'CANCEL')) + buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setIcon(QIcon()) layout = QVBoxLayout() layout.addWidget(l1) layout.addWidget(xLength) @@ -4674,7 +4674,7 @@ def single_cut(self): xLength.setValue(self.PREFS.getpref('X length', 0.0, float, 'SINGLE CUT')) yLength.setValue(self.PREFS.getpref('Y length', 0.0, float, 'SINGLE CUT')) self.vkb_show(True) - result = sC.exec_() + result = sC.exec() self.singleCutDialog = False self.refresh_button_states() self.vkb_hide() @@ -5001,7 +5001,7 @@ def delete_material_clicked(self): break head = _translate('HandlerClass', 'Delete Material') msg0 = _translate('HandlerClass', 'Do you really want to delete material') - if not self.dialog_show_yesno(QMessageBox.Question, f'{head}', f'\n{msg0} #{matNum}?\n'): + if not self.dialog_show_yesno(QMessageBox.Icon.Question, f'{head}', f'\n{msg0} #{matNum}?\n'): return self.MATS.remove_section(f'MATERIAL_NUMBER_{matNum}') self.MATS.write(open(self.MATS.fn, 'w')) @@ -5945,7 +5945,7 @@ def openColorDialog(self, widget): self.set_basic_colors() self.set_color_styles() self.preview_stack_changed() - if self.umButton and util.find_spec("PyQt5.QtWebEngineWidgets") is not None: + if self.umButton and util.find_spec("PyQt6.QtWebEngineWidgets") is not None: self.w.webview.page().loadFinished.connect(self.style_user_manual) self.w.webview.page().setBackgroundColor(QColor(self.backColor)) self.w.webview.reload() @@ -6073,19 +6073,19 @@ def custom_stylesheet(self): msg0 = _translate('HandlerClass', 'Invalid number of colors defined') msg1 = _translate('HandlerClass', 'in custom stylesheet header') msg2 = _translate('HandlerClass', 'Reverting to standard stylesheet') - self.dialog_show_ok(QMessageBox.Warning, f'{head}', f'\n{msg0}\n{msg1}\n\n{msg2}\n') + self.dialog_show_ok(QMessageBox.Icon.Warning, f'{head}', f'\n{msg0}\n{msg1}\n\n{msg2}\n') self.standard_stylesheet() except: msg0 = _translate('HandlerClass', 'Cannot open custom stylesheet') msg1 = _translate('HandlerClass', 'Reverting to standard stylesheet') - self.dialog_show_ok(QMessageBox.Warning, f'{head}', f'\n{msg0}\n\n{msg1}\n') + self.dialog_show_ok(QMessageBox.Icon.Warning, f'{head}', f'\n{msg0}\n\n{msg1}\n') self.standard_stylesheet() def color_item(self, item, color, type): image_path = f'{self.IMAGES}{item}.svg' self.image = QPixmap(image_path) colorChange = QPainter(self.image) - colorChange.setCompositionMode(QPainter.CompositionMode_SourceIn) + colorChange.setCompositionMode(QPainter.CompositionMode.CompositionMode_SourceIn) colorChange.fillRect(self.image.rect(), QColor(color)) colorChange.end() if type == 'button': diff --git a/share/qtvcp/screens/qttouchy/qttouchy_handler.py b/share/qtvcp/screens/qttouchy/qttouchy_handler.py index 7ce91b26536..13058c59fa0 100644 --- a/share/qtvcp/screens/qttouchy/qttouchy_handler.py +++ b/share/qtvcp/screens/qttouchy/qttouchy_handler.py @@ -5,7 +5,7 @@ import os import linuxcnc -from PyQt5 import QtCore, QtWidgets, QtGui +from PyQt6 import QtCore, QtWidgets, QtGui from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE @@ -98,8 +98,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to diff --git a/share/qtvcp/screens/tester/tester_handler.py b/share/qtvcp/screens/tester/tester_handler.py index de16a88d675..d88a7d46c55 100644 --- a/share/qtvcp/screens/tester/tester_handler.py +++ b/share/qtvcp/screens/tester/tester_handler.py @@ -5,7 +5,7 @@ import os import linuxcnc -from PyQt5 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE @@ -58,8 +58,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to diff --git a/share/qtvcp/screens/woodpecker/woodpecker_handler.py b/share/qtvcp/screens/woodpecker/woodpecker_handler.py index 07c03281108..b1dc745f735 100644 --- a/share/qtvcp/screens/woodpecker/woodpecker_handler.py +++ b/share/qtvcp/screens/woodpecker/woodpecker_handler.py @@ -2,8 +2,8 @@ import linuxcnc import hal import sys -from PyQt5.QtWidgets import QMessageBox -from PyQt5 import QtCore, QtWidgets, QtGui, uic +from PyQt6.QtWidgets import QMessageBox +from PyQt6 import QtCore, QtWidgets, QtGui, uic 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 @@ -366,7 +366,7 @@ def init_widgets(self): self.w.filemanager_usb.showList() #tool icons self.w.cmb_tool_icons.addItem("SELECT\nICON") - self.w.cmb_tool_icons.view().setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) + self.w.cmb_tool_icons.view().setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) path = os.path.join(PATH.SCREENDIR,PATH.BASENAME, "tool_icons") if os.path.isdir(path): icons = os.listdir(path) @@ -448,8 +448,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2): -# QtCore.Qt.Key_F3,QtCore.Qt.Key_F4,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2): +# QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F4,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to diff --git a/share/qtvcp/screens/x1mill/x1mill_handler.py b/share/qtvcp/screens/x1mill/x1mill_handler.py index 02d8313a026..fad94b2fbf7 100644 --- a/share/qtvcp/screens/x1mill/x1mill_handler.py +++ b/share/qtvcp/screens/x1mill/x1mill_handler.py @@ -5,7 +5,7 @@ import os import linuxcnc -from PyQt5 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets from qtvcp.widgets.mdi_line import MDILine as MDI_WIDGET from qtvcp.widgets.gcode_editor import GcodeEditor as GCODE @@ -63,8 +63,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl): # when typing in MDI, we don't want keybinding to call functions # so we catch and process the events directly. # We do want ESC, F1 and F2 to call keybinding functions though - if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2, - QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5): + if code not in(QtCore.Qt.Key.Key_Escape,QtCore.Qt.Key.Key_F1 ,QtCore.Qt.Key.Key_F2, + QtCore.Qt.Key.Key_F3,QtCore.Qt.Key.Key_F5,QtCore.Qt.Key.Key_F5): # search for the top widget of whatever widget received the event # then check if it's one we want the keypress events to go to diff --git a/src/emc/usr_intf/gremlin/qt5_graphics.py b/src/emc/usr_intf/gremlin/qt5_graphics.py index 1613419507f..889bc0f41b8 100644 --- a/src/emc/usr_intf/gremlin/qt5_graphics.py +++ b/src/emc/usr_intf/gremlin/qt5_graphics.py @@ -8,9 +8,9 @@ from qtvcp import logger LOG = logger.getLogger(__name__) -from PyQt5.QtCore import pyqtProperty, pyqtSignal, QSize, Qt, QTimer -from PyQt5.QtGui import QColor -from PyQt5.QtWidgets import (QApplication, QHBoxLayout, QSlider, +from PyQt6.QtCore import pyqtProperty, pyqtSignal, QSize, Qt, QTimer +from PyQt6.QtGui import QColor +from PyQt6.QtWidgets import (QApplication, QHBoxLayout, QSlider, QWidget, QOpenGLWidget) LIB_GOOD = True @@ -1320,7 +1320,7 @@ def resetfontlarge(self): usage() window = Window(inifilename) window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/src/emc/usr_intf/qtplasmac/pmx485-test.py b/src/emc/usr_intf/qtplasmac/pmx485-test.py index 66b333d5a8e..4ffaa195b9c 100755 --- a/src/emc/usr_intf/qtplasmac/pmx485-test.py +++ b/src/emc/usr_intf/qtplasmac/pmx485-test.py @@ -22,9 +22,9 @@ import os import sys -from PyQt5.QtGui import * -from PyQt5.QtWidgets import * -from PyQt5.QtCore import * +from PyQt6.QtGui import * +from PyQt6.QtWidgets import * +from PyQt6.QtCore import * try: import serial @@ -58,7 +58,7 @@ def __init__(self): '\nsudo apt-get install python3-serial\n' response = QMessageBox() response.setText(msg) - response.exec_() + response.exec() raise SystemExit self.iconPath = 'share/icons/hicolor/scalable/apps/linuxcnc_alt/linuxcncicon_plasma.svg' appPath = os.path.realpath(os.path.dirname(sys.argv[0])) @@ -66,7 +66,7 @@ def __init__(self): self.setWindowIcon(QIcon(os.path.join(self.iconBase, self.iconPath))) self.setWindowTitle('Powermax Communicator') qtRectangle = self.frameGeometry() - centerPoint = QDesktopWidget().availableGeometry().center() + centerPoint = QApplication.primaryScreen().availableGeometry().center() qtRectangle.moveCenter(centerPoint) self.move(qtRectangle.topLeft()) self.createGridLayout() @@ -413,7 +413,7 @@ def dialog_ok(self, icon, title, text): response.setWindowIcon(QIcon(os.path.join(self.iconBase, self.iconPath))) response.setWindowTitle(title) response.setText(text) - response.exec_() + response.exec() return response def createGridLayout(self): @@ -579,4 +579,4 @@ def shut_down(self): app = QApplication(sys.argv) ex = App() app.aboutToQuit.connect(ex.shut_down) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/src/emc/usr_intf/qtplasmac/qtplasmac-materials.py b/src/emc/usr_intf/qtplasmac/qtplasmac-materials.py index 0be62bc9b0f..5855f4bda08 100755 --- a/src/emc/usr_intf/qtplasmac/qtplasmac-materials.py +++ b/src/emc/usr_intf/qtplasmac/qtplasmac-materials.py @@ -22,9 +22,9 @@ import os import sys -from PyQt5.QtCore import * -from PyQt5.QtWidgets import * -from PyQt5.QtGui import * +from PyQt6.QtCore import * +from PyQt6.QtWidgets import * +from PyQt6.QtGui import * class MaterialConverter(QMainWindow, object): @@ -522,7 +522,7 @@ def fusion_dialog(self): QLineEdit { border: 1px solid #ffee06; border-radius: 4 } \ QPushButton {border: 1px solid #ffee06; border-radius: 4; height: 20; width: 80} \ QPushButton:pressed {color: #16160e; background: #ffee06}') - response = dialog.exec_() + response = dialog.exec() if self.inManual.isChecked(): self.fNUM = dNU.text() self.fNAM = dNA.text() @@ -546,4 +546,4 @@ def fusion_dialog(self): app = QApplication(sys.argv) w = MaterialConverter() w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py b/src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py index 866069e9617..68faa871720 100755 --- a/src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py +++ b/src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py @@ -36,9 +36,9 @@ from tkinter import Tk, Label, Text, Scrollbar, Button GUI = 'axis' else: - from PyQt5.QtCore import Qt - from PyQt5.QtGui import QIcon - from PyQt5.QtWidgets import QApplication, QDialog, QScrollArea, QWidget, QVBoxLayout, QLabel, QPushButton, QStyle, QFrame + from PyQt6.QtCore import Qt + from PyQt6.QtGui import QIcon + from PyQt6.QtWidgets import QApplication, QDialog, QScrollArea, QWidget, QVBoxLayout, QLabel, QPushButton, QStyle, QFrame GUI = 'qtplasmac' class Filter(): diff --git a/src/emc/usr_intf/qtvcp/qtvcp.py b/src/emc/usr_intf/qtvcp/qtvcp.py index d496d4ed161..77cd9e2802a 100644 --- a/src/emc/usr_intf/qtvcp/qtvcp.py +++ b/src/emc/usr_intf/qtvcp/qtvcp.py @@ -9,15 +9,15 @@ import subprocess from optparse import Option, OptionParser -from PyQt5 import QtWidgets, QtCore, QtGui +from PyQt6 import QtWidgets, QtCore, QtGui try: - from PyQt5.QtWebEngineWidgets import QWebEngineView as QWebView + from PyQt6.QtWebEngineWidgets import QWebEngineView as QWebView except: try: - from PyQt5.QtWebKitWidgets import QWebView + from PyQt6.QtWebKitWidgets import QWebView except: - print('Qtvcp Error with loading webView - is python3-pyqt5.qtwebengine installed?') + print('Qtvcp Error with loading webView - is python3-pyqt6.qtwebengine installed?') # keep track of the number of traceback errors ERROR_COUNT = 0 @@ -53,7 +53,7 @@ , help='pass USEROPTS strings to handler under self.w.USEROPTIONS_ list variable') ] -from PyQt5.QtCore import QObject, QEvent, pyqtSignal +from PyQt6.QtCore import QObject, QEvent, pyqtSignal class inputFocusFilter(QObject): focusIn = pyqtSignal(object) @@ -552,7 +552,7 @@ def excepthook(self, exc_type, exc_obj, exc_tb): if msg.buttonRole(i) == QtWidgets.QMessageBox.ActionRole: i.click() - retval = msg.exec_() + retval = msg.exec() if retval == QtWidgets.QMessageBox.Abort: #cancel button LOG.critical("Aborted from Error Dialog\n {}\n{}\n".format(self._message,''.join(lines))) self.shutdown() diff --git a/src/hal/user_comps/hal_bridge.py b/src/hal/user_comps/hal_bridge.py index 80fa4fe557c..cdf71f76287 100644 --- a/src/hal/user_comps/hal_bridge.py +++ b/src/hal/user_comps/hal_bridge.py @@ -8,7 +8,7 @@ import signal import hal -from PyQt5 import QtCore +from PyQt6 import QtCore from qtvcp.qt_halobjects import Qhal from common.iniinfo import _IStat as IStatParent from common import logger @@ -227,7 +227,7 @@ def __setitem__(self, item, value): if __name__ == "__main__": import sys import getopt - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication letters = 'dh' # the : means an argument needs to be passed after the letter keywords = ['readport=', 'writeport=' ] # the = means that a value is expected after @@ -257,4 +257,4 @@ def __setitem__(self, item, value): app = QApplication(sys.argv) test = Bridge(readport, writeport) - sys.exit(app.exec_()) + sys.exit(app.exec())