Move ConfigurationModel into cura.UI module

cura/PrinterOutput/PrinterOutputDevice.py

@@ -17,7 +17,7 @@ from UM.FlameProfiler import pyqtSlot
 MYPY = False
 if MYPY:
     from cura.UI.PrinterOutputModel import PrinterOutputModel
-    from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
+    from cura.UI.ConfigurationModel import ConfigurationModel
     from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater
     from UM.FileHandler.FileHandler import FileHandler
     from UM.Scene.SceneNode import SceneNode

cura/Settings/MachineManager.py

@@ -23,7 +23,7 @@ from UM.Signal import postponeSignals, CompressTechnique
 
 from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch
 from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType
-from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
+from cura.UI.ConfigurationModel import ConfigurationModel
 from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
 from cura.UI.MaterialOutputModel import MaterialOutputModel
 from cura.Settings.CuraContainerRegistry import CuraContainerRegistry

cura/UI/ConfigurationModel.py

@@ -19,14 +19,14 @@ class ConfigurationModel(QObject):
         self._extruder_configurations = []     # type: List[ExtruderConfigurationModel]
         self._buildplate_configuration = ""
 
-    def setPrinterType(self, printer_type):
+    def setPrinterType(self, printer_type: str) -> None:
         self._printer_type = printer_type
 
     @pyqtProperty(str, fset = setPrinterType, notify = configurationChanged)
     def printerType(self) -> str:
         return self._printer_type
 
-    def setExtruderConfigurations(self, extruder_configurations: List["ExtruderConfigurationModel"]):
+    def setExtruderConfigurations(self, extruder_configurations: List["ExtruderConfigurationModel"]) -> None:
         if self._extruder_configurations != extruder_configurations:
             self._extruder_configurations = extruder_configurations
 
@@ -40,7 +40,7 @@ class ConfigurationModel(QObject):
         return self._extruder_configurations
 
     def setBuildplateConfiguration(self, buildplate_configuration: str) -> None:
-        if self._buildplate_configuration !=  buildplate_configuration:
+        if self._buildplate_configuration != buildplate_configuration:
             self._buildplate_configuration = buildplate_configuration
             self.configurationChanged.emit()
 
@@ -86,4 +86,4 @@ class ConfigurationModel(QObject):
         if first_extruder:
             extruder_hash &= hash(first_extruder)
 
-        return hash(self._printer_type) ^ extruder_hash ^ hash(self._buildplate_configuration)
+        return hash(self._printer_type) ^ extruder_hash ^ hash(self._buildplate_configuration)

cura/UI/PrintJobOutputModel.py

@@ -9,7 +9,7 @@ from PyQt5.QtGui import QImage
 if TYPE_CHECKING:
     from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
     from cura.UI.PrinterOutputModel import PrinterOutputModel
-    from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
+    from cura.UI.ConfigurationModel import ConfigurationModel
 
 
 class PrintJobOutputModel(QObject):

cura/UI/PrinterOutputModel.py

@@ -4,7 +4,7 @@
 from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant, pyqtSlot, QUrl
 from typing import List, Dict, Optional
 from UM.Math.Vector import Vector
-from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
+from cura.UI.ConfigurationModel import ConfigurationModel
 from cura.UI.ExtruderOutputModel import ExtruderOutputModel
 
 MYPY = False

plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobStatus.py

@@ -2,7 +2,7 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 from typing import List, Optional, Union, Dict, Any
 
-from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
+from cura.UI.ConfigurationModel import ConfigurationModel
 from ...UM3PrintJobOutputModel import UM3PrintJobOutputModel
 from ...ConfigurationChangeModel import ConfigurationChangeModel
 from ..CloudOutputController import CloudOutputController

plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py

@@ -19,7 +19,7 @@ from UM.Scene.SceneNode import SceneNode  # For typing.
 from UM.Settings.ContainerRegistry import ContainerRegistry
 
 from cura.CuraApplication import CuraApplication
-from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
+from cura.UI.ConfigurationModel import ConfigurationModel
 from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
 from cura.UI.PrinterOutputModel import PrinterOutputModel

tests/UI/TestConfigurationModel.py

@@ -4,7 +4,7 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
+from cura.UI.ConfigurationModel import ConfigurationModel
 from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
 
 test_validate_data_get_set = [

tests/UI/TestPrintJobOutputModel.py

@@ -2,7 +2,7 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
+from cura.UI.ConfigurationModel import ConfigurationModel
 from cura.UI.PrintJobOutputModel import PrintJobOutputModel
 from cura.UI.PrinterOutputModel import PrinterOutputModel