GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 04:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange items in WelcomeContent.qml

Browse Source
This commit is contained in:
Lipu Fei 2019-03-22 14:19:26 +01:00
parent f8c4cee2de
commit a9431b270f
2 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/qml/WelcomePages/UserAgreementContent.qml
View File

@ -27,8 +27,7 @@ Item
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
Item // Area for pictures and texts
Item
{ {
anchors.top: titleLabel.bottom anchors.top: titleLabel.bottom
anchors.bottom: agreeButton.top anchors.bottom: agreeButton.top
@ -39,11 +38,6 @@ Item
Label Label
{ {
id: disclaimerLineLabel id: disclaimerLineLabel
/*
anchors.top: titleLabel.bottom
anchors.bottom: agreeButton.top
anchors.horizontalCenter: parent.horizontalCenter
*/
anchors.centerIn: parent anchors.centerIn: parent
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width

20
resources/qml/WelcomePages/WelcomeContent.qml
View File

@ -11,14 +11,17 @@ import Cura 1.1 as Cura
// //
// This component contains the content for the "Welcome" page of the welcome on-boarding process. // This component contains the content for the "Welcome" page of the welcome on-boarding process.
// //
Column Item
{ {
UM.I18nCatalog { id: catalog; name: "cura" } 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: " " } {
anchors.centerIn: parent
width: parent.width
spacing: UM.Theme.getSize("welcome_pages_default_margin").height
Label Label
{ {
@ -31,11 +34,6 @@ Column
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
Column
{
anchors.horizontalCenter: parent.horizontalCenter
spacing: 40
Image Image
{ {
id: curaImage id: curaImage
@ -52,15 +50,17 @@ Column
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
}
Cura.PrimaryButton Cura.PrimaryButton
{ {
id: getStartedButton id: getStartedButton
anchors.top: contentArea.bottom
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
text: catalog.i18nc("@button", "Get started") text: catalog.i18nc("@button", "Get started")
width: 140 width: 140
fixedWidthMode: true fixedWidthMode: true
onClicked: base.showNextPage() onClicked: base.showNextPage()
} }
} }
}