Changed multiple properties in profile page to new API

CURA-1285
This commit is contained in:
Jaime van Kessel 2016-06-03 14:40:28 +02:00
parent ea73f00aac
commit cd8df44812

View File

@ -90,15 +90,15 @@ UM.ManagementPage
profileName = (profileName.length > 20) ? profileName.substring(0, 20) + '...' : profileName; profileName = (profileName.length > 20) ? profileName.substring(0, 20) + '...' : profileName;
return catalog.i18nc("@action:button", "Update \"%1\"".arg(profileName)); return catalog.i18nc("@action:button", "Update \"%1\"".arg(profileName));
} }
enabled: UM.ActiveProfile.hasCustomisedValues && !UM.ActiveProfile.readOnly enabled: Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
onClicked: UM.ActiveProfile.updateProfile() onClicked: UM.ActiveProfile.updateProfile()
} }
Button Button
{ {
text: catalog.i18nc("@action:button", "Discard changes"); text: catalog.i18nc("@action:button", "Discard changes");
enabled: UM.ActiveProfile.hasCustomisedValues enabled: Cura.MachineManager.hasUserSettings
onClicked: UM.ActiveProfile.discardChanges() onClicked: Cura.MachineManager.clearUserSettings();
} }
} }
@ -114,7 +114,7 @@ UM.ManagementPage
} }
Label { Label {
text: base.currentItem == null ? "" : text: base.currentItem == null ? "" :
base.currentItem.id == -1 ? UM.MachineManager.activeProfile : base.currentItem.id == -1 ? Cura.MachineManager.activeQualityName:
base.currentItem.readOnly ? catalog.i18nc("@label", "Protected profile") : catalog.i18nc("@label", "Custom profile") base.currentItem.readOnly ? catalog.i18nc("@label", "Protected profile") : catalog.i18nc("@label", "Custom profile")
} }