Move PrintJobOutputModel into cura.UI module

cura/PrinterOutput/GenericOutputController.py

@@ -7,7 +7,7 @@ from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
 from PyQt5.QtCore import QTimer
 
 if TYPE_CHECKING:
-    from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
+    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
     from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
     from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
     from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel

cura/PrinterOutput/PrinterOutputController.py

@@ -4,11 +4,9 @@
 from UM.Logger import Logger
 from UM.Signal import Signal
 
-from typing import Union
-
 MYPY = False
 if MYPY:
-    from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
+    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
     from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel
     from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
     from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice

cura/PrinterOutput/PrinterOutputModel.py

@@ -9,7 +9,7 @@ from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel
 
 MYPY = False
 if MYPY:
-    from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
+    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
     from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
 
 

cura/UI/PrintJobOutputModel.py

@@ -1,10 +1,9 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, pyqtSlot
 from typing import Optional, TYPE_CHECKING, List
 
-from PyQt5.QtCore import QUrl
+from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, pyqtSlot, QUrl
 from PyQt5.QtGui import QImage
 
 if TYPE_CHECKING:
@@ -25,7 +24,7 @@ class PrintJobOutputModel(QObject):
     previewImageChanged = pyqtSignal()
     compatibleMachineFamiliesChanged = pyqtSignal()
 
-    def __init__(self, output_controller: "PrinterOutputController", key: str = "", name: str = "", parent=None) -> None:
+    def __init__(self, output_controller: "PrinterOutputController", key: str = "", name: str = "", parent = None) -> None:
         super().__init__(parent)
         self._output_controller = output_controller
         self._state = ""
@@ -142,13 +141,13 @@ class PrintJobOutputModel(QObject):
 
     @pyqtProperty(bool, notify=stateChanged)
     def isActive(self) -> bool:
-        inactiveStates = [
+        inactive_states = [
             "pausing",
             "paused",
             "resuming",
             "wait_cleanup"
         ]
-        if self.state in inactiveStates and self.timeRemaining > 0:
+        if self.state in inactive_states and self.timeRemaining > 0:
             return False
         return True
 

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/LegacyUM3OutputDevice.py

@@ -3,7 +3,7 @@ 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.UI.PrintJobOutputModel import PrintJobOutputModel
 from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
 from cura.PrinterOutputDevice import ConnectionType
 

plugins/UM3NetworkPrinting/src/LegacyUM3PrinterOutputController.py

@@ -7,7 +7,7 @@ from UM.Version import Version
 
 MYPY = False
 if MYPY:
-    from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
+    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
     from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
 
 

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
 

plugins/USBPrinting/USBPrinterOutputDevice.py

@@ -9,7 +9,7 @@ from UM.Qt.Duration import DurationFormat
 from cura.CuraApplication import CuraApplication
 from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType
 from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
-from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
+from cura.UI.PrintJobOutputModel import PrintJobOutputModel
 from cura.PrinterOutput.GenericOutputController import GenericOutputController
 
 from .AutoDetectBaudJob import AutoDetectBaudJob

tests/PrinterOutput/TestPrinterOutputModel.py

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

tests/UI/TestPrintJobOutputModel.py

@@ -3,7 +3,7 @@ from unittest.mock import MagicMock
 import pytest
 
 from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
-from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
+from cura.UI.PrintJobOutputModel import PrintJobOutputModel
 from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
 
 test_validate_data_get_set = [