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

Added activeMaterial property

Browse source 
CURA-1278
This commit is contained in:
Jaime van Kessel 2016-05-12 17:01:47 +02:00
parent 44f5559db3
commit 89c0644e4b
2 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/qml/SidebarHeader.qml
View file

@ -172,8 +172,8 @@ Item
ToolButton {
id: materialSelection
text: UM.MachineManager.activeMaterial
tooltip: UM.MachineManager.activeMaterial
text: Cura.MachineManager.activeMaterialName
tooltip: Cura.MachineManager.activeMaterialName
visible: UM.MachineManager.hasMaterials
height: UM.Theme.getSize("setting_control").height
@ -187,6 +187,11 @@ Item
Instantiator
{
id: materialSelectionInstantiator
model: UM.InstanceContainersModel
{
filter: {"type": "material"}
}
//model: UM.InstancesModel {filter: {"type":"material"}}
// model: UM.MachineMaterialsModel { id: machineMaterialsModel }
MenuItem
{