From 6aeac2b2a4bb24042e5d8a32a462127992f849fc Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2022 16:12:27 +0100 Subject: [PATCH 1/5] Shorten copy of update button Added the full text in the tooltip CURA-9023 --- resources/qml/Preferences/ProfilesPage.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index e5848a86c7..d1a05cba4c 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -325,9 +325,10 @@ UM.ManagementPage Cura.SecondaryButton { - text: catalog.i18nc("@action:button", "Update profile with current settings/overrides") + 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") } Cura.SecondaryButton From cbf995cb851c76aad2171350074b944787e799b2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2022 16:24:49 +0100 Subject: [PATCH 2/5] Add tooltip to create new button 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 d1a05cba4c..b61aa3022c 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -76,7 +76,7 @@ UM.ManagementPage enabled: !Cura.MachineManager.stacksHaveErrors visible: base.canCreateProfile - + tooltip: catalog.i18nc("@action:tooltip", "Create new profile from current settings/overrides") onClicked: { createQualityDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name) From a285e39799ba90af0772263f29c33455bfb6913d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2022 16:26:01 +0100 Subject: [PATCH 3/5] Set defaultname for create new profile 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 b61aa3022c..8982931b91 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -79,7 +79,7 @@ UM.ManagementPage tooltip: catalog.i18nc("@action:tooltip", "Create new profile from current settings/overrides") onClicked: { - createQualityDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name) + createQualityDialog.object = Cura.ContainerManager.makeUniqueName("") createQualityDialog.open() createQualityDialog.selectText() } From 84bb4790f808f726409b5dd1d2417450f89b659f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2022 16:28:26 +0100 Subject: [PATCH 4/5] Fix spacing between update & discard actions CURA-9023 --- resources/qml/Preferences/ProfilesPage.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 8982931b91..a4069d4d82 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -316,13 +316,14 @@ UM.ManagementPage elide: Text.ElideRight } + Flow { id: currentSettingsActions width: parent.width visible: base.hasCurrentItem && base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName && base.currentItem.intent_category == Cura.MachineManager.activeIntentCategory - + spacing: UM.Theme.getSize("default_margin").width Cura.SecondaryButton { text: catalog.i18nc("@action:button", "Update profile.") From ec1f8f71250793d338489dc0fe7ef5158f34fcac Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2022 16:30:32 +0100 Subject: [PATCH 5/5] Add extra info label CURA-9023 --- resources/qml/Preferences/ProfilesPage.qml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index a4069d4d82..2a6b317314 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -315,7 +315,13 @@ UM.ManagementPage font: UM.Theme.getFont("large_bold") elide: Text.ElideRight } - + UM.Label + { + anchors.left: parent.left + anchors.right: parent.right + text: catalog.i18nc("@action:label", "Some settings from current profile were overwritten.") + visible: currentSettingsActions.visible + } Flow {