mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 04:18:12 +02:00
changing location of shortcuts
This commit is contained in:
parent
a5038850f1
commit
e76ebf7a0b
2 changed files with 66 additions and 61 deletions
|
@ -117,27 +117,27 @@ Item {
|
||||||
}
|
}
|
||||||
spacing: hifi.dimensions.contentSpacing.y / 2
|
spacing: hifi.dimensions.contentSpacing.y / 2
|
||||||
|
|
||||||
TextField {
|
TextField {
|
||||||
id: usernameField
|
id: usernameField
|
||||||
anchors {
|
anchors {
|
||||||
horizontalCenter: parent.horizontalCenter
|
horizontalCenter: parent.horizontalCenter
|
||||||
}
|
|
||||||
width: 1080
|
|
||||||
placeholderText: qsTr("Username or Email")
|
|
||||||
}
|
}
|
||||||
|
width: 1080
|
||||||
|
placeholderText: qsTr("Username or Email")
|
||||||
|
}
|
||||||
|
|
||||||
TextField {
|
TextField {
|
||||||
id: passwordField
|
id: passwordField
|
||||||
anchors {
|
anchors {
|
||||||
horizontalCenter: parent.horizontalCenter
|
horizontalCenter: parent.horizontalCenter
|
||||||
}
|
|
||||||
width: 1080
|
|
||||||
|
|
||||||
placeholderText: qsTr("Password")
|
|
||||||
echoMode: TextInput.Password
|
|
||||||
|
|
||||||
Keys.onReturnPressed: linkAccountBody.login()
|
|
||||||
}
|
}
|
||||||
|
width: 1080
|
||||||
|
|
||||||
|
placeholderText: qsTr("Password")
|
||||||
|
echoMode: TextInput.Password
|
||||||
|
|
||||||
|
Keys.onReturnPressed: linkAccountBody.login()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
InfoItem {
|
InfoItem {
|
||||||
|
@ -176,7 +176,7 @@ Item {
|
||||||
anchors {
|
anchors {
|
||||||
left: parent.left
|
left: parent.left
|
||||||
top: form.bottom
|
top: form.bottom
|
||||||
topMargin: hifi.dimensions.contentSpacing.y / 2
|
topMargin: hifi.dimensions.contentSpacing.y / 2
|
||||||
}
|
}
|
||||||
|
|
||||||
spacing: hifi.dimensions.contentSpacing.x
|
spacing: hifi.dimensions.contentSpacing.x
|
||||||
|
@ -201,7 +201,7 @@ Item {
|
||||||
anchors {
|
anchors {
|
||||||
right: parent.right
|
right: parent.right
|
||||||
top: form.bottom
|
top: form.bottom
|
||||||
topMargin: hifi.dimensions.contentSpacing.y / 2
|
topMargin: hifi.dimensions.contentSpacing.y / 2
|
||||||
}
|
}
|
||||||
spacing: hifi.dimensions.contentSpacing.x
|
spacing: hifi.dimensions.contentSpacing.x
|
||||||
onHeightChanged: d.resize(); onWidthChanged: d.resize();
|
onHeightChanged: d.resize(); onWidthChanged: d.resize();
|
||||||
|
|
|
@ -15,13 +15,14 @@ import QtQuick.Controls.Styles 1.4 as OriginalStyles
|
||||||
|
|
||||||
import "../controls-uit"
|
import "../controls-uit"
|
||||||
import "../styles-uit"
|
import "../styles-uit"
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: linkAccountBody
|
id: linkAccountBody
|
||||||
clip: true
|
clip: true
|
||||||
height: root.pane.height
|
height: root.pane.height
|
||||||
width: root.pane.width
|
width: root.pane.width
|
||||||
property bool failAfterSignUp: false
|
property bool failAfterSignUp: false
|
||||||
|
property var locale: Qt.locale()
|
||||||
|
property string dateTimeString
|
||||||
|
|
||||||
function login() {
|
function login() {
|
||||||
mainTextContainer.visible = false
|
mainTextContainer.visible = false
|
||||||
|
@ -124,29 +125,27 @@ Item {
|
||||||
placeholderText: "Username or Email"
|
placeholderText: "Username or Email"
|
||||||
activeFocusOnPress: true
|
activeFocusOnPress: true
|
||||||
|
|
||||||
|
ShortcutText {
|
||||||
|
z: 10
|
||||||
|
y: usernameField.height
|
||||||
|
anchors {
|
||||||
|
right: usernameField.right
|
||||||
|
topMargin: -19
|
||||||
|
}
|
||||||
|
|
||||||
|
text: "<a href='https://highfidelity.com/users/password/new'>Forgot Username?</a>"
|
||||||
|
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
linkColor: hifi.colors.blueAccent
|
||||||
|
|
||||||
|
onLinkActivated: loginDialog.openUrl(link)
|
||||||
|
}
|
||||||
|
|
||||||
onFocusChanged: {
|
onFocusChanged: {
|
||||||
root.text = "";
|
root.text = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ShortcutText {
|
|
||||||
id: forgotUsernameShortcut
|
|
||||||
z: 10
|
|
||||||
anchors {
|
|
||||||
leftMargin: usernameField.textFieldLabel.contentWidth + 10
|
|
||||||
topMargin: -19
|
|
||||||
}
|
|
||||||
|
|
||||||
text: "<a href='https://highfidelity.com/users/password/new'>Forgot Username?</a>"
|
|
||||||
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
horizontalAlignment: Text.AlignRight
|
|
||||||
linkColor: hifi.colors.blueAccent
|
|
||||||
|
|
||||||
onLinkActivated: loginDialog.openUrl(link)
|
|
||||||
Component.onCompleted: {
|
|
||||||
forgotUsernameShortcut.x = root.implicitWidth - forgotUsernameShortcut.width;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
TextField {
|
TextField {
|
||||||
id: passwordField
|
id: passwordField
|
||||||
|
@ -154,11 +153,30 @@ Item {
|
||||||
placeholderText: "Password"
|
placeholderText: "Password"
|
||||||
activeFocusOnPress: true
|
activeFocusOnPress: true
|
||||||
echoMode: TextInput.Password
|
echoMode: TextInput.Password
|
||||||
|
onHeightChanged: d.resize(); onWidthChanged: d.resize();
|
||||||
|
|
||||||
|
ShortcutText {
|
||||||
|
id: forgotPasswordShortcut
|
||||||
|
y: passwordField.height
|
||||||
|
z: 10
|
||||||
|
anchors {
|
||||||
|
right: passwordField.right
|
||||||
|
}
|
||||||
|
|
||||||
|
text: "<a href='https://highfidelity.com/users/password/new'>Forgot Password?</a>"
|
||||||
|
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
linkColor: hifi.colors.blueAccent
|
||||||
|
|
||||||
|
onLinkActivated: loginDialog.openUrl(link)
|
||||||
|
}
|
||||||
|
|
||||||
onFocusChanged: {
|
onFocusChanged: {
|
||||||
root.text = "";
|
root.text = "";
|
||||||
root.isPassword = true;
|
root.isPassword = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
id: showPasswordImage
|
id: showPasswordImage
|
||||||
x: parent.width - ((parent.height) * 31 / 23)
|
x: parent.width - ((parent.height) * 31 / 23)
|
||||||
|
@ -190,7 +208,6 @@ Item {
|
||||||
showPasswordImage.y = showPassword ? 0 : (passwordField.height - showPasswordImage.height) / 2;
|
showPasswordImage.y = showPassword ? 0 : (passwordField.height - showPasswordImage.height) / 2;
|
||||||
showPasswordHitbox.width = showPasswordImage.width;
|
showPasswordHitbox.width = showPasswordImage.width;
|
||||||
showPasswordHitbox.x = showPasswordImage.x;
|
showPasswordHitbox.x = showPasswordImage.x;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -198,26 +215,6 @@ Item {
|
||||||
Keys.onReturnPressed: linkAccountBody.login()
|
Keys.onReturnPressed: linkAccountBody.login()
|
||||||
}
|
}
|
||||||
|
|
||||||
ShortcutText {
|
|
||||||
id: forgotPasswordShortcut
|
|
||||||
z: 10
|
|
||||||
anchors {
|
|
||||||
leftMargin: passwordField.textFieldLabel.contentWidth + 10
|
|
||||||
topMargin: -19
|
|
||||||
}
|
|
||||||
|
|
||||||
text: "<a href='https://highfidelity.com/users/password/new'>Forgot Password?</a>"
|
|
||||||
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
horizontalAlignment: Text.AlignHCenter
|
|
||||||
linkColor: hifi.colors.blueAccent
|
|
||||||
|
|
||||||
onLinkActivated: loginDialog.openUrl(link)
|
|
||||||
Component.onCompleted: {
|
|
||||||
forgotPasswordShortcut.x = root.implicitWidth - forgotPasswordShortcut.width;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
InfoItem {
|
InfoItem {
|
||||||
id: additionalInformation
|
id: additionalInformation
|
||||||
|
|
||||||
|
@ -304,6 +301,14 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
usernameField.forceActiveFocus();
|
usernameField.forceActiveFocus();
|
||||||
|
|
||||||
|
var data = {
|
||||||
|
"date": new Date().toLocaleString(),
|
||||||
|
};
|
||||||
|
print(new Date().toLocaleString());
|
||||||
|
print(model.sessionId);
|
||||||
|
|
||||||
|
//UserActivityLogger.logAction("login_screen_shown", )
|
||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
|
|
Loading…
Reference in a new issue