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

Merge branch 'master' into refactor_singleton_settingsbase

Browse source
This commit is contained in:
Diego Prado Gesto 2018-09-25 09:38:55 +02:00
commit b52c28321a
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
resources/qml/Preferences/Materials/MaterialsList.qml
View file

@ -17,9 +17,23 @@ Item
// Children
UM.I18nCatalog { id: catalog; name: "cura"; }
Cura.MaterialBrandsModel { id: materialsModel }
Cura.FavoriteMaterialsModel { id: favoriteMaterialsModel }
Cura.GenericMaterialsModel { id: genericMaterialsModel }
Cura.MaterialBrandsModel
{
id: materialsModel
extruderPosition: Cura.ExtruderManager.activeExtruderIndex
}
Cura.FavoriteMaterialsModel
{
id: favoriteMaterialsModel
extruderPosition: Cura.ExtruderManager.activeExtruderIndex
}
Cura.GenericMaterialsModel
{
id: genericMaterialsModel
extruderPosition: Cura.ExtruderManager.activeExtruderIndex
}
property var currentType: null
property var currentBrand: null