mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-07 05:53:59 -06:00
Merge branch '3.5'
This commit is contained in:
commit
e31f35ec95
2 changed files with 18 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue