From bfa89452e091280706d9645f35f905329ba7c39e Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Tue, 22 Oct 2019 14:24:32 -0700 Subject: [PATCH] updating launcher text --- launchers/qt/resources/qml/Download.qml | 2 +- .../qml/HFBase/CreateAccountBase.qml | 6 +++++- .../qt/resources/qml/HFBase/LoginBase.qml | 6 +++++- launchers/qt/src/LauncherState.cpp | 19 +++++++++---------- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/launchers/qt/resources/qml/Download.qml b/launchers/qt/resources/qml/Download.qml index 094b9cc961..5c3bb3fd1c 100644 --- a/launchers/qt/resources/qml/Download.qml +++ b/launchers/qt/resources/qml/Download.qml @@ -42,7 +42,7 @@ Item { HFTextHeader { id: firstText - text: "Set up will take a moment" + text: "Setup will take a moment" anchors { top: logo.bottom diff --git a/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml b/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml index 4a47ea4253..c419878413 100644 --- a/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml +++ b/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml @@ -164,7 +164,11 @@ Item { topMargin: 4 } - onAccepted: LauncherState.signup(email.text, username.text, password.text, displayName.text) + onAccepted: { + if (root.enabled && email.text.length > 0 && username.text.length > 0 && password.text.length > 0 && displayName.text.length > 0) { + LauncherState.signup(email.text, username.text, password.text, displayName.text); + } + } } HFButton { diff --git a/launchers/qt/resources/qml/HFBase/LoginBase.qml b/launchers/qt/resources/qml/HFBase/LoginBase.qml index fd24b63398..1df9950dd4 100644 --- a/launchers/qt/resources/qml/HFBase/LoginBase.qml +++ b/launchers/qt/resources/qml/HFBase/LoginBase.qml @@ -137,7 +137,11 @@ Item { left: parent.left right: parent.right; } - onAccepted: LauncherState.login(username.text, password.text, displayName.text) + onAccepted: { + if (root.enabled && username.text.length > 0 && password.text.length > 0 && displayName.text.length > 0) { + LauncherState.login(username.text, password.text, displayName.text); + } + } } HFButton { diff --git a/launchers/qt/src/LauncherState.cpp b/launchers/qt/src/LauncherState.cpp index 56491f8f88..98e476bc99 100644 --- a/launchers/qt/src/LauncherState.cpp +++ b/launchers/qt/src/LauncherState.cpp @@ -286,7 +286,6 @@ void LauncherState::getCurrentClientVersion() { setApplicationState(ApplicationState::WaitingForLogin); } } - //setApplicationState(ApplicationState::WaitingForLogin); } @@ -335,19 +334,19 @@ void LauncherState::signup(QString email, QString username, QString password, QS auto err = signupRequest->getError(); if (err == SignupRequest::Error::ExistingUsername) { - setLastSignupErrorMessage(_username + " is already taken - please try a different username."); + setLastSignupErrorMessage(_username + " is already taken. Please try a different username."); setApplicationState(ApplicationState::WaitingForSignup); return; } else if (err == SignupRequest::Error::BadPassword) { - setLastSignupErrorMessage("That's an invalid password - must be at least 6 characters."); + setLastSignupErrorMessage("That's an invalid password. Must be at least 6 characters."); setApplicationState(ApplicationState::WaitingForSignup); return; } else if (err == SignupRequest::Error::BadUsername) { - setLastSignupErrorMessage("That's an invalid username - please try another username."); + setLastSignupErrorMessage("That's an invalid username. Please try another username."); setApplicationState(ApplicationState::WaitingForSignup); return; } else if (err == SignupRequest::Error::UserProfileAlreadyCompleted) { - setLastSignupErrorMessage("This email exists, if it's yours please login."); + setLastSignupErrorMessage("An account with this email already exists. Please log in."); setApplicationState(ApplicationState::WaitingForSignup); return; } else if (err == SignupRequest::Error::NoSuchEmail) { @@ -355,7 +354,7 @@ void LauncherState::signup(QString email, QString username, QString password, QS setApplicationState(ApplicationState::WaitingForSignup); return; } else if (err != SignupRequest::Error::None) { - setApplicationStateError("Failed to sign up"); + setApplicationStateError("Failed to sign up. Please try again."); return; } @@ -374,11 +373,11 @@ void LauncherState::signup(QString email, QString username, QString password, QS auto err = loginRequest->getError(); if (err == LoginRequest::Error::BadUsernameOrPassword) { - setLastLoginErrorMessage("Bad username or password"); + setLastLoginErrorMessage("Invalid username or password."); setApplicationState(ApplicationState::WaitingForLogin); return; } else if (err != LoginRequest::Error::None) { - setApplicationStateError("Failed to login"); + setApplicationStateError("Failed to login. Please try again."); return; } @@ -413,11 +412,11 @@ void LauncherState::login(QString username, QString password, QString displayNam auto err = request->getError(); if (err == LoginRequest::Error::BadUsernameOrPassword) { - setLastLoginErrorMessage("Bad username or password"); + setLastLoginErrorMessage("Invalid username or password"); setApplicationState(ApplicationState::WaitingForLogin); return; } else if (err != LoginRequest::Error::None) { - setApplicationStateError("Failed to login"); + setApplicationStateError("Failed to login. Please try again."); return; }