Skip to content

Commit

Permalink
Change Label to Text to fix ugly fonts
Browse files Browse the repository at this point in the history
CURA-3389
  • Loading branch information
Appesteijn committed Apr 18, 2017
1 parent 8c9eccd commit 2d14052
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions resources/qml/Preferences/MachinesPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ UM.ManagementPage
visible: base.currentItem != null
anchors.fill: parent

Label
Text
{
id: machineName
text: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
Expand Down Expand Up @@ -146,26 +146,28 @@ UM.ManagementPage
property var connectedPrinter: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands

Label
Text
{
text: catalog.i18nc("@label", "Printer type:")
visible: base.currentItem && "definition_name" in base.currentItem.metadata
}
Label {
Text
{
text: (base.currentItem && "definition_name" in base.currentItem.metadata) ? base.currentItem.metadata.definition_name : ""
}
Label
Text
{
text: catalog.i18nc("@label", "Connection:")
visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId
}
Label {
Text
{
width: parent.width * 0.7
text: machineInfo.printerConnected ? machineInfo.connectedPrinter.connectionText : catalog.i18nc("@info:status", "The printer is not connected.")
visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId
wrapMode: Text.WordWrap
}
Label
Text
{
text: catalog.i18nc("@label", "State:")
visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId && machineInfo.printerAcceptsCommands
Expand Down

0 comments on commit 2d14052

Please sign in to comment.