From c4aabfda44abdf49db49097c464d4408fef19f8c Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Mon, 29 Oct 2018 08:47:09 -0700 Subject: [PATCH] adding prototype functions --- interface/src/Application.cpp | 7 +++++++ interface/src/Application.h | 4 ++-- interface/src/ui/LoginDialog.cpp | 19 +++++++++++++------ interface/src/ui/LoginDialog.h | 3 +++ 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9b52357099..414dc92e0b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5181,6 +5181,12 @@ void Application::init() { _entitySimulation->setWorkloadSpace(getEntities()->getWorkloadSpace()); } +void Application::pauseUntilLoginDetermined() { +} + +void Application::resumeAfterLoginDialogActionTaken() { +} + void Application::loadAvatarScripts(const QVector& urls) { auto scriptEngines = DependencyManager::get(); auto runningScripts = scriptEngines->getRunningScripts(); @@ -8398,6 +8404,7 @@ void Application::onDismissedLoginDialog() { qDebug() << "dismissed login dialog"; _loginDialogPoppedUp = false; loginDialogPoppedUp.set(false); + resumeAfterLoginDialogActionTaken(); } void Application::startHMDStandBySession() { diff --git a/interface/src/Application.h b/interface/src/Application.h index d35848754a..e78bf3e84a 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -320,8 +320,6 @@ public: void setOtherAvatarsReplicaCount(int count) { DependencyManager::get()->setReplicaCount(count); } bool getLoginDialogPoppedUp() const { return _loginDialogPoppedUp; } - void pauseUntilLoginDetermined(); - void resumeAfterLoginDialogActionTaken(); #if defined(Q_OS_ANDROID) void beforeEnterBackground(); @@ -514,6 +512,8 @@ private slots: private: void init(); + void pauseUntilLoginDetermined(); + void resumeAfterLoginDialogActionTaken(); bool handleKeyEventForFocusedEntityOrOverlay(QEvent* event); bool handleFileOpenEvent(QFileOpenEvent* event); void cleanupBeforeQuit(); diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp index 1ec098ddb2..085ddf5b5a 100644 --- a/interface/src/ui/LoginDialog.cpp +++ b/interface/src/ui/LoginDialog.cpp @@ -26,6 +26,8 @@ #include "Menu.h" #include "Application.h" +#include "overlays/Overlays.h" +#include "overlays/Web3DOverlay.h" #include "scripting/HMDScriptingInterface.h" #include "Constants.h" @@ -63,12 +65,13 @@ void LoginDialog::showWithSelection() { } } } else { - //if (qApp->getLoginDialogPoppedUp()) { - // // pop up those overlay things. - // return; - //} else { - // tablet->initialScreen(url); - //} + if (qApp->getLoginDialogPoppedUp()) { + // pop up those overlay things. + createLoginScreenDialog(); + return; + } else { + tablet->initialScreen(url); + } } if (!hmd->getShouldShowTablet()) { @@ -252,6 +255,10 @@ bool LoginDialog::getLoginDialogPoppedUp() const { return qApp->getLoginDialogPoppedUp(); } +void LoginDialog::createLoginScreenDialog() { + +} + QString errorStringFromAPIObject(const QJsonValue& apiObject) { if (apiObject.isArray()) { return apiObject.toArray()[0].toString(); diff --git a/interface/src/ui/LoginDialog.h b/interface/src/ui/LoginDialog.h index df7bf69172..c2b0af54c3 100644 --- a/interface/src/ui/LoginDialog.h +++ b/interface/src/ui/LoginDialog.h @@ -76,8 +76,11 @@ protected slots: Q_INVOKABLE bool getLoginDialogPoppedUp() const; private: + static void createLoginScreenDialog(); + bool getIsLogIn() const { return _isLogIn; } void setIsLogIn(const bool isLogIn) { _isLogIn = isLogIn; } + bool _isLogIn { false }; };