Resolve merge conflicts

CURA-6483

resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml

@@ -41,10 +41,7 @@ Item
 
         onClicked:
         {
-            if (contentShown)
-            {
-                addLocalPrinterDropDown.contentShown = false
-            }
+            addLocalPrinterDropDown.contentShown = !contentShown
         }
 
         contentComponent: networkPrinterListComponent
@@ -79,16 +76,13 @@ Item
         anchors.top: addNetworkPrinterDropDown.bottom
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.topMargin: UM.Theme.getSize("wide_margin").height
+        anchors.topMargin: UM.Theme.getSize("default_margin").height
 
         title: catalog.i18nc("@label", "Add a non-networked printer")
 
         onClicked:
         {
-            if (contentShown)
-            {
-                addNetworkPrinterDropDown.contentShown = false
-            }
+            addNetworkPrinterDropDown.contentShown = !contentShown
         }
 
         contentComponent: localPrinterListComponent

resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml

@@ -56,7 +56,7 @@ Item
             ScrollBar.vertical.policy: ScrollBar.AsNeeded
 
             property int maxItemCountAtOnce: 8  // show at max 8 items at once, otherwise you need to scroll.
-            height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
+            height: Math.min(contentHeight, maxItemCountAtOnce * UM.Theme.getSize("action_button").height)
 
             visible: networkPrinterListView.count > 0
 

resources/qml/WelcomePages/DataCollectionsContent.qml

@@ -48,40 +48,69 @@ Item
 
             spacing: UM.Theme.getSize("wide_margin").height
 
-            Image
+            Label
             {
-                id: curaImage
+                id: topLabel
+                width: parent.width
                 anchors.horizontalCenter: parent.horizontalCenter
-                source: UM.Theme.getImage("first_run_share_data")
+                horizontalAlignment: Text.AlignHCenter
+                text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:")
+                wrapMode: Text.WordWrap
+                font: UM.Theme.getFont("medium")
+                color: UM.Theme.getColor("text")
+                renderType: Text.NativeRendering
+            }
+
+            Grid {
+                columns: 2
+                spacing: UM.Theme.getSize("wide_margin").height
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                ImageTile
+                {
+                    text: catalog.i18nc("@text", "Machine types")
+                    imageSource: UM.Theme.getImage("first_run_machine_types")
+                }
+
+                ImageTile
+                {
+                    text: catalog.i18nc("@text", "Material usage")
+                    imageSource: UM.Theme.getImage("first_run_material_usage")
+                }
+
+                ImageTile
+                {
+                    text: catalog.i18nc("@text", "Number of slices")
+                    imageSource: UM.Theme.getImage("first_run_number_slices")
+                }
+
+                ImageTile
+                {
+                    text: catalog.i18nc("@text", "Print settings")
+                    imageSource: UM.Theme.getImage("first_run_print_settings")
+                }
             }
 
             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", "Data collected by Ultimaker Cura will not contain any personal information.")
                     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()
-                    }
-                }
             }
         }
     }

resources/qml/WelcomePages/DropDownWidget.qml

@@ -56,7 +56,8 @@ Item
     Cura.RoundedRectangle
     {
         id: contentRectangle
-        anchors.top: header.bottom
+        // Move up a bit (exaclty the width of the border) to avoid double line
+        y: header.height - UM.Theme.getSize("default_lining").width
         anchors.left: header.left
         anchors.right: header.right
         // Add 2x lining, because it needs a bit of space on the top and the bottom.

resources/qml/WelcomePages/ImageTile.qml

@@ -0,0 +1,39 @@
+// Copyright (c) 2019 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+
+import UM 1.3 as UM
+
+
+//
+// This component places a text on top of an image.
+//
+Column
+{
+    leftPadding: UM.Theme.getSize("default_margin").width
+    rightPadding: UM.Theme.getSize("default_margin").width
+    spacing: UM.Theme.getSize("default_margin").height
+    property alias text: label.text
+    property alias imageSource: image.source
+
+    Label
+    {
+        id: label
+        width: image.width
+        anchors.horizontalCenter: image.horizontalCenter
+        horizontalAlignment: Text.AlignHCenter
+        text: ""
+        wrapMode: Text.WordWrap
+        font: UM.Theme.getFont("default")
+        color: UM.Theme.getColor("text")
+        renderType: Text.NativeRendering
+    }
+
+    Image
+    {
+        id: image
+        source: ""
+    }
+}

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
         {