Rearrange items in WelcomeContent.qml

resources/qml/WelcomePages/UserAgreementContent.qml

@@ -27,8 +27,7 @@ Item
         renderType: Text.NativeRendering
     }
 
-
+    Item  // Area for pictures and texts
-    Item
     {
         anchors.top: titleLabel.bottom
         anchors.bottom: agreeButton.top
@@ -36,28 +35,23 @@ Item
         anchors.right: parent.right
         anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
 
-    Label
+        Label
-    {
+        {
-        id: disclaimerLineLabel
+            id: disclaimerLineLabel
-        /*
+            anchors.centerIn: parent
-        anchors.top: titleLabel.bottom
+            anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
-        anchors.bottom: agreeButton.top
-        anchors.horizontalCenter: parent.horizontalCenter
-        */
-        anchors.centerIn: parent
-        anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
 
-        width: (parent.width * 2 / 3) | 0
+            width: (parent.width * 2 / 3) | 0
 
-        text: "<p><b>Disclaimer by Ultimaker</b></p>"
+            text: "<p><b>Disclaimer by Ultimaker</b></p>"
-            + "<p>Please read this disclaimer carefully.</p>"
+                + "<p>Please read this disclaimer carefully.</p>"
-            + "<p>Except when otherwise stated in writing, Ultimaker provides any Ultimaker software or third party software \"As is\" without warranty of any kind. The entire risk as to the quality and perfoemance of Ultimaker software is with you.</p>"
+                + "<p>Except when otherwise stated in writing, Ultimaker provides any Ultimaker software or third party software \"As is\" without warranty of any kind. The entire risk as to the quality and perfoemance of Ultimaker software is with you.</p>"
-            + "<p>Unless required by applicable law or agreed to in writing, in no event will Ultimaker be liable to you for damages, including any general, special, incidental, or consequential damages arising out of the use or inability to use any Ultimaker software or third party software.</p>"
+                + "<p>Unless required by applicable law or agreed to in writing, in no event will Ultimaker be liable to you for damages, including any general, special, incidental, or consequential damages arising out of the use or inability to use any Ultimaker software or third party software.</p>"
-        textFormat: Text.RichText
+            textFormat: Text.RichText
-        wrapMode: Text.WordWrap
+            wrapMode: Text.WordWrap
-        font: UM.Theme.getFont("default")
+            font: UM.Theme.getFont("default")
-        renderType: Text.NativeRendering
+            renderType: Text.NativeRendering
-    }
+        }
     }
 
     Cura.PrimaryButton

resources/qml/WelcomePages/WelcomeContent.qml

@@ -11,30 +11,28 @@ import Cura 1.1 as Cura
 //
 // This component contains the content for the "Welcome" page of the welcome on-boarding process.
 //
-Column
+Item
 {
     UM.I18nCatalog { id: catalog; name: "cura" }
 
-    spacing: 60
+    anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
 
-    // Placeholder
+    Column  // Arrange the items vertically and put everything in the center
-    Label { text: " " }
-
-    Label
     {
-        id: titleLabel
+        anchors.centerIn: parent
-        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width
-        horizontalAlignment: Text.AlignHCenter
+        spacing: UM.Theme.getSize("welcome_pages_default_margin").height
-        text: catalog.i18nc("@label", "Welcome to Ultimaker Cura")
-        color: UM.Theme.getColor("primary_button")
-        font: UM.Theme.getFont("large_bold")
-        renderType: Text.NativeRendering
-    }
 
-    Column
+        Label
-    {
+        {
-        anchors.horizontalCenter: parent.horizontalCenter
+            id: titleLabel
-        spacing: 40
+            anchors.horizontalCenter: parent.horizontalCenter
+            horizontalAlignment: Text.AlignHCenter
+            text: catalog.i18nc("@label", "Welcome to Ultimaker Cura")
+            color: UM.Theme.getColor("primary_button")
+            font: UM.Theme.getFont("large_bold")
+            renderType: Text.NativeRendering
+        }
 
         Image
         {
@@ -52,15 +50,17 @@ Column
             font: UM.Theme.getFont("medium")
             renderType: Text.NativeRendering
         }
-    }
 
-    Cura.PrimaryButton
+        Cura.PrimaryButton
-    {
+        {
-        id: getStartedButton
+            id: getStartedButton
-        anchors.horizontalCenter: parent.horizontalCenter
+            anchors.top: contentArea.bottom
-        text: catalog.i18nc("@button", "Get started")
+            anchors.horizontalCenter: parent.horizontalCenter
-        width: 140
+            anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
-        fixedWidthMode: true
+            text: catalog.i18nc("@button", "Get started")
-        onClicked: base.showNextPage()
+            width: 140
+            fixedWidthMode: true
+            onClicked: base.showNextPage()
+        }
     }
 }