From c7a91f07d25128b6484c0367b936df666b454c00 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Thu, 2 Feb 2017 14:45:44 +0100
Subject: [PATCH] Add label for printer connection text to header

Also fixed the indenting of the previous two labels to use spaces instead of tabs. I knew I was going to forget putting it back to spaces after working on a different project that uses tabs.

The information is duplicated now. I'll remove the old one promptly.

Contributes to issue CURA-3161.
---
 resources/qml/PrintMonitor.qml | 68 ++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 28 deletions(-)

diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml
index e4d9d84ac7..c5bf160657 100644
--- a/resources/qml/PrintMonitor.qml
+++ b/resources/qml/PrintMonitor.qml
@@ -24,36 +24,48 @@ Column
     {
         id: connectedPrinterHeader
         width: parent.width
-        height: UM.Theme.getSize("sidebar_header").height
+        height: childrenRect.height + UM.Theme.getSize("default_margin").height * 2
         color: UM.Theme.getColor("setting_category")
 
-		Label
-		{
-			id: connectedPrinterNameLabel
-			text: printerConnected ? connectedPrinter.name : catalog.i18nc("@info:status", "No printer connected")
-			font: UM.Theme.getFont("large")
-			color: UM.Theme.getColor("text")
-			anchors.left: parent.left
-			anchors.leftMargin: UM.Theme.getSize("default_margin").width
-			anchors.top: parent.top
-			anchors.topMargin: UM.Theme.getSize("default_margin").height
-			anchors.right: parent.right
-			anchors.rightMargin: UM.Theme.getSize("default_margin").width
-		}
-		Label
-		{
-			id: connectedPrinterAddressLabel
-			text: printerConnected ? connectedPrinter.address : ""
-			font: UM.Theme.getFont("small")
-			color: UM.Theme.getColor("text_inactive")
-			anchors.left: parent.left
-			anchors.leftMargin: UM.Theme.getSize("default_margin").width
-			anchors.top: parent.top
-			anchors.topMargin: UM.Theme.getSize("default_margin").height
-			anchors.right: parent.right
-			anchors.rightMargin: UM.Theme.getSize("default_margin").width
-			horizontalAlignment: Text.AlignRight
-		}
+        Label
+        {
+            id: connectedPrinterNameLabel
+            text: printerConnected ? connectedPrinter.name : catalog.i18nc("@info:status", "No printer connected")
+            font: UM.Theme.getFont("large")
+            color: UM.Theme.getColor("text")
+            anchors.left: parent.left
+            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.top: parent.top
+            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            anchors.right: parent.right
+            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+        }
+        Label
+        {
+            id: connectedPrinterAddressLabel
+            text: printerConnected ? connectedPrinter.address : ""
+            font: UM.Theme.getFont("small")
+            color: UM.Theme.getColor("text_inactive")
+            anchors.left: parent.left
+            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.top: parent.top
+            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            anchors.right: parent.right
+            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            horizontalAlignment: Text.AlignRight
+        }
+        Label
+        {
+            text: printerConnected ? connectedPrinter.connectionText : catalog.i18nc("@info:status", "The printer is not connected.")
+            color: printerConnected && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
+            font: UM.Theme.getFont("default")
+            wrapMode: Text.WordWrap
+            anchors.left: parent.left
+            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.right: parent.right
+            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.top: connectedPrinterNameLabel.bottom
+        }
     }
 
     Label {