Use containermanager for operations on Quality

Contributes to CURA-2006
This commit is contained in:
Arjen Hiemstra 2016-08-10 11:04:15 +02:00
parent ba2c60bb0d
commit 783d395fbc

View File

@ -76,9 +76,9 @@ UM.ManagementPage
{ {
var selectedContainer; var selectedContainer;
if (base.currentItem.id == Cura.MachineManager.activeQualityId) { if (base.currentItem.id == Cura.MachineManager.activeQualityId) {
selectedContainer = Cura.MachineManager.newQualityContainerFromQualityAndUser(); selectedContainer = Cura.ContainerManager.createQualityChanges();
} else { } else {
selectedContainer = Cura.MachineManager.duplicateContainer(base.currentItem.id); selectedContainer = Cura.ContainerManager.duplicateQuality(base.currentItem.name);
} }
base.selectContainer(selectedContainer); base.selectContainer(selectedContainer);
@ -106,13 +106,15 @@ UM.ManagementPage
text: catalog.i18nc("@action:button", "Import"); text: catalog.i18nc("@action:button", "Import");
iconName: "document-import"; iconName: "document-import";
onClicked: importDialog.open(); onClicked: importDialog.open();
enabled: false
}, },
Button Button
{ {
text: catalog.i18nc("@action:button", "Export") text: catalog.i18nc("@action:button", "Export")
iconName: "document-export" iconName: "document-export"
onClicked: exportDialog.open() onClicked: exportDialog.open()
enabled: currentItem != null // enabled: currentItem != null
enabled: false
} }
] ]
@ -152,14 +154,14 @@ UM.ManagementPage
return catalog.i18nc("@action:button", "Update profile with current settings"); return catalog.i18nc("@action:button", "Update profile with current settings");
} }
enabled: Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId) enabled: Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
onClicked: Cura.MachineManager.updateQualityContainerFromUserContainer() onClicked: Cura.ContainerManager.updateQualityChanges()
} }
Button Button
{ {
text: catalog.i18nc("@action:button", "Discard current settings"); text: catalog.i18nc("@action:button", "Discard current settings");
enabled: Cura.MachineManager.hasUserSettings enabled: Cura.MachineManager.hasUserSettings
onClicked: Cura.MachineManager.clearUserSettings(); onClicked: Cura.ContainerManager.clearUserContainers();
} }
} }
@ -214,19 +216,19 @@ UM.ManagementPage
{ {
id: confirmDialog id: confirmDialog
object: base.currentItem != null ? base.currentItem.name : "" object: base.currentItem != null ? base.currentItem.name : ""
onYes: Cura.MachineManager.removeQualityContainer(base.currentItem.id) onYes: Cura.ContainerManager.removeQualityChanges(base.currentItem.name)
} }
UM.RenameDialog UM.RenameDialog
{ {
id: renameDialog; id: renameDialog;
object: base.currentItem != null ? base.currentItem.name : "" object: base.currentItem != null ? base.currentItem.name : ""
property bool removeWhenRejected: false property bool removeWhenRejected: false
onAccepted: Cura.MachineManager.renameQualityContainer(base.currentItem.id, newName)
onRejected: { onRejected: {
if(removeWhenRejected) { if(removeWhenRejected) {
Cura.MachineManager.removeQualityContainer(base.currentItem.id) Cura.MachineManager.removeQualityContainer(base.currentItem.id)
} }
} }
onAccepted: Cura.ContainerManager.renameQualityChanges(base.currentItem.name, newName)
} }
MessageDialog MessageDialog
{ {