From 5b9c4e402e5c4dcdd3cf64666e0b1045e5e047e5 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 2 May 2019 15:38:19 +0200 Subject: [PATCH] Change the Back button to be a secondary button Change also some texts in the More information dialog and the font type of one of the titles in the first use flow Contributes to CURA-6483. --- plugins/SliceInfoPlugin/MoreInfoWindow.qml | 6 +++--- resources/qml/WelcomePages/AddPrinterByIpContent.qml | 2 +- resources/qml/WelcomePages/CloudContent.qml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index f19e2cce19..50276ec25c 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -71,7 +71,7 @@ Window left: parent.left right: parent.right } - text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is sent:") + text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:") wrapMode: Text.WordWrap renderType: Text.NativeRendering } @@ -106,7 +106,7 @@ Window Cura.RadioButton { id: dontSendButton - text: catalog.i18nc("@text:window", "I don't want to send this data") + text: catalog.i18nc("@text:window", "I don't want to send anonymous data") onClicked: { baseDialog.allowSendData = !checked @@ -115,7 +115,7 @@ Window Cura.RadioButton { id: allowSendButton - text: catalog.i18nc("@text:window", "Allow sending this data to Ultimaker and help us improve Cura") + text: catalog.i18nc("@text:window", "Allow sending anonymous data") onClicked: { baseDialog.allowSendData = checked diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml index a2543d1fb8..4aec5879c1 100644 --- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml +++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml @@ -321,7 +321,7 @@ Item } } - Cura.PrimaryButton + Cura.SecondaryButton { id: backButton anchors.left: parent.left diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index b0b4d53cf1..e9b6df94e0 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -35,7 +35,7 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "Ultimaker Cloud") color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("large_bold") + font: UM.Theme.getFont("huge") renderType: Text.NativeRendering }