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

Slightly modify the variant label to match more with the monitor tab

Browse Source 
CURA-6100
This commit is contained in:
Jaime van Kessel 2019-01-17 14:21:11 +01:00
parent 0ce0228f76
commit 12a120f044
1 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View File

@ -61,6 +61,26 @@ Cura.ExpandablePopup
width: height width: height
} }
// Label for the brand of the material
Label
{
id: typeAndBrandNameLabel
text: model.material_brand + " " + model.material
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
anchors
{
top: extruderIcon.top
left: extruderIcon.right
leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
}
}
// Label that shows the name of the variant // Label that shows the name of the variant
Label Label
{ {
@ -70,7 +90,7 @@ Cura.ExpandablePopup
text: model.variant text: model.variant
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
@ -78,46 +98,7 @@ Cura.ExpandablePopup
{ {
left: extruderIcon.right left: extruderIcon.right
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
verticalCenter: parent.verticalCenter top: typeAndBrandNameLabel.bottom
}
}
// Label for the brand of the material
Label
{
id: brandNameLabel
text: model.material_brand
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_inactive")
renderType: Text.NativeRendering
anchors
{
left: variantLabel.visible ? variantLabel.right : extruderIcon.right
leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
}
}
// Label that shows the name of the material
Label
{
text: model.material
elide: Text.ElideRight
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
anchors
{
left: variantLabel.visible ? variantLabel.right : extruderIcon.right
leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
top: brandNameLabel.bottom
} }
} }
} }