Simplify user agreement page layout

This commit is contained in:
Lipu Fei 2019-03-22 13:47:12 +01:00
parent b25df557d3
commit f8c4cee2de
2 changed files with 40 additions and 33 deletions

View File

@ -31,7 +31,7 @@ Item
// Area where the cloud contents can be put. Pictures, texts and such.
Item
{
id: cloudContentsArea
id: contentsArea
anchors.top: titleLabel.bottom
anchors.bottom: getStartedButton.top
anchors.left: parent.left

View File

@ -12,23 +12,13 @@ import Cura 1.1 as Cura
//
Item
{
Column
{
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: 20
UM.I18nCatalog { id: catalog; name: "cura" }
spacing: 40
// Placeholder
Label { text: " " }
Label
{
id: titleLabel
anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "User Agreement")
@ -37,11 +27,28 @@ Item
renderType: Text.NativeRendering
}
Item
{
anchors.top: titleLabel.bottom
anchors.bottom: agreeButton.top
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
Label
{
width: parent.width * 2 / 3
id: disclaimerLineLabel
/*
anchors.top: titleLabel.bottom
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
text: "<p><b>Disclaimer by Ultimaker</b></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>"