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:40:09 +0300 |
commit | d5c0fde7f2b7bdb17e94dc61a3605c5cbad6c175 (patch) | |
tree | 5333854a5279982cb9c1a7e7885d9f6a09042f25 /resources/qml/ActionPanel | |
parent | 35f5c3f959a7d5ad85b0e2d8e0514cde509ca6c8 (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 'resources/qml/ActionPanel')
-rw-r--r-- | resources/qml/ActionPanel/PrintJobInformation.qml | 28 | ||||
-rw-r--r-- | resources/qml/ActionPanel/SliceProcessWidget.qml | 12 |
2 files changed, 10 insertions, 30 deletions
diff --git a/resources/qml/ActionPanel/PrintJobInformation.qml b/resources/qml/ActionPanel/PrintJobInformation.qml index 9cdbf0714f..d142335d41 100644 --- a/resources/qml/ActionPanel/PrintJobInformation.qml +++ b/resources/qml/ActionPanel/PrintJobInformation.qml @@ -4,7 +4,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 -import UM 1.1 as UM +import UM 1.5 as UM import Cura 1.0 as Cura Column @@ -26,15 +26,14 @@ Column leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width - Label + UM.Label { text: catalog.i18nc("@label", "Time estimation").toUpperCase() color: UM.Theme.getColor("primary") font: UM.Theme.getFont("default_bold") - renderType: Text.NativeRendering } - Label + UM.Label { id: byLineType @@ -76,16 +75,13 @@ Column Repeater { model: modelData - Label + UM.Label { width: Math.round(byLineType.width * byLineType.columnWidthMultipliers[index]) height: contentHeight horizontalAlignment: byLineType.columnHorizontalAligns[index] - color: UM.Theme.getColor("text") - font: UM.Theme.getFont("default") wrapMode: Text.WrapAnywhere text: modelData - renderType: Text.NativeRendering } } } @@ -94,9 +90,6 @@ Column width: parent.width - 2 * UM.Theme.getSize("default_margin").width height: childrenRect.height - color: UM.Theme.getColor("text") - font: UM.Theme.getFont("default") - renderType: Text.NativeRendering textFormat: Text.RichText } } @@ -109,15 +102,14 @@ Column leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width - Label + UM.Label { text: catalog.i18nc("@label", "Material estimation").toUpperCase() color: UM.Theme.getColor("primary") font: UM.Theme.getFont("default_bold") - renderType: Text.NativeRendering } - Label + UM.Label { id: byMaterialType @@ -180,16 +172,13 @@ Column Repeater { model: modelData - Label + UM.Label { width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index]) height: contentHeight horizontalAlignment: byMaterialType.columnHorizontalAligns[index] - color: UM.Theme.getColor("text") - font: UM.Theme.getFont("default") wrapMode: Text.WrapAnywhere text: modelData - renderType: Text.NativeRendering } } } @@ -198,9 +187,6 @@ Column width: parent.width - 2 * UM.Theme.getSize("default_margin").width height: childrenRect.height - color: UM.Theme.getColor("text") - font: UM.Theme.getFont("default") - renderType: Text.NativeRendering textFormat: Text.RichText } } diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml index 58bf736575..cf70e4ba87 100644 --- a/resources/qml/ActionPanel/SliceProcessWidget.qml +++ b/resources/qml/ActionPanel/SliceProcessWidget.qml @@ -5,7 +5,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.4 import QtQuick.Layouts 1.3 -import UM 1.4 as UM +import UM 1.5 as UM import Cura 1.0 as Cura @@ -45,16 +45,13 @@ Column } } - Label + UM.Label { id: autoSlicingLabel width: parent.width visible: progressBar.visible text: catalog.i18nc("@label:PrintjobStatus", "Slicing...") - color: UM.Theme.getColor("text") - font: UM.Theme.getFont("default") - renderType: Text.NativeRendering } Item { @@ -71,7 +68,7 @@ Column height: width status: UM.StatusIcon.Status.WARNING } - Label + UM.Label { id: label anchors.left: warningIcon.right @@ -79,9 +76,6 @@ Column anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@label:PrintjobStatus", "Unable to slice") - color: UM.Theme.getColor("text") - font: UM.Theme.getFont("default") - renderType: Text.NativeRendering wrapMode: Text.WordWrap } } |