From d370a69073d2beceb5def5685ca3700486f78e00 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 11 Sep 2019 11:29:34 +0200 Subject: [PATCH 1/4] Add some theme values CS-158 --- resources/themes/cura-light/theme.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 9a7ebf1b37..0d9f624805 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -619,6 +619,8 @@ "monitor_empty_state_offset": [5.6, 5.6], "monitor_empty_state_size": [35.0, 25.0], "monitor_external_link_icon": [1.16, 1.16], - "monitor_column": [18.0, 1.0] + "monitor_column": [18.0, 1.0], + "monitor_progress_bar": [16.5, 1.0], + "monitor_margin": [1.5, 1.5] } } From 07a5213ea634ccced8b89adec24032a6f3bb7590 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 11 Sep 2019 11:30:14 +0200 Subject: [PATCH 2/4] Reduce text size to 12pt from 14pt CS-158 --- .../resources/qml/MonitorPrintJobProgressBar.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index 48bab48a9f..631285a0ac 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -46,7 +46,7 @@ Item text: printJob ? Math.round(printJob.progress * 100) + "%" : "0%" color: printJob && printJob.isActive ? UM.Theme.getColor("monitor_text_primary") : UM.Theme.getColor("monitor_text_disabled") width: contentWidth - font: UM.Theme.getFont("medium") // 14pt, regular + font: UM.Theme.getFont("default") // 12pt, regular // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! @@ -63,7 +63,7 @@ Item verticalCenter: parent.verticalCenter } color: UM.Theme.getColor("monitor_text_primary") - font: UM.Theme.getFont("medium") // 14pt, regular + font: UM.Theme.getFont("default") // 12pt, regular text: { if (!printJob) From 3b5cf115f1ec9e3930fcd9c00c780f576f86679e Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 11 Sep 2019 11:30:29 +0200 Subject: [PATCH 3/4] Reduce progress bar length CS-158 --- .../resources/qml/MonitorPrintJobProgressBar.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index 631285a0ac..44f0a30c30 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -31,7 +31,7 @@ Item left: parent.left } value: printJob ? printJob.progress : 0 - width: UM.Theme.getSize("monitor_column").width + width: UM.Theme.getSize("monitor_progress_bar").width } Label From 72ba6153c269a1ad458418215de72c5e5f8d2b04 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 11 Sep 2019 11:30:39 +0200 Subject: [PATCH 4/4] Boyscout some stuff CS-158 --- .../resources/qml/MonitorPrintJobProgressBar.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index 44f0a30c30..91f4accee1 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -20,7 +20,7 @@ Item property var printJob: null width: childrenRect.width - height: 18 * screenScaleFactor // TODO: Theme! + height: UM.Theme.getSize("monitor_text_line").height UM.ProgressBar { @@ -40,7 +40,7 @@ Item anchors { left: progressBar.right - leftMargin: 18 * screenScaleFactor // TODO: Theme! + leftMargin: UM.Theme.getSize("monitor_margin").width verticalCenter: parent.verticalCenter } text: printJob ? Math.round(printJob.progress * 100) + "%" : "0%" @@ -49,7 +49,7 @@ Item font: UM.Theme.getFont("default") // 12pt, regular // FIXED-LINE-HEIGHT: - height: 18 * screenScaleFactor // TODO: Theme! + height: UM.Theme.getSize("monitor_text_line").height verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering } @@ -59,7 +59,7 @@ Item anchors { left: percentLabel.right - leftMargin: 18 * screenScaleFactor // TODO: Theme! + leftMargin: UM.Theme.getSize("monitor_margin").width verticalCenter: parent.verticalCenter } color: UM.Theme.getColor("monitor_text_primary") @@ -103,7 +103,7 @@ Item width: contentWidth // FIXED-LINE-HEIGHT: - height: 18 * screenScaleFactor // TODO: Theme! + height: UM.Theme.getSize("monitor_text_line").height verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering }