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

Merge branch 'feature_configuration_menu_variant' of https://github.com/fieldOfView/Cura into 4.0

Browse Source
This commit is contained in:
Jaime van Kessel 2019-01-17 14:03:43 +01:00
commit 0ce0228f76
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,27 @@ Cura.ExpandablePopup
width: height width: height
} }
// Label that shows the name of the variant
Label
{
id: variantLabel
visible: Cura.MachineManager.hasVariants
text: model.variant
elide: Text.ElideRight
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
anchors
{
left: extruderIcon.right
leftMargin: UM.Theme.getSize("default_margin").width
verticalCenter: parent.verticalCenter
}
}
// Label for the brand of the material // Label for the brand of the material
Label Label
{ {
@ -74,7 +95,7 @@ Cura.ExpandablePopup
anchors anchors
{ {
left: extruderIcon.right left: variantLabel.visible ? variantLabel.right : extruderIcon.right
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("default_margin").width
@ -92,7 +113,7 @@ Cura.ExpandablePopup
anchors anchors
{ {
left: extruderIcon.right left: variantLabel.visible ? variantLabel.right : extruderIcon.right
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("default_margin").width