Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Done with My Purchases flow for now

Browse source
This commit is contained in:
Zach Fox 2018-02-13 15:04:31 -08:00
parent 69a06bf1b7
commit a477a3da70
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
View file

@ -100,6 +100,10 @@ Rectangle {
size: 20; size: 20;
verticalAlignment: Text.AlignTop; verticalAlignment: Text.AlignTop;
wrapMode: Text.WordWrap; wrapMode: Text.WordWrap;
onLinkActivated: {
sendToParent({ method: 'commerceLightboxLinkClicked', linkUrl: link });
}
} }
Item { Item {

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

@ -147,7 +147,11 @@ Rectangle {
Connections { Connections {
onSendToParent: { onSendToParent: {
sendToScript(msg); if (msg.method === 'commerceLightboxLinkClicked') {
Qt.openUrlExternally(msg.linkUrl);
} else {
sendToScript(msg);
}
} }
} }
} }
@ -433,7 +437,11 @@ Rectangle {
lightboxPopup.visible = true; lightboxPopup.visible = true;
} else if (msg.method === "showReplaceContentLightbox") { } else if (msg.method === "showReplaceContentLightbox") {
lightboxPopup.titleText = "Replace Content"; lightboxPopup.titleText = "Replace Content";
lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain."; lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
"If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
"For more information about backing up and restoring content, " +
"<a href='https://docs.highfidelity.com/create-and-explore/start-working-in-your-sandbox/restoring-sandbox-content'>" +
"click here to open info on your desktop browser.";
lightboxPopup.button1text = "CANCEL"; lightboxPopup.button1text = "CANCEL";
lightboxPopup.button1method = "root.visible = false;" lightboxPopup.button1method = "root.visible = false;"
lightboxPopup.button2text = "CONFIRM"; lightboxPopup.button2text = "CONFIRM";