3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Cleaner code

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ Item
// Children
UM.I18nCatalog { id: catalog; name: "cura"; }
Cura.BrandMaterialsModel { id: materialsModel }
Cura.MaterialBrandsModel { id: materialsModel }
Cura.FavoriteMaterialsModel { id: favoriteMaterialsModel }
Cura.GenericMaterialsModel { id: genericMaterialsModel }
Column
@ -186,7 +186,7 @@ Item
{
id: brand_section
property var expanded: true
property var types_model: model.materials
property var types_model: model.material_types
height: childrenRect.height
width: parent.width
Rectangle

2
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -31,7 +31,7 @@ Item
id: catalog
name: "cura"
}
Cura.BrandMaterialsModel
Cura.MaterialBrandsModel
{
id: materialsModel
}