From 5c2f1a935a4a95dd842d3b4392f84cb53406dcfe Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Wed, 1 Feb 2017 17:31:36 +0100
Subject: [PATCH] Move monitorLabel into PrintMonitor.qml

It's a label that belongs to the print monitor after all. Let the print monitor file decide how it's going to look.

Contributes to issue CURA-3161.
---
 resources/qml/PrintMonitor.qml | 13 ++++++++++++-
 resources/qml/Sidebar.qml      | 17 ++---------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml
index cd2f2a7376..887c70f457 100644
--- a/resources/qml/PrintMonitor.qml
+++ b/resources/qml/PrintMonitor.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2016 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.2
@@ -20,6 +20,17 @@ Column
         simpleNames: true
     }
 
+    Label {
+        id: monitorLabel
+        text: catalog.i18nc("@label","Printer Monitor");
+        anchors.left: parent.left
+        anchors.leftMargin: UM.Theme.getSize("default_margin").width;
+        width: parent.width * 0.45
+        font: UM.Theme.getFont("large")
+        color: UM.Theme.getColor("text")
+        visible: monitoringPrint
+    }
+
     Item
     {
         width: base.width - 2 * UM.Theme.getSize("default_margin").width
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index 148606679f..45dc49d076 100644
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.2
@@ -455,19 +455,6 @@ Rectangle
         }
     }
 
-    Label {
-        id: monitorLabel
-        text: catalog.i18nc("@label","Printer Monitor");
-        anchors.left: parent.left
-        anchors.leftMargin: UM.Theme.getSize("default_margin").width;
-        anchors.top: headerSeparator.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
-        width: parent.width * 0.45
-        font: UM.Theme.getFont("large")
-        color: UM.Theme.getColor("text")
-        visible: monitoringPrint
-    }
-
     StackView
     {
         id: sidebarContents
@@ -511,7 +498,7 @@ Rectangle
     Loader
     {
         anchors.bottom: footerSeparator.top
-        anchors.top: monitorLabel.bottom
+        anchors.top: headerSeparator.bottom
         anchors.topMargin: UM.Theme.getSize("default_margin").height
         anchors.left: base.left
         anchors.leftMargin: UM.Theme.getSize("default_margin").width