From 4f10b7809aa1cc97fc73703c9f9f73915edff363 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Mon, 5 Nov 2018 12:15:17 +0100 Subject: [PATCH 1/2] Configuration override improvements Contributes to CL-1124 --- .../resources/qml/PrintJobInfoBlock.qml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml index 0fa65ba4c4..d851b684e5 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml @@ -355,7 +355,7 @@ Item { anchors.fill: parent; elide: Text.ElideRight; color: UM.Theme.getColor("text"); - font: UM.Theme.getFont("large_nonbold"); + font: UM.Theme.getFont("medium"); text: { if (!printJob || printJob.configurationChanges.length === 0) { return ""; @@ -398,6 +398,22 @@ Item { bottom: parent.bottom; left: parent.left; } + background: Rectangle { + border { + color: UM.Theme.getColor("monitor_lining_heavy"); + width: UM.Theme.getSize("default_lining").width; + } + color: parent.hovered ? UM.Theme.getColor("monitor_card_background_inactive") : UM.Theme.getColor("monitor_card_background"); + implicitHeight: UM.Theme.getSize("default_margin").height * 3; + implicitWidth: UM.Theme.getSize("default_margin").height * 8; + } + contentItem: Label { + color: UM.Theme.getColor("text"); + font: UM.Theme.getFont("medium"); + horizontalAlignment: Text.AlignHCenter; + text: parent.text; + verticalAlignment: Text.AlignVCenter; + } onClicked: { overrideConfirmationDialog.visible = true; } From c84aa9cf214c882a0b0cc24667915d7a2cfc18ef Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Mon, 5 Nov 2018 17:19:22 +0100 Subject: [PATCH 2/2] Use default font for configuration override Contributes to CL-1124 --- plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml index d851b684e5..8c2c8f9121 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml @@ -296,6 +296,7 @@ Item { verticalCenter: parent.verticalCenter; } color: UM.Theme.getColor("text"); + font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Configuration change"); } @@ -355,7 +356,7 @@ Item { anchors.fill: parent; elide: Text.ElideRight; color: UM.Theme.getColor("text"); - font: UM.Theme.getFont("medium"); + font: UM.Theme.getFont("default"); text: { if (!printJob || printJob.configurationChanges.length === 0) { return "";