mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 18:16:45 +02:00
making ui changes
This commit is contained in:
parent
62e5e152ba
commit
0acec03a3e
5 changed files with 18 additions and 25 deletions
|
@ -8,7 +8,7 @@ import HQLauncher 1.0
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
anchors.centerIn: parent
|
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 usernamePlaceholder: "Username"
|
||||||
property string passwordPlaceholder: "Set a password (must be at least 6 characters)"
|
property string passwordPlaceholder: "Set a password (must be at least 6 characters)"
|
||||||
property int marginLeft: root.width * 0.15
|
property int marginLeft: root.width * 0.15
|
||||||
|
@ -30,7 +30,7 @@ Item {
|
||||||
width: 481
|
width: 481
|
||||||
lineHeight: 35
|
lineHeight: 35
|
||||||
lineHeightMode: Text.FixedHeight
|
lineHeightMode: Text.FixedHeight
|
||||||
text: LauncherState.lastSignupErrorMessage.length == 0 ? root.titleText : "Uh oh."
|
text: LauncherState.lastSignupErrorMessage.length == 0 ? root.titleText : "Uh oh"
|
||||||
anchors {
|
anchors {
|
||||||
top: root.top
|
top: root.top
|
||||||
topMargin: 29
|
topMargin: 29
|
||||||
|
@ -43,7 +43,7 @@ Item {
|
||||||
id: instruction
|
id: instruction
|
||||||
width: 425
|
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
|
visible: LauncherState.lastSignupErrorMessage.length == 0
|
||||||
|
|
||||||
anchors {
|
anchors {
|
||||||
|
@ -214,7 +214,6 @@ Item {
|
||||||
bottom: root.bottom
|
bottom: root.bottom
|
||||||
bottomMargin: 46
|
bottomMargin: 46
|
||||||
right: displayName.right
|
right: displayName.right
|
||||||
rightMargin: 30
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -33,10 +33,6 @@ Item {
|
||||||
|
|
||||||
HFTextHeader {
|
HFTextHeader {
|
||||||
id: header
|
id: header
|
||||||
|
|
||||||
width: 87
|
|
||||||
height: 31
|
|
||||||
|
|
||||||
text: "Uh oh."
|
text: "Uh oh."
|
||||||
|
|
||||||
anchors {
|
anchors {
|
||||||
|
@ -49,10 +45,7 @@ Item {
|
||||||
HFTextRegular {
|
HFTextRegular {
|
||||||
id: description
|
id: description
|
||||||
|
|
||||||
text: "We seem to have a problem.\nPlease restart Launcher"
|
text: "We seem to have a problem.\n Please restart Launcher."
|
||||||
|
|
||||||
horizontalAlignment: Text.AlignHCenter
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
|
|
||||||
anchors {
|
anchors {
|
||||||
top: header.bottom
|
top: header.bottom
|
||||||
|
|
|
@ -21,7 +21,7 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: 383
|
width: 430
|
||||||
height: root.height
|
height: root.height
|
||||||
|
|
||||||
|
|
||||||
|
@ -32,9 +32,8 @@ Item {
|
||||||
|
|
||||||
HFTextHeader {
|
HFTextHeader {
|
||||||
id: title
|
id: title
|
||||||
|
lineHeight: 35
|
||||||
font.bold: true
|
lineHeightMode: Text.FixedHeight
|
||||||
|
|
||||||
text: "Please Log in"
|
text: "Please Log in"
|
||||||
|
|
||||||
anchors {
|
anchors {
|
||||||
|
@ -75,6 +74,7 @@ Item {
|
||||||
id: username
|
id: username
|
||||||
|
|
||||||
enabled: root.enabled
|
enabled: root.enabled
|
||||||
|
width: 430
|
||||||
|
|
||||||
text: LauncherState.lastUsedUsername
|
text: LauncherState.lastUsedUsername
|
||||||
placeholderText: "Username"
|
placeholderText: "Username"
|
||||||
|
@ -91,7 +91,7 @@ Item {
|
||||||
|
|
||||||
HFTextField {
|
HFTextField {
|
||||||
id: password
|
id: password
|
||||||
|
width: 430
|
||||||
enabled: root.enabled
|
enabled: root.enabled
|
||||||
|
|
||||||
placeholderText: "Password"
|
placeholderText: "Password"
|
||||||
|
@ -125,7 +125,7 @@ Item {
|
||||||
|
|
||||||
HFTextField {
|
HFTextField {
|
||||||
id: displayName
|
id: displayName
|
||||||
|
width: 430
|
||||||
enabled: root.enabled
|
enabled: root.enabled
|
||||||
|
|
||||||
placeholderText: "Display name"
|
placeholderText: "Display name"
|
||||||
|
@ -142,7 +142,7 @@ Item {
|
||||||
|
|
||||||
HFButton {
|
HFButton {
|
||||||
id: button
|
id: button
|
||||||
width: 110
|
width: 134
|
||||||
|
|
||||||
enabled: root.enabled && username.text.length > 0 && password.text.length > 0 && displayName.text.length > 0
|
enabled: root.enabled && username.text.length > 0 && password.text.length > 0 && displayName.text.length > 0
|
||||||
|
|
||||||
|
@ -161,7 +161,7 @@ Item {
|
||||||
Text {
|
Text {
|
||||||
id: createAccountLink
|
id: createAccountLink
|
||||||
|
|
||||||
text: "Create New Account"
|
text: "Sign up"
|
||||||
font.family: "Graphik"
|
font.family: "Graphik"
|
||||||
font.pixelSize: 14
|
font.pixelSize: 14
|
||||||
color: "#009EE0"
|
color: "#009EE0"
|
||||||
|
@ -191,8 +191,8 @@ Item {
|
||||||
right: parent.right
|
right: parent.right
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
}
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
root.parent.setBuildInfoState("right");
|
root.parent.setBuildInfoState("right");
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//#define BREAK_ON_ERROR
|
//#define BREAK_ON_ERROR
|
||||||
//#define DEBUG_UI
|
#define DEBUG_UI
|
||||||
|
|
||||||
const QString configHomeLocationKey { "homeLocation" };
|
const QString configHomeLocationKey { "homeLocation" };
|
||||||
const QString configLastLoginKey { "lastLogin" };
|
const QString configLastLoginKey { "lastLogin" };
|
||||||
|
@ -286,6 +286,7 @@ void LauncherState::getCurrentClientVersion() {
|
||||||
setApplicationState(ApplicationState::WaitingForLogin);
|
setApplicationState(ApplicationState::WaitingForLogin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//setApplicationState(ApplicationState::WaitingForLogin);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -350,7 +351,7 @@ void LauncherState::signup(QString email, QString username, QString password, QS
|
||||||
setApplicationState(ApplicationState::WaitingForSignup);
|
setApplicationState(ApplicationState::WaitingForSignup);
|
||||||
return;
|
return;
|
||||||
} else if (err == SignupRequest::Error::NoSuchEmail) {
|
} 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);
|
setApplicationState(ApplicationState::WaitingForSignup);
|
||||||
return;
|
return;
|
||||||
} else if (err != SignupRequest::Error::None) {
|
} else if (err != SignupRequest::Error::None) {
|
||||||
|
|
Loading…
Reference in a new issue