Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-07 02:33:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

show 'edit wearables' button even if avatar doesn't have any wearables

Browse source
This commit is contained in:
Alexander Ivash 2018-08-06 22:35:20 +03:00
parent 1c9e409444
commit a85ed2a2f5
2 changed files with 0 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
interface/resources/qml/hifi/AvatarApp.qml
View file

@ -491,33 +491,10 @@ Rectangle {
anchors.verticalCenter: wearablesLabel.verticalCenter
glyphText: "\ue02e"
visible: avatarWearablesCount !== 0
onClicked: {
adjustWearables.open(currentAvatar);
}
}
// TextStyle3
RalewayRegular {
size: 22;
anchors.right: parent.right
anchors.verticalCenter: wearablesLabel.verticalCenter
font.underline: true
text: "Add"
color: 'black'
visible: avatarWearablesCount === 0
MouseArea {
anchors.fill: parent
onClicked: {
popup.showGetWearables(function() {
emitSendToScript({'method' : 'navigate', 'url' : 'hifi://AvatarIsland/11.5848,-8.10862,-2.80195'})
}, function(link) {
emitSendToScript({'method' : 'navigate', 'url' : link})
});
}
}
}
}
Rectangle {

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

@ -33,35 +33,6 @@ MessageBox {
popup.inputText.forceActiveFocus();
}
property url getWearablesUrl: '../../../images/avatarapp/AvatarIsland.jpg'
function showGetWearables(callback, linkCallback) {
popup.button2text = 'AvatarIsland'
popup.dialogButtons.yesButton.fontCapitalization = Font.MixedCase;
popup.button1text = 'CANCEL'
popup.titleText = 'Get Wearables'
popup.bodyText = 'Buy wearables from <b><a href="app://marketplace">Marketplace.</a></b>' + '<br/>' +
'Wear wearables from <b><a href="app://purchases">My Purchases.</a></b>' + '<br/>' + '<br/>' +
'Visit “AvatarIsland” to get wearables'
popup.imageSource = getWearablesUrl;
popup.onButton2Clicked = function() {
popup.close();
if(callback)
callback();
}
popup.onLinkClicked = function(link) {
popup.close();
if(linkCallback)
linkCallback(link);
}
popup.open();
}
function showDeleteFavorite(favoriteName, callback) {
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 My Purchases.'