Merge pull request #16426 from danteruiz/update-launcher-text

Dev-2602: Update Text on new QT Launcher
This commit is contained in:
Zach Fox 2019-10-30 10:47:47 -07:00 committed by GitHub
commit 80b93bd43b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 20 deletions

View file

@ -8,7 +8,7 @@ import HQLauncher 1.0
Item {
id: root
anchors.centerIn: parent
property string titleText: "Sign in and pick a password"
property string titleText: "Create Your Username and Password"
property string usernamePlaceholder: "Username"
property string passwordPlaceholder: "Set a password (must be at least 6 characters)"
property int marginLeft: root.width * 0.15
@ -28,6 +28,7 @@ Item {
HFTextHeader {
id: title
width: 481
wrapMode: Text.WordWrap
lineHeight: 35
lineHeightMode: Text.FixedHeight
text: LauncherState.lastSignupErrorMessage.length == 0 ? root.titleText : "Uh oh"
@ -39,21 +40,6 @@ Item {
}
}
HFTextRegular {
id: instruction
width: 425
text: "Use the email address you applied for access with"
visible: LauncherState.lastSignupErrorMessage.length == 0
anchors {
left: root.left
leftMargin: root.marginLeft
top: title.bottom
topMargin: 18
}
}
HFTextError {
id: error
@ -88,10 +74,10 @@ Item {
enabled: root.enabled
placeholderText: "Email Address"
placeholderText: "Verify Your Email"
seperatorColor: Qt.rgba(1, 1, 1, 0.3)
anchors {
top: instruction.bottom
top: error.visible ? error.bottom : title.bottom
left: root.left
leftMargin: root.marginLeft
topMargin: 18

View file

@ -45,7 +45,7 @@ Item {
HFTextRegular {
id: description
text: "We seem to have a problem.\n Please restart Launcher."
text: "We seem to have a problem."
anchors {
top: header.bottom
@ -54,6 +54,16 @@ Item {
}
}
HFTextRegular {
text: "Please restart."
anchors {
top: description.bottom
topMargin: 1
horizontalCenter: header.horizontalCenter
}
}
HFButton {
id: button

View file

@ -77,7 +77,7 @@ Item {
width: 430
text: LauncherState.lastUsedUsername
placeholderText: "Username"
placeholderText: "Username or Email address"
seperatorColor: Qt.rgba(1, 1, 1, 0.3)
anchors {