Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding files for staging login

Browse source
This commit is contained in:
Wayne Chen 2018-12-18 16:28:49 -08:00
parent 14ab53571f
commit 8e67876ac3
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,7 @@ Item {
property bool withSteam: false property bool withSteam: false
property bool linkSteam: linkSteam property bool linkSteam: linkSteam
property bool withOculus: false property bool withOculus: false
property bool linkOculus: linkOculus
property string errorString: errorString property string errorString: errorString
property bool lostFocus: false property bool lostFocus: false
@ -370,7 +371,6 @@ Item {
lightboxPopup.visible = false; lightboxPopup.visible = false;
} }
lightboxPopup.visible = true; lightboxPopup.visible = true;
// bodyLoader.setSource("CantAccessBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader });
} }
} }
HifiControlsUit.Button { HifiControlsUit.Button {
@ -408,11 +408,10 @@ 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 } else if (loginDialog.isSteamRunning()) {
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 {
@ -425,7 +424,7 @@ Item {
id: signUpContainer id: signUpContainer
width: loginContainer.width width: loginContainer.width
height: signUpTextMetrics.height height: signUpTextMetrics.height
visible: !linkAccountBody.linkSteam visible: !linkAccountBody.linkSteam && !linkAccountBody.linkOculus
anchors { anchors {
left: loginContainer.left left: loginContainer.left
top: loginContainer.bottom top: loginContainer.bottom

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

@ -29,6 +29,7 @@ Item {
property bool withSteam: withSteam property bool withSteam: withSteam
property bool withOculus: withOculus property bool withOculus: withOculus
property bool linkSteam: linkSteam property bool linkSteam: linkSteam
property bool linkOculus: linkOculus
QtObject { QtObject {
id: d id: d

5
interface/src/ui/LoginDialog.cpp
View file

@ -121,6 +121,11 @@ void LoginDialog::login(const QString& username, const QString& password) const
DependencyManager::get<AccountManager>()->requestAccessToken(username, password); DependencyManager::get<AccountManager>()->requestAccessToken(username, password);
} }
void LoginDialog::loginThroughOculus() {
qDebug() << "Attempting to login through Oculus";
}
void LoginDialog::loginThroughSteam() { void LoginDialog::loginThroughSteam() {
qDebug() << "Attempting to login through Steam"; qDebug() << "Attempting to login through Steam";
if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) { if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {

3
interface/src/ui/LoginDialog.h
View file

@ -73,6 +73,9 @@ protected slots:
Q_INVOKABLE void loginThroughSteam(); Q_INVOKABLE void loginThroughSteam();
Q_INVOKABLE void linkSteam(); Q_INVOKABLE void linkSteam();
Q_INVOKABLE void createAccountFromSteam(QString username = QString()); Q_INVOKABLE void createAccountFromSteam(QString username = QString());
Q_INVOKABLE void loginThroughOculus();
//Q_INVOKABLE void linkOculus();
//Q_INVOKABLE void createAccountFromOculus(QString username = QString());
Q_INVOKABLE void signup(const QString& email, const QString& username, const QString& password); Q_INVOKABLE void signup(const QString& email, const QString& username, const QString& password);