From 2ed1894a27d140d25bbb7168f9ea76c21b48e979 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Fri, 18 Feb 2022 16:11:18 +0100 Subject: [PATCH 1/4] Set Dialog margin as it was in 4.13 CURA-8688 --- resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index 18517d5e96..15540e1964 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -21,6 +21,8 @@ UM.Dialog width: minimumWidth height: minimumHeight + margin: UM.Theme.getSize("thick_margin").width + property var changesModel: Cura.UserChangesModel { id: userChangesModel } onVisibilityChanged: From d333b4639c29937e4ac993b966809aa9bd217c96 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Fri, 18 Feb 2022 17:20:49 +0100 Subject: [PATCH 2/4] Align per object settings visibility checkbox with icon CURA-8688 --- plugins/PerObjectSettingsTool/PerObjectItem.qml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/PerObjectSettingsTool/PerObjectItem.qml b/plugins/PerObjectSettingsTool/PerObjectItem.qml index ac78da7850..d5582b9643 100644 --- a/plugins/PerObjectSettingsTool/PerObjectItem.qml +++ b/plugins/PerObjectSettingsTool/PerObjectItem.qml @@ -10,16 +10,24 @@ import Cura 1.0 as Cura UM.TooltipArea { - x: model.depth * UM.Theme.getSize("default_margin").width; - text: model.description; + x: model.depth * UM.Theme.getSize("default_margin").width + text: model.description - width: childrenRect.width; - height: childrenRect.height; + width: childrenRect.width + height: childrenRect.height + + Item + { + id: spacer + width: 5 + } UM.CheckBox { id: check + anchors.left: spacer.right + text: definition.label checked: addedSettingsModel.getVisible(model.key) From c00eb5b432c6842ff872e086d6b893e27a967b94 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Fri, 18 Feb 2022 18:15:48 +0100 Subject: [PATCH 3/4] Align checkbox with category icon in per object visibility settings dialog and preferences visibility settings. Move "Information" icon to the right of checkboxes in settings visibilty preferences page. This allows clean aligning of checkboxes with category icon. CURA-8688 --- .../PerObjectCategory.qml | 19 +++++++++++++------ .../PerObjectSettingsTool/PerObjectItem.qml | 3 ++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml index 3f95d4e021..1800555b9d 100644 --- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml +++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml @@ -11,19 +11,26 @@ import ".." Button { id: base; - background: Item { } + background: Item {} contentItem: Row { spacing: UM.Theme.getSize("default_lining").width - UM.RecolorImage + Item //Wrapper to give space before icon with fixed width. This allows aligning checkbox with category icon. { - anchors.verticalCenter: parent.verticalCenter - height: (label.height / 2) | 0 + height: label.height width: height - source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight"); - color: base.hovered ? palette.highlight : palette.buttonText + anchors.verticalCenter: parent.verticalCenter + + UM.RecolorImage + { + anchors.verticalCenter: parent.verticalCenter + height: (label.height / 2) | 0 + width: height + source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight"); + color: base.hovered ? palette.highlight : palette.buttonText + } } UM.RecolorImage { diff --git a/plugins/PerObjectSettingsTool/PerObjectItem.qml b/plugins/PerObjectSettingsTool/PerObjectItem.qml index d5582b9643..0c8015541e 100644 --- a/plugins/PerObjectSettingsTool/PerObjectItem.qml +++ b/plugins/PerObjectSettingsTool/PerObjectItem.qml @@ -19,7 +19,8 @@ UM.TooltipArea Item { id: spacer - width: 5 + // Align checkbox with PerObjectCategory icon + width: UM.Theme.getSize("default_margin").width } UM.CheckBox From 104a34d05ad5bc2a6a5e4f95e2e7ad0af55f5d36 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 21 Feb 2022 10:46:39 +0100 Subject: [PATCH 4/4] Vertically center aligns "Material", "PrintCore" and dropdowns in extruder configuration menu. CURA-8688 --- resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 8a637f3870..f3cef1a819 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -278,6 +278,7 @@ Item width: selectors.controlWidth height: parent.height + anchors.verticalCenter: parent.verticalCenter focusPolicy: Qt.ClickFocus @@ -289,6 +290,7 @@ Item } onClicked: materialsMenu.popup() } + Item { width: instructionButton.width + 2 * UM.Theme.getSize("narrow_margin").width @@ -331,6 +333,7 @@ Item tooltip: text height: parent.height width: selectors.controlWidth + anchors.verticalCenter: parent.verticalCenter focusPolicy: Qt.ClickFocus enabled: enabledCheckbox.checked