Merge branch 'feature_drag_curaprofile' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2016-11-04 14:31:58 +01:00
commit 2eb1c61033
3 changed files with 75 additions and 8 deletions

View file

@ -310,7 +310,7 @@ UM.ManagementPage
folder: CuraApplication.getDefaultPath("dialog_profile_path")
onAccepted:
{
var result = base.model.importProfile(fileUrl)
var result = Cura.ContainerManager.importProfile(fileUrl);
messageDialog.text = result.message
if(result.status == "ok")
{
@ -339,7 +339,7 @@ UM.ManagementPage
onAccepted:
{
var containers = Cura.ContainerManager.findInstanceContainers({"type": "quality_changes", "name": base.currentItem.name})
var result = base.model.exportProfile(containers, fileUrl, selectedNameFilter)
var result = Cura.ContainerManager.exportProfile(containers, fileUrl, selectedNameFilter)
if(result && result.status == "error")
{