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

Use the material name instead of brand + type + color

Browse source 
CURA-8514
Fixes #10421
This commit is contained in:
Jaime van Kessel 2021-10-19 11:23:21 +02:00
parent 89c5a38afa
commit 2baada8a70
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,9 +79,9 @@ 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")
@ -92,15 +92,15 @@ Cura.ExpandablePopup
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
@ -113,7 +113,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