diff --git a/cura/Settings/ExtrudersModel.py b/cura/Settings/ExtrudersModel.py index 26c05d3787..0ba6cdcfd6 100644 --- a/cura/Settings/ExtrudersModel.py +++ b/cura/Settings/ExtrudersModel.py @@ -46,6 +46,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel): self.addRoleName(self.IndexRole, "index") self._add_global = False + self._simple_names = False self._active_extruder_stack = None @@ -70,6 +71,21 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel): def addGlobal(self): return self._add_global + ## Set the simpleNames property. + def setSimpleNames(self, simple_names): + if simple_names != self._simple_names: + self._simple_names = simple_names + self.simpleNamesChanged.emit() + self._updateExtruders() + + ## Emitted when the simpleNames property changes. + simpleNamesChanged = pyqtSignal() + + ## Whether or not the model should show all definitions regardless of visibility. + @pyqtProperty(bool, fset = setSimpleNames, notify = simpleNamesChanged) + def simpleNames(self): + return self._simple_names + def _onActiveExtruderChanged(self): manager = ExtruderManager.getInstance() active_extruder_stack = manager.getActiveExtruderStack() @@ -119,7 +135,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel): for extruder in manager.getMachineExtruders(global_container_stack.getId()): extruder_name = extruder.getName() material = extruder.findContainer({ "type": "material" }) - if material: + if material and not self._simple_names: extruder_name = "%s (%s)" % (material.getName(), extruder_name) position = extruder.getMetaDataEntry("position", default = "0") # Get the position try: diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml index 27b0e532d4..8d04122aa8 100644 --- a/resources/qml/PrintMonitor.qml +++ b/resources/qml/PrintMonitor.qml @@ -14,7 +14,11 @@ Column id: printMonitor property var connectedPrinter: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null - Cura.ExtrudersModel { id: extrudersModel } + Cura.ExtrudersModel + { + id: extrudersModel + simpleNames: true + } Label {