Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 06:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Login and picture selection done

Browse source
This commit is contained in:
Zach Fox 2017-08-17 16:34:33 -07:00
parent 5f69f30551
commit d052b49a54
3 changed files with 75 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/commerce/wallet/Wallet.qml
View file

@ -38,7 +38,7 @@ Rectangle {
}
Connections {
target: walletSetupLightbox;
onSignalSent: {
onSendSignalToWallet: {
sendToScript(msg);
}
}

69
interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
View file

@ -24,7 +24,7 @@ Rectangle {
HifiConstants { id: hifi; }
id: root;
property string lastPage: "";
property string lastPage: "login";
// Style
color: "white";
@ -42,7 +42,7 @@ Rectangle {
onSecurityImageResult: {
if (imageID !== 0) { // "If security image is set up"
passphrasePageSecurityImage.source = securityImageSelection.getImagePathFromImageID(imageID);
if (root.lastPage === "") {
if (root.lastPage === "login") {
securityImageContainer.visible = false;
choosePassphraseContainer.visible = true;
}
@ -77,6 +77,7 @@ Rectangle {
}
Item {
id: loginTitle;
// Size
width: parent.width;
height: 50;
@ -103,6 +104,64 @@ Rectangle {
}
}
// Text below title bar
RalewaySemiBold {
id: loginTitleHelper;
text: "Please Log In to High Fidelity";
// Text size
size: 24;
// Anchors
anchors.top: loginTitle.bottom;
anchors.left: parent.left;
anchors.leftMargin: 16;
anchors.right: parent.right;
anchors.rightMargin: 16;
height: 50;
// Style
color: hifi.colors.darkGray;
// Alignment
horizontalAlignment: Text.AlignHLeft;
verticalAlignment: Text.AlignVCenter;
}
// Text below helper text
RalewaySemiBold {
id: loginDetailText;
text: "To set up your wallet, you must first log in to High Fidelity.";
// Text size
size: 18;
// Anchors
anchors.top: loginTitleHelper.bottom;
anchors.topMargin: 25;
anchors.left: parent.left;
anchors.leftMargin: 16;
anchors.right: parent.right;
anchors.rightMargin: 16;
height: 50;
// Style
color: hifi.colors.darkGray;
wrapMode: Text.WordWrap;
// Alignment
horizontalAlignment: Text.AlignHLeft;
verticalAlignment: Text.AlignVCenter;
}
// "Cancel" button
HifiControlsUit.Button {
color: hifi.buttons.black;
colorScheme: hifi.colorSchemes.dark;
anchors.top: loginDetailText.bottom;
anchors.topMargin: 25;
anchors.left: parent.left;
anchors.leftMargin: 16;
width: 150;
height: 50;
text: "Log In"
onClicked: {
sendSignalToWallet({method: 'walletSetup_loginClicked'});
}
}
// Navigation Bar
Item {
// Size
@ -125,7 +184,7 @@ Rectangle {
width: 100;
text: "Cancel"
onClicked: {
sendSignalToWallet({method: 'walletSetup_cancelClicked'});
}
}
}
@ -250,7 +309,7 @@ Rectangle {
width: 100;
text: "Cancel"
onClicked: {
signalSent({method: 'securityImageSelection_cancelClicked'});
sendSignalToWallet({method: 'walletSetup_cancelClicked'});
}
}
@ -430,7 +489,7 @@ Rectangle {
//
// FUNCTION DEFINITIONS START
//
signal signalSent(var msg);
signal sendSignalToWallet(var msg);
//
// FUNCTION DEFINITIONS END
//

11
scripts/system/commerce/wallet.js
View file

@ -55,9 +55,18 @@
// in the format "{method, params}", like json-rpc. See also sendToQml().
function fromQml(message) {
switch (message.method) {
case 'securityImageSelection_cancelClicked':
case 'walletSetup_cancelClicked':
tablet.gotoHomeScreen();
break;
case 'walletSetup_loginClicked':
if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
|| (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
Menu.triggerOption("Login / Sign Up");
tablet.gotoHomeScreen();
} else {
tablet.loadQMLOnTop("../../../dialogs/TabletLoginDialog.qml");
}
break;
default:
print('Unrecognized message from QML:', JSON.stringify(message));
}