Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Lock overlay on top of security image

Browse source
This commit is contained in:
Zach Fox 2017-08-29 17:19:34 -07:00
parent 5d1170c5d6
commit 6ee634b90a
6 changed files with 64 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -147,6 +147,16 @@ Rectangle {
cache: false; cache: false;
source: "image://security/securityImage"; source: "image://security/securityImage";
} }
Image {
id: securityImageOverlay;
source: "../wallet/images/lockOverlay.png";
width: securityImage.width * 0.45;
height: securityImage.height * 0.45;
anchors.bottom: securityImage.bottom;
anchors.right: securityImage.right;
mipmap: true;
opacity: 0.9;
}
// Separator // Separator
HifiControlsUit.Separator { HifiControlsUit.Separator {

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

@ -118,6 +118,16 @@ Rectangle {
cache: false; cache: false;
source: "image://security/securityImage"; source: "image://security/securityImage";
} }
Image {
id: securityImageOverlay;
source: "../wallet/images/lockOverlay.png";
width: securityImage.width * 0.45;
height: securityImage.height * 0.45;
anchors.bottom: securityImage.bottom;
anchors.right: securityImage.right;
mipmap: true;
opacity: 0.9;
}
// Separator // Separator
HifiControlsUit.Separator { HifiControlsUit.Separator {

14
interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
View file

@ -154,9 +154,19 @@ Item {
commerce.getSecurityImage(); commerce.getSecurityImage();
} }
} }
// "Security picture" text below pic Image {
id: topSecurityImageOverlay;
source: "images/lockOverlay.png";
width: passphrasePageSecurityImage.width * 0.45;
height: passphrasePageSecurityImage.height * 0.45;
anchors.bottom: passphrasePageSecurityImage.bottom;
anchors.right: passphrasePageSecurityImage.right;
mipmap: true;
opacity: 0.9;
}
// "Security image" text below pic
RalewayRegular { RalewayRegular {
text: "security picture"; text: "security image";
// Text size // Text size
size: 12; size: 12;
// Anchors // Anchors

25
interface/resources/qml/hifi/commerce/wallet/Security.qml
View file

@ -13,6 +13,7 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtGraphicalEffects 1.0
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
@ -35,8 +36,6 @@ Item {
topSecurityImage.source = path; topSecurityImage.source = path;
changeSecurityImageImage.source = ""; changeSecurityImageImage.source = "";
changeSecurityImageImage.source = path; changeSecurityImageImage.source = path;
changePassphraseImage.source = "";
changePassphraseImage.source = path;
} }
} }
@ -92,9 +91,19 @@ Item {
source: "image://security/securityImage"; source: "image://security/securityImage";
cache: false; cache: false;
} }
// "Security picture" text below pic Image {
id: topSecurityImageMask;
source: "images/lockOverlay.png";
width: topSecurityImage.width * 0.45;
height: topSecurityImage.height * 0.45;
anchors.bottom: topSecurityImage.bottom;
anchors.right: topSecurityImage.right;
mipmap: true;
opacity: 0.9;
}
// "Security image" text below pic
RalewayRegular { RalewayRegular {
text: "security picture"; text: "security image";
// Text size // Text size
size: 12; size: 12;
// Anchors // Anchors
@ -148,10 +157,16 @@ Item {
anchors.left: parent.left; anchors.left: parent.left;
height: parent.height; height: parent.height;
width: height; width: height;
source: "image://security/securityImage"; source: "images/lockOverlay.png";
fillMode: Image.PreserveAspectFit; fillMode: Image.PreserveAspectFit;
mipmap: true; mipmap: true;
cache: false; cache: false;
visible: false;
}
ColorOverlay {
anchors.fill: changePassphraseImage;
source: changePassphraseImage;
color: "white"
} }
// "Change Passphrase" button // "Change Passphrase" button
HifiControlsUit.Button { HifiControlsUit.Button {

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

@ -182,9 +182,19 @@ Item {
cache: false; cache: false;
source: "image://security/securityImage"; source: "image://security/securityImage";
} }
// "Security picture" text below pic Image {
id: securityImageOverlay;
source: "images/lockOverlay.png";
width: securityImage.width * 0.45;
height: securityImage.height * 0.45;
anchors.bottom: securityImage.bottom;
anchors.right: securityImage.right;
mipmap: true;
opacity: 0.9;
}
// "Security image" text below pic
RalewayRegular { RalewayRegular {
text: "security picture"; text: "security image";
// Text size // Text size
size: 12; size: 12;
// Anchors // Anchors

BIN
interface/resources/qml/hifi/commerce/wallet/images/lockOverlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.9 KiB