From 59d395a1217667bc0352d1d2d3ed6df445e8f658 Mon Sep 17 00:00:00 2001 From: Saumya Jain Date: Fri, 15 Mar 2024 12:20:56 +0100 Subject: [PATCH 1/2] Added learn more button while saving and opening UCP CURA-11734 --- plugins/3MFReader/WorkspaceDialog.qml | 13 +++++++++++++ plugins/3MFWriter/UCPDialog.qml | 21 +++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index a8cdad92bd..878b80db17 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -35,6 +35,19 @@ UM.Dialog anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.leftMargin: UM.Theme.getSize("default_margin").height } + + Cura.TertiaryButton + { + id: learnMoreButton + visible: manager.isUcp + anchors.right: parent.right + anchors.topMargin: UM.Theme.getSize("default_margin").height + anchors.rightMargin: UM.Theme.getSize("default_margin").height + text: catalog.i18nc("@button", "Learn more") + iconSource: UM.Theme.getIcon("LinkExternal") + isIconOnRightSide: true + onClicked: Qt.openUrlExternally("https://support.ultimaker.com/s/article/000002979") + } } Rectangle diff --git a/plugins/3MFWriter/UCPDialog.qml b/plugins/3MFWriter/UCPDialog.qml index f90378a8ea..5c85f7fe7d 100644 --- a/plugins/3MFWriter/UCPDialog.qml +++ b/plugins/3MFWriter/UCPDialog.qml @@ -35,14 +35,23 @@ UM.Dialog anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: anchors.leftMargin - - UM.Label + RowLayout { - id: titleLabel - text: catalog.i18nc("@action:title Don't translate 'Universal Cura Project'", "Summary - Universal Cura Project") - font: UM.Theme.getFont("large") + UM.Label + { + id: titleLabel + text: catalog.i18nc("@action:title Don't translate 'Universal Cura Project'", "Summary - Universal Cura Project") + font: UM.Theme.getFont("large") + } + Cura.TertiaryButton + { + id: learnMoreButton + text: catalog.i18nc("@button", "Learn more") + iconSource: UM.Theme.getIcon("LinkExternal") + isIconOnRightSide: true + onClicked: Qt.openUrlExternally("https://support.ultimaker.com/s/article/000002979") + } } - UM.Label { id: descriptionLabel From 80a28021e90b815df425246755caf76a3a2e476b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Mar 2024 13:09:54 +0100 Subject: [PATCH 2/2] Add blank line to split elements visually CURA-11734 --- plugins/3MFWriter/UCPDialog.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/3MFWriter/UCPDialog.qml b/plugins/3MFWriter/UCPDialog.qml index 5c85f7fe7d..25bbb49db0 100644 --- a/plugins/3MFWriter/UCPDialog.qml +++ b/plugins/3MFWriter/UCPDialog.qml @@ -35,6 +35,7 @@ UM.Dialog anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: anchors.leftMargin + RowLayout { UM.Label