From 3e67d208902eac21ec5f834c2ca2510f8f568add Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 8 Oct 2020 17:31:19 +0200 Subject: Remove monitor_text_primary It's so close to the text one that it really doesn't make sense to keep it. Boyscouting the code a bit here CURA-7745 --- .../resources/qml/MonitorBuildplateConfiguration.qml | 2 +- plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml | 4 ++-- .../resources/qml/MonitorContextMenuButton.qml | 2 +- .../resources/qml/MonitorExtruderConfiguration.qml | 4 ++-- .../UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml | 2 +- .../UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml | 8 ++++---- .../resources/qml/MonitorPrintJobProgressBar.qml | 4 ++-- .../UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml | 12 ++++++------ .../UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml | 2 +- plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml | 10 +++++----- .../resources/qml/PrintJobContextMenuItem.qml | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) (limited to 'plugins/UM3NetworkPrinting') diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml index 5d08422877..2034c23abe 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml @@ -60,7 +60,7 @@ Item Label { id: buildplateLabel - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("default") // 12pt, regular text: buildplate ? buildplate : "" diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml index 08743ed777..56e39bd477 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml @@ -97,7 +97,7 @@ Item height: width // TODO: Theme! sourceSize.width: width // TODO: Theme! sourceSize.height: width // TODO: Theme! - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") source: UM.Theme.getIcon("arrow_left") } } @@ -176,7 +176,7 @@ Item height: width // TODO: Theme! sourceSize.width: width // TODO: Theme! sourceSize.height: width // TODO: Theme! - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") source: UM.Theme.getIcon("arrow_right") } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml index aa5d6de89b..0be3732cef 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml @@ -18,7 +18,7 @@ Button width: base.width } contentItem: Label { - color: enabled ? UM.Theme.getColor("monitor_text_primary") : UM.Theme.getColor("monitor_text_disabled") + color: enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("monitor_text_disabled") font.pixelSize: 32 * screenScaleFactor horizontalAlignment: Text.AlignHCenter text: base.text diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml index 63caaab433..ac5f588db3 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml @@ -57,7 +57,7 @@ Item { id: materialLabel - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("default") // 12pt, regular text: "" @@ -87,7 +87,7 @@ Item { id: printCoreLabel - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("default_bold") // 12pt, bold text: "" diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml index 876215d65d..8c6f28d3e1 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml @@ -39,7 +39,7 @@ Item { id: positionLabel font: UM.Theme.getFont("small") - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") height: Math.round(size / 2) horizontalAlignment: Text.AlignHCenter text: position + 1 diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml index 78f9058765..65bf4e3a07 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml @@ -58,7 +58,7 @@ Item Label { text: printJob && printJob.name ? printJob.name : "" - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("medium") // 14pt, regular visible: printJob @@ -89,7 +89,7 @@ Item Label { text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : "" - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("medium") // 14pt, regular visible: printJob @@ -120,7 +120,7 @@ Item { id: printerAssignmentLabel anchors.verticalCenter: parent.verticalCenter - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("medium") // 14pt, regular text: { @@ -188,7 +188,7 @@ Item Label { text: printJob && printJob.owner ? printJob.owner : "" - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("medium") // 14pt, regular anchors.top: printerConfiguration.top diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index 0a478c8543..98cd3916fb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -44,7 +44,7 @@ Item verticalCenter: parent.verticalCenter } text: printJob ? Math.round(printJob.progress * 100) + "%" : "0%" - color: printJob && printJob.isActive ? UM.Theme.getColor("monitor_text_primary") : UM.Theme.getColor("monitor_text_disabled") + color: printJob && printJob.isActive ? UM.Theme.getColor("text") : UM.Theme.getColor("monitor_text_disabled") width: contentWidth font: UM.Theme.getFont("default") // 12pt, regular @@ -62,7 +62,7 @@ Item leftMargin: UM.Theme.getSize("monitor_margin").width verticalCenter: parent.verticalCenter } - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") font: UM.Theme.getFont("default") text: { diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index ef9fda257d..2e9b3e74fb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -103,7 +103,7 @@ Item Label { text: printer && printer.name ? printer.name : "" - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("large") // 16pt, bold width: parent.width @@ -341,7 +341,7 @@ Item { verticalCenter: parent.verticalCenter } - color: printer ? UM.Theme.getColor("monitor_text_primary") : UM.Theme.getColor("monitor_text_disabled") + color: printer ? UM.Theme.getColor("text") : UM.Theme.getColor("monitor_text_disabled") font: UM.Theme.getFont("large_bold") // 16pt, bold text: { if (!printer) { @@ -395,7 +395,7 @@ Item Label { id: printerJobNameLabel - color: printer && printer.activePrintJob && printer.activePrintJob.isActive ? UM.Theme.getColor("monitor_text_primary") : UM.Theme.getColor("monitor_text_disabled") + color: printer && printer.activePrintJob && printer.activePrintJob.isActive ? UM.Theme.getColor("text") : UM.Theme.getColor("monitor_text_disabled") elide: Text.ElideRight font: UM.Theme.getFont("large") // 16pt, bold text: printer && printer.activePrintJob ? printer.activePrintJob.name : catalog.i18nc("@label", "Untitled") @@ -416,7 +416,7 @@ Item topMargin: 6 * screenScaleFactor // TODO: Theme! left: printerJobNameLabel.left } - color: printer && printer.activePrintJob && printer.activePrintJob.isActive ? UM.Theme.getColor("monitor_text_primary") : UM.Theme.getColor("monitor_text_disabled") + color: printer && printer.activePrintJob && printer.activePrintJob.isActive ? UM.Theme.getColor("text") : UM.Theme.getColor("monitor_text_disabled") elide: Text.ElideRight font: UM.Theme.getFont("default") // 12pt, regular text: printer && printer.activePrintJob ? printer.activePrintJob.owner : catalog.i18nc("@label", "Anonymous") @@ -448,7 +448,7 @@ Item font: UM.Theme.getFont("default") text: catalog.i18nc("@label:status", "Requires configuration changes") visible: printer && printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0 && !printerStatus.visible - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! @@ -484,7 +484,7 @@ Item anchors.bottomMargin: 2 * screenScaleFactor // TODO: Theme! color: UM.Theme.getColor("monitor_secondary_button_text") font: UM.Theme.getFont("medium") // 14pt, regular - text: catalog.i18nc("@action:button","Details"); + text: catalog.i18nc("@action:button", "Details"); verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter height: 18 * screenScaleFactor // TODO: Theme! diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml index 44aa1a1f8d..4cd9d58cae 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml @@ -27,7 +27,7 @@ Item Label { id: printerNameLabel anchors.centerIn: parent - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") text: monitorPrinterPill.text font.pointSize: 10 // TODO: Theme! visible: monitorPrinterPill.text !== "" diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index f5122dc685..0da22ce10e 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml @@ -26,7 +26,7 @@ Item left: queuedPrintJobs.left top: parent.top } - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") font: UM.Theme.getFont("large") text: catalog.i18nc("@label", "Queued") renderType: Text.NativeRendering @@ -97,7 +97,7 @@ Item Label { text: catalog.i18nc("@label", "There are no print jobs in the queue. Slice and send a job to add one.") - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("medium") // 14pt, regular anchors.verticalCenter: parent.verticalCenter @@ -112,7 +112,7 @@ Item Label { text: catalog.i18nc("@label", "Print jobs") - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("medium") // 14pt, regular anchors.verticalCenter: parent.verticalCenter @@ -128,7 +128,7 @@ Item Label { text: catalog.i18nc("@label", "Total print time") - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("medium") // 14pt, regular anchors.verticalCenter: parent.verticalCenter @@ -144,7 +144,7 @@ Item Label { text: catalog.i18nc("@label", "Waiting for") - color: UM.Theme.getColor("monitor_text_primary") + color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("medium") // 14pt, regular anchors.verticalCenter: parent.verticalCenter diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml index 78b94ce259..3288896572 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml @@ -12,7 +12,7 @@ Button { color: UM.Theme.getColor("monitor_context_menu_hover") } contentItem: Label { - color: enabled ? UM.Theme.getColor("monitor_text_primary") : UM.Theme.getColor("monitor_text_disabled"); + color: enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("monitor_text_disabled"); text: parent.text horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter; -- cgit v1.2.3