3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Revert "Render labels using Text.QtRendering on OSX"

Browse source 
This reverts commit f0e3c19a34.
This commit is contained in:
c.lamboo 2022-05-10 15:39:02 +02:00
parent f0e3c19a34
commit 35f5c3f959
56 changed files with 337 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml
View file

@ -295,6 +295,7 @@ Cura.MachineAction
UM.Label
{
text: catalog.i18nc("@label", "Enter the IP address of your printer on the network.")
renderType: Text.NativeRendering
}
Cura.TextField

13
plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.2
import QtQuick.Controls 2.0
import UM 1.5 as UM
import UM 1.3 as UM
import Cura 1.6 as Cura
@ -57,25 +57,32 @@ Item
width: Math.max(materialLabel.contentWidth, 60 * screenScaleFactor) // TODO: Theme!
radius: 2 * screenScaleFactor // TODO: Theme!
UM.Label
Label
{
id: materialLabel
anchors.top: parent.top
color: UM.Theme.getColor("text")
elide: Text.ElideRight
font: UM.Theme.getFont("default") // 12pt, regular
text: ""
visible: text !== ""
renderType: Text.NativeRendering
}
UM.Label
Label
{
id: printCoreLabel
anchors.top: materialLabel.bottom
color: UM.Theme.getColor("text")
elide: Text.ElideRight
font: UM.Theme.getFont("default_bold") // 12pt, bold
text: ""
visible: text !== ""
renderType: Text.NativeRendering
}
}
}

5
plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.3
import QtQuick.Controls 2.0
import UM 1.5 as UM
import UM 1.3 as UM
/**
* A MonitorInfoBlurb is an extension of the GenericPopUp used to show static information (vs. interactive context
@ -31,7 +31,7 @@ Item
id: contentWrapper
implicitWidth: childrenRect.width
implicitHeight: innerLabel.contentHeight + 2 * innerLabel.padding
UM.Label
Label
{
id: innerLabel
padding: 12 * screenScaleFactor // TODO: Theme!
@ -39,6 +39,7 @@ Item
wrapMode: Text.WordWrap
width: 240 * screenScaleFactor // TODO: Theme!
color: UM.Theme.getColor("monitor_tooltip_text")
font: UM.Theme.getFont("default")
}
}
}

6
plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml
View file

@ -4,7 +4,7 @@ import QtQuick 2.2
import QtQuick.Window 2.2
import QtQuick.Controls 2.15
import UM 1.5 as UM
import UM 1.1 as UM
UM.Dialog {
@ -70,7 +70,7 @@ UM.Dialog {
name: "cura";
}
UM.Label {
Label {
id: manualPrinterSelectionLabel;
anchors {
left: parent.left;
@ -79,6 +79,8 @@ UM.Dialog {
}
height: 20 * screenScaleFactor;
text: catalog.i18nc("@label", "Printer selection");
wrapMode: Text.Wrap;
renderType: Text.NativeRendering;
}
ComboBox {