Merge WIP_onboarding

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -18,8 +18,8 @@ from UM.Scene.SceneNode import SceneNode
 
 from cura.CuraApplication import CuraApplication
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
-from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
-from cura.PrinterOutputDevice import ConnectionType
+from cura.UI.PrinterOutputModel import PrinterOutputModel
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 
 from .CloudOutputController import CloudOutputController
 from ..MeshFormatHandler import MeshFormatHandler

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

@@ -2,8 +2,8 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 from typing import Union, Dict, Optional, Any
 
-from cura.PrinterOutput.ExtruderConfigurationModel import ExtruderConfigurationModel
-from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel
+from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
+from cura.UI.ExtruderOutputModel import ExtruderOutputModel
 from .CloudClusterPrinterConfigurationMaterial import CloudClusterPrinterConfigurationMaterial
 from .BaseCloudModel import BaseCloudModel
 

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.PrinterConfigurationModel import PrinterConfigurationModel
 from ...UM3PrintJobOutputModel import UM3PrintJobOutputModel
 from ...ConfigurationChangeModel import ConfigurationChangeModel
 from ..CloudOutputController import CloudOutputController
@@ -95,9 +95,9 @@ class CloudClusterPrintJobStatus(BaseCloudModel):
         return model
 
     ## Creates a new configuration model
-    def _createConfigurationModel(self) -> ConfigurationModel:
+    def _createConfigurationModel(self) -> PrinterConfigurationModel:
         extruders = [extruder.createConfigurationModel() for extruder in self.configuration or ()]
-        configuration = ConfigurationModel()
+        configuration = PrinterConfigurationModel()
         configuration.setExtruderConfigurations(extruders)
         return configuration
 

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

@@ -2,7 +2,7 @@ from typing import Optional
 
 from UM.Logger import Logger
 from cura.CuraApplication import CuraApplication
-from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
+from cura.UI.MaterialOutputModel import MaterialOutputModel
 from .BaseCloudModel import BaseCloudModel
 
 

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

@@ -3,7 +3,7 @@
 from typing import List, Union, Dict, Optional, Any
 
 from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
-from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
+from cura.UI.PrinterOutputModel import PrinterOutputModel
 from .CloudClusterBuildPlate import CloudClusterBuildPlate
 from .CloudClusterPrintCoreConfiguration import CloudClusterPrintCoreConfiguration
 from .BaseCloudModel import BaseCloudModel

plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py

@@ -19,12 +19,12 @@ 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.PrinterOutput.ExtruderConfigurationModel import ExtruderConfigurationModel
+from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
+from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
-from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
-from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
-from cura.PrinterOutputDevice import ConnectionType
+from cura.UI.PrinterOutputModel import PrinterOutputModel
+from cura.UI.MaterialOutputModel import MaterialOutputModel
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 
 from .Cloud.Utils import formatTimeCompleted, formatDateCompleted
 from .ClusterUM3PrinterOutputController import ClusterUM3PrinterOutputController
@@ -522,7 +522,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
         print_job = UM3PrintJobOutputModel(output_controller=ClusterUM3PrinterOutputController(self),
                                         key=data["uuid"], name= data["name"])
 
-        configuration = ConfigurationModel()
+        configuration = PrinterConfigurationModel()
         extruders = [ExtruderConfigurationModel(position = idx) for idx in range(0, self._number_of_extruders)]
         for index in range(0, self._number_of_extruders):
             try:

plugins/UM3NetworkPrinting/src/ClusterUM3PrinterOutputController.py

@@ -5,7 +5,7 @@ from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
 
 MYPY = False
 if MYPY:
-    from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
+    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
 
 class ClusterUM3PrinterOutputController(PrinterOutputController):
     def __init__(self, output_device):

plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py

@@ -18,7 +18,7 @@ from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
 from .UM3OutputDevicePlugin import UM3OutputDevicePlugin
 
 if TYPE_CHECKING:
