Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 10:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

outing oculus login

Browse source
This commit is contained in:
Wayne Chen 2018-12-05 08:25:01 -08:00
parent a2a4d2ff89
commit 3d99ffc459
2 changed files with 10 additions and 10 deletions
interface/resources/qml/LoginDialog
LinkAccountBody.qmlLoggingInBody.qml

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

@ -376,10 +376,11 @@ Item {
buttonGlyph: hifi.glyphs.steamSquare
buttonGlyphRightMargin: 10
onClicked: {
if (loginDialog.isOculusStoreRunning()) {
linkAccountBody.withOculus = true;
loginDialog.loginThroughSteam();
} else if (loginDialog.isSteamRunning()) {
// if (loginDialog.isOculusStoreRunning()) {
// linkAccountBody.withOculus = true;
// loginDialog.loginThroughSteam();
// } else
if (loginDialog.isSteamRunning()) {
linkAccountBody.withSteam = true;
loginDialog.loginThroughSteam();
}
@ -392,10 +393,11 @@ Item {
continueButton.visible = false;
return;
}
if (loginDialog.isOculusStoreRunning()) {
continueButton.text = qsTr("CONTINUE WITH OCULUS");
continueButton.buttonGlyph = hifi.glyphs.oculus;
} else if (loginDialog.isSteamRunning()) {
// if (loginDialog.isOculusStoreRunning()) {
// continueButton.text = qsTr("CONTINUE WITH OCULUS");
// continueButton.buttonGlyph = hifi.glyphs.oculus;
// } else
if (loginDialog.isSteamRunning()) {
continueButton.text = qsTr("CONTINUE WITH STEAM");
continueButton.buttonGlyph = hifi.glyphs.steamSquare;
} else {

2
interface/resources/qml/LoginDialog/LoggingInBody.qml
View file

@ -68,8 +68,6 @@ Item {
function init() {
// For the process of logging in.
loggingInText.wrapMode = Text.NoWrap;
print("withSteam " + loggingInBody.withSteam);
print("withOculus " + loggingInBody.withOculus);
if (loggingInBody.withSteam) {
loggingInGlyph.visible = true;
loggingInText.text = "Logging in to Steam";