3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Merge branch 'master' into feature_extruder_warning_icon

Browse source
This commit is contained in:
fieldOfView 2021-11-16 14:56:43 +01:00
commit 19dbd1f168
4607 changed files with 36124 additions and 13817 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,10 @@ Cura.ExpandablePopup
// Horizontal list that shows the extruders and their materials
RowLayout
{
anchors.fill: parent
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: parent.left
width: parent.width - UM.Theme.getSize("standard_arrow").width
visible: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.hasMaterials : false
Repeater
{
@ -48,6 +51,7 @@ Cura.ExpandablePopup
delegate: Item
{
Layout.preferredWidth: Math.round(parent.width / extrudersModel.count)
Layout.maximumWidth: Math.round(parent.width / extrudersModel.count)
Layout.fillHeight: true
// Extruder icon. Shows extruder index and has the same color as the active material.
@ -91,10 +95,11 @@ Cura.ExpandablePopup
}
}
ColumnLayout
Column
{
opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a
spacing: 0
visible: width > 0
anchors
{
left: configurationWarning.visible ? configurationWarning.right : extruderIcon.right
@ -106,30 +111,28 @@ Cura.ExpandablePopup
// Label for the brand of the material
Label
{
id: materialBrandColorTypeLabel
id: materialBrandNameLabel
text: model.material_brand == model.color_name ? model.color_name + " " + model.material_type : model.material_brand + " " + model.color_name + " " + model.material_type
text: model.material_brand + " " + model.material_name
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
visible: !truncated
}
Label
{
id: materialColorTypeLabel
id: materialNameLabel
text: model.color_name + " " + model.material_type
text: model.material_name
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
visible: !materialBrandColorTypeLabel.visible && !truncated
visible: !materialBrandNameLabel.visible && !truncated
}
Label
@ -142,7 +145,7 @@ Cura.ExpandablePopup
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible
visible: !materialBrandNameLabel.visible && !materialNameLabel.visible
}
// Label that shows the name of the variant
Label
@ -156,7 +159,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
Layout.preferredWidth: parent.width
}
}
}