Remove crappy implementation

cura/Settings/MachineManager.py

@@ -527,12 +527,6 @@ class MachineManager(QObject):
             return self._global_container_stack.getMetaDataEntry("um_network_key", "")
         return ""
 
-    @pyqtProperty(str, notify=printerConnectedStatusChanged)
-    def activeMachineCloudKey(self) -> str:
-        if self._global_container_stack:
-            return self._global_container_stack.getMetaDataEntry("um_cloud_cluster_id", "")
-        return ""
-
     @pyqtProperty(str, notify = printerConnectedStatusChanged)
     def activeMachineNetworkGroupName(self) -> str:
         if self._global_container_stack:

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py

@@ -86,7 +86,7 @@ class CloudOutputDeviceManager:
         self._output_device_manager.addOutputDevice(device)
         self._remote_clusters[cluster.cluster_id] = device
         device.connect()  # TODO: remove this
-        self._connectToActiveMachine(cluster.cluster_id, cluster.host_name)
+        self._connectToActiveMachine(cluster.cluster_id)
 
     ##  Remove a CloudOutputDevice
     #   \param cluster: The cluster that was removed
@@ -96,7 +96,7 @@ class CloudOutputDeviceManager:
             del self._remote_clusters[cluster.cluster_id]
 
     ##  Callback for when the active machine was changed by the user.
-    def _connectToActiveMachine(self, cluster_id: Optional[str] = None, host_name: Optional[str] = None) -> None:
+    def _connectToActiveMachine(self, cluster_id: Optional[str] = None) -> None:
         active_machine = CuraApplication.getInstance().getGlobalContainerStack()
         if not active_machine:
             return
@@ -104,7 +104,6 @@ class CloudOutputDeviceManager:
         # TODO: Remove this once correct pairing has been added (see below).
         if cluster_id:
             active_machine.setMetaDataEntry("um_cloud_cluster_id", cluster_id)
-            active_machine.setMetaDataEntry("connect_group_name", host_name)
 
         # Check if the stored cluster_id for the active machine is in our list of remote clusters.
         stored_cluster_id = active_machine.getMetaDataEntry("um_cloud_cluster_id")

resources/qml/Menus/CloudPrinterMenu.qml

@@ -1,26 +0,0 @@
-// Copyright (c) 2018 Ultimaker B.V.
-// Cura is released under the terms of the LGPLv3 or higher.
-import QtQuick 2.2
-import QtQuick.Controls 1.4
-
-import UM 1.2 as UM
-import Cura 1.0 as Cura
-
-Instantiator {
-
-    model: UM.ContainerStacksModel {
-        filter: {"type": "machine", "um_cloud_cluster_id": "*"}
-    }
-
-    MenuItem {
-        // iconSource: UM.Theme.getIcon("printer_single") TODO: use cloud icon here
-        text: model.metadata["connect_group_name"]
-        checkable: true
-        checked: true // cloud printers are only listed if they are actually online
-        exclusiveGroup: group;
-        onTriggered: Cura.MachineManager.setActiveMachine(model.id);
-    }
-
-    onObjectAdded: menu.insertItem(index, object)
-    onObjectRemoved: menu.removeItem(object)
-}

resources/qml/Menus/PrinterMenu.qml

@@ -37,23 +37,6 @@ Menu
         visible: networkPrinterMenu.count > 0
     }
 
-    MenuItem
-    {
-        text: catalog.i18nc("@label:category menu label", "Cloud enabled printers")
-        enabled: false
-        visible: cloudPrinterMenu.count > 0
-    }
-
-    CloudPrinterMenu
-    {
-        id: cloudPrinterMenu
-    }
-
-    MenuSeparator
-    {
-        visible: cloudPrinterMenu.count > 0
-    }
-
     MenuItem
     {
         text: catalog.i18nc("@label:category menu label", "Local printers")

resources/qml/PrinterSelector/MachineSelector.qml

@@ -12,7 +12,6 @@ Cura.ExpandableComponent
     id: machineSelector
 
     property bool isNetworkPrinter: Cura.MachineManager.activeMachineNetworkKey != ""
-    property bool isCloudConnected: Cura.MachineManager.activeMachineCloudKey != ""
     property bool isPrinterConnected: Cura.MachineManager.printerConnected
     property var outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
 
@@ -56,7 +55,7 @@ Cura.ExpandableComponent
                 leftMargin: UM.Theme.getSize("thick_margin").width
             }
 
-            source: isCloudConnected ? UM.Theme.getIcon("printer_cloud_connected") : UM.Theme.getIcon("printer_connected")
+            source: UM.Theme.getIcon("printer_connected")
             width: UM.Theme.getSize("printer_status_icon").width
             height: UM.Theme.getSize("printer_status_icon").height
 
@@ -64,7 +63,7 @@ Cura.ExpandableComponent
             sourceSize.height: height
 
             color: UM.Theme.getColor("primary")
-            visible: isNetworkPrinter && (isPrinterConnected || isCloudConnected)
+            visible: isNetworkPrinter && isPrinterConnected
 
             // Make a themable circle in the background so we can change it in other themes
             Rectangle

resources/qml/PrinterSelector/MachineSelectorList.qml

@@ -32,7 +32,8 @@ Column
             id: networkedPrintersModel
             filter:
             {
-                "type": "machine", "um_network_key": "*", "hidden": "False"
+                "type": "machine",
+                "um_network_key": "*"
             }
         }
 
@@ -50,46 +51,6 @@ Column
         }
     }
 
-    Label
-    {
-        text: catalog.i18nc("@label", "Cloud connected printers")
-        visible: cloudPrintersModel.items.length > 0
-        leftPadding: UM.Theme.getSize("default_margin").width
-        height: visible ? contentHeight + 2 * UM.Theme.getSize("default_margin").height : 0
-        renderType: Text.NativeRendering
-        font: UM.Theme.getFont("medium")
-        color: UM.Theme.getColor("text_medium")
-        verticalAlignment: Text.AlignVCenter
-    }
-
-    Repeater
-    {
-        id: cloudPrinters
-
-        model: UM.ContainerStacksModel
-        {
-            id: cloudPrintersModel
-            filter:
-            {
-                "type": "machine",
-                "um_cloud_cluster_id": "*"
-            }
-        }
-
-        delegate: MachineSelectorButton
-        {
-            text: model.metadata["connect_group_name"]
-            checked: true  // cloud devices are always online if they are available
-            outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
-
-            Connections
-            {
-                target: Cura.MachineManager
-                onActiveMachineNetworkGroupNameChanged: checked = Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"]
-            }
-        }
-    }
-
     Label
     {
         text: catalog.i18nc("@label", "Preset printers")
@@ -112,8 +73,7 @@ Column
             filter:
             {
                 "type": "machine",
-                "um_network_key": null,
+                "um_network_key": null
-                "um_cloud_cluster_id": null
             }
         }
 

resources/themes/cura-light/icons/printer_cloud_connected.svg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 16 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
     <title>noun_Cloud_377836</title>
     <desc>Created with Sketch.</desc>