Change the implementation of creating a profile from the current settings

The newly created profile now combines the settings of the active quality profile and the current settings

CURA-970, CURA-1585
This commit is contained in:
fieldOfView 2016-06-09 18:40:42 +02:00
parent 4da69a4d3e
commit d34d398e96
4 changed files with 11 additions and 31 deletions

View file

@ -112,7 +112,7 @@ Item
id: updateProfileAction;
enabled: Cura.MachineManager.isGlobalStackValid && Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
text: catalog.i18nc("@action:inmenu menubar:profile","&Update Current Profile");
onTriggered: Cura.MachineManager.updateUserContainerToQuality()
onTriggered: Cura.MachineManager.updateQualityContainerFromUserContainer()
}
Action

View file

@ -582,7 +582,7 @@ UM.MainWindow
target: Cura.Actions.addProfile
onTriggered:
{
Cura.MachineManager.convertUserContainerToQuality();
Cura.MachineManager.newQualityContainerFromQualityAndUser();
preferences.setPage(5);
preferences.show();

View file

@ -65,7 +65,7 @@ UM.ManagementPage
onAddObject: {
var selectedContainer;
if (objectList.currentItem.id == Cura.MachineManager.activeQualityId) {
selectedContainer = Cura.MachineManager.convertUserContainerToQuality();
selectedContainer = Cura.MachineManager.newQualityContainerFromQualityAndUser();
} else {
selectedContainer = Cura.MachineManager.duplicateContainer(base.currentItem.id);
}
@ -121,7 +121,7 @@ UM.ManagementPage
return catalog.i18nc("@action:button", "Update \"%1\"".arg(profileName));
}
enabled: Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
onClicked: Cura.MachineManager.updateUserContainerToQuality()
onClicked: Cura.MachineManager.updateQualityContainerFromUserContainer()
}
Button