Merge pull request #4337 from Ultimaker/cura_connect_improvements

Organize files better before 3.5

plugins/UM3NetworkPrinting/__init__.py

@@ -1,11 +1,11 @@
 # Copyright (c) 2017 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from . import DiscoverUM3Action
+from .src import DiscoverUM3Action
 from UM.i18n import i18nCatalog
 catalog = i18nCatalog("cura")
 
-from . import UM3OutputDevicePlugin
+from .src import UM3OutputDevicePlugin
 
 def getMetaData():
     return {}

plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml

@@ -16,7 +16,6 @@ Component
         id: base
         property var lineColor: "#DCDCDC" // TODO: Should be linked to theme.
 
-
         property var cornerRadius: 4 * screenScaleFactor // TODO: Should be linked to theme.
         visible: OutputDevice != null
         anchors.fill: parent
@@ -154,11 +153,11 @@ Component
                                         switch(modelData.type)
                                         {
                                             case "Ultimaker 3":
-                                                return "UM3-icon.svg"
+                                                return "../svg/UM3-icon.svg"
                                             case "Ultimaker 3 Extended":
-                                                return "UM3x-icon.svg"
+                                                return "../svg/UM3x-icon.svg"
                                             case "Ultimaker S5":
-                                                return "UMs5-icon.svg"
+                                                return "../svg/UMs5-icon.svg"
                                         }
                                     }
                                     width: sourceSize.width
@@ -563,15 +562,15 @@ Component
                                         switch(modelData.activePrintJob.state)
                                         {
                                             case "paused":
-                                                return "paused-icon.svg"
+                                                return "../svg/paused-icon.svg"
                                             case "wait_cleanup":
                                                 if(modelData.activePrintJob.timeElapsed < modelData.activePrintJob.timeTotal)
                                                 {
-                                                    return "aborted-icon.svg"
+                                                    return "../svg/aborted-icon.svg"
                                                 }
-                                                return "approved-icon.svg"
+                                                return "../svg/approved-icon.svg"
                                             case "wait_user_action":
-                                                return "aborted-icon.svg"
+                                                return "../svg/aborted-icon.svg"
                                             default:
                                                 return ""
                                         }
@@ -599,7 +598,7 @@ Component
                                         height: width
                                         anchors.right: parent.right
                                         anchors.rightMargin: parent.rightMargin
-                                        source: "camera-icon.svg"
+                                        source: "../svg/camera-icon.svg"
                                     }
                                     MouseArea
                                     {

plugins/UM3NetworkPrinting/resources/qml/MonitorItem.qml

@@ -0,0 +1,54 @@
+import QtQuick 2.2
+
+
+import UM 1.3 as UM
+import Cura 1.0 as Cura
+
+Component
+{
+    Item
+    {
+        width: maximumWidth
+        height: maximumHeight
+        Image
+        {
+            id: cameraImage
+            width: Math.min(sourceSize.width === 0 ? 800 * screenScaleFactor : sourceSize.width, maximumWidth)
+            height: Math.floor((sourceSize.height === 0 ? 600 * screenScaleFactor : sourceSize.height) * width / sourceSize.width)
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.verticalCenter: parent.verticalCenter
+            z: 1
+            Component.onCompleted:
+            {
+                if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null)
+                {
+                    OutputDevice.activePrinter.camera.start()
+                }
+            }
+            onVisibleChanged:
+            {
+                if(visible)
+                {
+                    if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null)
+                    {
+                        OutputDevice.activePrinter.camera.start()
+                    }
+                } else
+                {
+                    if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null)
+                    {
+                        OutputDevice.activePrinter.camera.stop()
+                    }
+                }
+            }
+            source:
+            {
+                if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null && OutputDevice.activePrinter.camera.latestImage)
+                {
+                    return OutputDevice.activePrinter.camera.latestImage;
+                }
+                return "";
+            }
+        }
+    }
+}

plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml

@@ -93,7 +93,7 @@ Item
             {
                 id: statusImage
                 anchors.centerIn: printJobPreview
-                source: printJob.state == "error" ? "aborted-icon.svg" : ""
+                source: printJob.state == "error" ? "../svg/aborted-icon.svg" : ""
                 visible: source != ""
                 width: 0.5 * printJobPreview.width
                 height: 0.5 * printJobPreview.height

plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py

@@ -62,8 +62,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
 
         self._print_jobs = [] # type: List[PrintJobOutputModel]
 
-        self._monitor_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "ClusterMonitorItem.qml")
-        self._control_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "ClusterControlItem.qml")
+        self._monitor_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../resources/qml/ClusterMonitorItem.qml")
+        self._control_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../resources/qml/ClusterControlItem.qml")
 
         # See comments about this hack with the clusterPrintersChanged signal
         self.printersChanged.connect(self.clusterPrintersChanged)
@@ -158,7 +158,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
 
     def _spawnPrinterSelectionDialog(self):
         if self._printer_selection_dialog is None:
-            path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "PrintWindow.qml")
+            path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../resources/qml/PrintWindow.qml")
             self._printer_selection_dialog = CuraApplication.getInstance().createQmlComponent(path, {"OutputDevice": self})
         if self._printer_selection_dialog is not None:
             self._printer_selection_dialog.show()

plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py

@@ -24,7 +24,7 @@ class DiscoverUM3Action(MachineAction):
 
     def __init__(self) -> None:
         super().__init__("DiscoverUM3Action", catalog.i18nc("@action","Connect via Network"))
-        self._qml_url = "DiscoverUM3Action.qml"
+        self._qml_url = "../resources/qml/DiscoverUM3Action.qml"
 
         self._network_plugin = None #type: Optional[UM3OutputDevicePlugin]
 
@@ -174,7 +174,7 @@ class DiscoverUM3Action(MachineAction):
         plugin_path = PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting")
         if not plugin_path:
             return
-        path = os.path.join(plugin_path, "UM3InfoComponents.qml")
+        path = os.path.join(plugin_path, "resources/qml/UM3InfoComponents.qml")
         self.__additional_components_view = CuraApplication.getInstance().createQmlComponent(path, {"manager": self})
         if not self.__additional_components_view:
             Logger.log("w", "Could not create ui components for UM3.")

plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py

@@ -76,7 +76,7 @@ class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice):
 
         self.setIconName("print")
 
-        self._monitor_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "MonitorItem.qml")
+        self._monitor_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../resources/qml/MonitorItem.qml")
 
         self._output_controller = LegacyUM3PrinterOutputController(self)