diff --git a/resources/qml/Settings/SettingCategory.qml b/resources/qml/Settings/SettingCategory.qml index 842b3fd185..e3202323eb 100644 --- a/resources/qml/Settings/SettingCategory.qml +++ b/resources/qml/Settings/SettingCategory.qml @@ -79,6 +79,7 @@ Button verticalCenter: parent.verticalCenter; } text: definition.label + textFormat: Text.PlainText renderType: Text.NativeRendering font: UM.Theme.getFont("setting_category") color: diff --git a/resources/qml/Settings/SettingComboBox.qml b/resources/qml/Settings/SettingComboBox.qml index 5d283d5ebb..76d458e427 100644 --- a/resources/qml/Settings/SettingComboBox.qml +++ b/resources/qml/Settings/SettingComboBox.qml @@ -73,6 +73,7 @@ SettingItem anchors.right: downArrow.left text: control.currentText + textFormat: Text.PlainText renderType: Text.NativeRendering font: UM.Theme.getFont("default") color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text") @@ -115,6 +116,7 @@ SettingItem anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width text: modelData.value + textFormat: Text.PlainText renderType: Text.NativeRendering color: control.contentItem.color font: UM.Theme.getFont("default") diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index 4c00a60d0e..a9427f863a 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -145,6 +145,7 @@ SettingItem rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width text: control.currentText + textFormat: Text.PlainText renderType: Text.NativeRendering font: UM.Theme.getFont("default") color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 34bf9df921..ba7dfd05b6 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -115,6 +115,7 @@ Item { text: definition.label elide: Text.ElideMiddle; renderType: Text.NativeRendering + textFormat: Text.PlainText color: UM.Theme.getColor("setting_control_text"); opacity: (definition.visible) ? 1 : 0.5 diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index 2d4f25125f..a3c1422b30 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -140,6 +140,7 @@ SettingItem rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width text: control.currentText + textFormat: Text.PlainText renderType: Text.NativeRendering font: UM.Theme.getFont("default") color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") @@ -199,6 +200,7 @@ SettingItem anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width text: model.name + textFormat: Text.PlainText renderType: Text.NativeRendering color: { diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index c2c04ce36c..15782829d3 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -94,6 +94,7 @@ SettingItem anchors.verticalCenter: parent.verticalCenter text: definition.unit + textFormat: Text.PlainText renderType: Text.NativeRendering color: UM.Theme.getColor("setting_unit") font: UM.Theme.getFont("default") diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index e17f11bf99..da50b430ac 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -39,10 +39,11 @@ Item Label { id: globalProfileLabel - text: catalog.i18nc("@label","Profile:"); + text: catalog.i18nc("@label","Profile:") + textFormat: Text.PlainText width: Math.round(parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width - 2) - font: UM.Theme.getFont("default"); - color: UM.Theme.getColor("text"); + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") verticalAlignment: Text.AlignVCenter anchors.top: parent.top anchors.bottom: parent.bottom