What does Rez mean?

This commit is contained in:
Zach Fox 2017-10-18 15:44:06 -07:00
parent 91ac2ab58c
commit 1b7b35fe91
5 changed files with 49 additions and 3 deletions

View file

@ -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; lightboxPopup.visible = true;
} }
} }
RalewaySemiBold {
id: explainRezText;
//visible: !root.isWearable;
text: '<font color="' + hifi.colors.redAccent + '"><a href="#">What does "Rez" mean?</a></font>'
// 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 { RalewaySemiBold {
id: myPurchasesLink; id: myPurchasesLink;
@ -618,7 +658,7 @@ Rectangle {
// Text size // Text size
size: 20; size: 20;
// Anchors // Anchors
anchors.top: noPermissionText.visible ? noPermissionText.bottom : rezNowButton.bottom; anchors.top: explainRezText.visible ? explainRezText.bottom : (noPermissionText.visible ? noPermissionText.bottom : rezNowButton.bottom);
anchors.topMargin: 40; anchors.topMargin: 40;
height: paintedHeight; height: paintedHeight;
anchors.left: parent.left; anchors.left: parent.left;

View file

@ -25,7 +25,13 @@ Rectangle {
HifiConstants { id: hifi; } HifiConstants { id: hifi; }
id: root; id: root;
property int activeView: 1; property int activeView: 1;
onVisibleChanged: {
if (visible) {
root.activeView = 1;
}
}
Image { Image {
anchors.fill: parent; anchors.fill: parent;

View file

@ -241,7 +241,7 @@ Rectangle {
} }
} }
FirstUseTutorial { HifiCommerceCommon.FirstUseTutorial {
id: firstUseTutorial; id: firstUseTutorial;
z: 999; z: 999;
visible: root.activeView === "firstUseTutorial"; visible: root.activeView === "firstUseTutorial";