From c93643bc2f95b5292a2132a1bfdb8373e1539201 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Fri, 2 Mar 2018 17:30:19 +0100
Subject: [PATCH] Move createMaterial() to MaterialManager

---
 cura/Machines/MaterialManager.py            | 29 +++++++++++++++++++++
 cura/Settings/ContainerManager.py           | 26 ------------------
 resources/qml/Preferences/MaterialsPage.qml |  2 +-
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py
index ac2d8ed895..5998e8b020 100644
--- a/cura/Machines/MaterialManager.py
+++ b/cura/Machines/MaterialManager.py
@@ -3,6 +3,7 @@
 
 from collections import defaultdict, OrderedDict
 import copy
+import uuid
 from typing import Optional
 
 from PyQt5.Qt import QTimer, QObject, pyqtSignal, pyqtSlot
@@ -429,3 +430,31 @@ class MaterialManager(QObject):
             container_to_add.setDirty(True)
             self._container_registry.addContainer(container_to_add)
         return new_base_id
+
+    #
+    # Create a new material by cloning Generic PLA for the current material diameter and generate a new GUID.
+    #
+    @pyqtSlot(result = str)
+    def createMaterial(self) -> str:
+        from UM.i18n import i18nCatalog
+        catalog = i18nCatalog("cura")
+        # Ensure all settings are saved.
+        self._application.saveSettings()
+
+        global_stack = self._application.getGlobalContainerStack()
+        approximate_diameter = str(round(global_stack.getProperty("material_diameter", "value")))
+        root_material_id = "generic_pla"
+        root_material_id = self.getRootMaterialIDForDiameter(root_material_id, approximate_diameter)
+        material_group = self.getMaterialGroup(root_material_id)
+
+        # Create a new ID & container to hold the data.
+        new_id = self._container_registry.uniqueName("custom_material")
+        new_metadata = {"name": catalog.i18nc("@label", "Custom Material"),
+                        "brand": catalog.i18nc("@label", "Custom"),
+                        "GUID": str(uuid.uuid4()),
+                        }
+
+        self.duplicateMaterial(material_group.root_material_node,
+                               new_base_id = new_id,
+                               new_metadata = new_metadata)
+        return new_id
diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py
index ce641eb2f0..19a010fe2a 100644
--- a/cura/Settings/ContainerManager.py
+++ b/cura/Settings/ContainerManager.py
@@ -382,32 +382,6 @@ class ContainerManager(QObject):
 
             self._container_registry.addContainer(new_changes)
 
-    ##  Create a new material by cloning Generic PLA for the current material diameter and setting the GUID to something unqiue
-    #
-    #   \return \type{str} the id of the newly created container.
-    @pyqtSlot(result = str)
-    def createMaterial(self):
-        # Ensure all settings are saved.
-        Application.getInstance().saveSettings()
-
-        global_stack = Application.getInstance().getGlobalContainerStack()
-        approximate_diameter = str(round(global_stack.getProperty("material_diameter", "value")))
-        root_material_id = "generic_pla"
-        root_material_id = self._material_manager.getRootMaterialIDForDiameter(root_material_id, approximate_diameter)
-        material_group = self._material_manager.getMaterialGroup(root_material_id)
-
-        # Create a new ID & container to hold the data.
-        new_id = self._container_registry.uniqueName("custom_material")
-        new_metadata = {"name": catalog.i18nc("@label", "Custom Material"),
-                        "brand": catalog.i18nc("@label", "Custom"),
-                        "GUID": str(uuid.uuid4()),
-                        }
-
-        self.duplicateMaterial(material_group.root_material_node,
-                               new_base_id = new_id,
-                               new_metadata = new_metadata)
-        return new_id
-
     ##  Get a list of materials that have the same GUID as the reference material
     #
     #   \param material_id \type{str} the id of the material for which to get the linked materials.
diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml
index 71cf584997..c833d8d1f5 100644
--- a/resources/qml/Preferences/MaterialsPage.qml
+++ b/resources/qml/Preferences/MaterialsPage.qml
@@ -79,7 +79,7 @@ Item
             iconName: "list-add"
             onClicked: {
                 forceActiveFocus();
-                base.newRootMaterialIdToSwitchTo = Cura.ContainerManager.createMaterial();
+                base.newRootMaterialIdToSwitchTo = base.materialManager.createMaterial();
                 base.toActivateNewMaterial = true;
             }
         }