From 1532779d1b7b7da7f096d67f1546760851fbb139 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 24 Mar 2022 14:26:03 +0100 Subject: Remove Extruders property from global stack CURA-7810 --- cura/Settings/GlobalStack.py | 10 ---------- resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index 282034c0ee..d40ae08236 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -60,16 +60,6 @@ class GlobalStack(CuraContainerStack): extrudersChanged = pyqtSignal() configuredConnectionTypesChanged = pyqtSignal() - @pyqtProperty("QVariantMap", notify = extrudersChanged) - @deprecated("Please use extruderList instead.", "4.4") - def extruders(self) -> Dict[str, "ExtruderStack"]: - """Get the list of extruders of this stack. - - :return: The extruders registered with this stack. - """ - - return self._extruders - @pyqtProperty("QVariantList", notify = extrudersChanged) def extruderList(self) -> List["ExtruderStack"]: result_tuple_list = sorted(list(self._extruders.items()), key=lambda x: int(x[0])) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index f0b6e14683..58d96f8028 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -55,7 +55,7 @@ Cura.ExpandablePopup Layout.maximumWidth: Math.round(parent.width / extrudersModel.count) Layout.fillHeight: true - property var extruderStack: activeMachine ? activeMachine.extruders[model.index]: null + property var extruderStack: activeMachine ? activeMachine.extruderList[model.index]: null property bool valueWarning: !Cura.ExtruderManager.getExtruderHasQualityForMaterial(extruderStack) property bool valueError: activeMachine ? Cura.ContainerManager.getContainerMetaDataEntry(extruderStack.material.id, "compatible", "") != "True" : false -- cgit v1.2.3