From 78e9545ecea2cbf837402e69221d8a16110fd244 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 12 May 2016 11:46:28 +0200 Subject: [PATCH] Machines can now be removed CURA-1278 --- cura/MachineManagerModel.py | 5 +++++ resources/qml/MachinesPage.qml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py index ec346710af..2df28c1f92 100644 --- a/cura/MachineManagerModel.py +++ b/cura/MachineManagerModel.py @@ -33,6 +33,11 @@ class MachineManagerModel(QObject): if containers: containers[0].setName(new_name) + @pyqtSlot(str) + def removeMachine(self, machine_id): + ContainerRegistry.getInstance().removeContainer(machine_id) + + def createMachineManagerModel(engine, script_engine): return MachineManagerModel() \ No newline at end of file diff --git a/resources/qml/MachinesPage.qml b/resources/qml/MachinesPage.qml index 58a0878019..88cfbc740e 100644 --- a/resources/qml/MachinesPage.qml +++ b/resources/qml/MachinesPage.qml @@ -48,7 +48,7 @@ UM.ManagementPage { id: confirmDialog; object: base.currentItem && base.currentItem.name ? base.currentItem.name : ""; - onYes: base.model.removeMachineInstance(base.currentItem.name); + onYes: Cura.MachineManager.removeMachine(base.currentItem.id); } UM.RenameDialog