Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-30 04:16:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into Fix_ClangWarnings

Browse source
This commit is contained in:
G10h4ck 2019-04-23 12:45:33 +02:00 • committed by GitHub
commit 9102a698e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 2471 additions and 559 deletions
Download patch file Download diff file Expand all files Collapse all files

20
retroshare-gui/src/gui/Posted/PostedDialog.cpp
View file

@ -35,6 +35,7 @@ public:
PostedGroupInfoData() : RsUserdata() {}
public:
QMap<RsGxsGroupId, QIcon> mIcon;
QMap<RsGxsGroupId, QString> mDescription;
};
@ -102,17 +103,17 @@ QString PostedDialog::icon(IconType type)
case ICON_NEW:
return ":/icons/png/add.png";
case ICON_YOUR_GROUP:
return ":/icons/png/feedreader.png";
return "";
case ICON_SUBSCRIBED_GROUP:
return ":/icons/png/feed-subscribed.png";
return "";
case ICON_POPULAR_GROUP:
return ":/icons/png/feed-popular.png";
return "";
case ICON_OTHER_GROUP:
return ":/icons/png/feed-other.png";
case ICON_SEARCH:
return ":/images/find.png";
case ICON_DEFAULT:
return "";
return ":/icons/png/posted.png";
}
return "";
@ -161,6 +162,12 @@ void PostedDialog::loadGroupSummaryToken(const uint32_t &token, std::list<RsGrou
for (groupIt = groups.begin(); groupIt != groups.end(); ++groupIt) {
RsPostedGroup &group = *groupIt;
groupInfo.push_back(group.mMeta);
if (group.mGroupImage.mData != NULL) {
QPixmap image;
image.loadFromData(group.mGroupImage.mData, group.mGroupImage.mSize, "PNG");
postedData->mIcon[group.mMeta.mGroupId] = image;
}
if (!group.mDescription.empty()) {
postedData->mDescription[group.mMeta.mGroupId] = QString::fromUtf8(group.mDescription.c_str());
@ -183,4 +190,9 @@ void PostedDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, Gr
if (descriptionIt != postedData->mDescription.end()) {
groupItemInfo.description = descriptionIt.value();
}
QMap<RsGxsGroupId, QIcon>::const_iterator iconIt = postedData->mIcon.find(groupInfo.mGroupId);
if (iconIt != postedData->mIcon.end()) {
groupItemInfo.icon = iconIt.value();
}
}