GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 07:39:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface

Browse Source
This commit is contained in:
Jaime van Kessel 2019-09-03 11:14:19 +02:00
commit 7dc84f14a8
No known key found for this signature in database
GPG Key ID: 3710727397403C91
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/qml/LabelBar.qml
View File

@ -35,6 +35,7 @@ Item
text: model[modelKey]
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
height: contentHeight
anchors
{

2
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View File

@ -45,6 +45,7 @@ Item
}
text: catalog.i18nc("@label", "Profile")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
color: UM.Theme.getColor("text")
verticalAlignment: Text.AlignVCenter
}
@ -69,6 +70,7 @@ Item
anchors.verticalCenter: intentSelection.verticalCenter
height: contentHeight
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
background: Rectangle

1
resources/qml/PrintSetupSelector/Custom/MenuButton.qml
View File

@ -44,5 +44,6 @@ Button
verticalAlignment: Text.AlignVCenter
anchors.left: button.left
anchors.leftMargin: UM.Theme.getSize("wide_margin").width
renderType: Text.NativeRendering
}
}

3
resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
View File

@ -61,6 +61,7 @@ Popup
{
id: headerLabel
text: model.name
renderType: Text.NativeRendering
height: visible ? contentHeight: 0
enabled: false
visible: qualitiesList.visibleChildren.length > 0
@ -198,6 +199,7 @@ Popup
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
Label
{
@ -207,6 +209,7 @@ Popup
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
onClicked: