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

Merge pull request #303 from william-lohan/remove-commerce-options-from-wearables-ui-275

Browse source 
Remove commerce options from wearables ui
This commit is contained in:
Julian Groß 2023-01-08 19:56:55 +01:00 committed by GitHub
commit c5d866a866
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
View file

@ -235,22 +235,6 @@ Rectangle {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
spacing: 10
RalewayBold {
size: 15;
lineHeightMode: Text.FixedHeight
lineHeight: 18;
text: "<a href='#'>Get more</a>"
linkColor: hifi.colors.blueHighlight
Layout.alignment: Qt.AlignVCenter
onLinkActivated: {
popup.showGetWearables(null, function(link) {
emitSendToScript({'method' : 'navigate', 'url' : link})
});
}
}
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true

18
interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
View file

@ -56,24 +56,6 @@ MessageBox {
popup.inputText.forceActiveFocus(); popup.inputText.forceActiveFocus();
} }
function showGetWearables(callback, linkCallback) {
popup.dialogButtons.yesButton.visible = false;
popup.button1text = 'CANCEL'
popup.titleText = 'Get Wearables'
popup.bodyText = 'Get wearables from <b><a href="app://marketplace">Marketplace.</a></b>' + '<br/>' +
'Wear wearable from <b><a href="app://purchases">Inventory.</a></b>'
popup.onLinkClicked = function(link) {
popup.close();
if (linkCallback) {
linkCallback(link);
}
}
popup.open();
}
function showDeleteFavorite(favoriteName, callback) { function showDeleteFavorite(favoriteName, callback) {
popup.titleText = 'Delete Favorite: {AvatarName}'.replace('{AvatarName}', favoriteName) popup.titleText = 'Delete Favorite: {AvatarName}'.replace('{AvatarName}', favoriteName)
popup.bodyText = 'This will delete your favorite. You will retain access to the wearables and avatar that made up the favorite from Inventory.' popup.bodyText = 'This will delete your favorite. You will retain access to the wearables and avatar that made up the favorite from Inventory.'