From 1a42ad0736cb6d596a88db41091c8f51f3e434ee Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Wed, 30 Oct 2019 09:27:37 -0700 Subject: [PATCH] update launcher text --- .../qml/HFBase/CreateAccountBase.qml | 22 ++++--------------- launchers/qt/resources/qml/HFBase/Error.qml | 2 +- .../qt/resources/qml/HFBase/LoginBase.qml | 2 +- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml b/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml index c419878413..f788eeaa4d 100644 --- a/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml +++ b/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml @@ -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 diff --git a/launchers/qt/resources/qml/HFBase/Error.qml b/launchers/qt/resources/qml/HFBase/Error.qml index 98eb1d17ac..5f93931ced 100644 --- a/launchers/qt/resources/qml/HFBase/Error.qml +++ b/launchers/qt/resources/qml/HFBase/Error.qml @@ -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.\n Please restart." anchors { top: header.bottom diff --git a/launchers/qt/resources/qml/HFBase/LoginBase.qml b/launchers/qt/resources/qml/HFBase/LoginBase.qml index 1df9950dd4..1f526edf19 100644 --- a/launchers/qt/resources/qml/HFBase/LoginBase.qml +++ b/launchers/qt/resources/qml/HFBase/LoginBase.qml @@ -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 {