Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Ghostkeeper 2020-10-28 16:23:56 +01:00
commit a8f8e7b5a3
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A

View File

@ -39,7 +39,7 @@ UM.ManagementPage
id: activateMenuButton id: activateMenuButton
text: catalog.i18nc("@action:button", "Activate"); text: catalog.i18nc("@action:button", "Activate");
iconName: "list-activate"; iconName: "list-activate";
enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMaterialId enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMachine.id
onClicked: Cura.MachineManager.setActiveMachine(base.currentItem.id) onClicked: Cura.MachineManager.setActiveMachine(base.currentItem.id)
}, },
Button Button