Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add security image to Checkout and Purchases

Browse source
This commit is contained in:
Zach Fox 2017-08-28 09:33:30 -07:00
parent 4c16366562
commit e293d122b1
2 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,10 @@ Rectangle {
root.activeView = "notSetUp"; root.activeView = "notSetUp";
} else if (exists && root.activeView !== "checkoutMain") { } else if (exists && root.activeView !== "checkoutMain") {
root.activeView = "checkoutMain"; root.activeView = "checkoutMain";
} else if (exists) {
// just set the source again (to be sure the change was noticed)
securityImage.source = "";
securityImage.source = "image://security/securityImage";
} }
} }
@ -89,6 +93,10 @@ Rectangle {
} }
} }
HifiWallet.SecurityImageModel {
id: securityImageModel;
}
// //
// TITLE BAR START // TITLE BAR START
// //
@ -120,6 +128,21 @@ Rectangle {
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;
} }
// Security Image (TEMPORARY!)
Image {
id: securityImage;
// Anchors
anchors.top: parent.top;
anchors.right: parent.right;
anchors.verticalCenter: parent.verticalCenter;
height: parent.height - 10;
width: height;
fillMode: Image.PreserveAspectFit;
mipmap: true;
cache: false;
source: "image://security/securityImage";
}
// Separator // Separator
HifiControlsUit.Separator { HifiControlsUit.Separator {
anchors.left: parent.left; anchors.left: parent.left;

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

@ -37,6 +37,10 @@ Rectangle {
root.activeView = "notSetUp"; root.activeView = "notSetUp";
} else if (exists && root.activeView !== "purchasesMain") { } else if (exists && root.activeView !== "purchasesMain") {
root.activeView = "purchasesMain"; root.activeView = "purchasesMain";
} else if (exists) {
// just set the source again (to be sure the change was noticed)
securityImage.source = "";
securityImage.source = "image://security/securityImage";
} }
} }
@ -58,6 +62,10 @@ Rectangle {
} }
} }
HifiWallet.SecurityImageModel {
id: securityImageModel;
}
// //
// TITLE BAR START // TITLE BAR START
// //
@ -89,6 +97,21 @@ Rectangle {
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;
} }
// Security Image (TEMPORARY!)
Image {
id: securityImage;
// Anchors
anchors.top: parent.top;
anchors.right: parent.right;
anchors.verticalCenter: parent.verticalCenter;
height: parent.height - 10;
width: height;
fillMode: Image.PreserveAspectFit;
mipmap: true;
cache: false;
source: "image://security/securityImage";
}
// Separator // Separator
HifiControlsUit.Separator { HifiControlsUit.Separator {
anchors.left: parent.left; anchors.left: parent.left;