diff --git a/launchers/qt/resources/qml/Download.qml b/launchers/qt/resources/qml/Download.qml
index 00542d02d0..094b9cc961 100644
--- a/launchers/qt/resources/qml/Download.qml
+++ b/launchers/qt/resources/qml/Download.qml
@@ -42,7 +42,7 @@ Item {
HFTextHeader {
id: firstText
- text: "Setup will take a moment"
+ text: "Set up will take a moment"
anchors {
top: logo.bottom
@@ -54,7 +54,7 @@ Item {
HFTextRegular {
id: secondText
- text: "We're getting everything setup for you."
+ text: "We're getting everything set up for you."
anchors {
top: firstText.bottom
diff --git a/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml b/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml
index 200f7ad0be..4a47ea4253 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: "Sign in and pick a password"
property string usernamePlaceholder: "Username"
property string passwordPlaceholder: "Set a password (must be at least 6 characters)"
property int marginLeft: root.width * 0.15
@@ -30,7 +30,7 @@ Item {
width: 481
lineHeight: 35
lineHeightMode: Text.FixedHeight
- text: LauncherState.lastSignupErrorMessage.length == 0 ? root.titleText : "Uh oh."
+ text: LauncherState.lastSignupErrorMessage.length == 0 ? root.titleText : "Uh oh"
anchors {
top: root.top
topMargin: 29
@@ -43,7 +43,7 @@ Item {
id: instruction
width: 425
- text: "Use the email address you applied for access with."
+ text: "Use the email address you applied for access with"
visible: LauncherState.lastSignupErrorMessage.length == 0
anchors {
@@ -214,7 +214,6 @@ Item {
bottom: root.bottom
bottomMargin: 46
right: displayName.right
- rightMargin: 30
}
}
diff --git a/launchers/qt/resources/qml/HFBase/Error.qml b/launchers/qt/resources/qml/HFBase/Error.qml
index ad57f242f4..98eb1d17ac 100644
--- a/launchers/qt/resources/qml/HFBase/Error.qml
+++ b/launchers/qt/resources/qml/HFBase/Error.qml
@@ -33,10 +33,6 @@ Item {
HFTextHeader {
id: header
-
- width: 87
- height: 31
-
text: "Uh oh."
anchors {
@@ -49,10 +45,7 @@ Item {
HFTextRegular {
id: description
- text: "We seem to have a problem.\nPlease restart Launcher"
-
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
+ text: "We seem to have a problem.\n Please restart Launcher."
anchors {
top: header.bottom
diff --git a/launchers/qt/resources/qml/HFBase/LoginBase.qml b/launchers/qt/resources/qml/HFBase/LoginBase.qml
index 60763308bb..fd24b63398 100644
--- a/launchers/qt/resources/qml/HFBase/LoginBase.qml
+++ b/launchers/qt/resources/qml/HFBase/LoginBase.qml
@@ -21,7 +21,7 @@ Item {
}
Item {
- width: 383
+ width: 430
height: root.height
@@ -32,9 +32,8 @@ Item {
HFTextHeader {
id: title
-
- font.bold: true
-
+ lineHeight: 35
+ lineHeightMode: Text.FixedHeight
text: "Please Log in"
anchors {
@@ -75,6 +74,7 @@ Item {
id: username
enabled: root.enabled
+ width: 430
text: LauncherState.lastUsedUsername
placeholderText: "Username"
@@ -91,7 +91,7 @@ Item {
HFTextField {
id: password
-
+ width: 430
enabled: root.enabled
placeholderText: "Password"
@@ -125,7 +125,7 @@ Item {
HFTextField {
id: displayName
-
+ width: 430
enabled: root.enabled
placeholderText: "Display name"
@@ -142,7 +142,7 @@ Item {
HFButton {
id: button
- width: 110
+ width: 134
enabled: root.enabled && username.text.length > 0 && password.text.length > 0 && displayName.text.length > 0
@@ -161,7 +161,7 @@ Item {
Text {
id: createAccountLink
- text: "Create New Account"
+ text: "Sign up"
font.family: "Graphik"
font.pixelSize: 14
color: "#009EE0"
@@ -191,8 +191,8 @@ Item {
right: parent.right
}
}
- }
+ }
Component.onCompleted: {
root.parent.setBuildInfoState("right");
}
diff --git a/launchers/qt/src/LauncherState.cpp b/launchers/qt/src/LauncherState.cpp
index 42d13bfa58..eccd02eb19 100644
--- a/launchers/qt/src/LauncherState.cpp
+++ b/launchers/qt/src/LauncherState.cpp
@@ -32,7 +32,7 @@
#endif
//#define BREAK_ON_ERROR
-//#define DEBUG_UI
+#define DEBUG_UI
const QString configHomeLocationKey { "homeLocation" };
const QString configLastLoginKey { "lastLogin" };
@@ -286,6 +286,7 @@ void LauncherState::getCurrentClientVersion() {
setApplicationState(ApplicationState::WaitingForLogin);
}
}
+ //setApplicationState(ApplicationState::WaitingForLogin);
}
@@ -350,7 +351,7 @@ void LauncherState::signup(QString email, QString username, QString password, QS
setApplicationState(ApplicationState::WaitingForSignup);
return;
} else if (err == SignupRequest::Error::NoSuchEmail) {
- setLastSignupErrorMessage("That email isn't setup yet. <a href='https://www.highfidelity.com/hq-support'>Request Access</a>.");
+ setLastSignupErrorMessage("That email isn't setup yet. <a href='https://www.highfidelity.com/hq-support'>Request access</a>.");
setApplicationState(ApplicationState::WaitingForSignup);
return;
} else if (err != SignupRequest::Error::None) {