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

Taking a break now

Browse source
This commit is contained in:
Zach Fox 2017-08-22 12:26:46 -07:00
parent a31088b60f
commit 763ce73306
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,15 +33,15 @@ Rectangle {
id: commerce; id: commerce;
onSecurityImageResult: { onSecurityImageResult: {
if (imageID === 0 && root.lastPage === "securityImage") { // "If security image is set up" if (imageID === 0) { // "If security image is not set up"
// ERROR! Invalid security image. if (root.activeView !== "notSetUp") {
securityImageContainer.visible = true; root.activeView = "notSetUp";
choosePassphraseContainer.visible = false; }
} }
} }
onKeyFilePathResult: { onKeyFilePathResult: {
if (path === "") { if (path === "" && root.activeView !== "notSetUp") {
root.activeView = "notSetUp"; root.activeView = "notSetUp";
} }
} }

3
interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
View file

@ -30,7 +30,8 @@ Item {
onSecurityImageResult: { onSecurityImageResult: {
if (imageID !== 0) { // "If security image is set up" if (imageID !== 0) { // "If security image is set up"
securityImage.source = securityImageModel.getImagePathFromImageID(imageID); var path = securityImageModel.getImagePathFromImageID(imageID);
securityImage.source = path;
} }
} }

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

@ -554,6 +554,7 @@ Rectangle {
anchors.top: explanationText.bottom; anchors.top: explanationText.bottom;
anchors.topMargin: 10; anchors.topMargin: 10;
anchors.left: parent.left; anchors.left: parent.left;
anchors.leftMargin: 16;
anchors.right: clipboardButton.left; anchors.right: clipboardButton.left;
height: 40; height: 40;
readOnly: true; readOnly: true;
@ -569,6 +570,7 @@ Rectangle {
color: hifi.buttons.black; color: hifi.buttons.black;
colorScheme: hifi.colorSchemes.dark; colorScheme: hifi.colorSchemes.dark;
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: 16;
anchors.top: keyFilePath.top; anchors.top: keyFilePath.top;
anchors.bottom: keyFilePath.bottom; anchors.bottom: keyFilePath.bottom;
width: height; width: height;