Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorc.lamboo <casperlamboo@gmail.com>2022-05-10 16:39:02 +0300
committerc.lamboo <casperlamboo@gmail.com>2022-05-10 16:39:02 +0300
commit35f5c3f959a7d5ad85b0e2d8e0514cde509ca6c8 (patch)
treef650ab192e92ddb2797361efbe87b5f2c27e04fc /plugins/MachineSettingsAction
parentf0e3c19a34d1fde3b7ec4fd95677fbefa2028b26 (diff)
Revert "Render labels using `Text.QtRendering` on OSX"
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
Diffstat (limited to 'plugins/MachineSettingsAction')
-rw-r--r--plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml5
-rw-r--r--plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml10
2 files changed, 10 insertions, 5 deletions
diff --git a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml
index dc1a479be9..293e7386b2 100644
--- a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml
@@ -4,7 +4,7 @@
import QtQuick 2.10
import QtQuick.Controls 2.3
-import UM 1.5 as UM
+import UM 1.3 as UM
import Cura 1.1 as Cura
@@ -58,10 +58,11 @@ Item
spacing: base.columnSpacing
- UM.Label // Title Label
+ Label // Title Label
{
text: catalog.i18nc("@title:label", "Nozzle Settings")
font: UM.Theme.getFont("medium_bold")
+ renderType: Text.NativeRendering
}
Cura.NumericTextFieldWithUnit // "Nozzle size"
diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
index 6c11c414ed..32c8f8df63 100644
--- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
@@ -5,7 +5,7 @@ import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
-import UM 1.5 as UM
+import UM 1.3 as UM
import Cura 1.1 as Cura
@@ -51,10 +51,12 @@ Item
spacing: base.columnSpacing
- UM.Label // Title Label
+ Label // Title Label
{
text: catalog.i18nc("@title:label", "Printer Settings")
font: UM.Theme.getFont("medium_bold")
+ color: UM.Theme.getColor("text")
+ renderType: Text.NativeRendering
width: parent.width
elide: Text.ElideRight
}
@@ -180,10 +182,12 @@ Item
spacing: base.columnSpacing
- UM.Label // Title Label
+ Label // Title Label
{
text: catalog.i18nc("@title:label", "Printhead Settings")
font: UM.Theme.getFont("medium_bold")
+ color: UM.Theme.getColor("text")
+ renderType: Text.NativeRendering
width: parent.width
elide: Text.ElideRight
}