Merge pull request FreeCAD#12111 from 3x380V/draft_wb_qt6

Draft: Qt6 fixes

Author: Roy-043

src/Mod/Draft/DraftGui.py

@@ -41,6 +41,7 @@
 import math
 import PySide.QtCore as QtCore
 import PySide.QtGui as QtGui
+import PySide.QtWidgets as QtWidgets
 
 import FreeCAD
 import FreeCADGui
@@ -83,7 +84,7 @@ def _get_incmd_shortcut(itm):
 # Customized widgets
 #---------------------------------------------------------------------------
 
-class DraftBaseWidget(QtGui.QWidget):
+class DraftBaseWidget(QtWidgets.QWidget):
     def __init__(self,parent = None):
         super().__init__(parent)
     def eventFilter(self, widget, event):
@@ -106,7 +107,7 @@ def changeEvent(self, event):
         else:
             super().changeEvent(event)
 
-class DraftLineEdit(QtGui.QLineEdit):
+class DraftLineEdit(QtWidgets.QLineEdit):
     """custom QLineEdit widget that has the power to catch Escape keypress"""
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -130,7 +131,7 @@ def __init__(self,widget,extra=None):
         else:
             self.form = widget
     def getStandardButtons(self):
-        return int(QtGui.QDialogButtonBox.Close)
+        return int(QtWidgets.QDialogButtonBox.Close)
     def accept(self):
         if hasattr(FreeCADGui,"draftToolBar"):
             return FreeCADGui.draftToolBar.validatePoint()
@@ -203,7 +204,7 @@ def __init__(self):
 
         # add only a dummy widget, since widgets are created on demand
         self.baseWidget = DraftBaseWidget()
-        self.tray = QtGui.QToolBar(None)
+        self.tray = QtWidgets.QToolBar(None)
         self.tray.setObjectName("Draft tray")
         self.tray.setWindowTitle("Draft tray")
         self.toptray = self.tray
@@ -221,7 +222,7 @@ def __init__(self):
 
     def _pushbutton(self,name, layout, hide=True, icon=None,
                     width=None, checkable=False, square=False):
-        button = QtGui.QPushButton(self.baseWidget)
+        button = QtWidgets.QPushButton(self.baseWidget)
         button.setObjectName(name)
         if square:
             button.setMaximumSize(QtCore.QSize(button.height(), button.height()))
