Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 01:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sending to tutorial if dismiss login

Browse source
This commit is contained in:
Wayne Chen 2018-10-31 16:13:01 -07:00
parent f62c8ae87a
commit 6822287d67
4 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/LoginDialog/SignInBody.qml
View file

@ -90,8 +90,7 @@ Item {
loginButtonAtSignIn.text = "Log In"; loginButtonAtSignIn.text = "Log In";
loginButtonAtSignIn.color = hifi.buttons.black; loginButtonAtSignIn.color = hifi.buttons.black;
emailField.placeholderText = "Username or Email"; emailField.placeholderText = "Username or Email";
// var savedUsername = Settings.getValue("wallet/savedUsername", ""); var savedUsername = Settings.getValue("wallet/savedUsername", "");
var savedUsername = "";
emailField.text = savedUsername === "Unknown user" ? "" : savedUsername; emailField.text = savedUsername === "Unknown user" ? "" : savedUsername;
emailField.anchors.top = loginContainer.top; emailField.anchors.top = loginContainer.top;
emailField.anchors.topMargin = !root.isTablet ? 0.2 * root.height : 0.24 * root.height; emailField.anchors.topMargin = !root.isTablet ? 0.2 * root.height : 0.24 * root.height;
@ -196,8 +195,7 @@ Item {
width: banner.width width: banner.width
height: signInBody.textFieldHeight height: signInBody.textFieldHeight
font.family: signInBody.fontFamily font.family: signInBody.fontFamily
// text: Settings.getValue("wallet/savedUsername", ""); text: Settings.getValue("wallet/savedUsername", "");
text: "";
anchors { anchors {
top: parent.top top: parent.top
left: parent.left left: parent.left

25
interface/src/Application.cpp
View file

@ -5237,27 +5237,10 @@ void Application::resumeAfterLoginDialogActionTaken() {
} }
} }
QVariant testProperty = property(hifi::properties::TEST); auto accountManager = DependencyManager::get<AccountManager>();
qDebug() << testProperty; auto addressManager = DependencyManager::get<AddressManager>();
if (testProperty.isValid()) { if (!accountManager->isLoggedIn()) {
const auto testScript = property(hifi::properties::TEST).toUrl(); addressManager->goToEntry();
// Set last parameter to exit interface when the test script finishes, if so requested
DependencyManager::get<ScriptEngines>()->loadScript(testScript, false, false, false, false, quitWhenFinished);
// This is done so we don't get a "connection time-out" message when we haven't passed in a URL.
if (arguments().contains("--url")) {
auto reply = SandboxUtils::getStatus();
connect(reply, &QNetworkReply::finished, this, [this, reply] {
handleSandboxStatus(reply);
});
}
} else {
PROFILE_RANGE(render, "GetSandboxStatus");
auto reply = SandboxUtils::getStatus();
connect(reply, &QNetworkReply::finished, this, [this, reply] {
handleSandboxStatus(reply);
});
} }
const auto& nodeList = DependencyManager::get<NodeList>(); const auto& nodeList = DependencyManager::get<NodeList>();

1
libraries/networking/src/AddressManager.cpp
View file

@ -32,7 +32,6 @@
const QString DEFAULT_HIFI_ADDRESS = "file:///~/serverless/tutorial.json"; const QString DEFAULT_HIFI_ADDRESS = "file:///~/serverless/tutorial.json";
const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json"; const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json";
const QString LOGIN_SCREEN_HIFI_ADDRESS = "file:///~/serverless/login.json";
const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager"; const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
const QString SETTINGS_CURRENT_ADDRESS_KEY = "address"; const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";

1
libraries/networking/src/AddressManager.h
View file

@ -24,7 +24,6 @@
extern const QString DEFAULT_HIFI_ADDRESS; extern const QString DEFAULT_HIFI_ADDRESS;
extern const QString REDIRECT_HIFI_ADDRESS; extern const QString REDIRECT_HIFI_ADDRESS;
extern const QString LOGIN_SCREEN_HIFI_ADDRESS;
const QString SANDBOX_HIFI_ADDRESS = "hifi://localhost"; const QString SANDBOX_HIFI_ADDRESS = "hifi://localhost";
const QString INDEX_PATH = "/"; const QString INDEX_PATH = "/";