Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-06 05:14:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added for posted links group icons

Browse source
This commit is contained in:
defnax 2019-03-22 11:13:07 +01:00
parent da505e0426
commit b6c7afe989
8 changed files with 130 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

28
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,15 +103,15 @@ QString PostedDialog::icon(IconType type)
case ICON_NEW:
return ":/icons/png/add.png";
case ICON_YOUR_GROUP:
return ":/icons/png/feedreader.png";
case ICON_SUBSCRIBED_GROUP:
return ":/icons/png/feed-subscribed.png";
case ICON_POPULAR_GROUP:
return ":/icons/png/feed-popular.png";
case ICON_OTHER_GROUP:
return ":/icons/png/feed-other.png";
case ICON_DEFAULT:
return "";
case ICON_SUBSCRIBED_GROUP:
return "";
case ICON_POPULAR_GROUP:
return "";
case ICON_OTHER_GROUP:
return "";
case ICON_DEFAULT:
return ":/icons/png/posted.png";
}
return "";
@ -159,6 +160,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());
@ -181,4 +188,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();
}
}

45
retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
View file

@ -17,6 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
* *
*******************************************************************************/
#include <QBuffer>
#include "PostedGroupDialog.h"
@ -25,7 +26,7 @@
const uint32_t PostedCreateEnabledFlags = (
GXS_GROUP_FLAGS_NAME |
// GXS_GROUP_FLAGS_ICON |
GXS_GROUP_FLAGS_ICON |
GXS_GROUP_FLAGS_DESCRIPTION |
GXS_GROUP_FLAGS_DISTRIBUTION |
// GXS_GROUP_FLAGS_PUBLISHSIGN |
@ -90,14 +91,31 @@ QPixmap PostedGroupDialog::serviceImage()
return QPixmap(":/icons/png/posted.png");
}
void PostedGroupDialog::preparePostedGroup(RsPostedGroup &group, const RsGroupMetaData &meta)
{
group.mMeta = meta;
group.mDescription = getDescription().toUtf8().constData();
QPixmap pixmap = getLogo();
if (!pixmap.isNull()) {
QByteArray ba;
QBuffer buffer(&ba);
buffer.open(QIODevice::WriteOnly);
pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
group.mGroupImage.copy((uint8_t *) ba.data(), ba.size());
} else {
group.mGroupImage.clear();
}
}
bool PostedGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta)
{
// Specific Function.
RsPostedGroup grp;
grp.mMeta = meta;
grp.mDescription = getDescription().toStdString();
std::cerr << "PostedGroupDialog::service_CreateGroup() storing to Queue";
std::cerr << std::endl;
preparePostedGroup(grp, meta);
rsPosted->createGroup(token, grp);
@ -107,8 +125,7 @@ bool PostedGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaDa
bool PostedGroupDialog::service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta)
{
RsPostedGroup grp;
grp.mMeta = editedMeta;
grp.mDescription = getDescription().toUtf8().constData();
preparePostedGroup(grp, editedMeta);
std::cerr << "PostedGroupDialog::service_EditGroup() submitting changes";
std::cerr << std::endl;
@ -140,8 +157,18 @@ bool PostedGroupDialog::service_loadGroup(uint32_t token, Mode /*mode*/, RsGroup
std::cerr << "PostedGroupDialog::service_loadGroup() Unfinished Loading";
std::cerr << std::endl;
groupMetaData = groups[0].mMeta;
description = QString::fromUtf8(groups[0].mDescription.c_str());
const RsPostedGroup &group = groups[0];
groupMetaData = group.mMeta;
description = QString::fromUtf8(group.mDescription.c_str());
if (group.mGroupImage.mData) {
QPixmap pixmap;
if (pixmap.loadFromData(group.mGroupImage.mData, group.mGroupImage.mSize, "PNG")) {
setLogo(pixmap);
}
} else {
setLogo(QPixmap(":/icons/png/posted.png"));
}
return true;
}

3
retroshare-gui/src/gui/Posted/PostedGroupDialog.h
View file

@ -39,6 +39,9 @@ protected:
virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta);
virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description);
virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta);
private:
void preparePostedGroup(RsPostedGroup &group, const RsGroupMetaData &meta);
};
#endif

17
retroshare-gui/src/gui/feeds/PostedGroupItem.cpp
View file

@ -134,14 +134,23 @@ void PostedGroupItem::fill()
// ui->nameLabel->setText(groupName());
ui->descLabel->setText(QString::fromUtf8(mGroup.mDescription.c_str()));
//TODO - nice icon for subscribed group
if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) {
ui->logoLabel->setPixmap(QPixmap(":/images/posted_64.png"));
if (mGroup.mGroupImage.mData != NULL) {
QPixmap postedImage;
postedImage.loadFromData(mGroup.mGroupImage.mData, mGroup.mGroupImage.mSize, "PNG");
ui->logoLabel->setPixmap(QPixmap(postedImage));
} else {
ui->logoLabel->setPixmap(QPixmap(":/images/posted_64.png"));
}
//TODO - nice icon for subscribed group
// if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) {
// ui->logoLabel->setPixmap(QPixmap(":/images/posted_64.png"));
// } else {
// ui->logoLabel->setPixmap(QPixmap(":/images/posted_64.png"));
// }
if (IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) {
ui->subscribeButton->setEnabled(false);
} else {