diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 185e3563a5..c81281f0d7 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -194,22 +194,26 @@ UM.MainWindow NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.hasVariants; extruderIndex: index } MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.hasMaterials; extruderIndex: index } - MenuSeparator { + MenuSeparator + { visible: Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials } - MenuItem { + MenuItem + { text: catalog.i18nc("@action:inmenu", "Set as Active Extruder") onTriggered: Cura.MachineManager.setExtruderIndex(model.index) } - MenuItem { + MenuItem + { text: catalog.i18nc("@action:inmenu", "Enable Extruder") onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, true) visible: !Cura.MachineManager.getExtruder(model.index).isEnabled } - MenuItem { + MenuItem + { text: catalog.i18nc("@action:inmenu", "Disable Extruder") onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, false) visible: Cura.MachineManager.getExtruder(model.index).isEnabled diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index 2a2e213142..35ad198edf 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -17,7 +17,8 @@ SettingItem id: control anchors.fill: parent - model: Cura.ExtrudersModel { + model: Cura.ExtrudersModel + { onModelChanged: { control.color = getItem(control.currentIndex).color; } @@ -27,10 +28,12 @@ SettingItem onActivated: { - if (model.getItem(index).enabled) { + if (model.getItem(index).enabled) + { forceActiveFocus(); propertyProvider.setPropertyValue("value", model.getItem(index).index); - } else { + } else + { currentIndex = propertyProvider.properties.value; // keep the old value } }