3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Remove monitor_text_primary

Browse source 
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
This commit is contained in:
Jaime van Kessel 2020-10-08 17:31:19 +02:00
parent 910d8ec472
commit 3e67d20890
No known key found for this signature in database
GPG key ID: 3710727397403C91
14 changed files with 28 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/MonitorStage/MonitorMain.qml
View file

@ -99,7 +99,7 @@ Rectangle
visible: isNetworkConfigured && !isConnected visible: isNetworkConfigured && !isConnected
text: catalog.i18nc("@info", "Please make sure your printer has a connection:\n- Check if the printer is turned on.\n- Check if the printer is connected to the network.\n- Check if you are signed in to discover cloud-connected printers.") text: catalog.i18nc("@info", "Please make sure your printer has a connection:\n- Check if the printer is turned on.\n- Check if the printer is connected to the network.\n- Check if you are signed in to discover cloud-connected printers.")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
lineHeight: UM.Theme.getSize("monitor_text_line_large").height lineHeight: UM.Theme.getSize("monitor_text_line_large").height
lineHeightMode: Text.FixedHeight lineHeightMode: Text.FixedHeight
@ -116,7 +116,7 @@ Rectangle
visible: !isNetworkConfigured && isNetworkConfigurable visible: !isNetworkConfigured && isNetworkConfigurable
text: catalog.i18nc("@info", "Please connect your printer to the network.") text: catalog.i18nc("@info", "Please connect your printer to the network.")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
width: contentWidth width: contentWidth
lineHeight: UM.Theme.getSize("monitor_text_line_large").height lineHeight: UM.Theme.getSize("monitor_text_line_large").height

2
plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
View file

@ -60,7 +60,7 @@ Item
Label Label
{ {
id: buildplateLabel id: buildplateLabel
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") // 12pt, regular font: UM.Theme.getFont("default") // 12pt, regular
text: buildplate ? buildplate : "" text: buildplate ? buildplate : ""

4
plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
View file

@ -97,7 +97,7 @@ Item
height: width // TODO: Theme! height: width // TODO: Theme!
sourceSize.width: width // TODO: Theme! sourceSize.width: width // TODO: Theme!
sourceSize.height: 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") source: UM.Theme.getIcon("arrow_left")
} }
} }
@ -176,7 +176,7 @@ Item
height: width // TODO: Theme! height: width // TODO: Theme!
sourceSize.width: width // TODO: Theme! sourceSize.width: width // TODO: Theme!
sourceSize.height: 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") source: UM.Theme.getIcon("arrow_right")
} }
} }

2
plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml
View file

