From 900f953298c48c8d266e9dcf254c34a38d544969 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 22 Aug 2016 16:15:59 +0200 Subject: [PATCH 1/2] Make sure extruder menus are only shown if there the machine extruders --- resources/qml/Cura.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index fc808c1434..6c17b7f633 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -143,8 +143,9 @@ UM.MainWindow model: Cura.ExtrudersModel { } Menu { title: model.name + visible: machineExtruderCount.properties.value > 1 - NozzleMenu { title: catalog.i18nc("@title:menu", "&Nozzle"); visible: Cura.MachineManager.hasVariants } + NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.hasVariants } MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.hasMaterials } ProfileMenu { title: catalog.i18nc("@title:menu", "&Profile"); } @@ -156,7 +157,7 @@ UM.MainWindow onObjectRemoved: settingsMenu.removeItem(object) } - NozzleMenu { title: catalog.i18nc("@title:menu", "&Nozzle"); visible: machineExtruderCount.properties.value <= 1 && Cura.MachineManager.hasVariants } + NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: machineExtruderCount.properties.value <= 1 && Cura.MachineManager.hasVariants } MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: machineExtruderCount.properties.value <= 1 && Cura.MachineManager.hasMaterials } ProfileMenu { title: catalog.i18nc("@title:menu", "&Profile"); visible: machineExtruderCount.properties.value <= 1 } From c32700b7b428da511a56109112a3e5e4db544ef1 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 22 Aug 2016 16:30:34 +0200 Subject: [PATCH 2/2] Fix "Set as Active Extruder" menu item --- resources/qml/Cura.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 6c17b7f633..282d14ef06 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -151,7 +151,7 @@ UM.MainWindow MenuSeparator { } - MenuItem { text: catalog.i18nc("@action:inmenu", "Set as Active Extruder"); onTriggered: Cura.ExtruderManager.setActiveExtruderIndex(model.index) } + MenuItem { text: catalog.i18nc("@action:inmenu", "Set as Active Extruder"); onTriggered: ExtruderManager.setActiveExtruderIndex(model.index) } } onObjectAdded: settingsMenu.insertItem(index, object) onObjectRemoved: settingsMenu.removeItem(object)