Merge branch '3.3'

This commit is contained in:
Ghostkeeper 2018-04-23 14:07:46 +02:00
commit 5648bc82e7
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
109 changed files with 118437 additions and 204 deletions

View file

@ -71,7 +71,7 @@ Item
{
text: catalog.i18nc("@action:button", "Activate")
iconName: "list-activate"
enabled: !isCurrentItemActivated
enabled: !isCurrentItemActivated && base.currentItem.quality_group != undefined
onClicked: {
if (base.currentItem.is_read_only) {
Cura.MachineManager.setQualityGroup(base.currentItem.quality_group);
@ -101,7 +101,7 @@ Item
{
text: catalog.i18nc("@label", "Duplicate")
iconName: "list-add"
enabled: !base.canCreateProfile
enabled: !base.canCreateProfile && base.currentItem.quality_group != undefined
visible: !base.canCreateProfile
onClicked: {