@@ -241,7 +242,7 @@ def _pushbutton(self,name, layout, hide=True, icon=None,
         return button
 
     def _label (self,name, layout, hide=True, wrap=False):
-        label = QtGui.QLabel(self.baseWidget)
+        label = QtWidgets.QLabel(self.baseWidget)
         label.setObjectName(name)
         if wrap:
             label.setWordWrap(True)
@@ -264,8 +265,8 @@ def _inputfield (self,name, layout, hide=True, width=None):
         inputfield.setObjectName(name)
         if hide: inputfield.hide()
         if not width:
-            sizePolicy = QtGui.QSizePolicy(
-                QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
+            sizePolicy = QtWidgets.QSizePolicy(
+                QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
             inputfield.setSizePolicy(sizePolicy)
             inputfield.setMinimumWidth(110)
         else:
@@ -276,10 +277,10 @@ def _inputfield (self,name, layout, hide=True, width=None):
     def _spinbox (self,name, layout, val=None, vmax=None,
                   hide=True, double=False, size=None):
         if double:
-            sbox = QtGui.QDoubleSpinBox(self.baseWidget)
+            sbox = QtWidgets.QDoubleSpinBox(self.baseWidget)
             sbox.setDecimals(params.get_param("Decimals", path="Units"))
         else:
-            sbox = QtGui.QSpinBox(self.baseWidget)
+            sbox = QtWidgets.QSpinBox(self.baseWidget)
         sbox.setObjectName(name)
         if vmax: sbox.setMaximum(vmax)
         if val: sbox.setValue(val)
@@ -289,15 +290,15 @@ def _spinbox (self,name, layout, val=None, vmax=None,
         return sbox
 
     def _checkbox (self,name, layout, checked=True, hide=True):
-        chk = QtGui.QCheckBox(self.baseWidget)
+        chk = QtWidgets.QCheckBox(self.baseWidget)
         chk.setChecked(checked)
         chk.setObjectName(name)
         if hide: chk.hide()
         layout.addWidget(chk)
         return chk
 
     def _combo (self,name,layout,hide=True):
-        cb = QtGui.QComboBox(self.baseWidget)
+        cb = QtWidgets.QComboBox(self.baseWidget)
         cb.setObjectName(name)
         if hide: cb.hide()
         layout.addWidget(cb)
@@ -316,10 +317,10 @@ def setupToolBar(self,task=False):
 
         # point
 
-        xl = QtGui.QHBoxLayout()
-        yl = QtGui.QHBoxLayout()
-        zl = QtGui.QHBoxLayout()
-        bl = QtGui.QHBoxLayout()
+        xl = QtWidgets.QHBoxLayout()
+        yl = QtWidgets.QHBoxLayout()
+        zl = QtWidgets.QHBoxLayout()
+        bl = QtWidgets.QHBoxLayout()
         self.layout.addLayout(xl)
         self.layout.addLayout(yl)
         self.layout.addLayout(zl)
@@ -340,19 +341,19 @@ def setupToolBar(self,task=False):
 
         # text
 
-        self.textValue = QtGui.QTextEdit(self.baseWidget)
+        self.textValue = QtWidgets.QTextEdit(self.baseWidget)
         self.textValue.setObjectName("textValue")
         self.textValue.setTabChangesFocus(True)
         self.layout.addWidget(self.textValue)
         self.textValue.hide()
-        tl = QtGui.QHBoxLayout()
+        tl = QtWidgets.QHBoxLayout()
         self.layout.addLayout(tl)
         self.textOkButton = self._pushbutton("textButton", tl, icon="button_valid")
 
         # additional line controls
 
-        ll = QtGui.QHBoxLayout()
-        al = QtGui.QHBoxLayout()
+        ll = QtWidgets.QHBoxLayout()
+        al = QtWidgets.QHBoxLayout()
         self.layout.addLayout(ll)
         self.layout.addLayout(al)
         self.labellength = self._label("labellength", ll)
@@ -366,33 +367,33 @@ def setupToolBar(self,task=False):
 
         # options
 
-        fl = QtGui.QHBoxLayout()
+        fl = QtWidgets.QHBoxLayout()
         self.layout.addLayout(fl)
         self.numFacesLabel = self._label("numfaceslabel", fl)
         self.numFaces = self._spinbox("numFaces", fl, 3)
-        ol = QtGui.QHBoxLayout()
+        ol = QtWidgets.QHBoxLayout()
         self.layout.addLayout(ol)
-        rl = QtGui.QHBoxLayout()
+        rl = QtWidgets.QHBoxLayout()
         self.layout.addLayout(rl)
         self.labelRadius = self._label("labelRadius", rl)
         self.radiusValue = self._inputfield("radiusValue", rl)
         self.radiusValue.setText(FreeCAD.Units.Quantity(0,FreeCAD.Units.Length).UserString)
-        bl = QtGui.QHBoxLayout()
+        bl = QtWidgets.QHBoxLayout()
         self.layout.addLayout(bl)
         self.undoButton = self._pushbutton("undoButton", bl, icon='Draft_Rotate')
-        bl = QtGui.QHBoxLayout()
+        bl = QtWidgets.QHBoxLayout()
         self.layout.addLayout(bl)
         self.finishButton = self._pushbutton("finishButton", bl, icon='Draft_Finish')
-        bl = QtGui.QHBoxLayout()
+        bl = QtWidgets.QHBoxLayout()
         self.layout.addLayout(bl)
         self.closeButton = self._pushbutton("closeButton", bl, icon='Draft_Lock')
-        bl = QtGui.QHBoxLayout()
+        bl = QtWidgets.QHBoxLayout()
         self.layout.addLayout(bl)
         self.wipeButton = self._pushbutton("wipeButton", bl, icon='Draft_Wipe')
-        bl = QtGui.QHBoxLayout()
+        bl = QtWidgets.QHBoxLayout()
         self.layout.addLayout(bl)
         self.orientWPButton = self._pushbutton("orientWPButton", bl, icon='Draft_SelectPlane')
-        bl = QtGui.QHBoxLayout()
+        bl = QtWidgets.QHBoxLayout()
         self.layout.addLayout(bl)
         self.selectButton = self._pushbutton("selectButton", bl, icon='view-select')
 
@@ -424,8 +425,8 @@ def setupToolBar(self,task=False):
                                                checked=params.get_param("SubelementMode"))
 
         # spacer
-        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
-                                       QtGui.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum,
+                                       QtWidgets.QSizePolicy.Expanding)
         self.layout.addItem(spacerItem)
 
         QtCore.QObject.connect(self.xValue,QtCore.SIGNAL("valueChanged(double)"),self.changeXValue)
@@ -620,7 +621,7 @@ def taskUi(self,title="Draft",extra=None,icon="Draft_Draft"):
         self.isTaskOn = True
         todo.delay(FreeCADGui.Control.closeDialog,None)
         self.baseWidget = DraftBaseWidget()
-        self.layout = QtGui.QVBoxLayout(self.baseWidget)
+        self.layout = QtWidgets.QVBoxLayout(self.baseWidget)
         self.setupToolBar(task=True)
         self.retranslateUi(self.baseWidget)
         self.panel = DraftTaskPanel(self.baseWidget,extra)
@@ -753,10 +754,10 @@ def pointUi(self, title=translate("draft","Point"), cancel=None, extra=None,
         self.xValue.selectAll()
 
     def labelUi(self,title=translate("draft","Label"),callback=None):
-        w = QtGui.QWidget()
+        w = QtWidgets.QWidget()
         w.setWindowTitle(translate("draft","Label type"))
-        l = QtGui.QVBoxLayout(w)
-        combo = QtGui.QComboBox()
+        l = QtWidgets.QVBoxLayout(w)
+        combo = QtWidgets.QComboBox()
         from draftobjects.label import get_label_types
         types = get_label_types()
         for s in types:
@@ -788,7 +789,7 @@ def offUi(self):
         self.pointcallback = None
         self.mask = None
         self.isTaskOn = False
-        self.baseWidget = QtGui.QWidget()
+        self.baseWidget = QtWidgets.QWidget()
 
     def trimUi(self,title=translate("draft","Trimex")):
         self.taskUi(title, icon="Draft_Trimex")
@@ -906,9 +907,9 @@ def isThere(widget):
     def relocate(self):
         """relocates the right-aligned buttons depending on the toolbar size"""
         if self.baseWidget.geometry().width() < 400:
-            self.layout.setDirection(QtGui.QBoxLayout.TopToBottom)
+            self.layout.setDirection(QtWidgets.QBoxLayout.TopToBottom)
         else:
-            self.layout.setDirection(QtGui.QBoxLayout.LeftToRight)
+            self.layout.setDirection(QtWidgets.QBoxLayout.LeftToRight)
 
     def makeDumbTask(self, extra=None, on_close_call=None):
         """create a dumb taskdialog to prevent deleting the temp object"""
@@ -918,7 +919,7 @@ def __init__(self, extra=None, callback=None):
                     self.form = [extra]
                 self.callback = callback
             def getStandardButtons(self):
-                return int(QtGui.QDialogButtonBox.Close)
+                return int(QtWidgets.QDialogButtonBox.Close)
             def reject(self):
                 if self.callback:
                     self.callback()
@@ -1355,11 +1356,11 @@ def toggleContinue(self):
                 if hasattr(self.panel,"form"):
                     if isinstance(self.panel.form,list):
                         for w in self.panel.form:
-                            c = w.findChild(QtGui.QCheckBox,"ContinueCmd")
+                            c = w.findChild(QtWidgets.QCheckBox,"ContinueCmd")
                             if c:
                                 c.toggle()
                     else:
-                        c = self.panel.form.findChild(QtGui.QCheckBox,"ContinueCmd")
+                        c = self.panel.form.findChild(QtWidgets.QCheckBox,"ContinueCmd")
                         if c:
                             c.toggle()
         except Exception:
@@ -1405,7 +1406,7 @@ def setStyleButton(self):
 
     def popupMenu(self,llist,ilist=None,pos=None):
         """pops up a menu filled with the given list"""
-        self.groupmenu = QtGui.QMenu()
+        self.groupmenu = QtWidgets.QMenu()
         for i,l in enumerate(llist):
             if ilist:
                 self.groupmenu.addAction(ilist[i],l)
@@ -1632,26 +1633,26 @@ class FacebinderTaskPanel:
     def __init__(self):
 
         self.obj = None
-        self.form = QtGui.QWidget()
+        self.form = QtWidgets.QWidget()
         self.form.setObjectName("FacebinderTaskPanel")
-        self.grid = QtGui.QGridLayout(self.form)
+        self.grid = QtWidgets.QGridLayout(self.form)
         self.grid.setObjectName("grid")
-        self.title = QtGui.QLabel(self.form)
+        self.title = QtWidgets.QLabel(self.form)
         self.grid.addWidget(self.title, 0, 0, 1, 2)
 
         # tree
-        self.tree = QtGui.QTreeWidget(self.form)
+        self.tree = QtWidgets.QTreeWidget(self.form)
         self.grid.addWidget(self.tree, 1, 0, 1, 2)
         self.tree.setColumnCount(2)
         self.tree.setHeaderLabels(["Name","Subelement"])
 
         # buttons
-        self.addButton = QtGui.QPushButton(self.form)
+        self.addButton = QtWidgets.QPushButton(self.form)
         self.addButton.setObjectName("addButton")
         self.addButton.setIcon(QtGui.QIcon(":/icons/Arch_Add.svg"))
         self.grid.addWidget(self.addButton, 3, 0, 1, 1)
 
-        self.delButton = QtGui.QPushButton(self.form)
+        self.delButton = QtWidgets.QPushButton(self.form)
         self.delButton.setObjectName("delButton")
         self.delButton.setIcon(QtGui.QIcon(":/icons/Arch_Remove.svg"))
         self.grid.addWidget(self.delButton, 3, 1, 1, 1)
@@ -1667,7 +1668,7 @@ def isAllowedAlterView(self):
         return True
 
     def getStandardButtons(self):
-        return int(QtGui.QDialogButtonBox.Ok)
+        return int(QtWidgets.QDialogButtonBox.Ok)
 
     def update(self):
         """fills the treewidget"""
@@ -1676,12 +1677,12 @@ def update(self):
             for f in self.obj.Faces:
                 if isinstance(f[1],tuple):
                     for subf in f[1]:
-                        item = QtGui.QTreeWidgetItem(self.tree)
+                        item = QtWidgets.QTreeWidgetItem(self.tree)
                         item.setText(0,f[0].Name)
                         item.setIcon(0, QtGui.QIcon(":/icons/Part_3D_object.svg"))
                         item.setText(1,subf)
                 else:
-                    item = QtGui.QTreeWidgetItem(self.tree)
+                    item = QtWidgets.QTreeWidgetItem(self.tree)
                     item.setText(0,f[0].Name)
                     item.setIcon(0, QtGui.QIcon(":/icons/Part_3D_object.svg"))
                     item.setText(1,f[1])
@@ -1739,10 +1740,10 @@ def accept(self):
         return True
 
     def retranslateUi(self, TaskPanel):
-        TaskPanel.setWindowTitle(QtGui.QApplication.translate("draft", "Faces", None))
-        self.delButton.setText(QtGui.QApplication.translate("draft", "Remove", None))
-        self.addButton.setText(QtGui.QApplication.translate("draft", "Add", None))
-        self.title.setText(QtGui.QApplication.translate("draft", "Facebinder elements", None))
+        TaskPanel.setWindowTitle(QtWidgets.QApplication.translate("draft", "Faces", None))
+        self.delButton.setText(QtWidgets.QApplication.translate("draft", "Remove", None))
+        self.addButton.setText(QtWidgets.QApplication.translate("draft", "Add", None))
+        self.title.setText(QtWidgets.QApplication.translate("draft", "Facebinder elements", None))
 
 #def translateWidget(w, context=None, disAmb=None):
 #    '''translator for items where retranslateUi() is unavailable.
@@ -1757,7 +1758,7 @@ def retranslateUi(self, TaskPanel):
 #                w.setWindowTitle(newText)
 
 #    #handle children
-#    wKids = w.findChildren(QtGui.QWidget)
+#    wKids = w.findChildren(QtWidgets.QWidget)
 #    for i in wKids:
 #        className = i.metaObject().className()
 #        if hasattr(i,"text") and hasattr(i,"setText"):

src/Mod/Draft/WorkingPlane.py

@@ -1765,7 +1765,7 @@ def get_working_plane(update=True):
 
 # View observer code to update the Draft Tray:
 if FreeCAD.GuiUp:
-    from PySide2 import QtWidgets
+    from PySide import QtWidgets
     from draftutils.todo import ToDo
 
     def _update_gui():