From 671f15b63cc1314be6163304736d77d10298ef7d Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Tue, 15 Jan 2019 17:49:51 -0800 Subject: [PATCH] removing isLogIn --- interface/resources/qml/LoginDialog.qml | 4 ++-- .../qml/LoginDialog/CompleteProfileBody.qml | 16 ++++++++-------- .../qml/LoginDialog/LinkAccountBody.qml | 1 - .../resources/qml/LoginDialog/SignUpBody.qml | 1 - interface/resources/qml/OverlayLoginDialog.qml | 4 ++-- .../resources/qml/dialogs/TabletLoginDialog.qml | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml index 0f3db48925..341f7ba1c9 100644 --- a/interface/resources/qml/LoginDialog.qml +++ b/interface/resources/qml/LoginDialog.qml @@ -54,7 +54,7 @@ FocusScope { Image { z: -10 id: loginDialogBackground - source: "LoginDialog/images/background.jpg" + source: "LoginDialog/images/background.png" anchors.fill: parent } @@ -119,6 +119,6 @@ FocusScope { } Component.onCompleted: { - bodyLoader.setSource("LoginDialog/LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "linkSteam": false }); + bodyLoader.setSource("LoginDialog/LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "linkSteam": false, "linkOculus": false }); } } diff --git a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml index c2101aaea8..9b4ef3cb0e 100644 --- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml +++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml @@ -149,7 +149,7 @@ Item { case Qt.Key_Enter: case Qt.Key_Return: event.accepted = true; - completeProfileBody.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text); + loginDialog.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text); break; } } @@ -192,7 +192,7 @@ Item { case Qt.Key_Enter: case Qt.Key_Return: event.accepted = true; - completeProfileBody.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text); + loginDialog.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text); break; } } @@ -275,7 +275,7 @@ Item { case Qt.Key_Enter: case Qt.Key_Return: event.accepted = true; - completeProfileBody.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text); + loginDialog.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text); break; } } @@ -329,7 +329,7 @@ Item { onClicked: { loginErrorMessage.visible = false; if (completeProfileBody.withOculus) { - loginDialog.createAccountFromOculus(); + loginDialog.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text); } else if (completeProfileBody.withSteam) { loginDialog.createAccountFromSteam(); } @@ -455,7 +455,7 @@ Item { console.log("Create Failed: " + error); if (completeProfileBody.withOculus) { loginErrorMessage.visible = true; - loginErrorMessage.text = error; + loginErrorMessage.text = "Make sure email and username fields are filled out."; if (loginErrorMessageTextMetrics.width > root.bannerWidth && root.isTablet) { loginErrorMessage.wrapMode = Text.WordWrap; @@ -466,10 +466,10 @@ Item { loginErrorMessage.wrapMode = Text.NoWrap; errorContainer.height = loginErrorMessageTextMetrics.height; } + } else { + bodyLoader.setSource("UsernameCollisionBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": completeProfileBody.withSteam, + "withOculus": completeProfileBody.withOculus }); } - - bodyLoader.setSource("UsernameCollisionBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": completeProfileBody.withSteam, - "withOculus": completeProfileBody.withOculus }); } } diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 2b6667c683..4d3a74c033 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -75,7 +75,6 @@ Item { function init() { // going to/from sign in/up dialog. - loginDialog.isLogIn = true; loginErrorMessage.text = linkAccountBody.errorString; loginErrorMessage.visible = (linkAccountBody.errorString !== ""); if (loginErrorMessageTextMetrics.width > emailField.width) { diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml index d356e62e1d..4e1887e33d 100644 --- a/interface/resources/qml/LoginDialog/SignUpBody.qml +++ b/interface/resources/qml/LoginDialog/SignUpBody.qml @@ -71,7 +71,6 @@ Item { function init() { // going to/from sign in/up dialog. - loginDialog.isLogIn = false; emailField.placeholderText = "Email"; emailField.text = ""; emailField.anchors.top = usernameField.bottom; diff --git a/interface/resources/qml/OverlayLoginDialog.qml b/interface/resources/qml/OverlayLoginDialog.qml index 3de3f68942..8a08fea3de 100644 --- a/interface/resources/qml/OverlayLoginDialog.qml +++ b/interface/resources/qml/OverlayLoginDialog.qml @@ -55,7 +55,7 @@ FocusScope { Image { z: -10 id: loginDialogBackground - source: "LoginDialog/images/background.jpg" + source: "LoginDialog/images/background.png" anchors.fill: parent } @@ -149,6 +149,6 @@ FocusScope { Component.onCompleted: { keyboardTimer.start(); - bodyLoader.setSource("LoginDialog/LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "linkSteam": false }); + bodyLoader.setSource("LoginDialog/LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "linkSteam": false, "linkOculus": false }); } } diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml index 4a6d710995..826d895b5f 100644 --- a/interface/resources/qml/dialogs/TabletLoginDialog.qml +++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml @@ -97,7 +97,7 @@ FocusScope { Image { z: -10 id: loginDialogBackground - source: "../LoginDialog/images/background_tablet.jpg" + source: "../LoginDialog/images/background_tablet.png" anchors.fill: parent } @@ -177,6 +177,6 @@ FocusScope { Component.onCompleted: { keyboardTimer.start(); - bodyLoader.setSource("../LoginDialog/UsernameCollisionBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": true, "linkSteam": false }); + bodyLoader.setSource("../LoginDialog/LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "linkSteam": false, "linkOculus": false }); } }