@ -18,7 +18,7 @@ Button
width: base.width width: base.width
} }
contentItem: Label { 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 font.pixelSize: 32 * screenScaleFactor
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: base.text text: base.text

4
plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml
View file

@ -57,7 +57,7 @@ Item
{ {
id: materialLabel id: materialLabel
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") // 12pt, regular font: UM.Theme.getFont("default") // 12pt, regular
text: "" text: ""
@ -87,7 +87,7 @@ Item
{ {
id: printCoreLabel id: printCoreLabel
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default_bold") // 12pt, bold font: UM.Theme.getFont("default_bold") // 12pt, bold
text: "" text: ""

2
plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
View file

@ -39,7 +39,7 @@ Item
{ {
id: positionLabel id: positionLabel
font: UM.Theme.getFont("small") font: UM.Theme.getFont("small")
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
height: Math.round(size / 2) height: Math.round(size / 2)
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: position + 1 text: position + 1

8
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml
View file

@ -58,7 +58,7 @@ Item
Label Label
{ {
text: printJob && printJob.name ? printJob.name : "" text: printJob && printJob.name ? printJob.name : ""
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
visible: printJob visible: printJob
@ -89,7 +89,7 @@ Item
Label Label
{ {
text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : "" text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : ""
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
visible: printJob visible: printJob
@ -120,7 +120,7 @@ Item
{ {
id: printerAssignmentLabel id: printerAssignmentLabel
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
text: { text: {
@ -188,7 +188,7 @@ Item
Label { Label {
text: printJob && printJob.owner ? printJob.owner : "" text: printJob && printJob.owner ? printJob.owner : ""
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
anchors.top: printerConfiguration.top anchors.top: printerConfiguration.top

4
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml
View file

@ -44,7 +44,7 @@ Item
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
text: printJob ? Math.round(printJob.progress * 100) + "%" : "0%" 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 width: contentWidth
font: UM.Theme.getFont("default") // 12pt, regular font: UM.Theme.getFont("default") // 12pt, regular
@ -62,7 +62,7 @@ Item
leftMargin: UM.Theme.getSize("monitor_margin").width leftMargin: UM.Theme.getSize("monitor_margin").width
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
text: text:
{ {

12
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

@ -103,7 +103,7 @@ Item
Label Label
{ {
text: printer && printer.name ? printer.name : "" text: printer && printer.name ? printer.name : ""
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("large") // 16pt, bold font: UM.Theme.getFont("large") // 16pt, bold
width: parent.width width: parent.width
@ -341,7 +341,7 @@ Item
{ {
verticalCenter: parent.verticalCenter 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 font: UM.Theme.getFont("large_bold") // 16pt, bold
text: { text: {
if (!printer) { if (!printer) {
@ -395,7 +395,7 @@ Item
Label Label
{ {
id: printerJobNameLabel 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 elide: Text.ElideRight
font: UM.Theme.getFont("large") // 16pt, bold font: UM.Theme.getFont("large") // 16pt, bold
text: printer && printer.activePrintJob ? printer.activePrintJob.name : catalog.i18nc("@label", "Untitled") text: printer && printer.activePrintJob ? printer.activePrintJob.name : catalog.i18nc("@label", "Untitled")
@ -416,7 +416,7 @@ Item
topMargin: 6 * screenScaleFactor // TODO: Theme! topMargin: 6 * screenScaleFactor // TODO: Theme!
left: printerJobNameLabel.left 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 elide: Text.ElideRight
font: UM.Theme.getFont("default") // 12pt, regular font: UM.Theme.getFont("default") // 12pt, regular
text: printer && printer.activePrintJob ? printer.activePrintJob.owner : catalog.i18nc("@label", "Anonymous") text: printer && printer.activePrintJob ? printer.activePrintJob.owner : catalog.i18nc("@label", "Anonymous")
@ -448,7 +448,7 @@ Item
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
text: catalog.i18nc("@label:status", "Requires configuration changes") text: catalog.i18nc("@label:status", "Requires configuration changes")
visible: printer && printer.activePrintJob && printer.activePrintJob.configurationChanges.length > 0 && !printerStatus.visible 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: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
@ -484,7 +484,7 @@ Item
anchors.bottomMargin: 2 * screenScaleFactor // TODO: Theme! anchors.bottomMargin: 2 * screenScaleFactor // TODO: Theme!
color: UM.Theme.getColor("monitor_secondary_button_text") color: UM.Theme.getColor("monitor_secondary_button_text")
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
text: catalog.i18nc("@action:button","Details"); text: catalog.i18nc("@action:button", "Details");
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!

2
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml
View file

@ -27,7 +27,7 @@ Item
Label { Label {
id: printerNameLabel id: printerNameLabel
anchors.centerIn: parent anchors.centerIn: parent
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
text: monitorPrinterPill.text text: monitorPrinterPill.text
font.pointSize: 10 // TODO: Theme! font.pointSize: 10 // TODO: Theme!
visible: monitorPrinterPill.text !== "" visible: monitorPrinterPill.text !== ""

10
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View file

@ -26,7 +26,7 @@ Item
left: queuedPrintJobs.left left: queuedPrintJobs.left
top: parent.top top: parent.top
} }
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
text: catalog.i18nc("@label", "Queued") text: catalog.i18nc("@label", "Queued")
renderType: Text.NativeRendering renderType: Text.NativeRendering
@ -97,7 +97,7 @@ Item
Label Label
{ {
text: catalog.i18nc("@label", "There are no print jobs in the queue. Slice and send a job to add one.") 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 elide: Text.ElideRight
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -112,7 +112,7 @@ Item
Label Label
{ {
text: catalog.i18nc("@label", "Print jobs") text: catalog.i18nc("@label", "Print jobs")
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -128,7 +128,7 @@ Item
Label Label
{ {
text: catalog.i18nc("@label", "Total print time") text: catalog.i18nc("@label", "Total print time")
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -144,7 +144,7 @@ Item
Label Label
{ {
text: catalog.i18nc("@label", "Waiting for") text: catalog.i18nc("@label", "Waiting for")
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

2
plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml
View file

@ -12,7 +12,7 @@ Button {
color: UM.Theme.getColor("monitor_context_menu_hover") color: UM.Theme.getColor("monitor_context_menu_hover")
} }
contentItem: Label { 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 text: parent.text
horizontalAlignment: Text.AlignLeft; horizontalAlignment: Text.AlignLeft;
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;

1
resources/themes/cura-dark/theme.json
View file

@ -172,7 +172,6 @@
"toolbox_header_button_text_inactive": [128, 128, 128, 255], "toolbox_header_button_text_inactive": [128, 128, 128, 255],
"monitor_printer_family_tag": [86, 86, 106, 255], "monitor_printer_family_tag": [86, 86, 106, 255],
"monitor_text_primary": [229, 229, 229, 255],
"monitor_text_disabled": [102, 102, 102, 255], "monitor_text_disabled": [102, 102, 102, 255],
"monitor_icon_primary": [229, 229, 229, 255], "monitor_icon_primary": [229, 229, 229, 255],
"monitor_icon_accent": [51, 53, 54, 255], "monitor_icon_accent": [51, 53, 54, 255],

1
resources/themes/cura-light/theme.json
View file

@ -405,7 +405,6 @@
"favorites_row_selected": [196, 239, 255, 255], "favorites_row_selected": [196, 239, 255, 255],
"monitor_printer_family_tag": [228, 228, 242, 255], "monitor_printer_family_tag": [228, 228, 242, 255],
"monitor_text_primary": [65, 64, 84, 255],
"monitor_text_disabled": [238, 238, 238, 255], "monitor_text_disabled": [238, 238, 238, 255],
"monitor_icon_primary": [10, 8, 80, 255], "monitor_icon_primary": [10, 8, 80, 255],
"monitor_icon_accent": [255, 255, 255, 255], "monitor_icon_accent": [255, 255, 255, 255],