GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:35:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use Label for all text, not just labels

Browse Source 
The fonts use better fallbacks if they fail to load for labels.

Contributes to issue CURA-3161.
This commit is contained in:
Ghostkeeper 2017-02-10 11:56:37 +01:00
parent 6ed0e81492
commit f6fe4f9fd3
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/qml/PrintMonitor.qml
View File

@ -86,7 +86,7 @@ Column
height: UM.Theme.getSize("sidebar_extruder_box").height height: UM.Theme.getSize("sidebar_extruder_box").height
Layout.fillWidth: index == machineExtruderCount.properties.value - 1 && index % 2 == 0 Layout.fillWidth: index == machineExtruderCount.properties.value - 1 && index % 2 == 0
Text //Extruder name. Label //Extruder name.
{ {
text: machineExtruderCount.properties.value > 1 ? extrudersModel.getItem(index).name : catalog.i18nc("@label", "Hotend") text: machineExtruderCount.properties.value > 1 ? extrudersModel.getItem(index).name : catalog.i18nc("@label", "Hotend")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
@ -94,7 +94,7 @@ Column
anchors.top: parent.top anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
} }
Text //Temperature indication. Label //Temperature indication.
{ {
text: connectedPrinter != null ? Math.round(connectedPrinter.hotendTemperatures[index]) + "°C" : "" text: connectedPrinter != null ? Math.round(connectedPrinter.hotendTemperatures[index]) + "°C" : ""
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
@ -115,7 +115,7 @@ Column
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: materialName.verticalCenter anchors.verticalCenter: materialName.verticalCenter
} }
Text //Material name. Label //Material name.
{ {
id: materialName id: materialName
text: connectedPrinter != null ? connectedPrinter.materialNames[index] : "" text: connectedPrinter != null ? connectedPrinter.materialNames[index] : ""
@ -125,7 +125,7 @@ Column
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
} }
Text //Variant name. Label //Variant name.
{ {
text: connectedPrinter != null ? connectedPrinter.hotendIds[index] : "" text: connectedPrinter != null ? connectedPrinter.hotendIds[index] : ""
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
@ -155,7 +155,7 @@ Column
anchors.top: parent.top anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
} }
Text //Target temperature. Label //Target temperature.
{ {
id: bedTargetTemperature id: bedTargetTemperature
text: connectedPrinter != null ? connectedPrinter.targetBedTemperature + "°C" : "" text: connectedPrinter != null ? connectedPrinter.targetBedTemperature + "°C" : ""
@ -165,7 +165,7 @@ Column
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.bottom: bedCurrentTemperature.bottom anchors.bottom: bedCurrentTemperature.bottom
} }
Text //Current temperature. Label //Current temperature.
{ {
id: bedCurrentTemperature id: bedCurrentTemperature
text: connectedPrinter != null ? connectedPrinter.bedTemperature + "°C" : "" text: connectedPrinter != null ? connectedPrinter.bedTemperature + "°C" : ""
@ -300,7 +300,7 @@ Column
} }
} }
} }
Text Label
{ {
id: preheatCountdown id: preheatCountdown
text: "0:00" text: "0:00"