From 9deeee6534778cfb64aaae6c4c2a6059c43b7098 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Mon, 5 Nov 2018 11:07:29 -0800 Subject: [PATCH] removing unused classes --- .../resources/qml/LoginDialog/SignInBody.qml | 30 +++++++++++++++++++ interface/src/Application.cpp | 1 - interface/src/ui/LoginScreenDialog.cpp | 29 ------------------ interface/src/ui/LoginScreenDialog.h | 25 ---------------- 4 files changed, 30 insertions(+), 55 deletions(-) delete mode 100644 interface/src/ui/LoginScreenDialog.cpp delete mode 100644 interface/src/ui/LoginScreenDialog.h diff --git a/interface/resources/qml/LoginDialog/SignInBody.qml b/interface/resources/qml/LoginDialog/SignInBody.qml index 4cbc4aeba6..7a8bf347af 100644 --- a/interface/resources/qml/LoginDialog/SignInBody.qml +++ b/interface/resources/qml/LoginDialog/SignInBody.qml @@ -200,6 +200,16 @@ Item { event.accepted = true; passwordField.focus = true; break; + case Qt.Key_Enter: + case Qt.Key_Return: + event.accepted = true; + if (loginDialog.isLogIn) { + Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text); + } else { + Settings.setValue("keepMeLoggedIn/savedUsername", usernameField.text); + } + signInBody.login(); + break; } } } @@ -233,6 +243,16 @@ Item { event.accepted = true; usernameField.focus = true; break; + case Qt.Key_Enter: + case Qt.Key_Return: + event.accepted = true; + if (loginDialog.isLogIn) { + Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text); + } else { + Settings.setValue("keepMeLoggedIn/savedUsername", usernameField.text); + } + signInBody.login(); + break; } } } @@ -305,6 +325,16 @@ Item { event.accepted = true; emailField.focus = true; break; + case Qt.Key_Enter: + case Qt.Key_Return: + event.accepted = true; + if (loginDialog.isLogIn) { + Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text); + } else { + Settings.setValue("keepMeLoggedIn/savedUsername", usernameField.text); + } + signInBody.login(); + break; } } } diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 4907ea62a4..a46d3bce07 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1287,7 +1287,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo setCrashAnnotation("hmd", displayPlugin->isHmd() ? "1" : "0"); }); connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateSystemTabletMode); - connect(this, &Application::activeDisplayPluginChanged, this, &Application::checkReadyToCreateLoginDialogOverlay); // Save avatar location immediately after a teleport. connect(myAvatar.get(), &MyAvatar::positionGoneTo, diff --git a/interface/src/ui/LoginScreenDialog.cpp b/interface/src/ui/LoginScreenDialog.cpp deleted file mode 100644 index 7c1a1d7ea1..0000000000 --- a/interface/src/ui/LoginScreenDialog.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// -// LoginScreenDialog.cpp -// interface/src/ui -// -// Created by Wayne Chen on 2018/10/9 -// Copyright 2018 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// -#include "LoginScreenDialog.h" - -#include - -#include "ui/overlays/Overlays.h" -#include "ui/overlays/Overlay.h" -#include "avatar/AvatarManager.h" -#include "avatar/MyAvatar.h" -#include "DependencyManager.h" - -#include "Application.h" - -void LoginScreenDialog::createLoginScreen() { - Overlays& overlays = qApp->getOverlays(); - - //QVariantMap loginScreenOverlayProperties { - // { "url", } - //} -} \ No newline at end of file diff --git a/interface/src/ui/LoginScreenDialog.h b/interface/src/ui/LoginScreenDialog.h deleted file mode 100644 index ce94b4247b..0000000000 --- a/interface/src/ui/LoginScreenDialog.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// LoginScreenDialog.h -// interface/src/ui -// -// Created by Wayne Chen on 2018/10/9 -// Copyright 2018 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// -#ifndef hifi_LoginScreenDialog_h -#define hifi_LoginScreenDialog_h - -#include - -class PointerEvent; - -class LoginScreenDialog : public Dependency, QObject { - LoginScreenDialog(); - void createLoginScreen(); - -public slots: -}; - -#endif // hifi_LoginScreenDialog_h \ No newline at end of file