-    from cura.PrinterOutputDevice import PrinterOutputDevice
+    from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
 
 catalog = i18nCatalog("cura")
 

plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py

@@ -2,10 +2,10 @@ from typing import List, Optional
 
 from cura.CuraApplication import CuraApplication
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice, AuthState
-from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
-from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
-from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
-from cura.PrinterOutputDevice import ConnectionType
+from cura.UI.PrinterOutputModel import PrinterOutputModel
+from cura.UI.PrintJobOutputModel import PrintJobOutputModel
+from cura.UI.MaterialOutputModel import MaterialOutputModel
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 
 from cura.Settings.ContainerManager import ContainerManager
 from cura.Settings.ExtruderManager import ExtruderManager

plugins/UM3NetworkPrinting/src/LegacyUM3PrinterOutputController.py

@@ -7,8 +7,8 @@ from UM.Version import Version
 
 MYPY = False
 if MYPY:
-    from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
-    from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
+    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
+    from cura.UI.PrinterOutputModel import PrinterOutputModel
 
 
 class LegacyUM3PrinterOutputController(PrinterOutputController):

plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py

@@ -5,16 +5,16 @@ from queue import Queue
 from threading import Event, Thread
 from time import time
 import os
+from typing import Optional, TYPE_CHECKING
 
 from zeroconf import Zeroconf, ServiceBrowser, ServiceStateChange, ServiceInfo
 from PyQt5.QtNetwork import QNetworkRequest, QNetworkAccessManager
-from PyQt5.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty, QObject
+from PyQt5.QtCore import QUrl
 from PyQt5.QtGui import QDesktopServices
 
 from cura.CuraApplication import CuraApplication
-from cura.PrinterOutputDevice import ConnectionType
-from cura.Settings.GlobalStack import GlobalStack # typing
-from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
+
 from UM.OutputDevice.OutputDeviceManager import ManualDeviceAdditionAttempt
 
 from UM.i18n import i18nCatalog
@@ -28,10 +28,13 @@ from UM.Version import Version
 from . import ClusterUM3OutputDevice, LegacyUM3OutputDevice
 from .Cloud.CloudOutputDeviceManager import CloudOutputDeviceManager
 
-from typing import Optional
+if TYPE_CHECKING:
+    from cura.Settings.GlobalStack import GlobalStack
+    from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin
 
 i18n_catalog = i18nCatalog("cura")
 
+
 ##      This plugin handles the connection detection & creation of output device objects for the UM3 printer.
 #       Zero-Conf is used to detect printers, which are saved in a dict.
 #       If we discover a printer that has the same key as the active machine instance a connection is made.
@@ -448,7 +451,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
         Logger.log("d", "Checking if cloud connection is possible...")
 
         # Pre-Check: Skip if active machine already has been cloud connected or you said don't ask again
-        active_machine = self._application.getMachineManager().activeMachine # type: Optional["GlobalStack"]
+        active_machine = self._application.getMachineManager().activeMachine # type: Optional[GlobalStack]
         if active_machine:
             
             # Check 1A: Printer isn't already configured for cloud
@@ -536,7 +539,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
             return
 
     def _onDontAskMeAgain(self, checked: bool) -> None:
-        active_machine = self._application.getMachineManager().activeMachine # type: Optional["GlobalStack"]
+        active_machine = self._application.getMachineManager().activeMachine # type: Optional[GlobalStack]
         if active_machine:
             active_machine.setMetaDataEntry("do_not_show_cloud_message", checked)
             if checked:

plugins/UM3NetworkPrinting/src/UM3PrintJobOutputModel.py

@@ -5,7 +5,7 @@ from typing import List
 
 from PyQt5.QtCore import pyqtProperty, pyqtSignal
 
-from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
+from cura.UI.PrintJobOutputModel import PrintJobOutputModel
 from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
 from .ConfigurationChangeModel import ConfigurationChangeModel