From ce3a5f7e483a831c0f0536aaee6a15861805baaf Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Mon, 4 Jul 2016 12:08:38 +0200
Subject: [PATCH] Update references to moved classes so things work again

Contributes to CURA-342
---
 cura/CuraApplication.py                 | 19 +++++++------------
 cura/Settings/ContainerManager.py       |  5 +++--
 cura/Settings/ContainerSettingsModel.py |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 3664563590..4883194803 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -32,8 +32,6 @@ from UM.Settings.ContainerRegistry import ContainerRegistry
 
 from UM.i18n import i18nCatalog
 
-from . import ExtruderManager
-from . import ExtrudersModel
 from . import PlatformPhysics
 from . import BuildVolume
 from . import CameraAnimation
@@ -42,11 +40,8 @@ from . import CuraActions
 from . import MultiMaterialDecorator
 from . import ZOffsetDecorator
 from . import CuraSplashScreen
-from . import MachineManagerModel
-from . import ContainerSettingsModel
 from . import CameraImageProvider
 from . import MachineActionManager
-from . import ContainerManager
 
 import cura.Settings
 
@@ -373,9 +368,9 @@ class CuraApplication(QtApplication):
         self.showSplashMessage(self._i18n_catalog.i18nc("@info:progress", "Loading interface..."))
 
         # Initialise extruder so as to listen to global container stack changes before the first global container stack is set.
-        ExtruderManager.ExtruderManager.getInstance()
-        qmlRegisterSingletonType(MachineManagerModel.MachineManagerModel, "Cura", 1, 0, "MachineManager",
-                                 MachineManagerModel.createMachineManagerModel)
+        cura.Settings.ExtruderManager.getInstance()
+        qmlRegisterSingletonType(cura.Settings.MachineManager, "Cura", 1, 0, "MachineManager",
+                                 cura.Settings.MachineManager.createMachineManager)
 
         qmlRegisterSingletonType(MachineActionManager.MachineActionManager, "Cura", 1, 0, "MachineActionManager", self.getMachineActionManager)
         self.setMainQml(Resources.getPath(self.ResourceTypes.QmlFiles, "Cura.qml"))
@@ -426,16 +421,16 @@ class CuraApplication(QtApplication):
 
         qmlRegisterUncreatableType(CuraApplication, "Cura", 1, 0, "ResourceTypes", "Just an Enum type")
 
-        qmlRegisterType(ExtrudersModel.ExtrudersModel, "Cura", 1, 0, "ExtrudersModel")
+        qmlRegisterType(cura.Settings.ExtrudersModel, "Cura", 1, 0, "ExtrudersModel")
 
-        qmlRegisterType(ContainerSettingsModel.ContainerSettingsModel, "Cura", 1, 0, "ContainerSettingsModel")
+        qmlRegisterType(cura.Settings.ContainerSettingsModel, "Cura", 1, 0, "ContainerSettingsModel")
         qmlRegisterType(cura.Settings.MaterialSettingsVisibilityHandler, "Cura", 1, 0, "MaterialSettingsVisibilityHandler")
 
-        qmlRegisterSingletonType(ContainerManager.ContainerManager, "Cura", 1, 0, "ContainerManager", ContainerManager.createContainerManager)
+        qmlRegisterSingletonType(cura.Settings.ContainerManager, "Cura", 1, 0, "ContainerManager", cura.Settings.ContainerManager.createContainerManager)
 
         qmlRegisterSingletonType(QUrl.fromLocalFile(Resources.getPath(CuraApplication.ResourceTypes.QmlFiles, "Actions.qml")), "Cura", 1, 0, "Actions")
 
-        engine.rootContext().setContextProperty("ExtruderManager", ExtruderManager.ExtruderManager.getInstance())
+        engine.rootContext().setContextProperty("ExtruderManager", cura.Settings.ExtruderManager.getInstance())
 
         for path in Resources.getAllResourcesOfType(CuraApplication.ResourceTypes.QmlFiles):
             type_name = os.path.splitext(os.path.basename(path))[0]
diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py
index b2b8e36770..c3ee7e1645 100644
--- a/cura/Settings/ContainerManager.py
+++ b/cura/Settings/ContainerManager.py
@@ -58,5 +58,6 @@ class ContainerManager(QObject):
 
         containers[0].setMetaDataEntry(entry_name, entry_value)
 
-def createContainerManager(engine, js_engine):
-    return ContainerManager()
+    @staticmethod
+    def createContainerManager(engine, js_engine):
+        return ContainerManager()
diff --git a/cura/Settings/ContainerSettingsModel.py b/cura/Settings/ContainerSettingsModel.py
index 2ff1a5f401..9ec19ed7fb 100644
--- a/cura/Settings/ContainerSettingsModel.py
+++ b/cura/Settings/ContainerSettingsModel.py
@@ -90,4 +90,4 @@ class ContainerSettingsModel(ListModel):
     containersChanged = pyqtSignal()
     @pyqtProperty("QVariantList", fset = setContainers, notify = containersChanged)
     def containers(self):
-        return self.container_ids
\ No newline at end of file
+        return self.container_ids