Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

allow updating existing avatars

Browse source
This commit is contained in:
Alexander Ivash 2018-05-22 02:26:25 +03:00
parent b4c4ab88f0
commit ee856266c7
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,18 @@ Rectangle {
allAvatars.move(avatarIndex, 0, 1);
view.setPage(0);
} else if(message.method === 'bookmarkAdded') {
var avatarIndex = allAvatars.addAvatarEntry(message.bookmark, message.bookmarkName);
var avatar = allAvatars.findAvatar(message.bookmarkName);
if(avatar !== undefined) {
var avatarObject = allAvatars.makeAvatarObject(message.bookmark, message.bookmarkName);
for(var prop in avatarObject) {
avatar[prop] = avatarObject[prop];
}
if(currentAvatar.name === message.bookmarkName) {
currentAvatar = currentAvatarModel.makeAvatarEntry(avatarObject);
}
} else {
allAvatars.addAvatarEntry(message.bookmark, message.bookmarkName);
}
updateCurrentAvatarInBookmarks(currentAvatar);
} else if(message.method === 'bookmarkDeleted') {
pageOfAvatars.isUpdating = true;

4
interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
View file

@ -27,6 +27,8 @@ Rectangle {
function open(avatar) {
favoriteName.text = '';
favoriteName.forceActiveFocus();
console.debug('CreateFavoriteDialog: ', avatar.thumbnailUrl);
avatarImageUrl = avatar.thumbnailUrl;
@ -144,7 +146,7 @@ Rectangle {
anchors.left: parent.left
anchors.right: parent.right
yesButton.enabled: favoriteNameText !== '' && !wrongName.visible
yesButton.enabled: favoriteNameText !== ''
yesText: root.button2text
noText: root.button1text