From cd5d0980b40050ea3591d4c8fff70fb6619fcf04 Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Wed, 18 Jun 2025 10:24:21 +0100 Subject: [PATCH] =?UTF-8?q?[BIM][Draft][CAM]=20preparation=20for=20depreca?= =?UTF-8?q?tion=20of=20QCheckBox=E2=80=A6=20(#21939)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [BIM][Draft]{CAM] preparation for deprecation of QCheckBox stateChanged -> checkStateChanged --- src/Mod/BIM/bimcommands/BimClassification.py | 5 +- src/Mod/BIM/bimcommands/BimIfcElements.py | 5 +- src/Mod/BIM/bimcommands/BimIfcProperties.py | 11 +++-- src/Mod/BIM/bimcommands/BimIfcQuantities.py | 5 +- src/Mod/BIM/bimcommands/BimWall.py | 5 +- src/Mod/BIM/bimcommands/BimWindow.py | 5 +- .../CAM/Path/Base/Gui/PreferencesAdvanced.py | 8 +++- src/Mod/CAM/Path/Dressup/Gui/Boundary.py | 5 +- src/Mod/CAM/Path/Op/Gui/Adaptive.py | 14 ++++-- src/Mod/CAM/Path/Op/Gui/Drilling.py | 20 +++++--- src/Mod/CAM/Path/Op/Gui/Profile.py | 22 ++++++--- src/Mod/CAM/Path/Op/Gui/Slot.py | 5 +- src/Mod/CAM/Path/Op/Gui/Surface.py | 14 ++++-- src/Mod/CAM/Path/Op/Gui/ThreadMilling.py | 5 +- src/Mod/CAM/Path/Op/Gui/Waterline.py | 5 +- src/Mod/Draft/DraftGui.py | 48 +++++++++++++------ src/Mod/Draft/draftguitools/gui_fillets.py | 8 +++- .../Draft/draftguitools/gui_selectplane.py | 5 +- .../drafttaskpanels/task_circulararray.py | 8 +++- .../Draft/drafttaskpanels/task_orthoarray.py | 8 +++- .../Draft/drafttaskpanels/task_polararray.py | 8 +++- .../Draft/drafttaskpanels/task_shapestring.py | 5 +- 22 files changed, 166 insertions(+), 58 deletions(-) diff --git a/src/Mod/BIM/bimcommands/BimClassification.py b/src/Mod/BIM/bimcommands/BimClassification.py index a858215d52..5c38462f6f 100644 --- a/src/Mod/BIM/bimcommands/BimClassification.py +++ b/src/Mod/BIM/bimcommands/BimClassification.py @@ -159,7 +159,10 @@ class BIM_Classification: self.form.treeClass.itemDoubleClicked.connect(self.apply) self.form.search.up.connect(self.onUpArrow) self.form.search.down.connect(self.onDownArrow) - self.form.onlyVisible.stateChanged.connect(self.onVisible) + if hasattr(self.form.onlyVisible, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.onlyVisible.checkStateChanged.connect(self.onVisible) + else: # Qt version < 6.7.0 + self.form.onlyVisible.stateChanged.connect(self.onVisible) # center the dialog over FreeCAD window mw = FreeCADGui.getMainWindow() diff --git a/src/Mod/BIM/bimcommands/BimIfcElements.py b/src/Mod/BIM/bimcommands/BimIfcElements.py index ced59f2d63..736f488e82 100644 --- a/src/Mod/BIM/bimcommands/BimIfcElements.py +++ b/src/Mod/BIM/bimcommands/BimIfcElements.py @@ -95,7 +95,10 @@ class BIM_IfcElements: ) self.form.groupMode.currentIndexChanged.connect(self.update) self.form.tree.clicked.connect(self.onClickTree) - self.form.onlyVisible.stateChanged.connect(self.update) + if hasattr(self.form.onlyVisible, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.onlyVisible.checkStateChanged.connect(self.update) + else: # Qt version < 6.7.0 + self.form.onlyVisible.stateChanged.connect(self.update) self.form.buttonBox.accepted.connect(self.accept) self.form.globalMode.currentIndexChanged.connect(self.onObjectTypeChanged) self.form.globalMaterial.currentIndexChanged.connect(self.onMaterialChanged) diff --git a/src/Mod/BIM/bimcommands/BimIfcProperties.py b/src/Mod/BIM/bimcommands/BimIfcProperties.py index fc99e827b8..d72d7cc9d4 100644 --- a/src/Mod/BIM/bimcommands/BimIfcProperties.py +++ b/src/Mod/BIM/bimcommands/BimIfcProperties.py @@ -139,10 +139,15 @@ class BIM_IfcProperties: # connect signals self.form.tree.selectionModel().selectionChanged.connect(self.updateProperties) self.form.groupMode.currentIndexChanged.connect(self.update) - self.form.onlyVisible.stateChanged.connect(self.onVisible) - self.form.onlySelected.stateChanged.connect(self.onSelected) + if hasattr(self.form.onlyVisible, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.onlyVisible.checkStateChanged.connect(self.update) + self.form.onlySelected.checkStateChanged.connect(self.onSelected) + self.form.onlyMatches.checkStateChanged.connect(self.update) + else: # Qt version < 6.7.0 + self.form.onlyVisible.stateChanged.connect(self.update) + self.form.onlySelected.stateChanged.connect(self.onSelected) + self.form.onlyMatches.stateChanged.connect(self.update) self.form.buttonBox.accepted.connect(self.accept) - self.form.onlyMatches.stateChanged.connect(self.update) self.form.searchField.currentIndexChanged.connect(self.update) self.form.searchField.editTextChanged.connect(self.update) self.form.comboProperty.currentIndexChanged.connect(self.addProperty) diff --git a/src/Mod/BIM/bimcommands/BimIfcQuantities.py b/src/Mod/BIM/bimcommands/BimIfcQuantities.py index 7622eeca9b..f85f8b61ca 100644 --- a/src/Mod/BIM/bimcommands/BimIfcQuantities.py +++ b/src/Mod/BIM/bimcommands/BimIfcQuantities.py @@ -122,7 +122,10 @@ class BIM_IfcQuantities: self.qmodel.dataChanged.connect(self.setChecked) self.form.buttonBox.accepted.connect(self.accept) self.form.quantities.clicked.connect(self.onClickTree) - self.form.onlyVisible.stateChanged.connect(self.update) + if hasattr(self.form.onlyVisible, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.onlyVisible.checkStateChanged.connect(self.update) + else: # Qt version < 6.7.0 + self.form.onlyVisible.stateChanged.connect(self.update) self.form.buttonRefresh.clicked.connect(self.update) self.form.buttonApply.clicked.connect(self.add_qto) diff --git a/src/Mod/BIM/bimcommands/BimWall.py b/src/Mod/BIM/bimcommands/BimWall.py index e94a1f38a8..daeafd839a 100644 --- a/src/Mod/BIM/bimcommands/BimWall.py +++ b/src/Mod/BIM/bimcommands/BimWall.py @@ -358,7 +358,10 @@ class Arch_Wall: inputHeight.valueChanged.connect(self.setHeight) comboAlignment.currentIndexChanged.connect(self.setAlign) inputOffset.valueChanged.connect(self.setOffset) - checkboxUseSketches.stateChanged.connect(self.setUseSketch) + if hasattr(checkboxUseSketches, "checkStateChanged"): # Qt version >= 6.7.0 + checkboxUseSketches.checkStateChanged.connect(self.setUseSketch) + else: # Qt version < 6.7.0 + checkboxUseSketches.stateChanged.connect(self.setUseSketch) comboWallPresets.currentIndexChanged.connect(self.setMat) # Define the workflow of the input fields: diff --git a/src/Mod/BIM/bimcommands/BimWindow.py b/src/Mod/BIM/bimcommands/BimWindow.py index 05ab3d0e00..7ae2e08769 100644 --- a/src/Mod/BIM/bimcommands/BimWindow.py +++ b/src/Mod/BIM/bimcommands/BimWindow.py @@ -315,7 +315,10 @@ class Arch_Window: include = QtGui.QCheckBox(translate("Arch","Auto include in host object")) include.setChecked(True) grid.addWidget(include,0,0,1,2) - include.stateChanged.connect(self.setInclude) + if hasattr(include, "checkStateChanged"): # Qt version >= 6.7.0 + include.checkStateChanged.connect(self.setInclude) + else: # Qt version < 6.7.0 + include.stateChanged.connect(self.setInclude) # sill height labels = QtGui.QLabel(translate("Arch","Sill height")) diff --git a/src/Mod/CAM/Path/Base/Gui/PreferencesAdvanced.py b/src/Mod/CAM/Path/Base/Gui/PreferencesAdvanced.py index 1cab794e0a..cbeffc76e6 100644 --- a/src/Mod/CAM/Path/Base/Gui/PreferencesAdvanced.py +++ b/src/Mod/CAM/Path/Base/Gui/PreferencesAdvanced.py @@ -33,8 +33,12 @@ else: class AdvancedPreferencesPage: def __init__(self, parent=None): self.form = FreeCADGui.PySideUic.loadUi(":preferences/Advanced.ui") - self.form.WarningSuppressAllSpeeds.stateChanged.connect(self.updateSelection) - self.form.EnableAdvancedOCLFeatures.stateChanged.connect(self.updateSelection) + if hasattr(self.form.WarningSuppressAllSpeeds, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.WarningSuppressAllSpeeds.checkStateChanged.connect(self.updateSelection) + self.form.EnableAdvancedOCLFeatures.checkStateChanged.connect(self.updateSelection) + else: # Qt version < 6.7.0 + self.form.WarningSuppressAllSpeeds.stateChanged.connect(self.updateSelection) + self.form.EnableAdvancedOCLFeatures.stateChanged.connect(self.updateSelection) def saveSettings(self): Path.Preferences.setPreferencesAdvanced( diff --git a/src/Mod/CAM/Path/Dressup/Gui/Boundary.py b/src/Mod/CAM/Path/Dressup/Gui/Boundary.py index 56482c31b3..dc2eac675d 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/Boundary.py +++ b/src/Mod/CAM/Path/Dressup/Gui/Boundary.py @@ -182,7 +182,10 @@ class TaskPanel(object): self.form.stockInside.setChecked(self.obj.Inside) self.form.stock.currentIndexChanged.connect(self.updateStockEditor) - self.form.stockInside.stateChanged.connect(self.setDirty) + if hasattr(self.form.stockInside, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.stockInside.checkStateChanged.connect(self.setDirty) + else: # Qt version < 6.7.0 + self.form.stockInside.stateChanged.connect(self.setDirty) self.form.stockExtXneg.textChanged.connect(self.setDirty) self.form.stockExtXpos.textChanged.connect(self.setDirty) self.form.stockExtYneg.textChanged.connect(self.setDirty) diff --git a/src/Mod/CAM/Path/Op/Gui/Adaptive.py b/src/Mod/CAM/Path/Op/Gui/Adaptive.py index c2438dd21c..d16b6ace33 100644 --- a/src/Mod/CAM/Path/Op/Gui/Adaptive.py +++ b/src/Mod/CAM/Path/Op/Gui/Adaptive.py @@ -68,10 +68,16 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): signals.append(self.form.StockToLeave.valueChanged) signals.append(self.form.ZStockToLeave.valueChanged) signals.append(self.form.coolantController.currentIndexChanged) - signals.append(self.form.ForceInsideOut.stateChanged) - signals.append(self.form.FinishingProfile.stateChanged) - signals.append(self.form.useOutline.stateChanged) - signals.append(self.form.orderCutsByRegion.stateChanged) + if hasattr(self.form.ForceInsideOut, "checkStateChanged"): # Qt version >= 6.7.0 + signals.append(self.form.ForceInsideOut.checkStateChanged) + signals.append(self.form.FinishingProfile.checkStateChanged) + signals.append(self.form.useOutline.checkStateChanged) + signals.append(self.form.orderCutsByRegion.checkStateChanged) + else: # Qt version < 6.7.0 + signals.append(self.form.ForceInsideOut.stateChanged) + signals.append(self.form.FinishingProfile.stateChanged) + signals.append(self.form.useOutline.stateChanged) + signals.append(self.form.orderCutsByRegion.stateChanged) signals.append(self.form.StopButton.toggled) return signals diff --git a/src/Mod/CAM/Path/Op/Gui/Drilling.py b/src/Mod/CAM/Path/Op/Gui/Drilling.py index f39afee560..5d14580411 100644 --- a/src/Mod/CAM/Path/Op/Gui/Drilling.py +++ b/src/Mod/CAM/Path/Op/Gui/Drilling.py @@ -188,15 +188,23 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): signals.append(self.form.peckRetractHeight.editingFinished) signals.append(self.form.peckDepth.editingFinished) signals.append(self.form.dwellTime.editingFinished) - signals.append(self.form.dwellEnabled.stateChanged) - signals.append(self.form.peckEnabled.stateChanged) - signals.append(self.form.chipBreakEnabled.stateChanged) + if hasattr(self.form.dwellEnabled, "checkStateChanged"): # Qt version >= 6.7.0 + signals.append(self.form.dwellEnabled.checkStateChanged) + signals.append(self.form.peckEnabled.checkStateChanged) + signals.append(self.form.chipBreakEnabled.checkStateChanged) + else: # Qt version < 6.7.0 + signals.append(self.form.dwellEnabled.stateChanged) + signals.append(self.form.peckEnabled.stateChanged) + signals.append(self.form.chipBreakEnabled.stateChanged) signals.append(self.form.toolController.currentIndexChanged) signals.append(self.form.coolantController.currentIndexChanged) signals.append(self.form.ExtraOffset.currentIndexChanged) - signals.append(self.form.KeepToolDownEnabled.stateChanged) - signals.append(self.form.feedRetractEnabled.stateChanged) - + if hasattr(self.form.KeepToolDownEnabled, "checkStateChanged"): # Qt version >= 6.7.0 + signals.append(self.form.KeepToolDownEnabled.checkStateChanged) + signals.append(self.form.feedRetractEnabled.checkStateChanged) + else: # Qt version < 6.7.0 + signals.append(self.form.KeepToolDownEnabled.stateChanged) + signals.append(self.form.feedRetractEnabled.stateChanged) return signals def updateData(self, obj, prop): diff --git a/src/Mod/CAM/Path/Op/Gui/Profile.py b/src/Mod/CAM/Path/Op/Gui/Profile.py index f7aa0aff22..03146a4356 100644 --- a/src/Mod/CAM/Path/Op/Gui/Profile.py +++ b/src/Mod/CAM/Path/Op/Gui/Profile.py @@ -125,11 +125,18 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): signals.append(self.form.extraOffset.editingFinished) signals.append(self.form.numPasses.editingFinished) signals.append(self.form.stepover.editingFinished) - signals.append(self.form.useCompensation.stateChanged) - signals.append(self.form.useStartPoint.stateChanged) - signals.append(self.form.processHoles.stateChanged) - signals.append(self.form.processPerimeter.stateChanged) - signals.append(self.form.processCircles.stateChanged) + if hasattr(self.form.useCompensation, "checkStateChanged"): # Qt version >= 6.7.0 + signals.append(self.form.useCompensation.checkStateChanged) + signals.append(self.form.useStartPoint.checkStateChanged) + signals.append(self.form.processHoles.checkStateChanged) + signals.append(self.form.processPerimeter.checkStateChanged) + signals.append(self.form.processCircles.checkStateChanged) + else: # Qt version < 6.7.0 + signals.append(self.form.useCompensation.stateChanged) + signals.append(self.form.useStartPoint.stateChanged) + signals.append(self.form.processHoles.stateChanged) + signals.append(self.form.processPerimeter.stateChanged) + signals.append(self.form.processCircles.stateChanged) return signals @@ -159,7 +166,10 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): self.form.stepover.setEnabled(self.obj.NumPasses > 1) def registerSignalHandlers(self, obj): - self.form.useCompensation.stateChanged.connect(self.updateVisibility) + if hasattr(self.form.useCompensation, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.useCompensation.checkStateChanged.connect(self.updateVisibility) + else: # Qt version < 6.7.0 + self.form.useCompensation.stateChanged.connect(self.updateVisibility) self.form.numPasses.editingFinished.connect(self.updateVisibility) diff --git a/src/Mod/CAM/Path/Op/Gui/Slot.py b/src/Mod/CAM/Path/Op/Gui/Slot.py index 0b6ad86cd7..f75d28a25c 100644 --- a/src/Mod/CAM/Path/Op/Gui/Slot.py +++ b/src/Mod/CAM/Path/Op/Gui/Slot.py @@ -142,7 +142,10 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): signals.append(self.form.geo2Reference.currentIndexChanged) signals.append(self.form.layerMode.currentIndexChanged) signals.append(self.form.pathOrientation.currentIndexChanged) - signals.append(self.form.reverseDirection.stateChanged) + if hasattr(self.form.reverseDirection, "checkStateChanged"): # Qt version >= 6.7.0 + signals.append(self.form.reverseDirection.checkStateChanged) + else: # Qt version < 6.7.0 + signals.append(self.form.reverseDirection.stateChanged) return signals def updateVisibility(self, sentObj=None): diff --git a/src/Mod/CAM/Path/Op/Gui/Surface.py b/src/Mod/CAM/Path/Op/Gui/Surface.py index b1103a0a98..68a3ed40cc 100644 --- a/src/Mod/CAM/Path/Op/Gui/Surface.py +++ b/src/Mod/CAM/Path/Op/Gui/Surface.py @@ -217,10 +217,16 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): signals.append(self.form.depthOffset.editingFinished) signals.append(self.form.stepOver.editingFinished) signals.append(self.form.sampleInterval.editingFinished) - signals.append(self.form.useStartPoint.stateChanged) - signals.append(self.form.boundaryEnforcement.stateChanged) - signals.append(self.form.optimizeEnabled.stateChanged) - signals.append(self.form.optimizeStepOverTransitions.stateChanged) + if hasattr(self.form.useStartPoint, "checkStateChanged"): # Qt version >= 6.7.0 + signals.append(self.form.useStartPoint.checkStateChanged) + signals.append(self.form.boundaryEnforcement.checkStateChanged) + signals.append(self.form.optimizeEnabled.checkStateChanged) + signals.append(self.form.optimizeStepOverTransitions.checkStateChanged) + else: # Qt version < 6.7.0 + signals.append(self.form.useStartPoint.stateChanged) + signals.append(self.form.boundaryEnforcement.stateChanged) + signals.append(self.form.optimizeEnabled.stateChanged) + signals.append(self.form.optimizeStepOverTransitions.stateChanged) return signals diff --git a/src/Mod/CAM/Path/Op/Gui/ThreadMilling.py b/src/Mod/CAM/Path/Op/Gui/ThreadMilling.py index 4b6d95c78b..d38c601227 100644 --- a/src/Mod/CAM/Path/Op/Gui/ThreadMilling.py +++ b/src/Mod/CAM/Path/Op/Gui/ThreadMilling.py @@ -229,7 +229,10 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): signals.append(self.form.threadTPI.editingFinished) signals.append(self.form.opDirection.currentIndexChanged) signals.append(self.form.opPasses.editingFinished) - signals.append(self.form.leadInOut.stateChanged) + if hasattr(self.form.leadInOut, "checkStateChanged"): # Qt version >= 6.7.0 + signals.append(self.form.leadInOut.checkStateChanged) + else: # Qt version < 6.7.0 + signals.append(self.form.leadInOut.stateChanged) signals.append(self.form.toolController.currentIndexChanged) diff --git a/src/Mod/CAM/Path/Op/Gui/Waterline.py b/src/Mod/CAM/Path/Op/Gui/Waterline.py index 23347f8a4c..dba1cd1533 100644 --- a/src/Mod/CAM/Path/Op/Gui/Waterline.py +++ b/src/Mod/CAM/Path/Op/Gui/Waterline.py @@ -126,7 +126,10 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): signals.append(self.form.boundaryAdjustment.editingFinished) signals.append(self.form.stepOver.editingFinished) signals.append(self.form.sampleInterval.editingFinished) - signals.append(self.form.optimizeEnabled.stateChanged) + if hasattr(self.form.optimizeEnabled, "checkStateChanged"): # Qt version >= 6.7.0 + signals.append(self.form.optimizeEnabled.checkStateChanged) + else: # Qt version < 6.7.0 + signals.append(self.form.optimizeEnabled.stateChanged) return signals diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py index 96dc3e97c6..01b7f1f95d 100644 --- a/src/Mod/Draft/DraftGui.py +++ b/src/Mod/Draft/DraftGui.py @@ -432,7 +432,10 @@ class DraftToolBar: QtCore.QObject.connect(self.zValue,QtCore.SIGNAL("valueChanged(double)"),self.changeZValue) QtCore.QObject.connect(self.lengthValue,QtCore.SIGNAL("valueChanged(double)"),self.changeLengthValue) QtCore.QObject.connect(self.angleValue,QtCore.SIGNAL("valueChanged(double)"),self.changeAngleValue) - QtCore.QObject.connect(self.angleLock,QtCore.SIGNAL("stateChanged(int)"),self.toggleAngle) + if hasattr(self.angleLock, "checkStateChanged"): # Qt version >= 6.7.0 + QtCore.QObject.connect(self.angleLock,QtCore.SIGNAL("checkStateChanged(int)"),self.toggleAngle) + else: # Qt version < 6.7.0 + QtCore.QObject.connect(self.angleLock,QtCore.SIGNAL("stateChanged(int)"),self.toggleAngle) QtCore.QObject.connect(self.radiusValue,QtCore.SIGNAL("valueChanged(double)"),self.changeRadiusValue) QtCore.QObject.connect(self.xValue,QtCore.SIGNAL("returnPressed()"),self.checkx) QtCore.QObject.connect(self.yValue,QtCore.SIGNAL("returnPressed()"),self.checky) @@ -457,15 +460,22 @@ class DraftToolBar: QtCore.QObject.connect(self.orientWPButton,QtCore.SIGNAL("pressed()"),self.orientWP) QtCore.QObject.connect(self.undoButton,QtCore.SIGNAL("pressed()"),self.undoSegment) QtCore.QObject.connect(self.selectButton,QtCore.SIGNAL("pressed()"),self.selectEdge) - QtCore.QObject.connect(self.continueCmd,QtCore.SIGNAL("stateChanged(int)"),self.setContinue) - QtCore.QObject.connect(self.chainedModeCmd,QtCore.SIGNAL("stateChanged(int)"),self.setChainedMode) - - QtCore.QObject.connect(self.isCopy,QtCore.SIGNAL("stateChanged(int)"),self.setCopymode) - QtCore.QObject.connect(self.isSubelementMode, QtCore.SIGNAL("stateChanged(int)"), self.setSubelementMode) - - QtCore.QObject.connect(self.isRelative,QtCore.SIGNAL("stateChanged(int)"),self.setRelative) - QtCore.QObject.connect(self.isGlobal,QtCore.SIGNAL("stateChanged(int)"),self.setGlobal) - QtCore.QObject.connect(self.makeFace,QtCore.SIGNAL("stateChanged(int)"),self.setMakeFace) + if hasattr(self.continueCmd, "checkStateChanged"): # Qt version >= 6.7.0 + QtCore.QObject.connect(self.continueCmd,QtCore.SIGNAL("checkStateChanged(int)"),self.setContinue) + QtCore.QObject.connect(self.chainedModeCmd,QtCore.SIGNAL("checkStateChanged(int)"),self.setChainedMode) + QtCore.QObject.connect(self.isCopy,QtCore.SIGNAL("checkStateChanged(int)"),self.setCopymode) + QtCore.QObject.connect(self.isSubelementMode, QtCore.SIGNAL("checkStateChanged(int)"), self.setSubelementMode) + QtCore.QObject.connect(self.isRelative,QtCore.SIGNAL("checkStateChanged(int)"),self.setRelative) + QtCore.QObject.connect(self.isGlobal,QtCore.SIGNAL("checkStateChanged(int)"),self.setGlobal) + QtCore.QObject.connect(self.makeFace,QtCore.SIGNAL("checkStateChanged(int)"),self.setMakeFace) + else: # Qt version < 6.7.0 + QtCore.QObject.connect(self.continueCmd,QtCore.SIGNAL("stateChanged(int)"),self.setContinue) + QtCore.QObject.connect(self.chainedModeCmd,QtCore.SIGNAL("stateChanged(int)"),self.setChainedMode) + QtCore.QObject.connect(self.isCopy,QtCore.SIGNAL("stateChanged(int)"),self.setCopymode) + QtCore.QObject.connect(self.isSubelementMode, QtCore.SIGNAL("stateChanged(int)"), self.setSubelementMode) + QtCore.QObject.connect(self.isRelative,QtCore.SIGNAL("stateChanged(int)"),self.setRelative) + QtCore.QObject.connect(self.isGlobal,QtCore.SIGNAL("stateChanged(int)"),self.setGlobal) + QtCore.QObject.connect(self.makeFace,QtCore.SIGNAL("stateChanged(int)"),self.setMakeFace) QtCore.QObject.connect(self.baseWidget,QtCore.SIGNAL("resized()"),self.relocate) QtCore.QObject.connect(self.baseWidget,QtCore.SIGNAL("retranslate()"),self.retranslateUi) @@ -962,7 +972,12 @@ class DraftToolBar: # gui_stretch.py def setRelative(self, val=-1): if val < 0: - QtCore.QObject.disconnect(self.isRelative, + if hasattr(self.isRelative, "checkStateChanged"): # Qt version >= 6.7.0 + QtCore.QObject.disconnect(self.isRelative, + QtCore.SIGNAL("checkStateChanged(int)"), + self.setRelative) + else: # Qt version < 6.7.0 + QtCore.QObject.disconnect(self.isRelative, QtCore.SIGNAL("stateChanged(int)"), self.setRelative) if val == -1: @@ -972,9 +987,14 @@ class DraftToolBar: val = params.get_param("RelativeMode") self.isRelative.setChecked(val) self.relativeMode = val - QtCore.QObject.connect(self.isRelative, - QtCore.SIGNAL("stateChanged(int)"), - self.setRelative) + if hasattr(self.isRelative, "checkStateChanged"): # Qt version >= 6.7.0 + QtCore.QObject.disconnect(self.isRelative, + QtCore.SIGNAL("checkStateChanged(int)"), + self.setRelative) + else: # Qt version < 6.7.0 + QtCore.QObject.disconnect(self.isRelative, + QtCore.SIGNAL("stateChanged(int)"), + self.setRelative) else: params.set_param("RelativeMode", bool(val)) self.relativeMode = bool(val) diff --git a/src/Mod/Draft/draftguitools/gui_fillets.py b/src/Mod/Draft/draftguitools/gui_fillets.py index 187c2e75ac..e36610fe59 100644 --- a/src/Mod/Draft/draftguitools/gui_fillets.py +++ b/src/Mod/Draft/draftguitools/gui_fillets.py @@ -100,8 +100,12 @@ class Fillet(gui_base_original.Creator): "Create chamfer")) self.ui.check_chamfer.show() - self.ui.check_delete.stateChanged.connect(self.set_delete) - self.ui.check_chamfer.stateChanged.connect(self.set_chamfer) + if hasattr(self.ui.check_delete, "checkStateChanged"): # Qt version >= 6.7.0 + self.ui.check_delete.checkStateChanged.connect(self.set_delete) + self.ui.check_chamfer.checkStateChanged.connect(self.set_chamfer) + else: # Qt version < 6.7.0 + self.ui.check_delete.stateChanged.connect(self.set_delete) + self.ui.check_chamfer.stateChanged.connect(self.set_chamfer) # TODO: somehow we need to set up the trackers # to show a preview of the fillet. diff --git a/src/Mod/Draft/draftguitools/gui_selectplane.py b/src/Mod/Draft/draftguitools/gui_selectplane.py index a9cdcf4959..5baae69e38 100644 --- a/src/Mod/Draft/draftguitools/gui_selectplane.py +++ b/src/Mod/Draft/draftguitools/gui_selectplane.py @@ -126,7 +126,10 @@ class Draft_SelectPlane: form.buttonPrevious.clicked.connect(self.on_click_previous) form.buttonNext.clicked.connect(self.on_click_next) form.fieldOffset.textEdited.connect(self.on_set_offset) - form.checkCenter.stateChanged.connect(self.on_set_center) + if hasattr(form.checkCenter, "checkStateChanged"): # Qt version >= 6.7.0 + form.checkCenter.checkStateChanged.connect(self.on_set_center) + else: # Qt version < 6.7.0 + form.checkCenter.stateChanged.connect(self.on_set_center) form.fieldGridSpacing.textEdited.connect(self.on_set_grid_size) form.fieldGridMainLine.valueChanged.connect(self.on_set_main_line) form.fieldGridExtension.valueChanged.connect(self.on_set_extension) diff --git a/src/Mod/Draft/drafttaskpanels/task_circulararray.py b/src/Mod/Draft/drafttaskpanels/task_circulararray.py index 31d5361b35..1c555fc998 100644 --- a/src/Mod/Draft/drafttaskpanels/task_circulararray.py +++ b/src/Mod/Draft/drafttaskpanels/task_circulararray.py @@ -129,8 +129,12 @@ class TaskPanelCircularArray: self.form.button_reset.clicked.connect(self.reset_point) # When the checkbox changes, change the internal value - self.form.checkbox_fuse.stateChanged.connect(self.set_fuse) - self.form.checkbox_link.stateChanged.connect(self.set_link) + if hasattr(self.form.checkbox_fuse, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.checkbox_fuse.checkStateChanged.connect(self.set_fuse) + self.form.checkbox_link.checkStateChanged.connect(self.set_link) + else: # Qt version < 6.7.0 + self.form.checkbox_fuse.stateChanged.connect(self.set_fuse) + self.form.checkbox_link.stateChanged.connect(self.set_link) def accept(self): diff --git a/src/Mod/Draft/drafttaskpanels/task_orthoarray.py b/src/Mod/Draft/drafttaskpanels/task_orthoarray.py index 5be612a1a1..d68ed094da 100644 --- a/src/Mod/Draft/drafttaskpanels/task_orthoarray.py +++ b/src/Mod/Draft/drafttaskpanels/task_orthoarray.py @@ -154,8 +154,12 @@ class TaskPanelOrthoArray: self.form.button_reset_Z.clicked.connect(lambda: self.reset_v("Z")) # When the checkbox changes, change the internal value - self.form.checkbox_fuse.stateChanged.connect(self.set_fuse) - self.form.checkbox_link.stateChanged.connect(self.set_link) + if hasattr(self.form.checkbox_fuse, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.checkbox_fuse.checkStateChanged.connect(self.set_fuse) + self.form.checkbox_link.checkStateChanged.connect(self.set_link) + else: # Qt version < 6.7.0 + self.form.checkbox_fuse.stateChanged.connect(self.set_fuse) + self.form.checkbox_link.stateChanged.connect(self.set_link) # Linear mode callbacks - only set up if the UI elements exist self.form.button_linear_mode.clicked.connect(self.toggle_linear_mode) diff --git a/src/Mod/Draft/drafttaskpanels/task_polararray.py b/src/Mod/Draft/drafttaskpanels/task_polararray.py index 267b8193c5..324a0ec0e1 100644 --- a/src/Mod/Draft/drafttaskpanels/task_polararray.py +++ b/src/Mod/Draft/drafttaskpanels/task_polararray.py @@ -122,8 +122,12 @@ class TaskPanelPolarArray: self.form.button_reset.clicked.connect(self.reset_point) # When the checkbox changes, change the internal value - self.form.checkbox_fuse.stateChanged.connect(self.set_fuse) - self.form.checkbox_link.stateChanged.connect(self.set_link) + if hasattr(self.form.checkbox_fuse, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.checkbox_fuse.checkStateChanged.connect(self.set_fuse) + self.form.checkbox_link.checkStateChanged.connect(self.set_link) + else: # Qt version < 6.7.0 + self.form.checkbox_fuse.stateChanged.connect(self.set_fuse) + self.form.checkbox_link.stateChanged.connect(self.set_link) def accept(self): diff --git a/src/Mod/Draft/drafttaskpanels/task_shapestring.py b/src/Mod/Draft/drafttaskpanels/task_shapestring.py index 13bb81b45e..a1a182cf50 100644 --- a/src/Mod/Draft/drafttaskpanels/task_shapestring.py +++ b/src/Mod/Draft/drafttaskpanels/task_shapestring.py @@ -86,7 +86,10 @@ class ShapeStringTaskPanel: self.form.sbX.valueChanged.connect(self.set_point_x) self.form.sbY.valueChanged.connect(self.set_point_y) self.form.sbZ.valueChanged.connect(self.set_point_z) - self.form.cbGlobalMode.stateChanged.connect(self.set_global_mode) + if hasattr(self.form.cbGlobalMode.checkbox_fuse, "checkStateChanged"): # Qt version >= 6.7.0 + self.form.cbGlobalMode.checkStateChanged.connect(self.set_global_mode) + else: # Qt version < 6.7.0 + self.form.cbGlobalMode.stateChanged.connect(self.set_global_mode) self.form.pbReset.clicked.connect(self.reset_point) self.form.sbHeight.valueChanged.connect(self.set_height) self.form.leText.textEdited.connect(self.set_text)