Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:58:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

some cleanup in LinkAccountBody

Browse source
This commit is contained in:
Wayne Chen 2018-10-22 17:52:03 -07:00
parent 736a78061d
commit 1e418e9976
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -188,8 +188,6 @@ Item {
} }
onFocusChanged: { onFocusChanged: {
// root.text = "";
// root.isPassword = true;
} }
Rectangle { Rectangle {
@ -226,15 +224,10 @@ Item {
} }
} }
} }
} }
Keys.onReturnPressed: { Keys.onReturnPressed: {
signInBody.login() signInBody.login()
} }
} }
HifiControlsUit.CheckBox { HifiControlsUit.CheckBox {
id: autoLogoutCheckbox id: autoLogoutCheckbox
@ -281,7 +274,6 @@ Item {
font.pixelSize: 24 font.pixelSize: 24
font.bold: true font.bold: true
lineHeightMode: Text.ProportionalHeight lineHeightMode: Text.ProportionalHeight
// horizontalAlignment: Text.AlignHCenter
} }
MouseArea { MouseArea {
id: cancelArea id: cancelArea
@ -491,7 +483,7 @@ Item {
Connections { Connections {
target: loginDialog target: loginDialog
onHandleLoginCompleted: { onHandleLoginCompleted: {
console.log("Login Succeeded, linking steam account") console.log("Login Succeeded")
var poppedUp = Settings.getValue("loginDialogPoppedUp", false); var poppedUp = Settings.getValue("loginDialogPoppedUp", false);
if (poppedUp) { if (poppedUp) {
console.log("[ENCOURAGELOGINDIALOG]: logging in") console.log("[ENCOURAGELOGINDIALOG]: logging in")
@ -504,9 +496,7 @@ Item {
if (loginDialog.isSteamRunning()) { if (loginDialog.isSteamRunning()) {
loginDialog.linkSteam() loginDialog.linkSteam()
} else { } else {
bodyLoader.setSource("WelcomeBody.qml", { "welcomeBack" : true }) // TODO you are now logged in
bodyLoader.item.width = root.pane.width
bodyLoader.item.height = root.pane.height
} }
} }
onHandleLoginFailed: { onHandleLoginFailed: {