From 856c95b52aed9632d126f0a9954fd945aedd8a8c Mon Sep 17 00:00:00 2001 From: Alexander Ivash Date: Wed, 16 May 2018 22:16:15 +0300 Subject: [PATCH] move avatarapp-specific images into appropriate subfolder --- .../hifi-place-get-avatars.png | Bin .../hifi-place-get-wearables.png} | Bin ...i-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d.png | Bin 8257 -> 0 bytes interface/resources/qml/hifi/AvatarApp.qml | 2 -- .../qml/hifi/avatarapp/MessageBoxes.qml | 4 ++-- 5 files changed, 2 insertions(+), 4 deletions(-) rename interface/resources/images/{samples => avatarapp}/hifi-place-get-avatars.png (100%) rename interface/resources/images/{samples/hifi-place-77312e4b-6f48-4eb4-87e2-50444d8e56d1.png => avatarapp/hifi-place-get-wearables.png} (100%) delete mode 100644 interface/resources/images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d.png diff --git a/interface/resources/images/samples/hifi-place-get-avatars.png b/interface/resources/images/avatarapp/hifi-place-get-avatars.png similarity index 100% rename from interface/resources/images/samples/hifi-place-get-avatars.png rename to interface/resources/images/avatarapp/hifi-place-get-avatars.png diff --git a/interface/resources/images/samples/hifi-place-77312e4b-6f48-4eb4-87e2-50444d8e56d1.png b/interface/resources/images/avatarapp/hifi-place-get-wearables.png similarity index 100% rename from interface/resources/images/samples/hifi-place-77312e4b-6f48-4eb4-87e2-50444d8e56d1.png rename to interface/resources/images/avatarapp/hifi-place-get-wearables.png diff --git a/interface/resources/images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d.png b/interface/resources/images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d.png deleted file mode 100644 index a2295a8d88ece9493938c3d056a1698417ed7ab6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8257 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 diff --git a/interface/resources/qml/hifi/AvatarApp.qml b/interface/resources/qml/hifi/AvatarApp.qml index 38439949d1..36393c75a1 100644 --- a/interface/resources/qml/hifi/AvatarApp.qml +++ b/interface/resources/qml/hifi/AvatarApp.qml @@ -632,8 +632,6 @@ Rectangle { enabled: !container.highlighted hoverEnabled: enabled - property url getWearablesUrl: '../../images/samples/hifi-place-77312e4b-6f48-4eb4-87e2-50444d8e56d1.png' - onClicked: { if(isInManageState) { var currentItem = delegateRoot.GridView.view.model.get(index); diff --git a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml index 5ce7baca0b..3cda5cbfb8 100644 --- a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml +++ b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml @@ -16,7 +16,7 @@ MessageBox { popup.open(); } - property url getWearablesUrl: '../../../images/samples/hifi-place-77312e4b-6f48-4eb4-87e2-50444d8e56d1.png' + property url getWearablesUrl: '../../../images/avatarapp/hifi-place-get-wearables.png' function showGetWearables(callback, linkCallback) { popup.button2text = 'AvatarIsland' @@ -76,7 +76,7 @@ MessageBox { popup.open(); } - property url getAvatarsUrl: '../../../images/samples/hifi-place-get-avatars.png' + property url getAvatarsUrl: '../../../images/avatarapp/hifi-place-get-avatars.png' function showBuyAvatars(callback, linkCallback) { popup.button2text = 'BodyMart'