From 5b2ff705e79ea365a476e195b8a2b2ac0a7eeb07 Mon Sep 17 00:00:00 2001
From: Ian Paschal <i.paschal@ultimaker.com>
Date: Tue, 6 Mar 2018 17:03:44 +0100
Subject: [PATCH] CURA-4870 Add menu icons

---
 resources/qml/Menus/LocalPrinterMenu.qml           | 10 ++++------
 resources/qml/Menus/NetworkPrinterMenu.qml         | 11 +++++------
 .../themes/cura-light/icons/printer_group.svg      | 12 ++++++++++++
 .../themes/cura-light/icons/printer_single.svg     | 14 ++++++++++++++
 4 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 resources/themes/cura-light/icons/printer_group.svg
 create mode 100644 resources/themes/cura-light/icons/printer_single.svg

diff --git a/resources/qml/Menus/LocalPrinterMenu.qml b/resources/qml/Menus/LocalPrinterMenu.qml
index ef9a7b13b0..1c3064499b 100644
--- a/resources/qml/Menus/LocalPrinterMenu.qml
+++ b/resources/qml/Menus/LocalPrinterMenu.qml
@@ -7,14 +7,12 @@ import QtQuick.Controls 1.4
 import UM 1.2 as UM
 import Cura 1.0 as Cura
 
-Instantiator
-{
-    model: UM.ContainerStacksModel
-    {
+Instantiator {
+    model: UM.ContainerStacksModel {
         filter: {"type": "machine", "um_network_key": null}
     }
-    MenuItem
-    {
+    MenuItem {
+        iconSource: UM.Theme.getIcon("printer_single")
         text: model.name;
         checkable: true;
         checked: Cura.MachineManager.activeMachineId == model.id
diff --git a/resources/qml/Menus/NetworkPrinterMenu.qml b/resources/qml/Menus/NetworkPrinterMenu.qml
index 3dadad3913..fda99d065c 100644
--- a/resources/qml/Menus/NetworkPrinterMenu.qml
+++ b/resources/qml/Menus/NetworkPrinterMenu.qml
@@ -7,14 +7,13 @@ import QtQuick.Controls 1.4
 import UM 1.2 as UM
 import Cura 1.0 as Cura
 
-Instantiator
-{
-    model: UM.ContainerStacksModel
-    {
+Instantiator {
+    model: UM.ContainerStacksModel {
         filter: {"type": "machine", "um_network_key": "*"}
     }
-    MenuItem
-    {
+    MenuItem {
+        // TODO: Use printer_group icon when it's a cluster.
+        iconSource: UM.Theme.getIcon("printer_single")
         text: model.name;
         checkable: true;
         checked: Cura.MachineManager.activeMachineId == model.id
diff --git a/resources/themes/cura-light/icons/printer_group.svg b/resources/themes/cura-light/icons/printer_group.svg
new file mode 100644
index 0000000000..614bea90b8
--- /dev/null
+++ b/resources/themes/cura-light/icons/printer_group.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="16px" viewBox="0 0 32 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 49 (51002) - http://www.bohemiancoding.com/sketch -->
+    <title>icn_groupPrinters</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Visual" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Printer-status-icon" transform="translate(-24.000000, -176.000000)" fill="#000000">
+            <path d="M48,188 L54,188 L54,190 L48,190 L48,188 L48,188 Z M48,180 L54,180 L54,182 L48,182 L48,180 L48,180 Z M54,189 L56,189 L56,191 L54,191 L54,189 L54,189 Z M54,177 L56,177 L56,189 L54,189 L54,177 L54,177 Z M48,182 L51,182 L51,183 L48,183 L48,182 L48,182 Z M49,183 L50,183 L50,185 L49,185 L49,183 L49,183 Z M48,177 L54,177 L54,179 L48,179 L48,177 L48,177 Z M34,176 L46,176 L48,176 L48,187 L53,187 L53,188 L48,188 L48,190 L48,192 L46,192 L46,191 L34,191 L34,192 L32,192 L32,190 L26,190 L26,191 L24,191 L24,189 L24,177 L26,177 L32,177 L32,176 L34,176 Z M34,178 L34,179 L46,179 L46,178 L34,178 Z M41,182 L41,184 L39,184 L39,182 L38,182 L38,181 L42,181 L42,182 L41,182 Z M46,189 L46,181 L34,181 L34,189 L46,189 Z M32,179 L26,179 L26,180 L32,180 L32,179 Z M32,183 L31,183 L31,185 L30,185 L30,183 L29,183 L29,182 L26,182 L26,188 L27,188 L27,187 L32,187 L32,183 Z M35,188 L45,188 L45,189 L35,189 L35,188 Z" id="icn_groupPrinters"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/resources/themes/cura-light/icons/printer_single.svg b/resources/themes/cura-light/icons/printer_single.svg
new file mode 100644
index 0000000000..f7dc83987d
--- /dev/null
+++ b/resources/themes/cura-light/icons/printer_single.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 49 (51002) - http://www.bohemiancoding.com/sketch -->
+    <title>icn_singlePrinter</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Visual" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Printer-status-icon" transform="translate(-217.000000, -176.000000)" fill="#000000">
+            <g id="icn_singlePrinter" transform="translate(217.000000, 176.000000)">
+                <path d="M2,13 L14,13 L14,15 L2,15 L2,13 L2,13 Z M2,3 L14,3 L14,5 L2,5 L2,3 L2,3 Z M0,14 L2,14 L2,16 L0,16 L0,14 L0,14 Z M14,14 L16,14 L16,16 L14,16 L14,14 L14,14 Z M0,0 L2,0 L2,14 L0,14 L0,0 L0,0 Z M14,0 L16,0 L16,14 L14,14 L14,0 L14,0 Z M6,5 L10,5 L10,6 L6,6 L6,5 L6,5 Z M7,6 L9,6 L9,8 L7,8 L7,6 L7,6 Z M2,0 L14,0 L14,2 L2,2 L2,0 L2,0 Z M3,12 L13,12 L13,13 L3,13 L3,12 L3,12 Z" id="Rectangle-185-Copy-5-Copy-4"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file