Merge pull request #3854 from fieldOfView/fix_configurationmenu_text

Fix configurationmenu text
This commit is contained in:
Diego Prado Gesto 2018-05-29 13:50:03 +02:00 committed by GitHub
commit cc42d993d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions

View File

@ -92,6 +92,7 @@ Rectangle
anchors.verticalCenter: buildplateIcon.verticalCenter anchors.verticalCenter: buildplateIcon.verticalCenter
anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").height / 2) anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").height / 2)
text: configuration.buildplateConfiguration text: configuration.buildplateConfiguration
renderType: Text.NativeRendering
color: textColor color: textColor
} }
} }

View File

@ -26,6 +26,7 @@ Column
{ {
id: extruderLabel id: extruderLabel
text: catalog.i18nc("@label:extruder label", "Extruder") text: catalog.i18nc("@label:extruder label", "Extruder")
renderType: Text.NativeRendering
elide: Text.ElideRight elide: Text.ElideRight
anchors.left: parent.left anchors.left: parent.left
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
@ -59,6 +60,7 @@ Column
id: extruderNumberText id: extruderNumberText
anchors.centerIn: parent anchors.centerIn: parent
text: printCoreConfiguration.position + 1 text: printCoreConfiguration.position + 1
renderType: Text.NativeRendering
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: mainColor color: mainColor
} }
@ -69,6 +71,7 @@ Column
{ {
id: materialLabel id: materialLabel
text: printCoreConfiguration.material.name text: printCoreConfiguration.material.name
renderType: Text.NativeRendering
elide: Text.ElideRight elide: Text.ElideRight
width: parent.width width: parent.width
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default_bold")
@ -79,6 +82,7 @@ Column
{ {
id: printCoreTypeLabel id: printCoreTypeLabel
text: printCoreConfiguration.hotendID text: printCoreConfiguration.hotendID
renderType: Text.NativeRendering
elide: Text.ElideRight elide: Text.ElideRight
width: parent.width width: parent.width
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")

View File

@ -13,7 +13,7 @@ Button
id: base id: base
property var outputDevice: null property var outputDevice: null
property var matched: updateOnSync() property var matched: updateOnSync()
text: matched == true ? "Yes" : "No" text: matched == true ? catalog.i18nc("@label:extruder label", "Yes") : catalog.i18nc("@label:extruder label", "No")
width: parent.width width: parent.width
height: parent.height height: parent.height