From 22f9b2a0ec33015a7e3e67ceb92b916f08a00899 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 11 Mar 2022 15:38:34 +0100 Subject: [PATCH 1/8] Increase the indentation margin for settings CURA-8921 --- resources/qml/Settings/SettingItem.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index fa1976757b..6787855775 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -134,7 +134,7 @@ Item id: label anchors.left: parent.left - anchors.leftMargin: doDepthIndentation ? Math.round(UM.Theme.getSize("thin_margin").width + ((definition.depth - 1) * UM.Theme.getSize("narrow_margin").width)) : 0 + anchors.leftMargin: doDepthIndentation ? Math.round(UM.Theme.getSize("thin_margin").width + ((definition.depth - 1) * UM.Theme.getSize("default_margin").width)) : 0 anchors.right: settingControls.left anchors.verticalCenter: parent.verticalCenter From cfeb5101e7083b29df8e70313dd3fe3b62cf52b8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 14 Mar 2022 02:37:14 +0100 Subject: [PATCH 2/8] Reset Max Skin Angle for Expansion to 90 It has been found that the 20 degree leads to overhangs that this printer doesn't handle well. Fixes #11553. --- resources/quality/flsun_sr/flsun_sr_fine.inst.cfg | 1 - resources/quality/flsun_sr/flsun_sr_normal.inst.cfg | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg b/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg index 1e460ba4ae..c6943185b8 100644 --- a/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg +++ b/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg @@ -27,7 +27,6 @@ infill_before_walls = False infill_enable_travel_optimization = False infill_support_angle = 50 ironing_enabled = False -max_skin_angle_for_expansion = 20 retract_at_layer_change = False retraction_amount = 6.5 retraction_hop_only_when_collides = True diff --git a/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg b/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg index 826a2524bb..a5c43dc3d3 100644 --- a/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg +++ b/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg @@ -27,7 +27,6 @@ infill_before_walls = False infill_enable_travel_optimization = False infill_support_angle = 50 ironing_enabled = False -max_skin_angle_for_expansion = 20 retract_at_layer_change = False retraction_amount = 6.5 retraction_hop_only_when_collides = True From 790c2c23c18547e7a2982bb5524682a6ffac03df Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 14 Mar 2022 11:38:31 +0100 Subject: [PATCH 3/8] Display profile name correctly in dropdown CURA-9040 --- resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 6d3682d9ff..d2cd09c4ae 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -84,6 +84,7 @@ Item Layout.maximumWidth: Math.floor(parent.width * 0.7) // Always leave >= 30% for the rest of the row. height: contentHeight elide: Text.ElideRight + wrapMode: Text.NoWrap } UM.Label @@ -96,7 +97,7 @@ Item height: contentHeight elide: Text.ElideRight - + wrapMode: Text.NoWrap function activeQualityDetailText() { var resultMap = Cura.MachineManager.activeQualityDisplayNameMap From ea03236f03bd8d349353fb68ea4a34687a96ce4e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 14 Mar 2022 11:40:05 +0100 Subject: [PATCH 4/8] Remove unneeded font assignment The default font is, you guessed it, already default. --- resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index d2cd09c4ae..2ca4a9f9bf 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -90,7 +90,6 @@ Item UM.Label { text: activeQualityDetailText() - font: UM.Theme.getFont("default") color: UM.Theme.getColor("text_detail") Layout.margins: 0 Layout.fillWidth: true From 97732336e381b38f1a6fa75b62255a8d6fc879f9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 14 Mar 2022 11:42:50 +0100 Subject: [PATCH 5/8] Increase width of dropdown boxes in general page CURA-8990 --- resources/qml/Preferences/GeneralPage.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 8fbaadc5c3..9bb99f23cf 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -215,7 +215,7 @@ UM.PreferencesPage textRole: "text" model: languageList - implicitWidth: UM.Theme.getSize("setting_control").width + implicitWidth: UM.Theme.getSize("combobox_wide").width implicitHeight: currencyField.height function setCurrentIndex() { @@ -255,7 +255,7 @@ UM.PreferencesPage id: currencyField selectByMouse: true text: UM.Preferences.getValue("cura/currency") - implicitWidth: UM.Theme.getSize("setting_control").width + implicitWidth: UM.Theme.getSize("combobox_wide").width onTextChanged: UM.Preferences.setValue("cura/currency", text) } @@ -284,7 +284,7 @@ UM.PreferencesPage model: themeList textRole: "text" - implicitWidth: UM.Theme.getSize("setting_control").width + implicitWidth: UM.Theme.getSize("combobox_wide").width implicitHeight: currencyField.height currentIndex: From 0084001e2f896953526d7f10e3941de08688645e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 14 Mar 2022 11:47:19 +0100 Subject: [PATCH 6/8] Remove . from button string CURA-9023 --- resources/qml/Preferences/ProfilesPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 2a6b317314..9024f7b2ea 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -332,7 +332,7 @@ UM.ManagementPage spacing: UM.Theme.getSize("default_margin").width Cura.SecondaryButton { - text: catalog.i18nc("@action:button", "Update profile.") + text: catalog.i18nc("@action:button", "Update profile") enabled: Cura.MachineManager.hasUserSettings && objectList.currentIndex && !objectList.currentIndex.is_read_only onClicked: Cura.ContainerManager.updateQualityChanges() tooltip: catalog.i18nc("@action:tooltip", "Update profile with current settings/overrides") From c6326eff64323b5a4ab6da6532840042f78b3884 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 14 Mar 2022 11:56:45 +0100 Subject: [PATCH 7/8] Ensure that "update profile" button in preferences has correct enabled state CURA-9023 --- resources/qml/Preferences/ProfilesPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 9024f7b2ea..b25bad39fb 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -333,7 +333,7 @@ UM.ManagementPage Cura.SecondaryButton { text: catalog.i18nc("@action:button", "Update profile") - enabled: Cura.MachineManager.hasUserSettings && objectList.currentIndex && !objectList.currentIndex.is_read_only + enabled: !Cura.MachineManager.stacksHaveErrors && Cura.MachineManager.hasUserSettings && Cura.MachineManager.activeQualityChangesGroup != null onClicked: Cura.ContainerManager.updateQualityChanges() tooltip: catalog.i18nc("@action:tooltip", "Update profile with current settings/overrides") } From 067cdda4013696dc97db40eb734aeefbf9d762a5 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 15 Mar 2022 09:05:38 +0100 Subject: [PATCH 8/8] Add missing UM import CURA-9005 --- plugins/PerObjectSettingsTool/PerObjectCategory.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml index 99f0000393..555c661517 100644 --- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml +++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml @@ -5,6 +5,7 @@ import QtQuick 2.2 import QtQuick.Controls 2.1 import Cura 1.5 as Cura +import UM 1.5 as UM import ".." Cura.CategoryButton