Labels in layerview now correctly use font

Fixes #2309
This commit is contained in:
Jaime van Kessel 2017-08-23 14:02:02 +02:00
parent d74d865ec8
commit b1160c2c37

View file

@ -71,7 +71,7 @@ Item
id: layersLabel id: layersLabel
anchors.left: parent.left anchors.left: parent.left
text: catalog.i18nc("@label","View Mode: Layers") text: catalog.i18nc("@label","View Mode: Layers")
font.bold: true font: UM.Theme.getFont("default_bold");
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
Layout.fillWidth: true Layout.fillWidth: true
elide: Text.ElideMiddle; elide: Text.ElideMiddle;
@ -90,6 +90,7 @@ Item
id: layerViewTypesLabel id: layerViewTypesLabel
anchors.left: parent.left anchors.left: parent.left
text: catalog.i18nc("@label","Color scheme") text: catalog.i18nc("@label","Color scheme")
font: UM.Theme.getFont("default");
visible: !UM.LayerView.compatibilityMode visible: !UM.LayerView.compatibilityMode
Layout.fillWidth: true Layout.fillWidth: true
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
@ -148,6 +149,7 @@ Item
id: compatibilityModeLabel id: compatibilityModeLabel
anchors.left: parent.left anchors.left: parent.left
text: catalog.i18nc("@label","Compatibility Mode") text: catalog.i18nc("@label","Compatibility Mode")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
visible: UM.LayerView.compatibilityMode visible: UM.LayerView.compatibilityMode
Layout.fillWidth: true Layout.fillWidth: true
@ -210,6 +212,7 @@ Item
text: model.name text: model.name
elide: Text.ElideRight elide: Text.ElideRight
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: extrudersModelCheckBox.left; anchors.left: extrudersModelCheckBox.left;
anchors.right: extrudersModelCheckBox.right; anchors.right: extrudersModelCheckBox.right;
@ -275,6 +278,7 @@ Item
Label Label
{ {
text: label text: label
font: UM.Theme.getFont("default")
elide: Text.ElideRight elide: Text.ElideRight
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -340,6 +344,7 @@ Item
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
} }
} }
} }