From a85ed2a2f55e1edcaa352f1d91f196261291dcd8 Mon Sep 17 00:00:00 2001 From: Alexander Ivash Date: Mon, 6 Aug 2018 22:35:20 +0300 Subject: [PATCH] show 'edit wearables' button even if avatar doesn't have any wearables --- interface/resources/qml/hifi/AvatarApp.qml | 23 --------------- .../qml/hifi/avatarapp/MessageBoxes.qml | 29 ------------------- 2 files changed, 52 deletions(-) diff --git a/interface/resources/qml/hifi/AvatarApp.qml b/interface/resources/qml/hifi/AvatarApp.qml index b7e1adda70..bd3f8fd1cf 100644 --- a/interface/resources/qml/hifi/AvatarApp.qml +++ b/interface/resources/qml/hifi/AvatarApp.qml @@ -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 { diff --git a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml index 90f55fd8bb..c9b57abe66 100644 --- a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml +++ b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml @@ -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 Marketplace.' + '
' + - 'Wear wearables from My Purchases.' + '
' + '
' + - '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.'