Merge branch 'master' of github.com:Ultimaker/Cura

.gitignore

@@ -72,3 +72,6 @@ run.sh
 CuraEngine
 
 /.coverage
+
+#Prevents import failures when plugin running tests
+plugins/__init__.py

cura/BuildVolume.py

@@ -64,7 +64,7 @@ class BuildVolume(SceneNode):
 
         self._origin_mesh = None  # type: Optional[MeshData]
         self._origin_line_length = 20
-        self._origin_line_width = 0.5
+        self._origin_line_width = 1.5
 
         self._grid_mesh = None   # type: Optional[MeshData]
         self._grid_shader = None

cura/Machines/Models/DiscoveredPrintersModel.py

@@ -75,7 +75,7 @@ class DiscoveredPrinter(QObject):
     def readableMachineType(self) -> str:
         from cura.CuraApplication import CuraApplication
         machine_manager = CuraApplication.getInstance().getMachineManager()
-        # In ClusterUM3OutputDevice, when it updates a printer information, it updates the machine type using the field
+        # In LocalClusterOutputDevice, when it updates a printer information, it updates the machine type using the field
         # "machine_variant", and for some reason, it's not the machine type ID/codename/... but a human-readable string
         # like "Ultimaker 3". The code below handles this case.
         if self._hasHumanReadableMachineTypeName(self._machine_type):

cura/Settings/GlobalStack.py

@@ -118,7 +118,7 @@ class GlobalStack(CuraContainerStack):
     ##  \sa configuredConnectionTypes
     def removeConfiguredConnectionType(self, connection_type: int) -> None:
         configured_connection_types = self.configuredConnectionTypes
-        if connection_type in self.configured_connection_types:
+        if connection_type in configured_connection_types:
             # Store the values as a string.
             configured_connection_types.remove(connection_type)
             self.setMetaDataEntry("connection_type", ",".join([str(c_type) for c_type in configured_connection_types]))

plugins/UM3NetworkPrinting/__init__.py

@@ -1,6 +1,5 @@
-# Copyright (c) 2017 Ultimaker B.V.
+# Copyright (c) 2019 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
-from .src import DiscoverUM3Action
 from .src import UM3OutputDevicePlugin
 
 
@@ -10,6 +9,5 @@ def getMetaData():
 
 def register(app):
     return {
-        "output_device": UM3OutputDevicePlugin.UM3OutputDevicePlugin(),
-        "machine_action": DiscoverUM3Action.DiscoverUM3Action()
+        "output_device": UM3OutputDevicePlugin.UM3OutputDevicePlugin()
     }

plugins/UM3NetworkPrinting/plugin.json

@@ -1,7 +1,7 @@
 {
-    "name": "UM3 Network Connection",
+    "name": "Ultimaker Network Connection",
     "author": "Ultimaker B.V.",
-    "description": "Manages network connections to Ultimaker 3 printers.",
+    "description": "Manages network connections to Ultimaker networked printers.",
     "version": "1.0.1",
     "api": "6.0",
     "i18n-catalog": "cura"

plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.3
@@ -53,4 +53,4 @@ Rectangle
             }
         }
     }
-}
+}

plugins/UM3NetworkPrinting/resources/qml/ExpandableCard.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
@@ -87,4 +87,4 @@ Item
             }
         }
     }
-}
+}

plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2

plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
@@ -35,7 +35,7 @@ Item
         {
             height: parent.height
             width: 32 * screenScaleFactor // Ensure the icon is centered under the extruder icon (same width)
-            
+
             Rectangle
             {
                 anchors.centerIn: parent
@@ -56,7 +56,7 @@ Item
                 visible: buildplate
             }
         }
-        
+
         Label
         {
             id: buildplateLabel
@@ -72,4 +72,4 @@ Item
             renderType: Text.NativeRendering
         }
     }
-}
+}