Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 00:36:52 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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