mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-10 08:17:49 -06:00
CURA-5510 Add the Generic materials to the list of the bundled packages
so that they show up as installed. Show the installed icon on those packages as well.
This commit is contained in:
Diego Prado Gesto
parent
0bde1487e7
commit
f1379135e0
2 changed files with 219 additions and 3 deletions
|
|
@ -9,8 +9,8 @@ import UM 1.1 as UM
|
||||||
|
|
||||||
Item
|
Item
|
||||||
{
|
{
|
||||||
property int packageCount: toolbox.viewCategory == "material" ? toolbox.getTotalNumberOfPackagesByAuthor(model.id) : 1
|
property int packageCount: (toolbox.viewCategory == "material" && model.type === undefined) ? toolbox.getTotalNumberOfPackagesByAuthor(model.id) : 1
|
||||||
property int installedPackages: toolbox.viewCategory == "material" ? toolbox.getNumberOfInstalledPackagesByAuthor(model.id) : (toolbox.isInstalled(model.id) ? 1 : 0)
|
property int installedPackages: (toolbox.viewCategory == "material" && model.type === undefined) ? toolbox.getNumberOfInstalledPackagesByAuthor(model.id) : (toolbox.isInstalled(model.id) ? 1 : 0)
|
||||||
height: childrenRect.height
|
height: childrenRect.height
|
||||||
Layout.alignment: Qt.AlignTop | Qt.AlignLeft
|
Layout.alignment: Qt.AlignTop | Qt.AlignLeft
|
||||||
Rectangle
|
Rectangle
|
||||||
|
|
@ -106,7 +106,7 @@ Item
|
||||||
case "material":
|
case "material":
|
||||||
|
|
||||||
// If model has a type, it must be a package
|
// If model has a type, it must be a package
|
||||||
if (model.type)
|
if (model.type !== undefined)
|
||||||
{
|
{
|
||||||
toolbox.viewPage = "detail"
|
toolbox.viewPage = "detail"
|
||||||
toolbox.filterModelByProp("packages", "id", model.id)
|
toolbox.filterModelByProp("packages", "id", model.id)
|
||||||
|
|
|
||||||
|
|
@ -713,6 +713,222 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"GenericABS": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericABS",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic ABS",
|
||||||
|
"description": "The generic ABS profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericBAM": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericBAM",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic BAM",
|
||||||
|
"description": "The generic BAM profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericCPE": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericCPE",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic CPE",
|
||||||
|
"description": "The generic CPE profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericHIPS": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericHIPS",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic HIPS",
|
||||||
|
"description": "The generic HIPS profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericNylon": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericNylon",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic Nylon",
|
||||||
|
"description": "The generic Nylon profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericPC": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericPC",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic PC",
|
||||||
|
"description": "The generic PC profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericPETG": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericPETG",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic PETG",
|
||||||
|
"description": "The generic PETG profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericPLA": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericPLA",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic PLA",
|
||||||
|
"description": "The generic PLA profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericPP": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericPP",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic PP",
|
||||||
|
"description": "The generic PP profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericPVA": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericPVA",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic PVA",
|
||||||
|
"description": "The generic PVA profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericToughPLA": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericToughPLA",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic Tough PLA",
|
||||||
|
"description": "The generic Tough PLA profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GenericTPU": {
|
||||||
|
"package_info": {
|
||||||
|
"package_id": "GenericTPU",
|
||||||
|
"package_type": "material",
|
||||||
|
"display_name": "Generic TPU",
|
||||||
|
"description": "The generic TPU profile which other profiles can be based upon.",
|
||||||
|
"package_version": "1.0.0",
|
||||||
|
"sdk_version": 6,
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"author": {
|
||||||
|
"author_id": "Generic",
|
||||||
|
"display_name": "Generic",
|
||||||
|
"email": "materials@ultimaker.com",
|
||||||
|
"website": "https://github.com/Ultimaker/fdm_materials",
|
||||||
|
"description": "Professional 3D printing made accessible."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"DagomaChromatikPLA": {
|
"DagomaChromatikPLA": {
|
||||||
"package_info": {
|
"package_info": {
|
||||||
"package_id": "DagomaChromatikPLA",
|
"package_id": "DagomaChromatikPLA",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue