diff options
author | Lipu Fei <lipu.fei815@gmail.com> | 2019-03-22 16:28:23 +0300 |
---|---|---|
committer | Lipu Fei <lipu.fei815@gmail.com> | 2019-03-22 16:28:23 +0300 |
commit | ec0b197b6ec5d6480bd3c9f40631e58eb2f42492 (patch) | |
tree | f6185f428147e2ffafb78ae5cbb199e02305b2d1 /resources/qml/WelcomePages/WelcomeContent.qml | |
parent | 67428aee537a05e1c3d9ee528099245687c13bf3 (diff) | |
parent | a9431b270f679f6dfd8af20a95efbdbdc0f2bdee (diff) |
Fix merge conflicts
Diffstat (limited to 'resources/qml/WelcomePages/WelcomeContent.qml')
-rw-r--r-- | resources/qml/WelcomePages/WelcomeContent.qml | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml index 272c7bda47..ed56dd36fd 100644 --- a/resources/qml/WelcomePages/WelcomeContent.qml +++ b/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 - Label { text: " " } - - Label + Column // Arrange the items vertically and put everything in the center { - id: titleLabel - 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 - } + anchors.centerIn: parent + width: parent.width + spacing: UM.Theme.getSize("welcome_pages_default_margin").height - Column - { - anchors.horizontalCenter: parent.horizontalCenter - spacing: 40 + Label + { + id: titleLabel + 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,16 @@ Column font: UM.Theme.getFont("medium") renderType: Text.NativeRendering } - } - Cura.PrimaryButton - { - id: getStartedButton - anchors.horizontalCenter: parent.horizontalCenter - text: catalog.i18nc("@button", "Get started") - width: UM.Theme.getSize("welcome_pages_button").width - fixedWidthMode: true - onClicked: base.showNextPage() + Cura.PrimaryButton + { + id: getStartedButton + anchors.horizontalCenter: parent.horizontalCenter + anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width + text: catalog.i18nc("@button", "Get started") + width: UM.Theme.getSize("welcome_pages_button").width + fixedWidthMode: true + onClicked: base.showNextPage() + } } } |