mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Revert "Render labels using Text.QtRendering on OSX"
This reverts commit f0e3c19a34.
This commit is contained in:
parent
f0e3c19a34
commit
35f5c3f959
56 changed files with 337 additions and 129 deletions
|
|
@ -5,7 +5,7 @@ import QtQuick 2.7
|
|||
import QtQuick.Controls 2.4
|
||||
import QtQuick.Layouts 1.3
|
||||
|
||||
import UM 1.5 as UM
|
||||
import UM 1.4 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
|
||||
|
|
@ -45,13 +45,16 @@ Column
|
|||
}
|
||||
}
|
||||
|
||||
UM.Label
|
||||
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
|
||||
{
|
||||
|
|
@ -68,7 +71,7 @@ Column
|
|||
height: width
|
||||
status: UM.StatusIcon.Status.WARNING
|
||||
}
|
||||
UM.Label
|
||||
Label
|
||||
{
|
||||
id: label
|
||||
anchors.left: warningIcon.right
|
||||
|
|
@ -76,6 +79,9 @@ 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
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue