mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-05-07 05:58:58 +08:00
Merge branch 'master' of https://github.com/Ultimaker/Cura
This commit is contained in:
commit
516772e1f7
@ -91,6 +91,8 @@ Column
|
|||||||
exclusiveGroup: extruderMenuGroup
|
exclusiveGroup: extruderMenuGroup
|
||||||
checked: base.currentExtruderIndex == index
|
checked: base.currentExtruderIndex == index
|
||||||
|
|
||||||
|
property bool extruder_enabled: true
|
||||||
|
|
||||||
MouseArea
|
MouseArea
|
||||||
{
|
{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
@ -102,6 +104,7 @@ Column
|
|||||||
Cura.ExtruderManager.setActiveExtruderIndex(index);
|
Cura.ExtruderManager.setActiveExtruderIndex(index);
|
||||||
break;
|
break;
|
||||||
case Qt.RightButton:
|
case Qt.RightButton:
|
||||||
|
extruder_enabled = Cura.MachineManager.getExtruder(model.index).isEnabled
|
||||||
extruderMenu.popup();
|
extruderMenu.popup();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -116,13 +119,13 @@ Column
|
|||||||
MenuItem {
|
MenuItem {
|
||||||
text: catalog.i18nc("@action:inmenu", "Enable Extruder")
|
text: catalog.i18nc("@action:inmenu", "Enable Extruder")
|
||||||
onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, true)
|
onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, true)
|
||||||
visible: !Cura.MachineManager.getExtruder(model.index).isEnabled
|
visible: !extruder_enabled // using an intermediate variable prevents an empty popup that occured now and then
|
||||||
}
|
}
|
||||||
|
|
||||||
MenuItem {
|
MenuItem {
|
||||||
text: catalog.i18nc("@action:inmenu", "Disable Extruder")
|
text: catalog.i18nc("@action:inmenu", "Disable Extruder")
|
||||||
onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, false)
|
onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, false)
|
||||||
visible: Cura.MachineManager.getExtruder(model.index).isEnabled
|
visible: extruder_enabled
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user