Merge branch 'master' into feature_model_list

This commit is contained in:
Diego Prado Gesto 2019-03-05 10:36:05 +01:00
commit 982f7085b3
3 changed files with 11 additions and 10 deletions

View File

@ -134,8 +134,8 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
self._updateExtruders() # Since the new extruders may have different properties, update our own model.
def _onExtruderStackContainersChanged(self, container):
# Update when there is an empty container or material change
if container.getMetaDataEntry("type") == "material" or container.getMetaDataEntry("type") is None:
# Update when there is an empty container or material or variant change
if container.getMetaDataEntry("type") in ["material", "variant", None]:
# The ExtrudersModel needs to be updated when the material-name or -color changes, because the user identifies extruders by material-name
self._updateExtruders()

View File

@ -221,6 +221,7 @@ Item
height: 18 * screenScaleFactor // TODO: Theme!
width: childrenRect.width
visible: !cloudConnection
UM.RecolorImage
{
@ -263,4 +264,4 @@ Item
}
}
}
}
}

View File

@ -1365,7 +1365,7 @@
"package_type": "material",
"display_name": "Ultimaker ABS",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1",
"package_version": "1.2.2",
"sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/abs",
"author": {
@ -1403,7 +1403,7 @@
"package_type": "material",
"display_name": "Ultimaker CPE",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1",
"package_version": "1.2.2",
"sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/abs",
"author": {
@ -1422,7 +1422,7 @@
"package_type": "material",
"display_name": "Ultimaker CPE+",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1",
"package_version": "1.2.2",
"sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/cpe",
"author": {
@ -1441,7 +1441,7 @@
"package_type": "material",
"display_name": "Ultimaker Nylon",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1",
"package_version": "1.2.2",
"sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/abs",
"author": {
@ -1479,7 +1479,7 @@
"package_type": "material",
"display_name": "Ultimaker PLA",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1",
"package_version": "1.2.2",
"sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/abs",
"author": {
@ -1498,7 +1498,7 @@
"package_type": "material",
"display_name": "Ultimaker PP",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1",
"package_version": "1.2.2",
"sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/pp",
"author": {
@ -1536,7 +1536,7 @@
"package_type": "material",
"display_name": "Ultimaker TPU 95A",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1",
"package_version": "1.2.2",
"sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/tpu-95a",
"author": {