Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-18 13:54:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed to show when there is a chat from a friend as overlay icon, when popup chat is disable

Browse Source
This commit is contained in:
defnax 2024-08-23 07:59:30 +02:00
parent e49de2f25b
commit 3fcc1e9774
1 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
retroshare-gui/src/gui/common/FriendListModel.cpp
View File

@ -34,6 +34,8 @@
#include "gui/common/FriendListModel.h"
#include "gui/gxs/GxsIdDetails.h"
#include "gui/gxs/GxsIdTreeWidgetItem.h"
#include "gui/chat/ChatUserNotify.h"
#include "retroshare/rsexpr.h"
#include "retroshare/rsmsgs.h"
@ -1023,6 +1025,12 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
{
QPixmap sslAvatar;
bool foundAvatar = false;
bool hasPrivateChat = false;
// get peers with waiting incoming chats
std::vector<RsPeerId> privateChatIds;
ChatUserNotify::getPeersWithWaitingChat(privateChatIds);
const HierarchicalProfileInformation *hn = getProfileInfo(entry);
uint32_t status = RS_STATUS_OFFLINE;
const HierarchicalNodeInformation *bestNodeInformation = NULL;
@ -1057,11 +1065,26 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
QImage circleImage = getCirclePhoto(orginalImage,orginalImage.size().width());
sslAvatar.convertFromImage(circleImage);
}
if (mDisplayStatusIcon) {
for(uint32_t i=0;i<hn->child_node_indices.size();++i) {
if (std::find(privateChatIds.begin(), privateChatIds.end(), RsPeerId(mLocations[hn->child_node_indices[i]].node_info.id.toStdString())) != privateChatIds.end()) {
// private chat is available
hasPrivateChat = true;
break;
}
}
}
if (mDisplayStatusIcon) {
if (bestNodeInformation) {
QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(status));
return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
if (hasPrivateChat) {
QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(":/images/orange-bubble-64.png");
return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
} else {
QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(status));
return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
}
}
}
@ -1079,18 +1102,38 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
return QVariant();
QPixmap sslAvatar;
bool hasPrivateChat = false;
AvatarDefs::getAvatarFromSslId(RsPeerId(hn->node_info.id.toStdString()), sslAvatar);
// get peers with waiting incoming chats
std::vector<RsPeerId> privateChatIds;
ChatUserNotify::getPeersWithWaitingChat(privateChatIds);
if(mDisplayCircleAvatars) {
//make avatar as circle avatar
QImage orginalImage = sslAvatar.toImage();
QImage circleImage = getCirclePhoto(orginalImage,orginalImage.size().width());
sslAvatar.convertFromImage(circleImage);
}
if (mDisplayStatusIcon) {
for(uint32_t i=0;i<mLocations.size();++i){
if (std::find(privateChatIds.begin(), privateChatIds.end(), RsPeerId(hn->node_info.id.toStdString())) != privateChatIds.end()) {
// private chat is available
hasPrivateChat = true;
break;
}
}
}
if (mDisplayStatusIcon) {
QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(statusRole(entry, col).toInt()));
return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
if (hasPrivateChat) {
QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(":/images/orange-bubble-64.png");
return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
} else {
QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(statusRole(entry, col).toInt()));
return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
}
}
return QVariant(QIcon(sslAvatar));