From 9d48a90f8f8b03f94130684ec47eae7b232575e6 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Mon, 29 Apr 2019 13:45:55 +0200
Subject: [PATCH] Add two labels instead of one

Change the link to adhere to the color scheme

Contributes to CURA-6434.
---
 .../WelcomePages/DataCollectionsContent.qml   | 30 +++++++++++--------
 resources/qml/WelcomePages/WelcomeContent.qml |  2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml
index a2e54c1849..f2bfe10133 100644
--- a/resources/qml/WelcomePages/DataCollectionsContent.qml
+++ b/resources/qml/WelcomePages/DataCollectionsContent.qml
@@ -48,6 +48,19 @@ Item
 
             spacing: UM.Theme.getSize("wide_margin").height
 
+            Label
+            {
+                id: topLabel
+                width: parent.width
+                anchors.horizontalCenter: parent.horizontalCenter
+                horizontalAlignment: Text.AlignHCenter
+                text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience. For instance:")
+                wrapMode: Text.WordWrap
+                font: UM.Theme.getFont("medium")
+                color: UM.Theme.getColor("text")
+                renderType: Text.NativeRendering
+            }
+
             Image
             {
                 id: curaImage
@@ -57,31 +70,24 @@ Item
 
             Label
             {
-                id: textLabel
+                id: bottomLabel
                 width: parent.width
                 anchors.horizontalCenter: parent.horizontalCenter
                 horizontalAlignment: Text.AlignHCenter
                 text:
                 {
-                    var t = catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience.")
+                    var t = catalog.i18nc("@text", "Ultimaker Cura will not collect any information on the model.")
                     var t2 = catalog.i18nc("@text", "More information")
-                    t += " <span style=\"color: rgb(0,0,255)\">" + t2 + "</span>"
+                    t += " <a href='https://notusedref'>" + t2 + "</a>"
                     return t
                 }
                 textFormat: Text.RichText
                 wrapMode: Text.WordWrap
                 font: UM.Theme.getFont("medium")
                 color: UM.Theme.getColor("text")
+                linkColor: UM.Theme.getColor("text_link")
+                onLinkActivated: CuraApplication.showMoreInformationDialogForAnonymousDataCollection()
                 renderType: Text.NativeRendering
-
-                MouseArea
-                {
-                    anchors.fill: parent
-                    onClicked:
-                    {
-                        CuraApplication.showMoreInformationDialogForAnonymousDataCollection()
-                    }
-                }
             }
         }
     }
diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml
index 0099c3db3d..1464e363a8 100644
--- a/resources/qml/WelcomePages/WelcomeContent.qml
+++ b/resources/qml/WelcomePages/WelcomeContent.qml
@@ -19,7 +19,7 @@ Item
     {
         anchors.centerIn: parent
         width: parent.width
-        spacing: UM.Theme.getSize("wide_margin").height
+        spacing: 2 * UM.Theme.getSize("wide_margin").height
 
         Label
         {