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 /resources/qml/ActionPanel/PrintJobInformation.qml
parentf0e3c19a34d1fde3b7ec4fd95677fbefa2028b26 (diff)
Revert "Render labels using `Text.QtRendering` on OSX"
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
Diffstat (limited to 'resources/qml/ActionPanel/PrintJobInformation.qml')
-rw-r--r--resources/qml/ActionPanel/PrintJobInformation.qml28
1 files changed, 21 insertions, 7 deletions
diff --git a/resources/qml/ActionPanel/PrintJobInformation.qml b/resources/qml/ActionPanel/PrintJobInformation.qml
index d142335d41..9cdbf0714f 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.5 as UM
+import UM 1.1 as UM
import Cura 1.0 as Cura
Column
@@ -26,14 +26,15 @@ Column
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
- UM.Label
+ Label
{
text: catalog.i18nc("@label", "Time estimation").toUpperCase()
color: UM.Theme.getColor("primary")
font: UM.Theme.getFont("default_bold")
+ renderType: Text.NativeRendering
}
- UM.Label
+ Label
{
id: byLineType
@@ -75,13 +76,16 @@ Column
Repeater
{
model: modelData
- UM.Label
+ 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
}
}
}
@@ -90,6 +94,9 @@ 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
}
}
@@ -102,14 +109,15 @@ Column
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
- UM.Label
+ Label
{
text: catalog.i18nc("@label", "Material estimation").toUpperCase()
color: UM.Theme.getColor("primary")
font: UM.Theme.getFont("default_bold")
+ renderType: Text.NativeRendering
}
- UM.Label
+ Label
{
id: byMaterialType
@@ -172,13 +180,16 @@ Column
Repeater
{
model: modelData
- UM.Label
+ 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
}
}
}
@@ -187,6 +198,9 @@ 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
}
}