diff options
author | c.lamboo <casperlamboo@gmail.com> | 2022-05-10 16:36:50 +0300 |
---|---|---|
committer | c.lamboo <casperlamboo@gmail.com> | 2022-05-10 16:36:50 +0300 |
commit | f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26 (patch) | |
tree | 5333854a5279982cb9c1a7e7885d9f6a09042f25 /plugins/UltimakerMachineActions | |
parent | c4f9669887569f01d302382be15a1246e201617d (diff) |
Render labels using `Text.QtRendering` on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).
In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.
CURA-9154
Diffstat (limited to 'plugins/UltimakerMachineActions')
-rw-r--r-- | plugins/UltimakerMachineActions/BedLevelMachineAction.qml | 16 | ||||
-rw-r--r-- | plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml | 4 |
2 files changed, 5 insertions, 15 deletions
diff --git a/plugins/UltimakerMachineActions/BedLevelMachineAction.qml b/plugins/UltimakerMachineActions/BedLevelMachineAction.qml index a9f7e93d44..ccc1fb75b0 100644 --- a/plugins/UltimakerMachineActions/BedLevelMachineAction.qml +++ b/plugins/UltimakerMachineActions/BedLevelMachineAction.qml @@ -5,7 +5,7 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 -import UM 1.3 as UM +import UM 1.5 as UM import Cura 1.1 as Cura @@ -23,18 +23,16 @@ Cura.MachineAction anchors.horizontalCenter: parent.horizontalCenter width: parent.width * 3 / 4 - Label + UM.Label { id: pageTitle width: parent.width text: catalog.i18nc("@title", "Build Plate Leveling") wrapMode: Text.WordWrap font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering } - Label + UM.Label { id: pageDescription anchors.top: pageTitle.bottom @@ -42,12 +40,9 @@ Cura.MachineAction width: parent.width wrapMode: Text.WordWrap text: catalog.i18nc("@label", "To make sure your prints will come out great, you can now adjust your buildplate. When you click 'Move to Next Position' the nozzle will move to the different positions that can be adjusted.") - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering } - Label + UM.Label { id: bedlevelingText anchors.top: pageDescription.bottom @@ -55,9 +50,6 @@ Cura.MachineAction width: parent.width wrapMode: Text.WordWrap text: catalog.i18nc("@label", "For every position; insert a piece of paper under the nozzle and adjust the print build plate height. The print build plate height is right when the paper is slightly gripped by the tip of the nozzle.") - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering } Row diff --git a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml index 3d7b4a054f..8136e63a47 100644 --- a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml +++ b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml @@ -20,7 +20,7 @@ Cura.MachineAction anchors.topMargin: UM.Theme.getSize("default_margin").width * 5 anchors.leftMargin: UM.Theme.getSize("default_margin").width * 4 - Label + UM.Label { id: pageDescription anchors.top: parent.top @@ -29,8 +29,6 @@ Cura.MachineAction wrapMode: Text.WordWrap text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker Original") font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering } UM.CheckBox |