Skip to content

Port to PyQt6 #3876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bgermann wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Port to PyQt6 #3876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe65aa1
qtvcp: port PDFViewer to PyQt6, replace popplerqt5 with QPdfDocument
bgermann Mar 19, 2026
c0ba3ea
qtvcp: port to PyQt6
bgermann Mar 19, 2026
8fe1ad2
docs: port to PyQt6
bgermann Mar 23, 2026
aa762d2
Drop old py2 to py3 script handler
bgermann Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions configs/sim/qtvcp_screens/qtaxis_lathe/qtaxis/qtaxis_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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_'})
Expand Down Expand Up @@ -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)

Expand Down
24 changes: 12 additions & 12 deletions configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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")
Expand All @@ -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")
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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':
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions configs/sim/qtvcp_screens/qtvcp_custom/qtdefault_ngc/qtdefault_ngc_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions ...igs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp/qtdefault_gladevcp_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_gladevcp_handler_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions configs/sim/qtvcp_screens/qtvcp_experimental/qtdefault_ngc/qtdefault_ngc_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
24 changes: 12 additions & 12 deletions configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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:')
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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':
Expand Down
4 changes: 2 additions & 2 deletions configs/sim/woodpecker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
2 changes: 1 addition & 1 deletion configs/sim/woodpecker/compensate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions configs/sim/woodpecker/qtvcp/screens/woodpecker/resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down
6 changes: 3 additions & 3 deletions configs/sim/woodpecker/woodpecker_/woodpecker_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions configs/sim/woodpecker/zlevel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -187,5 +187,5 @@ def _mktemp(self):
app = QtWidgets.QApplication(sys.argv)
w = ZLevel()
w.show()
sys.exit( app.exec_() )
sys.exit( app.exec() )

2 changes: 1 addition & 1 deletion debian/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading