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

Checkout and Purchases

Browse source
This commit is contained in:
Zach Fox 2017-08-31 14:12:05 -07:00
parent 21a73b2f39
commit ce32d2d420
5 changed files with 141 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
interface/resources/qml/hifi/commerce/checkout/Checkout.qml
View file

@ -46,10 +46,38 @@ Rectangle {
root.activeView = "needsLogIn";
} else if (isLoggedIn) {
root.activeView = "initialize";
commerce.getSecurityImage();
commerce.getKeyFilePathIfExists();
commerce.balance();
commerce.inventory();
commerce.getPassphraseSetupStatus();
}
}
onPassphraseSetupStatusResult: {
if (!passphraseIsSetup && root.activeView !== "notSetUp") {
root.activeView = "notSetUp";
} else if (passphraseIsSetup && root.activeView === "initialize") {
commerce.getWalletAuthenticatedStatus();
}
}
onWalletAuthenticatedStatusResult: {
if (!isAuthenticated && !passphraseModal.visible) {
passphraseModal.visible = true;
} else if (isAuthenticated) {
if (passphraseModal.visible) {
passphraseModal.visible = false;
}
if (!securityImageResultReceived) {
commerce.getSecurityImage();
}
if (!keyFilePathIfExistsResultReceived) {
commerce.getKeyFilePathIfExists();
}
if (!balanceReceived) {
commerce.balance();
}
if (!purchasesReceived) {
commerce.inventory();
}
}
}
@ -110,10 +138,6 @@ Rectangle {
}
}
HifiWallet.SecurityImageModel {
id: securityImageModel;
}
//
// TITLE BAR START
//
@ -221,7 +245,21 @@ Rectangle {
}
}
PassphraseModal {
id: passphraseModal;
z: 998;
visible: false;
anchors.top: titleBarContainer.bottom;
anchors.bottom: parent.bottom;
anchors.left: parent.left;
anchors.right: parent.right;
Connections {
onSendSignalToParent: {
sendToScript(msg);
}
}
}
//
// "WALLET NOT SET UP" START

48
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -41,9 +41,35 @@ Rectangle {
root.activeView = "needsLogIn";
} else if (isLoggedIn) {
root.activeView = "initialize";
commerce.getSecurityImage();
commerce.getKeyFilePathIfExists();
commerce.inventory();
commerce.getPassphraseSetupStatus();
}
}
onPassphraseSetupStatusResult: {
if (!passphraseIsSetup && root.activeView !== "notSetUp") {
root.activeView = "notSetUp";
} else if (passphraseIsSetup && root.activeView === "initialize") {
commerce.getWalletAuthenticatedStatus();
}
}
onWalletAuthenticatedStatusResult: {
if (!isAuthenticated && !passphraseModal.visible) {
passphraseModal.visible = true;
} else if (isAuthenticated) {
if (passphraseModal.visible) {
passphraseModal.visible = false;
}
if (!securityImageResultReceived) {
commerce.getSecurityImage();
}
if (!keyFilePathIfExistsResultReceived) {
commerce.getKeyFilePathIfExists();
}
if (!purchasesReceived) {
commerce.inventory();
}
}
}
@ -191,6 +217,22 @@ Rectangle {
commerce.getLoginStatus();
}
}
PassphraseModal {
id: passphraseModal;
z: 998;
visible: false;
anchors.top: titleBarContainer.bottom;
anchors.bottom: parent.bottom;
anchors.left: parent.left;
anchors.right: parent.right;
Connections {
onSendSignalToParent: {
sendToScript(msg);
}
}
}
//
// "WALLET NOT SET UP" START

54
interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
View file

@ -48,9 +48,9 @@ Item {
onVisibleChanged: {
if (visible) {
passphraseField.focus = true;
sendSignalToWallet({method: 'disableHmdPreview'});
sendSignalToParent({method: 'disableHmdPreview'});
} else {
sendSignalToWallet({method: 'maybeEnableHmdPreview'});
sendSignalToParent({method: 'maybeEnableHmdPreview'});
}
}
@ -96,9 +96,9 @@ Item {
onFocusChanged: {
if (focus) {
sendSignalToWallet({method: 'walletSetup_raiseKeyboard'});
keyboard.raised = true;
} else if (!passphraseFieldAgain.focus) {
sendSignalToWallet({method: 'walletSetup_lowerKeyboard'});
keyboard.raised = false;
}
}
@ -106,7 +106,7 @@ Item {
anchors.fill: parent;
onClicked: {
parent.focus = true;
sendSignalToWallet({method: 'walletSetup_raiseKeyboard'});
keyboard.raised = true;
}
}
@ -206,7 +206,7 @@ Item {
width: parent.width/2 - anchors.leftMargin*2;
text: "Cancel"
onClicked: {
sendSignalToWallet({method: 'passphrasePopup_cancelClicked'});
sendSignalToParent({method: 'passphrasePopup_cancelClicked'});
}
}
@ -228,5 +228,45 @@ Item {
}
}
signal sendSignalToWallet(var msg);
Item {
id: keyboardContainer;
z: 999;
visible: keyboard.raised;
property bool punctuationMode: false;
anchors {
bottom: parent.bottom;
left: parent.left;
right: parent.right;
}
Image {
id: lowerKeyboardButton;
source: "images/lowerKeyboard.png";
anchors.horizontalCenter: parent.horizontalCenter;
anchors.bottom: keyboard.top;
height: 30;
width: 120;
MouseArea {
anchors.fill: parent;
onClicked: {
root.keyboardRaised = false;
}
}
}
HifiControlsUit.Keyboard {
id: keyboard;
raised: HMD.mounted && root.keyboardRaised;
numeric: parent.punctuationMode;
anchors {
bottom: parent.bottom;
left: parent.left;
right: parent.right;
}
}
}
signal sendSignalToParent(var msg);
}

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

@ -253,14 +253,8 @@ Rectangle {
anchors.right: parent.right;
Connections {
onSendSignalToWallet: {
if (msg.method === 'walletSetup_raiseKeyboard') {
root.keyboardRaised = true;
} else if (msg.method === 'walletSetup_lowerKeyboard') {
root.keyboardRaised = false;
} else {
sendToScript(msg);
}
onSendSignalToParent: {
sendToScript(msg);
}
}
}

1
scripts/system/marketplaces/marketplaces.js
View file

@ -231,6 +231,7 @@
case 'purchases_goToMarketplaceClicked':
tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
break;
case 'passphrasePopup_cancelClicked':
case 'needsLogIn_cancelClicked':
tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
break;