From 3a86d44c1ebe2181dd274d0f9d72723c82ed205a Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Tue, 31 Aug 2021 21:53:12 -0400 Subject: Finish getting all avatars jdenticonified --- resources/qml/CommunitiesList.qml | 1 + resources/qml/Completer.qml | 3 +++ resources/qml/RoomDirectory.qml | 1 + resources/qml/RoomMembers.qml | 1 + resources/qml/RoomSettings.qml | 1 + resources/qml/TimelineView.qml | 2 ++ resources/qml/components/AvatarListTile.qml | 2 ++ resources/qml/dialogs/ImagePackEditorDialog.qml | 1 + resources/qml/dialogs/ImagePackSettingsDialog.qml | 1 + resources/qml/voip/ActiveCallBar.qml | 1 + resources/qml/voip/PlaceCall.qml | 1 + 11 files changed, 15 insertions(+) (limited to 'resources') diff --git a/resources/qml/CommunitiesList.qml b/resources/qml/CommunitiesList.qml index 491913be..121eb7db 100644 --- a/resources/qml/CommunitiesList.qml +++ b/resources/qml/CommunitiesList.qml @@ -130,6 +130,7 @@ Page { else return "image://colorimage/" + model.avatarUrl + "?" + communityItem.unimportantText; } + roomid: model.roomid displayName: model.displayName color: communityItem.background } diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml index 00fc3216..6bde67fa 100644 --- a/resources/qml/Completer.qml +++ b/resources/qml/Completer.qml @@ -139,6 +139,7 @@ Popup { height: popup.avatarHeight width: popup.avatarWidth displayName: model.displayName + userid: model.userid url: model.avatarUrl.replace("mxc://", "image://MxcImage/") onClicked: popup.completionClicked(completer.completionAt(model.index)) } @@ -194,6 +195,7 @@ Popup { height: popup.avatarHeight width: popup.avatarWidth displayName: model.roomName + roomid: model.roomid url: model.avatarUrl.replace("mxc://", "image://MxcImage/") onClicked: { popup.completionClicked(completer.completionAt(model.index)); @@ -225,6 +227,7 @@ Popup { height: popup.avatarHeight width: popup.avatarWidth displayName: model.roomName + roomid: model.roomid url: model.avatarUrl.replace("mxc://", "image://MxcImage/") onClicked: popup.completionClicked(completer.completionAt(model.index)) } diff --git a/resources/qml/RoomDirectory.qml b/resources/qml/RoomDirectory.qml index 2d7b3a34..b51c7bbc 100644 --- a/resources/qml/RoomDirectory.qml +++ b/resources/qml/RoomDirectory.qml @@ -65,6 +65,7 @@ ApplicationWindow { width: avatarSize height: avatarSize url: model.avatarUrl.replace("mxc://", "image://MxcImage/") + roomid: model.roomid displayName: model.name } diff --git a/resources/qml/RoomMembers.qml b/resources/qml/RoomMembers.qml index 62175bf0..3376a4b6 100644 --- a/resources/qml/RoomMembers.qml +++ b/resources/qml/RoomMembers.qml @@ -39,6 +39,7 @@ ApplicationWindow { width: 130 height: width + roomid: members.roomId displayName: members.roomName Layout.alignment: Qt.AlignHCenter url: members.avatarUrl.replace("mxc://", "image://MxcImage/") diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml index a70cd71a..152567c8 100644 --- a/resources/qml/RoomSettings.qml +++ b/resources/qml/RoomSettings.qml @@ -38,6 +38,7 @@ ApplicationWindow { Avatar { url: roomSettings.roomAvatarUrl.replace("mxc://", "image://MxcImage/") + roomid: roomSettings.roomid displayName: roomSettings.roomName height: 130 width: 130 diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index f12060f2..b38df44f 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -137,6 +137,7 @@ Item { ColumnLayout { id: preview + property string roomid: room ? room.roomid : (roomPreview ? roomPreview.roomid : "") property string roomName: room ? room.roomName : (roomPreview ? roomPreview.roomName : "") property string roomTopic: room ? room.roomTopic : (roomPreview ? roomPreview.roomTopic : "") property string avatarUrl: room ? room.roomAvatarUrl : (roomPreview ? roomPreview.roomAvatarUrl : "") @@ -153,6 +154,7 @@ Item { Avatar { url: parent.avatarUrl.replace("mxc://", "image://MxcImage/") + roomid: parent.roomid displayName: parent.roomName height: 130 width: 130 diff --git a/resources/qml/components/AvatarListTile.qml b/resources/qml/components/AvatarListTile.qml index 36c26a97..853266c6 100644 --- a/resources/qml/components/AvatarListTile.qml +++ b/resources/qml/components/AvatarListTile.qml @@ -23,6 +23,8 @@ Rectangle { required property int index required property int selectedIndex property bool crop: true + property alias roomid: avatar.roomid + property alias userid: avatar.userid color: background height: avatarSize + 2 * Nheko.paddingMedium diff --git a/resources/qml/dialogs/ImagePackEditorDialog.qml b/resources/qml/dialogs/ImagePackEditorDialog.qml index e78213e0..9125e560 100644 --- a/resources/qml/dialogs/ImagePackEditorDialog.qml +++ b/resources/qml/dialogs/ImagePackEditorDialog.qml @@ -111,6 +111,7 @@ ApplicationWindow { title: shortCode subtitle: body avatarUrl: url + roomid: imagePack.roomid selectedIndex: currentImageIndex crop: false diff --git a/resources/qml/dialogs/ImagePackSettingsDialog.qml b/resources/qml/dialogs/ImagePackSettingsDialog.qml index b217abdd..4cc7bcd3 100644 --- a/resources/qml/dialogs/ImagePackSettingsDialog.qml +++ b/resources/qml/dialogs/ImagePackSettingsDialog.qml @@ -112,6 +112,7 @@ ApplicationWindow { return qsTr("Globally enabled pack"); } selectedIndex: currentPackIndex + roomid: currentPack.roomid TapHandler { onSingleTapped: currentPackIndex = index diff --git a/resources/qml/voip/ActiveCallBar.qml b/resources/qml/voip/ActiveCallBar.qml index d44c5edf..c92b15c9 100644 --- a/resources/qml/voip/ActiveCallBar.qml +++ b/resources/qml/voip/ActiveCallBar.qml @@ -35,6 +35,7 @@ Rectangle { height: Nheko.avatarSize url: CallManager.callPartyAvatarUrl.replace("mxc://", "image://MxcImage/") displayName: CallManager.callParty + userid: CallManager.callParty onClicked: TimelineManager.openImageOverlay(room.avatarUrl(userid), room.data.eventId) } diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml index 97932cc9..c733012c 100644 --- a/resources/qml/voip/PlaceCall.qml +++ b/resources/qml/voip/PlaceCall.qml @@ -79,6 +79,7 @@ Popup { height: Nheko.avatarSize url: room.roomAvatarUrl.replace("mxc://", "image://MxcImage/") displayName: room.roomName + roomid: room.roomid onClicked: TimelineManager.openImageOverlay(room.avatarUrl(userid), room.data.eventId) } -- cgit 1.4.1