From 6f5fafb62f25c39da87dd18ff520a6af5558dfb9 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 17 Oct 2017 13:44:19 -0700 Subject: [PATCH 1/8] Add 'showDebugButtons' switch on Help ta --- interface/resources/qml/hifi/commerce/wallet/Help.qml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml index 65c06994f8..46706458cb 100644 --- a/interface/resources/qml/hifi/commerce/wallet/Help.qml +++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml @@ -25,6 +25,7 @@ Item { id: root; property string keyFilePath; + property bool showDebugButtons: true; Hifi.QmlCommerce { id: commerce; @@ -56,6 +57,7 @@ Item { } HifiControlsUit.Button { id: clearCachedPassphraseButton; + visible: root.showDebugButtons; color: hifi.buttons.black; colorScheme: hifi.colorSchemes.dark; anchors.top: parent.top; @@ -71,6 +73,7 @@ Item { } HifiControlsUit.Button { id: resetButton; + visible: root.showDebugButtons; color: hifi.buttons.red; colorScheme: hifi.colorSchemes.dark; anchors.top: clearCachedPassphraseButton.top; From e829bd291934dff1283f1b5409b6c68f9ade367b Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 18 Oct 2017 14:47:14 -0700 Subject: [PATCH 2/8] Fix 'Recent Activity' indentation --- interface/resources/qml/hifi/commerce/wallet/WalletHome.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml index 50891deb60..280d49ceed 100644 --- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml +++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml @@ -164,7 +164,7 @@ Item { anchors.top: parent.top; anchors.topMargin: 26; anchors.left: parent.left; - anchors.leftMargin: 30; + anchors.leftMargin: 20; anchors.right: parent.right; anchors.rightMargin: 30; height: 30; From 6c7096b0d789adeac9d294f5cd596a6b07d87fa3 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 18 Oct 2017 14:53:39 -0700 Subject: [PATCH 3/8] Fix login button injection on individual item page --- scripts/system/html/js/marketplacesInject.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index fc16eae8bf..f6b35a5f1c 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -140,6 +140,10 @@ if (!$('body').hasClass("login-injected") && !userIsLoggedIn) { $('body').addClass("login-injected"); var resultsElement = document.getElementById('results'); + if (!resultsElement) { // If we're on the main page, this will evaluate to `true` + resultsElement = document.getElementById('item-show'); + resultsElement.style = 'margin-top:0;'; + } var logInElement = document.createElement('div'); logInElement.classList.add("row"); logInElement.id = "logInDiv"; From 33508b6b2bc1e374ca8382fe240ef202e6d76f09 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 18 Oct 2017 14:55:45 -0700 Subject: [PATCH 4/8] Update help text --- interface/resources/qml/hifi/commerce/wallet/Help.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml index 46706458cb..8425e6bb00 100644 --- a/interface/resources/qml/hifi/commerce/wallet/Help.qml +++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml @@ -98,7 +98,7 @@ Item { ListElement { isExpanded: false; question: "Where are my private keys stored?" - answer: qsTr('Your private keys are only stored on your hard drive in High Fidelity Interface\'s AppData directory.

Tap here to open the file path of your hifikey in your file explorer.

You may backup this file by copying it to a USB flash drive, or to a service like Dropbox or Google Drive. Restore your backup by replacing the file in Interface\'s AppData directory with your backed-up copy.'); + answer: qsTr('Your private keys are only stored on your hard drive in High Fidelity Interface\'s AppData directory.

Tap here to open the folder where your HifiKeys are stored on your main display.

You may backup this file by copying it to a USB flash drive, or to a service like Dropbox or Google Drive. Restore your backup by replacing the file in Interface\'s AppData directory with your backed-up copy.'); } ListElement { isExpanded: false; From a993386613319a966ae90c5ea8e3e372fd6d31ff Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 18 Oct 2017 15:13:28 -0700 Subject: [PATCH 5/8] Change color of 'Instructions Opened on Desktop' to disabled gray --- .../resources/qml/hifi/commerce/wallet/Security.qml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/commerce/wallet/Security.qml b/interface/resources/qml/hifi/commerce/wallet/Security.qml index 0f2edbe913..485b0ec086 100644 --- a/interface/resources/qml/hifi/commerce/wallet/Security.qml +++ b/interface/resources/qml/hifi/commerce/wallet/Security.qml @@ -290,7 +290,17 @@ Item { id: removeHmdContainer; z: 998; visible: false; - color: hifi.colors.blueHighlight; + + gradient: Gradient { + GradientStop { + position: 0.2; + color: hifi.colors.baseGrayHighlight; + } + GradientStop { + position: 1.0; + color: hifi.colors.baseGrayShadow; + } + } anchors.fill: backupInstructionsButton; radius: 5; MouseArea { From 91ac2ab58cf75f62701a3ea1a66d80be6682f3d2 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 18 Oct 2017 15:31:12 -0700 Subject: [PATCH 6/8] LowerKeyboard button changes --- .../hifi/commerce/wallet/PassphraseModal.qml | 14 ++++++++------ .../qml/hifi/commerce/wallet/Wallet.qml | 18 ++++++++++-------- .../commerce/wallet/images/lowerKeyboard.png | Bin 721 -> 1269 bytes 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml index 8d5d9f97de..2243143906 100644 --- a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml +++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml @@ -25,7 +25,7 @@ Item { HifiConstants { id: hifi; } id: root; - z: 998; + z: 997; property bool keyboardRaised: false; property string titleBarIcon: ""; property string titleBarText: ""; @@ -350,7 +350,7 @@ Item { Item { id: keyboardContainer; - z: 999; + z: 998; visible: keyboard.raised; property bool punctuationMode: false; anchors { @@ -361,11 +361,13 @@ Item { Image { id: lowerKeyboardButton; + z: 999; source: "images/lowerKeyboard.png"; - anchors.horizontalCenter: parent.horizontalCenter; - anchors.bottom: keyboard.top; - height: 30; - width: 120; + anchors.right: keyboard.right; + anchors.top: keyboard.showMirrorText ? keyboard.top : undefined; + anchors.bottom: keyboard.showMirrorText ? undefined : keyboard.bottom; + height: 50; + width: 60; MouseArea { anchors.fill: parent; diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml index 9beadd3361..472dd50b7d 100644 --- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml +++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml @@ -165,7 +165,7 @@ Rectangle { WalletSetup { id: walletSetup; visible: root.activeView === "walletSetup"; - z: 998; + z: 997; anchors.fill: parent; Connections { @@ -192,7 +192,7 @@ Rectangle { PassphraseChange { id: passphraseChange; visible: root.activeView === "passphraseChange"; - z: 998; + z: 997; anchors.top: titleBarContainer.bottom; anchors.left: parent.left; anchors.right: parent.right; @@ -217,7 +217,7 @@ Rectangle { SecurityImageChange { id: securityImageChange; visible: root.activeView === "securityImageChange"; - z: 998; + z: 997; anchors.top: titleBarContainer.bottom; anchors.left: parent.left; anchors.right: parent.right; @@ -653,7 +653,7 @@ Rectangle { Item { id: keyboardContainer; - z: 999; + z: 998; visible: keyboard.raised; property bool punctuationMode: false; anchors { @@ -664,11 +664,13 @@ Rectangle { Image { id: lowerKeyboardButton; + z: 999; source: "images/lowerKeyboard.png"; - anchors.horizontalCenter: parent.horizontalCenter; - anchors.bottom: keyboard.top; - height: 30; - width: 120; + anchors.right: keyboard.right; + anchors.top: keyboard.showMirrorText ? keyboard.top : undefined; + anchors.bottom: keyboard.showMirrorText ? undefined : keyboard.bottom; + height: 50; + width: 60; MouseArea { anchors.fill: parent; diff --git a/interface/resources/qml/hifi/commerce/wallet/images/lowerKeyboard.png b/interface/resources/qml/hifi/commerce/wallet/images/lowerKeyboard.png index 9fc88262dbc869891f0cad5cc39b031f632206df..c14409d45c8ea10cb173456869bc259b18c667af 100644 GIT binary patch delta 1217 zcmV;y1U~!G1@#FbiBL{Q4GJ0x0000DNk~Le0000y0000o2m$~A0FRU}Rgobd2?`Px z8ze096}yp1D}MxQNkl>wR(O3}>2oXzQ``(5md_3c;RU+QD^{n2g&QF!~=^Sp#TsK?_${uNijhXZnt}BY02;R z+wJybGJhEkhl|CcHf+%T(7?ce(P$(HLYsO%pXYf#lgYGi%4e<$hr_Y3u&}(mJU%{7 z5Co3ni9~`V$)~5MUwSBtQYaMe?(TS=Z#J6%0GG=Z2n76ozs+XDar`rjaU8c=t$x2h z7z~b%juHgXY&NUaYOPjlFISx7I0QkO%_fFn41dG0EUVY+0RYb8>Q$q9_DGN~Kaf9zQ%h%w#gnX7f3^(P;2IFUvB+Fbu=!^?JQtPt&x9 zNwHY`oK0ymnWm*x5{Vog9X&oiYIHnDx4U_s z2LMzC83kHKwxPTe`2TYt!r^n+N85x1X1?1>A zF(C+orfHUCNs@%Z1^nn&m~b4Y)9C;JIF6$z3WbZlM8Cwu;czevqZO;Fnt#n^cXxMV zu~;u$^d2zv)QIe#1JifiXeSLim@xdCj=r$(WybT6}s;ZZlmwS7A$H&Kl zAizI!fpyhtwNxr4Nz&=*Da*3ybo%P*s#2*yez@9?W9IkHO1|l&+X!k7_UUQm&*A4! f^iT9Rxc&i$XN>4TD}VL?015yANkvXXu0mjf!oojT delta 664 zcmV;J0%!g83DE^1iBL{Q4GJ0x0000DNk~Le0001Z0000U2m$~A0BEaC!jT~#2?!k) z7cJX3p(T+?D}Mq0{K6{WagJ|Ch%ooI-Le?%n#-g zxX>=N8yDJzcA?!^62g>02_hH_k|ZgL;`8}*1O$%b9)FML^?GTVX3F>s!@OOYW!Y}G z+iJDq@%Z_CRusiB43voziA1GR$!4>vs*0j$#%$jYP1AIz(-{l~xm>PTEOHzN0FWf< ze!ru}{Yl(xHiyGuzu#{(8Vtj1HXB7zoN;vcd_J$&i{rT8@2}VE`Fvgwg!z2FTCI-9 zqe*-7yMM&7Sgc$wx7+Pvu}IT2gb)Cb$z(#I(D8V5Kt*es_INy!$t1%tBuPRDDT+#^ zQq^jeWmz1@?XB*gtGL(eaU4fc6oz5Cu3xX$*=)x1ycyq>_e1Ntemb4j>-B!WhY*It zVUNdyVVLdQUl7Z(yjU#860|jMbo1xzYgg!A6(Eo$w6k>#+zY7Nd za1b$a(ErHI^E^QiwOXxEC^&)`QRu&NtEvhiBuNqg;0R)*p}*$-(NvLT8GT|0K>yBN zDq)oZfxu@W3xY72OwcDbt9$qM7=|Is@^-rw1Yx(^Q4|FL;CX&D8ZDPgNs>_hedDBx y{-wI3(P$(RIUEj`%f&%6hwj}wYvNuvuqYqVc$b0ZI{=&j0000 Date: Wed, 18 Oct 2017 15:44:06 -0700 Subject: [PATCH 7/8] What does Rez mean? --- .../qml/hifi/commerce/checkout/Checkout.qml | 42 +++++++++++++++++- .../FirstUseTutorial.qml | 8 +++- .../images/Purchase-First-Run-1.jpg | Bin .../images/Purchase-First-Run-2.jpg | Bin .../qml/hifi/commerce/purchases/Purchases.qml | 2 +- 5 files changed, 49 insertions(+), 3 deletions(-) rename interface/resources/qml/hifi/commerce/{purchases => common}/FirstUseTutorial.qml (97%) rename interface/resources/qml/hifi/commerce/{purchases => common}/images/Purchase-First-Run-1.jpg (100%) rename interface/resources/qml/hifi/commerce/{purchases => common}/images/Purchase-First-Run-2.jpg (100%) diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml index 8d94e284ed..c381988380 100644 --- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml +++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml @@ -239,6 +239,24 @@ Rectangle { } } } + } + + HifiCommerceCommon.FirstUseTutorial { + id: firstUseTutorial; + z: 999; + visible: root.activeView === "firstUseTutorial"; + anchors.fill: parent; + + Connections { + onSendSignalToParent: { + switch (message.method) { + case 'tutorial_skipClicked': + case 'tutorial_finished': + root.activeView = "checkoutSuccess"; + break; + } + } + } } // @@ -611,6 +629,28 @@ Rectangle { lightboxPopup.visible = true; } } + RalewaySemiBold { + id: explainRezText; + //visible: !root.isWearable; + text: 'What does "Rez" mean?' + // Text size + size: 16; + // Anchors + anchors.top: noPermissionText.visible ? noPermissionText.bottom : rezNowButton.bottom; + anchors.topMargin: 6; + height: paintedHeight; + anchors.left: parent.left; + anchors.right: parent.right; + // Style + color: hifi.colors.redAccent; + wrapMode: Text.WordWrap; + // Alignment + horizontalAlignment: Text.AlignHCenter; + verticalAlignment: Text.AlignVCenter; + onLinkActivated: { + root.activeView = "firstUseTutorial"; + } + } RalewaySemiBold { id: myPurchasesLink; @@ -618,7 +658,7 @@ Rectangle { // Text size size: 20; // Anchors - anchors.top: noPermissionText.visible ? noPermissionText.bottom : rezNowButton.bottom; + anchors.top: explainRezText.visible ? explainRezText.bottom : (noPermissionText.visible ? noPermissionText.bottom : rezNowButton.bottom); anchors.topMargin: 40; height: paintedHeight; anchors.left: parent.left; diff --git a/interface/resources/qml/hifi/commerce/purchases/FirstUseTutorial.qml b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml similarity index 97% rename from interface/resources/qml/hifi/commerce/purchases/FirstUseTutorial.qml rename to interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml index 2e8ad6db65..0d3f67ef7a 100644 --- a/interface/resources/qml/hifi/commerce/purchases/FirstUseTutorial.qml +++ b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml @@ -25,7 +25,13 @@ Rectangle { HifiConstants { id: hifi; } id: root; - property int activeView: 1; + property int activeView: 1; + + onVisibleChanged: { + if (visible) { + root.activeView = 1; + } + } Image { anchors.fill: parent; diff --git a/interface/resources/qml/hifi/commerce/purchases/images/Purchase-First-Run-1.jpg b/interface/resources/qml/hifi/commerce/common/images/Purchase-First-Run-1.jpg similarity index 100% rename from interface/resources/qml/hifi/commerce/purchases/images/Purchase-First-Run-1.jpg rename to interface/resources/qml/hifi/commerce/common/images/Purchase-First-Run-1.jpg diff --git a/interface/resources/qml/hifi/commerce/purchases/images/Purchase-First-Run-2.jpg b/interface/resources/qml/hifi/commerce/common/images/Purchase-First-Run-2.jpg similarity index 100% rename from interface/resources/qml/hifi/commerce/purchases/images/Purchase-First-Run-2.jpg rename to interface/resources/qml/hifi/commerce/common/images/Purchase-First-Run-2.jpg diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml index b5697f687d..d75fd6604b 100644 --- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml +++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml @@ -241,7 +241,7 @@ Rectangle { } } - FirstUseTutorial { + HifiCommerceCommon.FirstUseTutorial { id: firstUseTutorial; z: 999; visible: root.activeView === "firstUseTutorial"; From dc1b3aef8f6b1423d8294c34c5bec9546cc692ad Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 18 Oct 2017 16:25:06 -0700 Subject: [PATCH 8/8] Don't show purchases tutorial if user clicks what is rez --- interface/resources/qml/hifi/commerce/checkout/Checkout.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml index c381988380..177dfed420 100644 --- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml +++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml @@ -252,6 +252,7 @@ Rectangle { switch (message.method) { case 'tutorial_skipClicked': case 'tutorial_finished': + Settings.setValue("isFirstUseOfPurchases", false); root.activeView = "checkoutSuccess"; break; }