3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-24 03:11:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/3.3'

Browse source
This commit is contained in:
Lipu Fei 2018-04-25 12:55:21 +02:00
commit ec9be7a103
19 changed files with 77 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Preferences/ProfilesPage.qml
View file

@ -71,7 +71,7 @@ Item
{
text: catalog.i18nc("@action:button", "Activate")
iconName: "list-activate"
enabled: !isCurrentItemActivated && base.currentItem.quality_group != undefined
enabled: !isCurrentItemActivated
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 && base.currentItem.quality_group != undefined
enabled: !base.canCreateProfile
visible: !base.canCreateProfile
onClicked: {