From 631156390903f07a328373d2df35b1ec7bab926d Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 31 May 2017 09:35:22 +0200 Subject: [PATCH 1/5] Realign the selectboxes CURA-3810 --- resources/qml/SidebarHeader.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 32e1db607a..67832354da 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -209,7 +209,7 @@ Column width: height anchors.left: variantLabel.right - anchors.leftMargin: UM.Theme.getSize("default_margin").width * 2 + anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.verticalCenter: parent.verticalCenter visible: extrudersList.visible @@ -248,7 +248,7 @@ Column anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - width: parent.width * 0.50 + UM.Theme.getSize("default_margin").width + width: parent.width * 0.55 + UM.Theme.getSize("default_margin").width height: UM.Theme.getSize("setting_control").height ToolButton { From a934cc418214e3d4b2eda515e56d7dc18100cbeb Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 31 May 2017 09:37:20 +0200 Subject: [PATCH 2/5] Make the icon a litle bit smaller 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 67832354da..e04f2cc741 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -205,7 +205,7 @@ Column Button { id: materialInfoButton - height: parent.height * 0.70 + height: parent.height * 0.60 width: height anchors.left: variantLabel.right From 4e03eeca8e8724e874078b25a178d891af078321 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 31 May 2017 11:57:48 +0200 Subject: [PATCH 3/5] 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 163707df011c3c275e0087a7ee72fb7c36222c58 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 26 May 2017 23:51:56 +0200 Subject: [PATCH 4/5] Fix definition changes for UMO upgrade options --- plugins/UltimakerMachineActions/UMOUpgradeSelection.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/UltimakerMachineActions/UMOUpgradeSelection.py b/plugins/UltimakerMachineActions/UMOUpgradeSelection.py index 02b1482719..07f193e53f 100644 --- a/plugins/UltimakerMachineActions/UMOUpgradeSelection.py +++ b/plugins/UltimakerMachineActions/UMOUpgradeSelection.py @@ -52,7 +52,6 @@ class UMOUpgradeSelection(MachineAction): definition_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion) UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().addContainer(definition_changes_container) - # Insert definition_changes between the definition and the variant - global_container_stack.insertContainer(-1, definition_changes_container) + container_stack.definitionChanges = definition_changes_container return definition_changes_container From 654b9cfa1cc351082684e3cbc3ffbbe20dffcf7c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 31 May 2017 17:17:11 +0200 Subject: [PATCH 5/5] Fix global container stack variable The definition changes are only on the global container stack. That's the one that was meant here. Contributes to issue CURA-3875. --- plugins/UltimakerMachineActions/UMOUpgradeSelection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UltimakerMachineActions/UMOUpgradeSelection.py b/plugins/UltimakerMachineActions/UMOUpgradeSelection.py index 07f193e53f..70a9d3fa0e 100644 --- a/plugins/UltimakerMachineActions/UMOUpgradeSelection.py +++ b/plugins/UltimakerMachineActions/UMOUpgradeSelection.py @@ -52,6 +52,6 @@ class UMOUpgradeSelection(MachineAction): definition_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion) UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().addContainer(definition_changes_container) - container_stack.definitionChanges = definition_changes_container + global_container_stack.definitionChanges = definition_changes_container return definition_changes_container