From 6ee634b90ae43295388512abea9273a157b46cb4 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 29 Aug 2017 17:19:34 -0700 Subject: [PATCH] Lock overlay on top of security image --- .../qml/hifi/commerce/checkout/Checkout.qml | 10 +++++++ .../qml/hifi/commerce/purchases/Purchases.qml | 10 +++++++ .../commerce/wallet/PassphraseSelection.qml | 14 ++++++++-- .../qml/hifi/commerce/wallet/Security.qml | 25 ++++++++++++++---- .../qml/hifi/commerce/wallet/WalletHome.qml | 14 ++++++++-- .../commerce/wallet/images/lockOverlay.png | Bin 0 -> 10087 bytes 6 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 interface/resources/qml/hifi/commerce/wallet/images/lockOverlay.png diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml index ce75c40458..cdd692dd17 100644 --- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml +++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml @@ -147,6 +147,16 @@ Rectangle { cache: false; 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 HifiControlsUit.Separator { diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml index b4ea498b31..a88633344f 100644 --- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml +++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml @@ -118,6 +118,16 @@ Rectangle { cache: false; 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 HifiControlsUit.Separator { diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml index 23cf8c6ac2..84c9393b06 100644 --- a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml +++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml @@ -154,9 +154,19 @@ Item { 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 { - text: "security picture"; + text: "security image"; // Text size size: 12; // Anchors diff --git a/interface/resources/qml/hifi/commerce/wallet/Security.qml b/interface/resources/qml/hifi/commerce/wallet/Security.qml index d0a96db3f2..b5d52d57e2 100644 --- a/interface/resources/qml/hifi/commerce/wallet/Security.qml +++ b/interface/resources/qml/hifi/commerce/wallet/Security.qml @@ -13,6 +13,7 @@ import Hifi 1.0 as Hifi import QtQuick 2.5 +import QtGraphicalEffects 1.0 import QtQuick.Controls 1.4 import "../../../styles-uit" import "../../../controls-uit" as HifiControlsUit @@ -35,8 +36,6 @@ Item { topSecurityImage.source = path; changeSecurityImageImage.source = ""; changeSecurityImageImage.source = path; - changePassphraseImage.source = ""; - changePassphraseImage.source = path; } } @@ -92,9 +91,19 @@ Item { source: "image://security/securityImage"; 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 { - text: "security picture"; + text: "security image"; // Text size size: 12; // Anchors @@ -148,10 +157,16 @@ Item { anchors.left: parent.left; height: parent.height; width: height; - source: "image://security/securityImage"; + source: "images/lockOverlay.png"; fillMode: Image.PreserveAspectFit; mipmap: true; cache: false; + visible: false; + } + ColorOverlay { + anchors.fill: changePassphraseImage; + source: changePassphraseImage; + color: "white" } // "Change Passphrase" button HifiControlsUit.Button { diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml index 51e2187029..c69610d494 100644 --- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml +++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml @@ -182,9 +182,19 @@ Item { cache: false; 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 { - text: "security picture"; + text: "security image"; // Text size size: 12; // Anchors diff --git a/interface/resources/qml/hifi/commerce/wallet/images/lockOverlay.png b/interface/resources/qml/hifi/commerce/wallet/images/lockOverlay.png new file mode 100644 index 0000000000000000000000000000000000000000..09b2011e58817e9a9f120ef4303c6ea02e597cd6 GIT binary patch literal 10087 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 q&hUiK62U|0qx&3YYF%@F8