From cda6aa25477107bab996db8bb37cf271f1342d4e Mon Sep 17 00:00:00 2001
From: Jack Ha <jackha@gmail.com>
Date: Thu, 14 Dec 2017 14:49:18 +0100
Subject: [PATCH] CURA-4234 splitted MachineSelection into a separate file and
 add it to PrintMonitor as well, because now it's part of the sidebar

---
 resources/qml/MachineSelection.qml | 71 ++++++++++++++++++++++++++++++
 resources/qml/PrintMonitor.qml     | 10 ++++-
 resources/qml/Sidebar.qml          | 60 +------------------------
 3 files changed, 81 insertions(+), 60 deletions(-)
 create mode 100644 resources/qml/MachineSelection.qml

diff --git a/resources/qml/MachineSelection.qml b/resources/qml/MachineSelection.qml
new file mode 100644
index 0000000000..e40731f3ca
--- /dev/null
+++ b/resources/qml/MachineSelection.qml
@@ -0,0 +1,71 @@
+// Copyright (c) 2017 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.Styles 1.1
+import QtQuick.Layouts 1.1
+
+import UM 1.2 as UM
+import Cura 1.0 as Cura
+import "Menus"
+
+ToolButton
+{
+    text: Cura.MachineManager.activeMachineName
+
+    tooltip: Cura.MachineManager.activeMachineName
+
+    style: ButtonStyle
+    {
+        background: Rectangle
+        {
+            color:
+            {
+                if(control.pressed)
+                {
+                    return UM.Theme.getColor("sidebar_header_active");
+                }
+                else if(control.hovered)
+                {
+                    return UM.Theme.getColor("sidebar_header_hover");
+                }
+                else
+                {
+                    return UM.Theme.getColor("sidebar_header_bar");
+                }
+            }
+            Behavior on color { ColorAnimation { duration: 50; } }
+
+            UM.RecolorImage
+            {
+                id: downArrow
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.right: parent.right
+                anchors.rightMargin: UM.Theme.getSize("default_margin").width
+                width: UM.Theme.getSize("standard_arrow").width
+                height: UM.Theme.getSize("standard_arrow").height
+                sourceSize.width: width
+                sourceSize.height: width
+                color: UM.Theme.getColor("text_emphasis")
+                source: UM.Theme.getIcon("arrow_bottom")
+            }
+            Label
+            {
+                id: sidebarComboBoxLabel
+                color: UM.Theme.getColor("sidebar_header_text_active")
+                text: control.text;
+                elide: Text.ElideRight;
+                anchors.left: parent.left;
+                anchors.leftMargin: UM.Theme.getSize("default_margin").width * 2
+                anchors.right: downArrow.left;
+                anchors.rightMargin: control.rightMargin;
+                anchors.verticalCenter: parent.verticalCenter;
+                font: UM.Theme.getFont("large")
+            }
+        }
+        label: Label {}
+    }
+
+    menu: PrinterMenu { }
+}
diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml
index e69f7cf4fd..806e302047 100644
--- a/resources/qml/PrintMonitor.qml
+++ b/resources/qml/PrintMonitor.qml
@@ -20,6 +20,14 @@ Column
         simpleNames: true
     }
 
+    MachineSelection {
+        id: machineSelection
+        width: base.width
+        height: UM.Theme.getSize("sidebar_header").height
+        anchors.top: base.top
+        anchors.right: parent.right
+    }
+
     Rectangle
     {
         id: connectedPrinterHeader
@@ -1171,4 +1179,4 @@ Column
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index a45303aab8..66c23752ce 100644
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -87,70 +87,12 @@ Rectangle
         }
     }
 
-    ToolButton
-    {
+    MachineSelection {
         id: machineSelection
-        text: Cura.MachineManager.activeMachineName
-
         width: base.width
         height: UM.Theme.getSize("sidebar_header").height
-        tooltip: Cura.MachineManager.activeMachineName
-
         anchors.top: base.top
-        //anchors.verticalCenter: parent.verticalCenter
         anchors.right: parent.right
-        style: ButtonStyle
-        {
-            background: Rectangle
-            {
-                color:
-                {
-                    if(control.pressed)
-                    {
-                        return UM.Theme.getColor("sidebar_header_active");
-                    }
-                    else if(control.hovered)
-                    {
-                        return UM.Theme.getColor("sidebar_header_hover");
-                    }
-                    else
-                    {
-                        return UM.Theme.getColor("sidebar_header_bar");
-                    }
-                }
-                Behavior on color { ColorAnimation { duration: 50; } }
-
-                UM.RecolorImage
-                {
-                    id: downArrow
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.right: parent.right
-                    anchors.rightMargin: UM.Theme.getSize("default_margin").width
-                    width: UM.Theme.getSize("standard_arrow").width
-                    height: UM.Theme.getSize("standard_arrow").height
-                    sourceSize.width: width
-                    sourceSize.height: width
-                    color: UM.Theme.getColor("text_emphasis")
-                    source: UM.Theme.getIcon("arrow_bottom")
-                }
-                Label
-                {
-                    id: sidebarComboBoxLabel
-                    color: UM.Theme.getColor("sidebar_header_text_active")
-                    text: control.text;
-                    elide: Text.ElideRight;
-                    anchors.left: parent.left;
-                    anchors.leftMargin: UM.Theme.getSize("default_margin").width * 2
-                    anchors.right: downArrow.left;
-                    anchors.rightMargin: control.rightMargin;
-                    anchors.verticalCenter: parent.verticalCenter;
-                    font: UM.Theme.getFont("large")
-                }
-            }
-            label: Label {}
-        }
-
-        menu: PrinterMenu { }
     }
 
     SidebarHeader {