Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes and improvements

Browse source
This commit is contained in:
Zach Fox 2017-08-31 15:39:58 -07:00
parent eab2947d40
commit 2c2500875f
4 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -227,7 +227,6 @@ Rectangle {
HifiWallet.PassphraseModal {
id: passphraseModal;
z: 998;
visible: false;
anchors.top: titleBarContainer.bottom;
anchors.bottom: parent.bottom;

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

@ -198,7 +198,6 @@ Rectangle {
HifiWallet.PassphraseModal {
id: passphraseModal;
z: 998;
visible: false;
anchors.top: titleBarContainer.bottom;
anchors.bottom: parent.bottom;

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

@ -24,6 +24,9 @@ Item {
HifiConstants { id: hifi; }
id: root;
z: 998;
property bool keyboardRaised: false;
Hifi.QmlCommerce {
id: commerce;
@ -35,8 +38,7 @@ Item {
onWalletAuthenticatedStatusResult: {
submitPassphraseInputButton.enabled = true;
if (!isAuthenticated) {
// Auth failed, show error text
errorText.text = "Authentication failed - please try again.";
} else {
root.visible = false;
sendSignalToParent({method: 'passphraseModal_authSuccess'});
@ -76,7 +78,7 @@ Item {
anchors.top: parent.top;
anchors.left: parent.left;
anchors.right: parent.right;
height: 220;
height: 250;
color: hifi.colors.baseGray;
RalewaySemiBold {
@ -106,23 +108,21 @@ Item {
placeholderText: "passphrase";
onFocusChanged: {
if (focus) {
keyboard.raised = true;
} else if (!passphraseFieldAgain.focus) {
keyboard.raised = false;
}
root.keyboardRaised = focus;
}
MouseArea {
anchors.fill: parent;
onClicked: {
parent.focus = true;
keyboard.raised = true;
root.keyboardRaised = true;
}
}
onAccepted: {
//commerce.submitWalletPassphrase(passphraseField.text);
submitPassphraseInputButton.enabled = false;
commerce.setPassphrase(passphraseField.text);
}
}
@ -139,7 +139,7 @@ Item {
onClicked: {
passphraseField.echoMode = checked ? TextInput.Normal : TextInput.Password;
}
}
}
// Security Image
Item {
@ -191,6 +191,27 @@ Item {
verticalAlignment: Text.AlignVCenter;
}
}
// Error text above buttons
RalewaySemiBold {
id: errorText;
text: "";
// Text size
size: 16;
// Anchors
anchors.bottom: passphrasePopupActionButtonsContainer.top;
anchors.bottomMargin: 4;
anchors.left: parent.left;
anchors.leftMargin: 16;
anchors.right: parent.right;
anchors.rightMargin: 16;
height: 30;
// Style
color: hifi.colors.redHighlight;
// Alignment
horizontalAlignment: Text.AlignHCenter;
verticalAlignment: Text.AlignVCenter;
}
//
// ACTION BUTTONS START

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

@ -224,7 +224,6 @@ Rectangle {
PassphraseModal {
id: passphraseModal;
z: 998;
visible: false;
anchors.top: titleBarContainer.bottom;
anchors.bottom: parent.bottom;