From 4590fae9b209f99707eca7a4835b1fb0464df932 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Thu, 28 Feb 2019 17:08:28 +0100 Subject: [PATCH 1/2] Hide the "View print history" button when connecting via cloud CL-1247 --- plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index 6eaff20f71..ce08f78226 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml @@ -221,6 +221,7 @@ Item height: 18 * screenScaleFactor // TODO: Theme! width: childrenRect.width + visible: !cloudConnection UM.RecolorImage { @@ -263,4 +264,4 @@ Item } } } -} \ No newline at end of file +} From 3fd0561aca2c44eca60ba01c18e7d8cfa7569d77 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 1 Mar 2019 14:54:42 +0100 Subject: [PATCH 2/2] Update the ExtruderModel also when the variant container has changed. Contributes to CURA-6227. --- cura/Settings/ExtrudersModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/ExtrudersModel.py b/cura/Settings/ExtrudersModel.py index afc2af94b3..93cc1ce402 100644 --- a/cura/Settings/ExtrudersModel.py +++ b/cura/Settings/ExtrudersModel.py @@ -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()