From 0d8302d864fc36dd466c9f0c481f574da59aae41 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 27 Feb 2018 11:23:04 +0100
Subject: [PATCH] CURA-4870 Start showing the list of printers separating
 between local and networked priters.

---
 resources/qml/Menus/LocalPrinterMenu.qml   | 26 +++++++++++++++++
 resources/qml/Menus/NetworkPrinterMenu.qml | 26 +++++++++++++++++
 resources/qml/Menus/PrinterMenu.qml        | 34 +++++++++++-----------
 resources/qml/Topbar.qml                   |  2 +-
 4 files changed, 70 insertions(+), 18 deletions(-)
 create mode 100644 resources/qml/Menus/LocalPrinterMenu.qml
 create mode 100644 resources/qml/Menus/NetworkPrinterMenu.qml

diff --git a/resources/qml/Menus/LocalPrinterMenu.qml b/resources/qml/Menus/LocalPrinterMenu.qml
new file mode 100644
index 0000000000..ef9a7b13b0
--- /dev/null
+++ b/resources/qml/Menus/LocalPrinterMenu.qml
@@ -0,0 +1,26 @@
+// 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_network_key": null}
+    }
+    MenuItem
+    {
+        text: model.name;
+        checkable: true;
+        checked: Cura.MachineManager.activeMachineId == model.id
+        exclusiveGroup: group;
+        onTriggered: Cura.MachineManager.setActiveMachine(model.id);
+    }
+    onObjectAdded: menu.insertItem(index, object)
+    onObjectRemoved: menu.removeItem(object)
+}
diff --git a/resources/qml/Menus/NetworkPrinterMenu.qml b/resources/qml/Menus/NetworkPrinterMenu.qml
new file mode 100644
index 0000000000..3dadad3913
--- /dev/null
+++ b/resources/qml/Menus/NetworkPrinterMenu.qml
@@ -0,0 +1,26 @@
+// 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_network_key": "*"}
+    }
+    MenuItem
+    {
+        text: model.name;
+        checkable: true;
+        checked: Cura.MachineManager.activeMachineId == model.id
+        exclusiveGroup: group;
+        onTriggered: Cura.MachineManager.setActiveMachine(model.id);
+    }
+    onObjectAdded: menu.insertItem(index, object)
+    onObjectRemoved: menu.removeItem(object)
+}
diff --git a/resources/qml/Menus/PrinterMenu.qml b/resources/qml/Menus/PrinterMenu.qml
index 073723a60d..0d60606fb9 100644
--- a/resources/qml/Menus/PrinterMenu.qml
+++ b/resources/qml/Menus/PrinterMenu.qml
@@ -1,8 +1,8 @@
-// Copyright (c) 2016 Ultimaker B.V.
+// 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.1
+import QtQuick.Controls 1.4
 
 import UM 1.2 as UM
 import Cura 1.0 as Cura
@@ -11,24 +11,24 @@ Menu
 {
     id: menu;
 
-    Instantiator
+    MenuItem
     {
-        model: UM.ContainerStacksModel
-        {
-            filter: {"type": "machine"}
-        }
-        MenuItem
-        {
-            text: model.name;
-            checkable: true;
-            checked: Cura.MachineManager.activeMachineId == model.id
-            exclusiveGroup: group;
-            onTriggered: Cura.MachineManager.setActiveMachine(model.id);
-        }
-        onObjectAdded: menu.insertItem(index, object)
-        onObjectRemoved: menu.removeItem(object)
+        text: "Network printers"
+        checkable: false
     }
 
+    NetworkPrinterMenu { }
+
+    MenuSeparator { }
+
+    MenuItem
+    {
+        text: "Local printers"
+        checkable: false
+    }
+
+    LocalPrinterMenu { }
+
     ExclusiveGroup { id: group; }
 
     MenuSeparator { }
diff --git a/resources/qml/Topbar.qml b/resources/qml/Topbar.qml
index 950b9ec12d..69d27d483a 100644
--- a/resources/qml/Topbar.qml
+++ b/resources/qml/Topbar.qml
@@ -150,7 +150,7 @@ Rectangle
             visible: base.width - allItemsWidth - 1 * this.width > 0
         }
 
-        // #5 Left view
+        // #5 Right view
         Button
         {
             iconSource: UM.Theme.getIcon("view_right")