Merge branch '4.0'

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -500,7 +500,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
 
         is_printer_group = False
         if machine_conflict:
-            group_name = existing_global_stack.getMetaDataEntry("connect_group_name")
+            group_name = existing_global_stack.getMetaDataEntry("group_name")
             if group_name is not None:
                 is_printer_group = True
                 machine_name = group_name

plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py

@@ -355,8 +355,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
     def sendJobToTop(self, print_job_uuid: str) -> None:
         # This function is part of the output device (and not of the printjob output model) as this type of operation
         # is a modification of the cluster queue and not of the actual job.
-        data = "{\"to_position\": 0}"
-        self.put("print_jobs/{uuid}/move_to_position".format(uuid = print_job_uuid), data, on_finished=None)
+        data = "{\"list\": \"queued\",\"to_position\": 0}"
+        self.post("print_jobs/{uuid}/action/move".format(uuid = print_job_uuid), data, on_finished=None)
 
     @pyqtSlot(str)
     def deleteJobFromQueue(self, print_job_uuid: str) -> None:

plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py

@@ -106,13 +106,13 @@ class DiscoverUM3Action(MachineAction):
         global_container_stack = CuraApplication.getInstance().getGlobalContainerStack()
         if global_container_stack:
             meta_data = global_container_stack.getMetaData()
-            if "connect_group_name" in meta_data:
-                previous_connect_group_name = meta_data["connect_group_name"]
-                global_container_stack.setMetaDataEntry("connect_group_name", group_name)
+            if "group_name" in meta_data:
+                previous_connect_group_name = meta_data["group_name"]
+                global_container_stack.setMetaDataEntry("group_name", group_name)
                 # Find all the places where there is the same group name and change it accordingly
-                CuraApplication.getInstance().getMachineManager().replaceContainersMetadata(key = "connect_group_name", value = previous_connect_group_name, new_value = group_name)
+                CuraApplication.getInstance().getMachineManager().replaceContainersMetadata(key = "group_name", value = previous_connect_group_name, new_value = group_name)
             else:
-                global_container_stack.setMetaDataEntry("connect_group_name", group_name)
+                global_container_stack.setMetaDataEntry("group_name", group_name)
             # Set the default value for "hidden", which is used when you have a group with multiple types of printers
             global_container_stack.setMetaDataEntry("hidden", False)
 

plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py

@@ -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 json
 from queue import Queue
@@ -245,7 +245,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
                 properties = device.getProperties().copy()
                 if b"incomplete" in properties:
                     del properties[b"incomplete"]
-                properties[b'cluster_size'] = len(cluster_printers_list)
+                properties[b"cluster_size"] = len(cluster_printers_list)
                 self._onRemoveDevice(instance_name)
                 self._onAddDevice(instance_name, address, properties)
 

plugins/VersionUpgrade/VersionUpgrade35to40/VersionUpgrade35to40.py

@@ -1,9 +1,12 @@
 import configparser
-from typing import Tuple, List, Set
+from typing import Tuple, List, Set, Dict
 import io
+
 from UM.VersionUpgrade import VersionUpgrade
 from cura.PrinterOutputDevice import ConnectionType
+
 deleted_settings = {"bridge_wall_max_overhang"}  # type: Set[str]
+renamed_configurations = {"connect_group_name": "group_name"}  # type: Dict[str, str]
 
 
 class VersionUpgrade35to40(VersionUpgrade):
@@ -20,10 +23,16 @@ class VersionUpgrade35to40(VersionUpgrade):
             # Set the connection type if um_network_key or the octoprint key is set.
             parser["metadata"]["connection_type"] = str(ConnectionType.NetworkConnection.value)
 
+        if "metadata" in parser:
+            for old_name, new_name in renamed_configurations.items():
+                if old_name not in parser["metadata"]:
+                    continue
+                parser["metadata"][new_name] = parser["metadata"][old_name]
+                del parser["metadata"][old_name]
+
         result = io.StringIO()
         parser.write(result)
         return [filename], [result.getvalue()]
-        pass
 
     def getCfgVersion(self, serialised: str) -> int:
         parser = configparser.ConfigParser(interpolation = None)
@@ -65,4 +74,4 @@ class VersionUpgrade35to40(VersionUpgrade):
 
         result = io.StringIO()
         parser.write(result)
-        return [filename], [result.getvalue()]
+        return [filename], [result.getvalue()]