From a687c9c89eda846c9754866a87c434240cda0743 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Fri, 10 Jul 2015 18:41:24 +0200 Subject: [PATCH] Sets the platform activity on true when a model is loaded Also solved a problem with the deleteSelection trigger contributes to #128 --- resources/qml/Cura.qml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 226f4f59a9..f8e80367eb 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -41,7 +41,10 @@ UM.MainWindow { var path = modelData.toString() return (index + 1) + ". " + path.slice(path.lastIndexOf("/") + 1); } - onTriggered: UM.MeshFileHandler.readLocalFile(modelData); + onTriggered: { + UM.MeshFileHandler.readLocalFile(modelData); + Printer.setPlatformActivity(true) + } } onObjectAdded: fileMenu.insertItem(index, object) onObjectRemoved: fileMenu.removeItem(object) @@ -318,7 +321,11 @@ UM.MainWindow { redo.onTriggered: UM.OperationStack.redo(); redo.enabled: UM.OperationStack.canRedo; - deleteSelection.onTriggered: UM.Controller.removeSelection(); + deleteSelection.onTriggered: { + if(objectContextMenu.objectId != 0) { + Printer.deleteObject(objectContextMenu.objectId); + } + } deleteObject.onTriggered: { if(objectContextMenu.objectId != 0) { @@ -408,6 +415,7 @@ UM.MainWindow { onAccepted: { UM.MeshFileHandler.readLocalFile(fileUrl) + Printer.setPlatformActivity(true) } }