Merge branch '4.1'

resources/qml/MachineSettings/GcodeTextArea.qml

@@ -69,6 +69,7 @@ UM.TooltipArea
             background: Rectangle
             {
                 color: UM.Theme.getColor("main_background")
+                anchors.fill: parent
 
                 border.color:
                 {

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

@@ -99,7 +99,7 @@ Item
                 horizontalAlignment: Text.AlignHCenter
                 text:
                 {
-                    var t = catalog.i18nc("@text", "The data that Ultimaker Cura collects will not contain any information about your model.")
+                    var t = catalog.i18nc("@text", "Data collected by Ultimaker Cura will not contain any personal information.")
                     var t2 = catalog.i18nc("@text", "More information")
                     t += " <a href='https://notusedref'>" + t2 + "</a>"
                     return t

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/WizardDialog.qml

@@ -66,6 +66,7 @@ Window
         anchors.left: parent.left
         anchors.bottom: parent.bottom
         anchors.margins: UM.Theme.getSize("default_margin").width
+        anchors.leftMargin: UM.Theme.getSize("wide_margin").width
 
         enabled: true
         onClicked: dialog.visible = false