Cleaner code

I was hoping to completely nix the generic materials model (since it's basically just a brand "Generic", but then in the QML it has to be have the same in terms of sub-menus or fold-outs and that looked stupid (Generic -> ABS -> ABS)). So we keep that one for now. It is cleaner though.

Contributes to CURA-5162, CURA-5378
This commit is contained in:
Ian Paschal 2018-08-23 16:39:40 +02:00
parent 8da7773600
commit 56a5f59964
8 changed files with 222 additions and 280 deletions

View file

@ -26,7 +26,7 @@ Menu
extruderPosition: menu.extruderIndex
}
Cura.BrandMaterialsModel
Cura.MaterialBrandsModel
{
id: brandModel
extruderPosition: menu.extruderIndex
@ -80,7 +80,7 @@ Menu
id: brandMenu
title: brandName
property string brandName: model.name
property var brandMaterials: model.materials
property var brandMaterials: model.material_types
Instantiator
{