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 {