From a7585a4b9a10e83f181fce8adee12cee3b0851e5 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Mon, 11 Jul 2016 16:40:57 +0200 Subject: [PATCH 1/3] Ignore default container types when creating name filters for containers Contributes to CURA-342 --- cura/Settings/ContainerManager.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index eb9dab0ad7..9184db109a 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -349,6 +349,10 @@ class ContainerManager(QObject): def _updateContainerNameFilters(self): self._container_name_filters = {} for plugin_id, container_type in UM.Settings.ContainerRegistry.getContainerTypes(): + # Ignore default container types since those are not plugins + if container_type in (UM.Settings.InstanceContainer, UM.Settings.ContainerStack, UM.Settings.DefinitionContainer): + continue + serialize_type = "" try: plugin_metadata = UM.PluginRegistry.getInstance().getMetaData(plugin_id) From 5393beb8de1ae4ce8799949ce4b6e25a8b82c290 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Mon, 11 Jul 2016 16:41:39 +0200 Subject: [PATCH 2/3] Fix binding loop warnings that would sometimes occur when editing Brand entry Contributes to CURA-342 --- resources/qml/Preferences/MaterialsPage.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml index bacb4f73bb..4e0d64ca5e 100644 --- a/resources/qml/Preferences/MaterialsPage.qml +++ b/resources/qml/Preferences/MaterialsPage.qml @@ -129,7 +129,7 @@ UM.ManagementPage enabled: base.currentItem != null && !base.currentItem.readOnly - checkable: true + checkable: enabled } } @@ -144,7 +144,7 @@ UM.ManagementPage bottom: parent.bottom } - editingEnabled: base.currentItem != null && !base.currentItem.readOnly && editButton.checked; + editingEnabled: editButton.checkable && editButton.checked; properties: materialProperties containerId: base.currentItem != null ? base.currentItem.id : "" From 2c09fc4a6723239cd744b4aa9f28007dea5852fd Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 11 Jul 2016 16:43:55 +0200 Subject: [PATCH 3/3] JSON fix: infill mesh order defaults to higher than for normal meshes (CURA-833) --- resources/definitions/fdmprinter.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 077b9d2162..d8c335f0b3 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3076,7 +3076,8 @@ "label": "Infill Mesh Order", "description": "Determines which infill mesh is inside the infill of another infill mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes.", "default_value": 0, - "minimum_value_warning": "0", + "value": "1 if infill_mesh else 0", + "minimum_value_warning": "1", "maximum_value_warning": "50", "type": "int", "settable_per_mesh": true,