Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 07:51:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removing isLogIn

Browse source
This commit is contained in:
Wayne Chen 2019-01-15 17:49:51 -08:00
parent 3b3b86888e
commit 671f15b63c
6 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/LoginDialog.qml
View file

@ -54,7 +54,7 @@ FocusScope {
Image { Image {
z: -10 z: -10
id: loginDialogBackground id: loginDialogBackground
source: "LoginDialog/images/background.jpg" source: "LoginDialog/images/background.png"
anchors.fill: parent anchors.fill: parent
} }
@ -119,6 +119,6 @@ FocusScope {
} }
Component.onCompleted: { 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 });
} }
} }

16
interface/resources/qml/LoginDialog/CompleteProfileBody.qml
View file

@ -149,7 +149,7 @@ Item {
case Qt.Key_Enter: case Qt.Key_Enter:
case Qt.Key_Return: case Qt.Key_Return:
event.accepted = true; event.accepted = true;
completeProfileBody.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text); loginDialog.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text);
break; break;
} }
} }
@ -192,7 +192,7 @@ Item {
case Qt.Key_Enter: case Qt.Key_Enter:
case Qt.Key_Return: case Qt.Key_Return:
event.accepted = true; event.accepted = true;
completeProfileBody.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text); loginDialog.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text);
break; break;
} }
} }
@ -275,7 +275,7 @@ Item {
case Qt.Key_Enter: case Qt.Key_Enter:
case Qt.Key_Return: case Qt.Key_Return:
event.accepted = true; event.accepted = true;
completeProfileBody.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text); loginDialog.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text);
break; break;
} }
} }
@ -329,7 +329,7 @@ Item {
onClicked: { onClicked: {
loginErrorMessage.visible = false; loginErrorMessage.visible = false;
if (completeProfileBody.withOculus) { if (completeProfileBody.withOculus) {
loginDialog.createAccountFromOculus(); loginDialog.createAccountFromOculus(emailField.text, usernameField.text, passwordField.text);
} else if (completeProfileBody.withSteam) { } else if (completeProfileBody.withSteam) {
loginDialog.createAccountFromSteam(); loginDialog.createAccountFromSteam();
} }
@ -455,7 +455,7 @@ Item {
console.log("Create Failed: " + error); console.log("Create Failed: " + error);
if (completeProfileBody.withOculus) { if (completeProfileBody.withOculus) {
loginErrorMessage.visible = true; loginErrorMessage.visible = true;
loginErrorMessage.text = error; loginErrorMessage.text = "Make sure email and username fields are filled out.";
if (loginErrorMessageTextMetrics.width > root.bannerWidth && root.isTablet) { if (loginErrorMessageTextMetrics.width > root.bannerWidth && root.isTablet) {
loginErrorMessage.wrapMode = Text.WordWrap; loginErrorMessage.wrapMode = Text.WordWrap;
@ -466,10 +466,10 @@ Item {
loginErrorMessage.wrapMode = Text.NoWrap; loginErrorMessage.wrapMode = Text.NoWrap;
errorContainer.height = loginErrorMessageTextMetrics.height; 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 });
} }
} }

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

@ -75,7 +75,6 @@ Item {
function init() { function init() {
// going to/from sign in/up dialog. // going to/from sign in/up dialog.
loginDialog.isLogIn = true;
loginErrorMessage.text = linkAccountBody.errorString; loginErrorMessage.text = linkAccountBody.errorString;
loginErrorMessage.visible = (linkAccountBody.errorString !== ""); loginErrorMessage.visible = (linkAccountBody.errorString !== "");
if (loginErrorMessageTextMetrics.width > emailField.width) { if (loginErrorMessageTextMetrics.width > emailField.width) {

1
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -71,7 +71,6 @@ Item {
function init() { function init() {
// going to/from sign in/up dialog. // going to/from sign in/up dialog.
loginDialog.isLogIn = false;
emailField.placeholderText = "Email"; emailField.placeholderText = "Email";
emailField.text = ""; emailField.text = "";
emailField.anchors.top = usernameField.bottom; emailField.anchors.top = usernameField.bottom;

4
interface/resources/qml/OverlayLoginDialog.qml
View file

@ -55,7 +55,7 @@ FocusScope {
Image { Image {
z: -10 z: -10
id: loginDialogBackground id: loginDialogBackground
source: "LoginDialog/images/background.jpg" source: "LoginDialog/images/background.png"
anchors.fill: parent anchors.fill: parent
} }
@ -149,6 +149,6 @@ FocusScope {
Component.onCompleted: { Component.onCompleted: {
keyboardTimer.start(); 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 });
} }
} }

4
interface/resources/qml/dialogs/TabletLoginDialog.qml
View file

@ -97,7 +97,7 @@ FocusScope {
Image { Image {
z: -10 z: -10
id: loginDialogBackground id: loginDialogBackground
source: "../LoginDialog/images/background_tablet.jpg" source: "../LoginDialog/images/background_tablet.png"
anchors.fill: parent anchors.fill: parent
} }
@ -177,6 +177,6 @@ FocusScope {
Component.onCompleted: { Component.onCompleted: {
keyboardTimer.start(); 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 });
} }
} }