3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Show color + material in menus and Materials page

Browse source 
CURA-2108
This commit is contained in:
fieldOfView 2016-08-22 17:34:33 +02:00
parent cb6353ba2a
commit 3671d241d5
2 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resources/qml/Menus/MaterialMenu.qml
View file

@ -36,22 +36,7 @@ Menu
}
MenuItem
{
text:
{
var result = model.name
if(model.metadata.brand != undefined && model.metadata.brand != "Generic")
{
result = model.metadata.brand + " " + result
}
if(model.metadata.color_name != undefined && model.metadata.color_name != "Generic")
{
result = result + " (%1)".arg(model.metadata.color_name)
}
return result
}
text: model.name
checkable: true;
checked: model.id == Cura.MachineManager.activeMaterialId;
exclusiveGroup: group;