From 16cb42b3c74c7cfce524a55be84fc19bff1d7938 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 9 Apr 2021 11:39:43 +0200 Subject: [PATCH 1/7] Set the size of the "What's New" dialog equal to the "Welcome" dialog CURA-8154 --- resources/qml/Cura.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 067024a7b5..abced93100 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -863,6 +863,8 @@ UM.MainWindow { id: whatsNewDialog title: catalog.i18nc("@title:window", "What's New") + minimumWidth: UM.Theme.getSize("welcome_wizard_window").width + minimumHeight: UM.Theme.getSize("welcome_wizard_window").height model: CuraApplication.getWhatsNewPagesModel() progressBarVisible: false visible: false From 34195551f48fa44f9cc0c4307d9afac1fe72b255 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 9 Apr 2021 11:41:33 +0200 Subject: [PATCH 2/7] Fix uneven margins in the WizardPanel CURA-8154 --- resources/qml/WelcomePages/WizardPanel.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/WelcomePages/WizardPanel.qml b/resources/qml/WelcomePages/WizardPanel.qml index db4b66d18b..21d3657a90 100644 --- a/resources/qml/WelcomePages/WizardPanel.qml +++ b/resources/qml/WelcomePages/WizardPanel.qml @@ -64,7 +64,6 @@ Item anchors { margins: UM.Theme.getSize("wide_margin").width - bottomMargin: UM.Theme.getSize("default_margin").width top: progressBar.bottom bottom: parent.bottom left: parent.left From 89697ea48926155b453189b2cb3cf2a1ee10fb2b Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 9 Apr 2021 11:42:13 +0200 Subject: [PATCH 3/7] Set height of progressBar to 0 when not visible in WizardPanel CURA-8154 --- resources/qml/WelcomePages/WizardPanel.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/WelcomePages/WizardPanel.qml b/resources/qml/WelcomePages/WizardPanel.qml index 21d3657a90..99492d4862 100644 --- a/resources/qml/WelcomePages/WizardPanel.qml +++ b/resources/qml/WelcomePages/WizardPanel.qml @@ -53,7 +53,7 @@ Item anchors.left: parent.left anchors.right: parent.right - height: UM.Theme.getSize("progressbar").height + height: visible ? UM.Theme.getSize("progressbar").height : 0 value: base.progressValue } From 92dafccf6daaba3517a61ae146a96b1abad9c713 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 9 Apr 2021 15:08:43 +0200 Subject: [PATCH 4/7] Fix margins in the WhatsNew pages CURA-8154 --- .../qml/WelcomePages/WhatsNewContent.qml | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index 4a3afe66c1..ac0717eefc 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -31,23 +31,16 @@ Item renderType: Text.NativeRendering } - Item - { - id: topSpacer - anchors.top: titleLabel.bottom - height: UM.Theme.getSize("default_margin").height - width: UM.Theme.getSize("default_margin").width - } - Rectangle { anchors { - top: topSpacer.bottom + top: titleLabel.bottom + topMargin: UM.Theme.getSize("default_margin").width bottom: whatsNewDots.top + bottomMargin: UM.Theme.getSize("narrow_margin").width left: parent.left right: parent.right - margins: UM.Theme.getSize("default_margin").width * 2 } color: UM.Theme.getColor("viewport_overlay") @@ -59,7 +52,6 @@ Item anchors { top: parent.top - topMargin: UM.Theme.getSize("default_margin").width horizontalCenter: parent.horizontalCenter } height: parent.height @@ -69,12 +61,6 @@ Item Repeater { - anchors - { - top: parent.top - topMargin: UM.Theme.getSize("default_margin").width / 2 - horizontalCenter: parent.horizontalCenter - } model: manager.subpageCount @@ -82,6 +68,8 @@ Item { Layout.alignment: Qt.AlignHCenter color: UM.Theme.getColor("viewport_overlay") + width: whatsNewViewport.width + height: whatsNewViewport.height Image { @@ -89,12 +77,15 @@ Item anchors { - horizontalCenter: parent.horizontalCenter top: parent.top - topMargin: UM.Theme.getSize("default_margin").width + topMargin: UM.Theme.getSize("thick_margin").width + left: parent.left + leftMargin: UM.Theme.getSize("thick_margin").width + right: parent.right + rightMargin: UM.Theme.getSize("thick_margin").width } - width: Math.round(parent.width - (UM.Theme.getSize("default_margin").width * 2)) - height: Math.round((parent.height - UM.Theme.getSize("default_margin").height) * 0.75) + width: sourceSize.width + sourceSize.width: Math.round(parent.width - (UM.Theme.getSize("thick_margin").height * 2)) fillMode: Image.PreserveAspectFit source: manager.getSubpageImageSource(index) @@ -108,9 +99,10 @@ Item { top: subpageImage.bottom bottom: parent.bottom - horizontalCenter: parent.horizontalCenter + bottomMargin: UM.Theme.getSize("thick_margin").height + left: subpageImage.left + right: subpageImage.right } - width: Math.round(parent.width - (UM.Theme.getSize("default_margin").width * 2)) ScrollBar.horizontal.policy: ScrollBar.AlwaysOff @@ -139,7 +131,8 @@ Item anchors { - bottom: bottomSpacer.top + bottom: whatsNewNextButton.top + bottomMargin: UM.Theme.getSize("narrow_margin").height horizontalCenter: parent.horizontalCenter } From ae63dff0e40969e19c61cb642d9c17f0b479cc4f Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 9 Apr 2021 15:09:10 +0200 Subject: [PATCH 5/7] Remove padding of the text in the scrollable text area CURA-8154 --- resources/qml/WelcomePages/WhatsNewContent.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index ac0717eefc..1d90f7fb70 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -115,6 +115,8 @@ Item textArea.readOnly: true textArea.font: UM.Theme.getFont("medium") textArea.onLinkActivated: Qt.openUrlExternally(link) + textArea.leftPadding: 0 + textArea.rightPadding: 0 } } } From 17a4b40fd7e1ededf5529813c6ed53e2fbcb45cc Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 12 Apr 2021 12:37:57 +0200 Subject: [PATCH 6/7] Change the font size to default in the changelog So that it is consistent with the What's new pages CURA-8154 --- resources/qml/WelcomePages/ChangelogContent.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/WelcomePages/ChangelogContent.qml b/resources/qml/WelcomePages/ChangelogContent.qml index 9e290dcf54..d106f94c04 100644 --- a/resources/qml/WelcomePages/ChangelogContent.qml +++ b/resources/qml/WelcomePages/ChangelogContent.qml @@ -44,7 +44,7 @@ Item textArea.textFormat: Text.RichText textArea.wrapMode: Text.WordWrap textArea.readOnly: true - textArea.font: UM.Theme.getFont("medium") + textArea.font: UM.Theme.getFont("default") textArea.onLinkActivated: Qt.openUrlExternally(link) } From 14c11190fdb19d6280c8faecd48a1fa2a5ba0e63 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 12 Apr 2021 12:38:36 +0200 Subject: [PATCH 7/7] Minor UI fixes in the What's new pages * Add a top margin between the image and the text * Change the text font to default * Fix line break in the html page CURA-8154 --- resources/qml/WelcomePages/WhatsNewContent.qml | 3 ++- resources/texts/whats_new/1.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index 1d90f7fb70..7b38c6f85a 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -98,6 +98,7 @@ Item anchors { top: subpageImage.bottom + topMargin: UM.Theme.getSize("default_margin").height bottom: parent.bottom bottomMargin: UM.Theme.getSize("thick_margin").height left: subpageImage.left @@ -113,7 +114,7 @@ Item textArea.text: manager.getSubpageText(index) textArea.textFormat: Text.RichText textArea.readOnly: true - textArea.font: UM.Theme.getFont("medium") + textArea.font: UM.Theme.getFont("default") textArea.onLinkActivated: Qt.openUrlExternally(link) textArea.leftPadding: 0 textArea.rightPadding: 0 diff --git a/resources/texts/whats_new/1.html b/resources/texts/whats_new/1.html index 4c542e7e16..8b56f46928 100644 --- a/resources/texts/whats_new/1.html +++ b/resources/texts/whats_new/1.html @@ -1,3 +1,3 @@

Better visual representation

-

The Z-seam is now clearly indicated in Preview mode. This ensures that you will know whether the seam will be sufficiently hidden in the end product.
+

The Z-seam is now clearly indicated in Preview mode. This ensures that you will know whether the seam will be sufficiently hidden in the end product.
Thanks to BasF0 for contributing to this feature.