From 4fe4c759bd255949c6c38314325455880db74feb Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 31 May 2017 11:57:48 +0200 Subject: [PATCH 1/4] Anchor the i-button to materialVariantContainer CURA-3810 --- resources/qml/SidebarHeader.qml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index e04f2cc741..eb883d9959 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -162,7 +162,7 @@ Column Item { id: variantRow - + height: UM.Theme.getSize("sidebar_setup").height visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings @@ -177,6 +177,14 @@ Column Text { id: variantLabel + width: parent.width * 0.30 + + anchors.verticalCenter: parent.verticalCenter + anchors.left: variantRow.left + + font: UM.Theme.getFont("default"); + color: UM.Theme.getColor("text"); + text: { var label; @@ -194,12 +202,6 @@ Column } return "%1:".arg(label); } - - anchors.verticalCenter: parent.verticalCenter - anchors.left: variantRow.left - width: parent.width * 0.30 - font: UM.Theme.getFont("default"); - color: UM.Theme.getColor("text"); } Button @@ -208,8 +210,8 @@ Column height: parent.height * 0.60 width: height - anchors.left: variantLabel.right - anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.right: materialVariantContainer.left + anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.verticalCenter: parent.verticalCenter visible: extrudersList.visible @@ -245,6 +247,8 @@ Column Item { + id: materialVariantContainer + anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right From 3177d99bcf51d33b3f543ed59e2d0c94134b9194 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 31 May 2017 11:59:05 +0200 Subject: [PATCH 2/4] Anchor the i-button to materialVariantContainer CURA-3810 --- resources/qml/SidebarHeader.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index eb883d9959..73fd05f8fa 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -162,7 +162,7 @@ Column Item { id: variantRow - + height: UM.Theme.getSize("sidebar_setup").height visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings From 384fd45d7f6dff37f0ada3943740c335384db48f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 30 May 2017 17:16:41 +0200 Subject: [PATCH 3/4] JSON fix: only enable feature extruder nr settings for multi-extrusion printers (CURA-292) --- resources/definitions/fdmprinter.def.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d68904f45d..de4e6a83b8 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -838,6 +838,7 @@ "settable_per_extruder": false, "settable_per_meshgroup": true, "settable_globally": true, + "enabled": "machine_extruder_count > 1", "children": { "wall_0_extruder_nr": @@ -850,7 +851,8 @@ "settable_per_mesh": true, "settable_per_extruder": false, "settable_per_meshgroup": true, - "settable_globally": true + "settable_globally": true, + "enabled": "machine_extruder_count > 1" }, "wall_x_extruder_nr": { @@ -862,7 +864,8 @@ "settable_per_mesh": true, "settable_per_extruder": false, "settable_per_meshgroup": true, - "settable_globally": true + "settable_globally": true, + "enabled": "machine_extruder_count > 1" } } }, @@ -918,7 +921,8 @@ "settable_per_mesh": true, "settable_per_extruder": false, "settable_per_meshgroup": true, - "settable_globally": true + "settable_globally": true, + "enabled": "machine_extruder_count > 1" }, "top_bottom_thickness": { @@ -1191,7 +1195,8 @@ "settable_per_mesh": true, "settable_per_extruder": false, "settable_per_meshgroup": true, - "settable_globally": true + "settable_globally": true, + "enabled": "machine_extruder_count > 1" }, "infill_sparse_density": { From c76a91fbb4d0b6fcffac3bff712dba16a8b69217 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 31 May 2017 13:21:44 +0200 Subject: [PATCH 4/4] added curaplugin to list of plugin extensions CURA-3712 --- cura/CuraApplication.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index b5aecb9b56..ade2e69cd2 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -349,6 +349,8 @@ class CuraApplication(QtApplication): self.globalContainerStackChanged.connect(self._onGlobalContainerChanged) self._onGlobalContainerChanged() + self._plugin_registry.addSupportedPluginExtension("curaplugin", "Cura Plugin") + def _onEngineCreated(self): self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())