Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1870 from csoler/v0.6-ImprovedGUI_4

Browse Source 
V0.6 improved gui 4
This commit is contained in:
csoler 2020-04-23 17:26:01 +02:00 committed by GitHub
commit 54c6ab4ec0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 507 additions and 774 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

377
retroshare-gui/src/gui/Posted/PostedCardView.cpp
View File

@ -28,6 +28,7 @@
#include "gui/feeds/FeedHolder.h" #include "gui/feeds/FeedHolder.h"
#include "gui/gxs/GxsIdDetails.h" #include "gui/gxs/GxsIdDetails.h"
#include "util/misc.h" #include "util/misc.h"
#include "gui/common/FilesDefs.h"
#include "util/qtthreadsutils.h" #include "util/qtthreadsutils.h"
#include "util/HandleRichText.h" #include "util/HandleRichText.h"
@ -40,39 +41,76 @@
/** Constructor */ /** Constructor */
PostedCardView::PostedCardView(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate) : PostedCardView::PostedCardView(FeedHolder *feedHolder, uint32_t feedId, const RsGroupMetaData &group_meta, const RsGxsMessageId &post_id, bool isHome, bool autoUpdate)
GxsFeedItem(feedHolder, feedId, groupId, messageId, isHome, rsPosted, autoUpdate) : BasePostedItem(feedHolder, feedId, group_meta, post_id, isHome, autoUpdate)
{ {
setup(); setup();
requestGroup();
requestMessage();
requestComment();
} }
PostedCardView::PostedCardView(FeedHolder *feedHolder, uint32_t feedId, const RsPostedGroup &group, const RsPostedPost &post, bool isHome, bool autoUpdate) : PostedCardView::PostedCardView(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId& post_id, bool isHome, bool autoUpdate)
GxsFeedItem(feedHolder, feedId, post.mMeta.mGroupId, post.mMeta.mMsgId, isHome, rsPosted, autoUpdate) : BasePostedItem(feedHolder, feedId, groupId, post_id, isHome, autoUpdate)
{ {
setup(); setup();
loadGroup();
mMessageId = post.mMeta.mMsgId;
setGroup(group, false);
setPost(post);
requestComment();
} }
PostedCardView::PostedCardView(FeedHolder *feedHolder, uint32_t feedId, const RsPostedPost &post, bool isHome, bool autoUpdate) : void PostedCardView::setCommentsSize(int comNb)
GxsFeedItem(feedHolder, feedId, post.mMeta.mGroupId, post.mMeta.mMsgId, isHome, rsPosted, autoUpdate)
{ {
setup(); QString sComButText = tr("Comment");
if (comNb == 1)
sComButText = sComButText.append("(1)");
else if(comNb > 1)
sComButText = tr("Comments ").append("(%1)").arg(comNb);
requestGroup(); ui->commentButton->setText(sComButText);
setPost(post);
requestComment();
} }
void PostedCardView::makeDownVote()
{
RsGxsGrpMsgIdPair msgId;
msgId.first = mPost.mMeta.mGroupId;
msgId.second = mPost.mMeta.mMsgId;
ui->voteUpButton->setEnabled(false);
ui->voteDownButton->setEnabled(false);
emit vote(msgId, false);
}
void PostedCardView::makeUpVote()
{
RsGxsGrpMsgIdPair msgId;
msgId.first = mPost.mMeta.mGroupId;
msgId.second = mPost.mMeta.mMsgId;
ui->voteUpButton->setEnabled(false);
ui->voteDownButton->setEnabled(false);
emit vote(msgId, true);
}
void PostedCardView::setReadStatus(bool isNew, bool isUnread)
{
if (isUnread)
{
ui->readButton->setChecked(true);
ui->readButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-unread.png"));
}
else
{
ui->readButton->setChecked(false);
ui->readButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-read.png"));
}
ui->newLabel->setVisible(isNew);
ui->mainFrame->setProperty("new", isNew);
ui->mainFrame->style()->unpolish(ui->mainFrame);
ui->mainFrame->style()->polish( ui->mainFrame);
}
void PostedCardView::setComment(const RsGxsComment& cmt) {}
PostedCardView::~PostedCardView() PostedCardView::~PostedCardView()
{ {
delete(ui); delete(ui);
@ -125,161 +163,7 @@ void PostedCardView::setup()
ui->readAndClearButton->hide(); ui->readAndClearButton->hide();
} }
bool PostedCardView::setGroup(const RsPostedGroup &group, bool doFill)
{
if (groupId() != group.mMeta.mGroupId) {
std::cerr << "PostedCardView::setGroup() - Wrong id, cannot set post";
std::cerr << std::endl;
return false;
}
mGroup = group;
if (doFill) {
fill();
}
return true;
}
bool PostedCardView::setPost(const RsPostedPost &post, bool doFill)
{
if (groupId() != post.mMeta.mGroupId || messageId() != post.mMeta.mMsgId) {
std::cerr << "PostedCardView::setPost() - Wrong id, cannot set post";
std::cerr << std::endl;
return false;
}
mPost = post;
if (doFill) {
fill();
}
return true;
}
void PostedCardView::loadGroup()
{
RsThread::async([this]()
{
// 1 - get group data
#ifdef DEBUG_FORUMS
std::cerr << "Retrieving post data for post " << mThreadId << std::endl;
#endif
std::vector<RsPostedGroup> groups;
const std::list<RsGxsGroupId> groupIds = { groupId() };
if(!rsPosted->getBoardsInfo(groupIds,groups))
{
RsErr() << "GxsPostedGroupItem::loadGroup() ERROR getting data" << std::endl;
return;
}
if (groups.size() != 1)
{
std::cerr << "GxsPostedGroupItem::loadGroup() Wrong number of Items";
std::cerr << std::endl;
return;
}
RsPostedGroup group(groups[0]);
RsQThreadUtils::postToObject( [group,this]()
{
/* Here it goes any code you want to be executed on the Qt Gui
* thread, for example to update the data model with new information
* after a blocking call to RetroShare API complete */
setGroup(group);
}, this );
});
}
void PostedCardView::loadMessage()
{
RsThread::async([this]()
{
// 1 - get group data
std::vector<RsPostedPost> posts;
std::vector<RsGxsComment> comments;
if(! rsPosted->getBoardContent( groupId(), std::set<RsGxsMessageId>( { messageId() } ),posts,comments))
{
RsErr() << "PostedItem::loadMessage() ERROR getting data" << std::endl;
return;
}
if (posts.size() == 1)
{
std::cerr << (void*)this << ": Obtained post, with msgId = " << posts[0].mMeta.mMsgId << std::endl;
const RsPostedPost& post(posts[0]);
RsQThreadUtils::postToObject( [post,this]() { setPost(post); }, this );
}
else if(comments.size() == 1)
{
const RsGxsComment& cmt = comments[0];
std::cerr << (void*)this << ": Obtained comment, setting messageId to threadID = " << cmt.mMeta.mThreadId << std::endl;
RsQThreadUtils::postToObject( [cmt,this]()
{
//Change this item to be uploaded with thread element.
setMessageId(cmt.mMeta.mThreadId);
requestMessage();
}, this );
}
else
{
std::cerr << "GxsChannelPostItem::loadMessage() Wrong number of Items. Remove It.";
std::cerr << std::endl;
RsQThreadUtils::postToObject( [this]() { removeItem(); }, this );
}
});
}
void PostedCardView::loadComment()
{
RsThread::async([this]()
{
// 1 - get group data
std::set<RsGxsMessageId> msgIds;
for(auto MsgId: messageVersions())
msgIds.insert(MsgId);
std::vector<RsPostedPost> posts;
std::vector<RsGxsComment> comments;
if(! rsPosted->getBoardContent( groupId(),msgIds,posts,comments))
{
RsErr() << "PostedCardView::loadGroup() ERROR getting data" << std::endl;
return;
}
int comNb = comments.size();
RsQThreadUtils::postToObject( [comNb,this]()
{
QString sComButText = tr("Comment");
if (comNb == 1)
sComButText = sComButText.append("(1)");
else if(comNb > 1)
sComButText = tr("Comments ").append("(%1)").arg(comNb);
ui->commentButton->setText(sComButText);
}, this );
});
}
void PostedCardView::fill() void PostedCardView::fill()
{ {
@ -460,141 +344,4 @@ void PostedCardView::fill()
emit sizeChanged(this); emit sizeChanged(this);
} }
void PostedCardView::toggleNotes() {}
const RsPostedPost &PostedCardView::getPost() const
{
return mPost;
}
RsPostedPost &PostedCardView::post()
{
return mPost;
}
QString PostedCardView::groupName()
{
return QString::fromUtf8(mGroup.mMeta.mGroupName.c_str());
}
QString PostedCardView::messageName()
{
return QString::fromUtf8(mPost.mMeta.mMsgName.c_str());
}
void PostedCardView::makeDownVote()
{
RsGxsGrpMsgIdPair msgId;
msgId.first = mPost.mMeta.mGroupId;
msgId.second = mPost.mMeta.mMsgId;
ui->voteUpButton->setEnabled(false);
ui->voteDownButton->setEnabled(false);
emit vote(msgId, false);
}
void PostedCardView::makeUpVote()
{
RsGxsGrpMsgIdPair msgId;
msgId.first = mPost.mMeta.mGroupId;
msgId.second = mPost.mMeta.mMsgId;
ui->voteUpButton->setEnabled(false);
ui->voteDownButton->setEnabled(false);
emit vote(msgId, true);
}
void PostedCardView::loadComments()
{
std::cerr << "PostedCardView::loadComments()";
std::cerr << std::endl;
if (mFeedHolder)
{
QString title = QString::fromUtf8(mPost.mMeta.mMsgName.c_str());
#warning (csoler) Posted item versions not handled yet. When it is the case, start here.
QVector<RsGxsMessageId> post_versions ;
post_versions.push_back(mPost.mMeta.mMsgId) ;
mFeedHolder->openComments(0, mPost.mMeta.mGroupId, post_versions,mPost.mMeta.mMsgId, title);
}
}
void PostedCardView::setReadStatus(bool isNew, bool isUnread)
{
if (isUnread)
{
ui->readButton->setChecked(true);
ui->readButton->setIcon(QIcon(":/images/message-state-unread.png"));
}
else
{
ui->readButton->setChecked(false);
ui->readButton->setIcon(QIcon(":/images/message-state-read.png"));
}
ui->newLabel->setVisible(isNew);
ui->mainFrame->setProperty("new", isNew);
ui->mainFrame->style()->unpolish(ui->mainFrame);
ui->mainFrame->style()->polish( ui->mainFrame);
}
void PostedCardView::readToggled(bool checked)
{
if (mInFill) {
return;
}
RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
uint32_t token;
rsPosted->setMessageReadStatus(token, msgPair, !checked);
setReadStatus(false, checked);
}
void PostedCardView::readAndClearItem()
{
#ifdef DEBUG_ITEM
std::cerr << "PostedCardView::readAndClearItem()";
std::cerr << std::endl;
#endif
readToggled(false);
removeItem();
}
void PostedCardView::doExpand(bool open)
{
/*if (open)
{
}
else
{
}
emit sizeChanged(this);*/
}
void PostedCardView::copyMessageLink()
{
if (groupId().isNull() || mMessageId.isNull()) {
return;
}
RetroShareLink link = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_POSTED, groupId(), mMessageId, messageName());
if (link.valid()) {
QList<RetroShareLink> urls;
urls.push_back(link);
RSLinkClipboard::copyLinks(urls);
}
}

60
retroshare-gui/src/gui/Posted/PostedCardView.h
View File

@ -24,7 +24,7 @@
#include <QMetaType> #include <QMetaType>
#include <retroshare/rsposted.h> #include <retroshare/rsposted.h>
#include "gui/gxs/GxsFeedItem.h" #include "PostedItem.h"
namespace Ui { namespace Ui {
class PostedCardView; class PostedCardView;
@ -33,62 +33,30 @@ class PostedCardView;
class FeedHolder; class FeedHolder;
class RsPostedPost; class RsPostedPost;
class PostedCardView : public GxsFeedItem class PostedCardView : public BasePostedItem
{ {
Q_OBJECT Q_OBJECT
public: public:
PostedCardView(FeedHolder *parent, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate); PostedCardView(FeedHolder *parent, uint32_t feedId, const RsGxsGroupId& groupId, const RsGxsMessageId& messageId, bool isHome, bool autoUpdate);
PostedCardView(FeedHolder *parent, uint32_t feedId, const RsPostedGroup &group, const RsPostedPost &post, bool isHome, bool autoUpdate); PostedCardView(FeedHolder *parent, uint32_t feedId, const RsGroupMetaData& group_meta, const RsGxsMessageId& post_id, bool isHome, bool autoUpdate);
PostedCardView(FeedHolder *parent, uint32_t feedId, const RsPostedPost &post, bool isHome, bool autoUpdate);
virtual ~PostedCardView(); virtual ~PostedCardView();
bool setGroup(const RsPostedGroup& group, bool doFill = true);
bool setPost(const RsPostedPost& post, bool doFill = true);
const RsPostedPost &getPost() const;
RsPostedPost &post();
uint64_t uniqueIdentifier() const override { return hash_64bits("PostedItem " + mMessageId.toStdString()); }
protected:
/* FeedItem */
virtual void doExpand(bool open);
private slots:
void loadComments();
void makeUpVote();
void makeDownVote();
void readToggled(bool checked);
void readAndClearItem();
void copyMessageLink();
signals:
void vote(const RsGxsGrpMsgIdPair& msgId, bool up);
protected: protected:
/* GxsGroupFeedItem */ /* GxsGroupFeedItem */
virtual QString groupName();
virtual void loadGroup() override;
virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_UNKNOWN; }
/* GxsFeedItem */ void setup() override;
virtual QString messageName(); void fill() override;
virtual void loadMessage(); void doExpand(bool open) override {}
virtual void loadComment(); void setComment(const RsGxsComment&) override;
void setReadStatus(bool isNew, bool isUnread) override;
void toggle() override {}
void setCommentsSize(int comNb) override;
void makeUpVote() override;
void makeDownVote() override;
void toggleNotes() override;
private: private:
void setup();
void fill();
void setReadStatus(bool isNew, bool isUnread);
private:
bool mInFill;
RsPostedGroup mGroup;
RsPostedPost mPost;
RsGxsMessageId mMessageId;
/** Qt Designer generated object */ /** Qt Designer generated object */
Ui::PostedCardView *ui; Ui::PostedCardView *ui;
}; };

632
retroshare-gui/src/gui/Posted/PostedItem.cpp
View File

@ -29,6 +29,7 @@
#include "gui/RetroShareLink.h" #include "gui/RetroShareLink.h"
#include "gui/gxs/GxsIdDetails.h" #include "gui/gxs/GxsIdDetails.h"
#include "util/misc.h" #include "util/misc.h"
#include "gui/common/FilesDefs.h"
#include "util/qtthreadsutils.h" #include "util/qtthreadsutils.h"
#include "util/HandleRichText.h" #include "util/HandleRichText.h"
#include "PhotoView.h" #include "PhotoView.h"
@ -41,44 +42,290 @@
/** Constructor */ /** Constructor */
PostedItem::PostedItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate) : //========================================================================================
GxsFeedItem(feedHolder, feedId, groupId, messageId, isHome, rsPosted, autoUpdate) // BasePostedItem //
{ //========================================================================================
setup();
requestGroup(); BasePostedItem::BasePostedItem(FeedHolder *feedHolder, uint32_t feedId, const RsGroupMetaData &group_meta, const RsGxsMessageId& post_id, bool isHome, bool autoUpdate) :
requestMessage(); GxsFeedItem(feedHolder, feedId, group_meta.mGroupId, post_id, isHome, rsPosted, autoUpdate),
requestComment(); mGroupMeta(group_meta)
{
mPost.mMeta.mMsgId = post_id;
mPost.mMeta.mGroupId = mGroupMeta.mGroupId;
mLoaded = false;
} }
PostedItem::PostedItem(FeedHolder *feedHolder, uint32_t feedId, const RsPostedGroup &group, const RsPostedPost &post, bool isHome, bool autoUpdate) : BasePostedItem::BasePostedItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId& post_id, bool isHome, bool autoUpdate) :
GxsFeedItem(feedHolder, feedId, post.mMeta.mGroupId, post.mMeta.mMsgId, isHome, rsPosted, autoUpdate) GxsFeedItem(feedHolder, feedId, groupId, post_id, isHome, rsPosted, autoUpdate)
{ {
setup(); mPost.mMeta.mMsgId = post_id;
mLoaded = false;
}
void BasePostedItem::paintEvent(QPaintEvent *e)
{
/* This method employs a trick to trigger a deferred loading. The post and group is requested only
* when actually displayed on the screen. */
if(!mLoaded)
{
mLoaded = true ;
requestMessage();
requestComment();
}
GxsFeedItem::paintEvent(e) ;
}
bool BasePostedItem::setPost(const RsPostedPost &post, bool doFill)
{
if (groupId() != post.mMeta.mGroupId || messageId() != post.mMeta.mMsgId) {
std::cerr << "BasePostedItem::setPost() - Wrong id, cannot set post";
std::cerr << std::endl;
return false;
}
mPost = post;
if (doFill)
fill();
return true;
}
void BasePostedItem::loadGroup()
{
RsThread::async([this]()
{
// 1 - get group data
#ifdef DEBUG_FORUMS
std::cerr << "Retrieving post data for post " << mThreadId << std::endl;
#endif
std::vector<RsPostedGroup> groups;
const std::list<RsGxsGroupId> groupIds = { groupId() };
if(!rsPosted->getBoardsInfo(groupIds,groups))
{
RsErr() << "GxsPostedGroupItem::loadGroup() ERROR getting data" << std::endl;
return;
}
if (groups.size() != 1)
{
std::cerr << "GxsPostedGroupItem::loadGroup() Wrong number of Items";
std::cerr << std::endl;
return;
}
RsPostedGroup group(groups[0]);
RsQThreadUtils::postToObject( [group,this]()
{
/* Here it goes any code you want to be executed on the Qt Gui
* thread, for example to update the data model with new information
* after a blocking call to RetroShare API complete */
mGroupMeta = group.mMeta;
}, this );
});
}
void BasePostedItem::loadMessage()
{
RsThread::async([this]()
{
// 1 - get group data
std::vector<RsPostedPost> posts;
std::vector<RsGxsComment> comments;
if(! rsPosted->getBoardContent( groupId(), std::set<RsGxsMessageId>( { messageId() } ),posts,comments))
{
RsErr() << "BasePostedItem::loadMessage() ERROR getting data" << std::endl;
return;
}
if (posts.size() == 1)
{
std::cerr << (void*)this << ": Obtained post, with msgId = " << posts[0].mMeta.mMsgId << std::endl;
const RsPostedPost& post(posts[0]);
RsQThreadUtils::postToObject( [post,this]() { setPost(post,true); }, this );
}
else if(comments.size() == 1)
{
const RsGxsComment& cmt = comments[0];
std::cerr << (void*)this << ": Obtained comment, setting messageId to threadID = " << cmt.mMeta.mThreadId << std::endl;
RsQThreadUtils::postToObject( [cmt,this]()
{
setComment(cmt);
//Change this item to be uploaded with thread element.
setMessageId(cmt.mMeta.mThreadId);
requestMessage();
}, this );
}
else
{
std::cerr << "GxsChannelPostItem::loadMessage() Wrong number of Items. Remove It.";
std::cerr << std::endl;
RsQThreadUtils::postToObject( [this]() { removeItem(); }, this );
}
});
}
void BasePostedItem::loadComment()
{
#ifdef DEBUG_ITEM
std::cerr << "GxsChannelPostItem::loadComment()";
std::cerr << std::endl;
#endif
RsThread::async([this]()
{
// 1 - get group data
std::set<RsGxsMessageId> msgIds;
for(auto MsgId: messageVersions())
msgIds.insert(MsgId);
std::vector<RsPostedPost> posts;
std::vector<RsGxsComment> comments;
if(! rsPosted->getBoardContent( groupId(),msgIds,posts,comments))
{
RsErr() << "BasePostedItem::loadGroup() ERROR getting data" << std::endl;
return;
}
int comNb = comments.size();
RsQThreadUtils::postToObject( [comNb,this]()
{
setCommentsSize(comNb);
}, this );
});
}
QString BasePostedItem::groupName()
{
return QString::fromUtf8(mGroupMeta.mGroupName.c_str());
}
QString BasePostedItem::messageName()
{
return QString::fromUtf8(mPost.mMeta.mMsgName.c_str());
}
void BasePostedItem::loadComments()
{
std::cerr << "BasePostedItem::loadComments()";
std::cerr << std::endl;
if (mFeedHolder)
{
QString title = QString::fromUtf8(mPost.mMeta.mMsgName.c_str());
#warning (csoler) Posted item versions not handled yet. When it is the case, start here.
QVector<RsGxsMessageId> post_versions ;
post_versions.push_back(mPost.mMeta.mMsgId) ;
mFeedHolder->openComments(0, mPost.mMeta.mGroupId, post_versions,mPost.mMeta.mMsgId, title);
}
}
void BasePostedItem::readToggled(bool checked)
{
if (mInFill) {
return;
}
RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
uint32_t token;
rsPosted->setMessageReadStatus(token, msgPair, !checked);
setReadStatus(false, checked);
}
void BasePostedItem::readAndClearItem()
{
#ifdef DEBUG_ITEM
std::cerr << "BasePostedItem::readAndClearItem()";
std::cerr << std::endl;
#endif
readToggled(false);
removeItem();
}
void BasePostedItem::copyMessageLink()
{
if (groupId().isNull() || messageId().isNull()) {
return;
}
RetroShareLink link = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_POSTED, groupId(), messageId(), messageName());
if (link.valid()) {
QList<RetroShareLink> urls;
urls.push_back(link);
RSLinkClipboard::copyLinks(urls);
}
}
void BasePostedItem::viewPicture()
{
if(mPost.mImage.mData == NULL) {
return;
}
QString timestamp = misc::timeRelativeToNow(mPost.mMeta.mPublishTs);
QPixmap pixmap;
GxsIdDetails::loadPixmapFromData(mPost.mImage.mData, mPost.mImage.mSize, pixmap,GxsIdDetails::ORIGINAL);
RsGxsId authorID = mPost.mMeta.mAuthorId;
mMessageId = post.mMeta.mMsgId; PhotoView *PView = new PhotoView(this);
PView->setPixmap(pixmap);
PView->setTitle(messageName());
PView->setName(authorID);
PView->setTime(timestamp);
PView->setGroupId(groupId());
PView->setMessageId(messageId());
PView->show();
setGroup(group, false); /* window will destroy itself! */
setPost(post);
requestComment();
} }
PostedItem::PostedItem(FeedHolder *feedHolder, uint32_t feedId, const RsPostedPost &post, bool isHome, bool autoUpdate) : //========================================================================================
GxsFeedItem(feedHolder, feedId, post.mMeta.mGroupId, post.mMeta.mMsgId, isHome, rsPosted, autoUpdate) // PostedItem //
//========================================================================================
PostedItem::PostedItem(FeedHolder *feedHolder, uint32_t feedId, const RsGroupMetaData &group_meta, const RsGxsMessageId& post_id, bool isHome, bool autoUpdate) :
BasePostedItem(feedHolder, feedId, group_meta, post_id, isHome, autoUpdate)
{ {
setup(); setup();
requestGroup();
setPost(post);
requestComment();
} }
PostedItem::~PostedItem() PostedItem::PostedItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId& post_id, bool isHome, bool autoUpdate) :
BasePostedItem(feedHolder, feedId, groupId, post_id, isHome, autoUpdate)
{ {
delete(ui); setup();
loadGroup();
} }
void PostedItem::setup() void PostedItem::setup()
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
@ -119,7 +366,7 @@ void PostedItem::setup()
int S = QFontMetricsF(font()).height() ; int S = QFontMetricsF(font()).height() ;
ui->voteUpButton->setIconSize(QSize(S*1.5,S*1.5)); ui->voteUpButton->setIconSize(QSize(S*1.5,S*1.5));
ui->voteDownButton->setIconSize(QSize(S*1.5,S*1.5)); ui->voteDownButton->setIconSize(QSize(S*1.5,S*1.5));
ui->commentButton->setIconSize(QSize(S*1.5,S*1.5)); ui->commentButton->setIconSize(QSize(S*1.5,S*1.5));
@ -127,7 +374,7 @@ void PostedItem::setup()
ui->notesButton->setIconSize(QSize(S*1.5,S*1.5)); ui->notesButton->setIconSize(QSize(S*1.5,S*1.5));
ui->readButton->setIconSize(QSize(S*1.5,S*1.5)); ui->readButton->setIconSize(QSize(S*1.5,S*1.5));
ui->shareButton->setIconSize(QSize(S*1.5,S*1.5)); ui->shareButton->setIconSize(QSize(S*1.5,S*1.5));
QMenu *menu = new QMenu(); QMenu *menu = new QMenu();
menu->addAction(CopyLinkAction); menu->addAction(CopyLinkAction);
ui->shareButton->setMenu(menu); ui->shareButton->setMenu(menu);
@ -137,173 +384,52 @@ void PostedItem::setup()
ui->nameLabel->hide(); ui->nameLabel->hide();
} }
bool PostedItem::setGroup(const RsPostedGroup &group, bool doFill) void PostedItem::makeDownVote()
{ {
if (groupId() != group.mMeta.mGroupId) { RsGxsGrpMsgIdPair msgId;
std::cerr << "PostedItem::setGroup() - Wrong id, cannot set post"; msgId.first = mPost.mMeta.mGroupId;
std::cerr << std::endl; msgId.second = mPost.mMeta.mMsgId;
return false;
}
mGroup = group; ui->voteUpButton->setEnabled(false);
ui->voteDownButton->setEnabled(false);
if (doFill) { emit vote(msgId, false);
fill();
}
return true;
} }
bool PostedItem::setPost(const RsPostedPost &post, bool doFill) void PostedItem::makeUpVote()
{ {
if (groupId() != post.mMeta.mGroupId || messageId() != post.mMeta.mMsgId) { RsGxsGrpMsgIdPair msgId;
std::cerr << "PostedItem::setPost() - Wrong id, cannot set post"; msgId.first = mPost.mMeta.mGroupId;
std::cerr << std::endl; msgId.second = mPost.mMeta.mMsgId;
return false;
}
mPost = post; ui->voteUpButton->setEnabled(false);
ui->voteDownButton->setEnabled(false);
if (doFill) { emit vote(msgId, true);
fill();
}
return true;
} }
void PostedItem::loadGroup()
void PostedItem::setComment(const RsGxsComment& cmt)
{ {
RsThread::async([this]() ui->newCommentLabel->show();
{ ui->commLabel->show();
// 1 - get group data ui->commLabel->setText(QString::fromUtf8(cmt.mComment.c_str()));
#ifdef DEBUG_FORUMS
std::cerr << "Retrieving post data for post " << mThreadId << std::endl;
#endif
std::vector<RsPostedGroup> groups;
const std::list<RsGxsGroupId> groupIds = { groupId() };
if(!rsPosted->getBoardsInfo(groupIds,groups))
{
RsErr() << "GxsPostedGroupItem::loadGroup() ERROR getting data" << std::endl;
return;
}
if (groups.size() != 1)
{
std::cerr << "GxsPostedGroupItem::loadGroup() Wrong number of Items";
std::cerr << std::endl;
return;
}
RsPostedGroup group(groups[0]);
RsQThreadUtils::postToObject( [group,this]()
{
/* Here it goes any code you want to be executed on the Qt Gui
* thread, for example to update the data model with new information
* after a blocking call to RetroShare API complete */
setGroup(group);
}, this );
});
} }
void PostedItem::setCommentsSize(int comNb)
void PostedItem::loadMessage()
{ {
RsThread::async([this]() QString sComButText = tr("Comment");
{ if (comNb == 1)
// 1 - get group data sComButText = sComButText.append("(1)");
else if(comNb > 1)
sComButText = tr("Comments ").append("(%1)").arg(comNb);
std::vector<RsPostedPost> posts; ui->commentButton->setText(sComButText);
std::vector<RsGxsComment> comments;
if(! rsPosted->getBoardContent( groupId(), std::set<RsGxsMessageId>( { messageId() } ),posts,comments))
{
RsErr() << "PostedItem::loadMessage() ERROR getting data" << std::endl;
return;
}
if (posts.size() == 1)
{
std::cerr << (void*)this << ": Obtained post, with msgId = " << posts[0].mMeta.mMsgId << std::endl;
const RsPostedPost& post(posts[0]);
RsQThreadUtils::postToObject( [post,this]() { setPost(post); }, this );
}
else if(comments.size() == 1)
{
const RsGxsComment& cmt = comments[0];
std::cerr << (void*)this << ": Obtained comment, setting messageId to threadID = " << cmt.mMeta.mThreadId << std::endl;
RsQThreadUtils::postToObject( [cmt,this]()
{
ui->newCommentLabel->show();
ui->commLabel->show();
ui->commLabel->setText(QString::fromUtf8(cmt.mComment.c_str()));
//Change this item to be uploaded with thread element.
setMessageId(cmt.mMeta.mThreadId);
requestMessage();
}, this );
}
else
{
std::cerr << "GxsChannelPostItem::loadMessage() Wrong number of Items. Remove It.";
std::cerr << std::endl;
RsQThreadUtils::postToObject( [this]() { removeItem(); }, this );
}
});
}
void PostedItem::loadComment()
{
#ifdef DEBUG_ITEM
std::cerr << "GxsChannelPostItem::loadComment()";
std::cerr << std::endl;
#endif
RsThread::async([this]()
{
// 1 - get group data
std::set<RsGxsMessageId> msgIds;
for(auto MsgId: messageVersions())
msgIds.insert(MsgId);
std::vector<RsPostedPost> posts;
std::vector<RsGxsComment> comments;
if(! rsPosted->getBoardContent( groupId(),msgIds,posts,comments))
{
RsErr() << "PostedItem::loadGroup() ERROR getting data" << std::endl;
return;
}
int comNb = comments.size();
RsQThreadUtils::postToObject( [comNb,this]()
{
QString sComButText = tr("Comment");
if (comNb == 1)
sComButText = sComButText.append("(1)");
else if(comNb > 1)
sComButText = tr("Comments ").append("(%1)").arg(comNb);
ui->commentButton->setText(sComButText);
}, this );
});
} }
void PostedItem::fill() void PostedItem::fill()
{ {
RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_POSTED, mGroup.mMeta.mGroupId, groupName()); RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_POSTED, mGroupMeta.mGroupId, groupName());
ui->nameLabel->setText(link.toHtml()); ui->nameLabel->setText(link.toHtml());
QPixmap sqpixmap2 = QPixmap(":/images/thumb-default.png"); QPixmap sqpixmap2 = QPixmap(":/images/thumb-default.png");
@ -327,20 +453,21 @@ void PostedItem::fill()
QUrl url = QUrl::fromEncoded(urlarray.trimmed()); QUrl url = QUrl::fromEncoded(urlarray.trimmed());
QString urlstr = "Invalid Link"; QString urlstr = "Invalid Link";
QString sitestr = "Invalid Link"; QString sitestr = "Invalid Link";
bool urlOkay = url.isValid(); bool urlOkay = url.isValid();
if (urlOkay) if (urlOkay)
{ {
QString scheme = url.scheme(); QString scheme = url.scheme();
if ((scheme != "https") if ((scheme != "https")
&& (scheme != "http") && (scheme != "http")
&& (scheme != "ftp") && (scheme != "ftp")
&& (scheme != "retroshare")) && (scheme != "retroshare"))
{ {
urlOkay = false; urlOkay = false;
sitestr = "Invalid Link Scheme"; sitestr = "Invalid Link Scheme";
} }
} }
if (urlOkay) if (urlOkay)
{ {
urlstr = QString("<a href=\""); urlstr = QString("<a href=\"");
@ -351,7 +478,7 @@ void PostedItem::fill()
QString siteurl = url.toEncoded(); QString siteurl = url.toEncoded();
sitestr = QString("<a href=\"%1\" ><span style=\" text-decoration: underline; color:#0079d3;\"> %2 </span></a>").arg(siteurl).arg(siteurl); sitestr = QString("<a href=\"%1\" ><span style=\" text-decoration: underline; color:#0079d3;\"> %2 </span></a>").arg(siteurl).arg(siteurl);
ui->titleLabel->setText(urlstr); ui->titleLabel->setText(urlstr);
}else }else
{ {
@ -365,13 +492,13 @@ void PostedItem::fill()
} }
ui->siteLabel->setText(sitestr); ui->siteLabel->setText(sitestr);
if(mPost.mImage.mData != NULL) if(mPost.mImage.mData != NULL)
{ {
QPixmap pixmap; QPixmap pixmap;
GxsIdDetails::loadPixmapFromData(mPost.mImage.mData, mPost.mImage.mSize, pixmap,GxsIdDetails::ORIGINAL); GxsIdDetails::loadPixmapFromData(mPost.mImage.mData, mPost.mImage.mSize, pixmap,GxsIdDetails::ORIGINAL);
// Wiping data - as its been passed to thumbnail. // Wiping data - as its been passed to thumbnail.
QPixmap sqpixmap = pixmap.scaled(desired_width,desired_height, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); QPixmap sqpixmap = pixmap.scaled(desired_width,desired_height, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
ui->thumbnailLabel->setPixmap(sqpixmap); ui->thumbnailLabel->setPixmap(sqpixmap);
ui->thumbnailLabel->setToolTip(tr("Click to view Picture")); ui->thumbnailLabel->setToolTip(tr("Click to view Picture"));
@ -380,14 +507,14 @@ void PostedItem::fill()
if(pixmap.width() > 800){ if(pixmap.width() > 800){
QPixmap scaledpixmap = pixmap.scaledToWidth(800, Qt::SmoothTransformation); QPixmap scaledpixmap = pixmap.scaledToWidth(800, Qt::SmoothTransformation);
ui->pictureLabel->setPixmap(scaledpixmap); ui->pictureLabel->setPixmap(scaledpixmap);
}else{ }else{
ui->pictureLabel->setPixmap(pixmap); ui->pictureLabel->setPixmap(pixmap);
} }
} }
else if (urlOkay && (mPost.mImage.mData == NULL)) else if (urlOkay && (mPost.mImage.mData == NULL))
{ {
ui->expandButton->setDisabled(true); ui->expandButton->setDisabled(true);
ui->thumbnailLabel->setPixmap(QPixmap(LINK_IMAGE)); ui->thumbnailLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(LINK_IMAGE));
} }
else else
{ {
@ -397,7 +524,7 @@ void PostedItem::fill()
//QString score = "Hot" + QString::number(post.mHotScore); //QString score = "Hot" + QString::number(post.mHotScore);
//score += " Top" + QString::number(post.mTopScore); //score += " Top" + QString::number(post.mTopScore);
//score += " New" + QString::number(post.mNewScore); //score += " New" + QString::number(post.mNewScore);
QString score = QString::number(mPost.mTopScore); QString score = QString::number(mPost.mTopScore);
@ -409,7 +536,7 @@ void PostedItem::fill()
QTextDocument doc; QTextDocument doc;
doc.setHtml(ui->notes->text()); doc.setHtml(ui->notes->text());
if(doc.toPlainText().trimmed().isEmpty()) if(doc.toPlainText().trimmed().isEmpty())
ui->notesButton->hide(); ui->notesButton->hide();
// differences between Feed or Top of Comment. // differences between Feed or Top of Comment.
@ -465,7 +592,7 @@ void PostedItem::fill()
#if 0 #if 0
uint32_t up, down, nComments; uint32_t up, down, nComments;
bool ok = rsPosted->retrieveScores(mPost.mMeta.mServiceString, up, down, nComments); bool ok = rsPosted->retrieveScores(mPost.mMeta.mServiceString, up, down, nComments);
if(ok) if(ok)
@ -486,79 +613,18 @@ void PostedItem::fill()
emit sizeChanged(this); emit sizeChanged(this);
} }
const RsPostedPost &PostedItem::getPost() const
{
return mPost;
}
RsPostedPost &PostedItem::post()
{
return mPost;
}
QString PostedItem::groupName()
{
return QString::fromUtf8(mGroup.mMeta.mGroupName.c_str());
}
QString PostedItem::messageName()
{
return QString::fromUtf8(mPost.mMeta.mMsgName.c_str());
}
void PostedItem::makeDownVote()
{
RsGxsGrpMsgIdPair msgId;
msgId.first = mPost.mMeta.mGroupId;
msgId.second = mPost.mMeta.mMsgId;
ui->voteUpButton->setEnabled(false);
ui->voteDownButton->setEnabled(false);
emit vote(msgId, false);
}
void PostedItem::makeUpVote()
{
RsGxsGrpMsgIdPair msgId;
msgId.first = mPost.mMeta.mGroupId;
msgId.second = mPost.mMeta.mMsgId;
ui->voteUpButton->setEnabled(false);
ui->voteDownButton->setEnabled(false);
emit vote(msgId, true);
}
void PostedItem::loadComments()
{
std::cerr << "PostedItem::loadComments()";
std::cerr << std::endl;
if (mFeedHolder)
{
QString title = QString::fromUtf8(mPost.mMeta.mMsgName.c_str());
#warning (csoler) Posted item versions not handled yet. When it is the case, start here.
QVector<RsGxsMessageId> post_versions ;
post_versions.push_back(mPost.mMeta.mMsgId) ;
mFeedHolder->openComments(0, mPost.mMeta.mGroupId, post_versions,mPost.mMeta.mMsgId, title);
}
}
void PostedItem::setReadStatus(bool isNew, bool isUnread) void PostedItem::setReadStatus(bool isNew, bool isUnread)
{ {
if (isUnread) if (isUnread)
{ {
ui->readButton->setChecked(true); ui->readButton->setChecked(true);
ui->readButton->setIcon(QIcon(":/images/message-state-unread.png")); ui->readButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-unread.png"));
} }
else else
{ {
ui->readButton->setChecked(false); ui->readButton->setChecked(false);
ui->readButton->setIcon(QIcon(":/images/message-state-read.png")); ui->readButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-read.png"));
} }
ui->newLabel->setVisible(isNew); ui->newLabel->setVisible(isNew);
@ -568,30 +634,6 @@ void PostedItem::setReadStatus(bool isNew, bool isUnread)
ui->mainFrame->style()->polish( ui->mainFrame); ui->mainFrame->style()->polish( ui->mainFrame);
} }
void PostedItem::readToggled(bool checked)
{
if (mInFill) {
return;
}
RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
uint32_t token;
rsPosted->setMessageReadStatus(token, msgPair, !checked);
setReadStatus(false, checked);
}
void PostedItem::readAndClearItem()
{
#ifdef DEBUG_ITEM
std::cerr << "PostedItem::readAndClearItem()";
std::cerr << std::endl;
#endif
readToggled(false);
removeItem();
}
void PostedItem::toggle() void PostedItem::toggle()
{ {
@ -603,13 +645,13 @@ void PostedItem::doExpand(bool open)
if (open) if (open)
{ {
ui->frame_picture->show(); ui->frame_picture->show();
ui->expandButton->setIcon(QIcon(QString(":/images/decrease.png"))); ui->expandButton->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/images/decrease.png")));
ui->expandButton->setToolTip(tr("Hide")); ui->expandButton->setToolTip(tr("Hide"));
} }
else else
{ {
ui->frame_picture->hide(); ui->frame_picture->hide();
ui->expandButton->setIcon(QIcon(QString(":/images/expand.png"))); ui->expandButton->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/images/expand.png")));
ui->expandButton->setToolTip(tr("Expand")); ui->expandButton->setToolTip(tr("Expand"));
} }
@ -617,21 +659,6 @@ void PostedItem::doExpand(bool open)
} }
void PostedItem::copyMessageLink()
{
if (groupId().isNull() || mMessageId.isNull()) {
return;
}
RetroShareLink link = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_POSTED, groupId(), mMessageId, messageName());
if (link.valid()) {
QList<RetroShareLink> urls;
urls.push_back(link);
RSLinkClipboard::copyLinks(urls);
}
}
void PostedItem::toggleNotes() void PostedItem::toggleNotes()
{ {
if (ui->notesButton->isChecked()) if (ui->notesButton->isChecked())
@ -639,33 +666,10 @@ void PostedItem::toggleNotes()
ui->frame_notes->show(); ui->frame_notes->show();
} }
else else
{ {
ui->frame_notes->hide(); ui->frame_notes->hide();
} }
} }
void PostedItem::viewPicture()
{
if(mPost.mImage.mData == NULL) {
return;
}
QString timestamp = misc::timeRelativeToNow(mPost.mMeta.mPublishTs);
QPixmap pixmap;
GxsIdDetails::loadPixmapFromData(mPost.mImage.mData, mPost.mImage.mSize, pixmap,GxsIdDetails::ORIGINAL);
RsGxsId authorID = mPost.mMeta.mAuthorId;
PhotoView *PView = new PhotoView(this);
PView->setPixmap(pixmap);
PView->setTitle(messageName());
PView->setName(authorID);
PView->setTime(timestamp);
PView->setGroupId(groupId());
PView->setMessageId(mMessageId);
PView->show();
/* window will destroy itself! */
}

67
retroshare-gui/src/gui/Posted/PostedItem.h
View File

@ -33,42 +33,36 @@ class PostedItem;
class FeedHolder; class FeedHolder;
class RsPostedPost; class RsPostedPost;
class PostedItem : public GxsFeedItem class BasePostedItem : public GxsFeedItem
{ {
Q_OBJECT Q_OBJECT
public: public:
PostedItem(FeedHolder *parent, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate); BasePostedItem(FeedHolder *parent, uint32_t feedId, const RsGxsGroupId& groupId, const RsGxsMessageId& messageId, bool isHome, bool autoUpdate);
PostedItem(FeedHolder *parent, uint32_t feedId, const RsPostedGroup &group, const RsPostedPost &post, bool isHome, bool autoUpdate); BasePostedItem(FeedHolder *parent, uint32_t feedId, const RsGroupMetaData& group_meta, const RsGxsMessageId& post_id, bool isHome, bool autoUpdate);
PostedItem(FeedHolder *parent, uint32_t feedId, const RsPostedPost &post, bool isHome, bool autoUpdate); virtual ~BasePostedItem()=default;
virtual ~PostedItem();
bool setGroup(const RsPostedGroup& group, bool doFill = true);
bool setPost(const RsPostedPost& post, bool doFill = true); bool setPost(const RsPostedPost& post, bool doFill = true);
const RsPostedPost& getPost() const; const RsPostedPost& getPost() const { return mPost ; }
RsPostedPost &post(); RsPostedPost& getPost() { return mPost ; }
uint64_t uniqueIdentifier() const override { return hash_64bits("PostedItem " + messageId().toStdString()); } uint64_t uniqueIdentifier() const override { return hash_64bits("PostedItem " + messageId().toStdString()); }
protected:
/* FeedItem */
virtual void doExpand(bool open);
private slots: private slots:
void loadComments(); void loadComments();
void makeUpVote();
void makeDownVote();
void readToggled(bool checked); void readToggled(bool checked);
void readAndClearItem(); void readAndClearItem();
void toggle() override;
void copyMessageLink(); void copyMessageLink();
void toggleNotes();
void viewPicture(); void viewPicture();
signals: signals:
void vote(const RsGxsGrpMsgIdPair& msgId, bool up); void vote(const RsGxsGrpMsgIdPair& msgId, bool up);
protected: protected:
/* FeedItem */
virtual void paintEvent(QPaintEvent *) override;
/* GxsGroupFeedItem */ /* GxsGroupFeedItem */
virtual QString groupName(); virtual QString groupName();
virtual void loadGroup() override; virtual void loadGroup() override;
@ -80,18 +74,43 @@ protected:
virtual void loadMessage(); virtual void loadMessage();
virtual void loadComment(); virtual void loadComment();
private:
void setup();
void fill();
void setReadStatus(bool isNew, bool isUnread);
private:
bool mInFill; bool mInFill;
RsGroupMetaData mGroupMeta;
RsPostedGroup mGroup;
RsPostedPost mPost; RsPostedPost mPost;
RsGxsMessageId mMessageId;
virtual void setup()=0;
virtual void fill()=0;
virtual void doExpand(bool open)=0;
virtual void setComment(const RsGxsComment&)=0;
virtual void setReadStatus(bool isNew, bool isUnread)=0;
virtual void setCommentsSize(int comNb)=0;
virtual void makeUpVote()=0;
virtual void makeDownVote()=0;
virtual void toggleNotes()=0;
private:
bool mLoaded;
};
class PostedItem: public BasePostedItem
{
public:
PostedItem(FeedHolder *parent, uint32_t feedId, const RsGxsGroupId& groupId, const RsGxsMessageId& messageId, bool isHome, bool autoUpdate);
PostedItem(FeedHolder *parent, uint32_t feedId, const RsGroupMetaData& group_meta, const RsGxsMessageId& post_id, bool isHome, bool autoUpdate);
protected:
void setup() override;
void fill() override;
void doExpand(bool open) override;
void setComment(const RsGxsComment&) override;
void setReadStatus(bool isNew, bool isUnread) override;
void toggle() override ;
void setCommentsSize(int comNb) override;
void makeUpVote() override;
void makeDownVote() override;
void toggleNotes() override;
private:
/** Qt Designer generated object */ /** Qt Designer generated object */
Ui::PostedItem *ui; Ui::PostedItem *ui;
}; };

19
retroshare-gui/src/gui/Posted/PostedListWidget.cpp
View File

@ -481,26 +481,22 @@ void PostedListWidget::insertPostedDetails(const RsPostedGroup &group)
/*********************** **** **** **** ***********************/ /*********************** **** **** **** ***********************/
/*********************** **** **** **** ***********************/ /*********************** **** **** **** ***********************/
void PostedListWidget::loadPost(const RsPostedPost &post) void PostedListWidget::loadPost(const RsPostedPost& post)
{ {
/* Group is not always available because of the TokenQueue */ /* Group is not always available because of the TokenQueue */
RsPostedGroup dummyGroup;
dummyGroup.mMeta.mGroupId = groupId();
PostedItem *item = new PostedItem(this, 0, dummyGroup, post, true, false); PostedItem *item = new PostedItem(this, 0, mGroup.mMeta, post.mMeta.mMsgId, true, false);
connect(item, SIGNAL(vote(RsGxsGrpMsgIdPair,bool)), this, SLOT(submitVote(RsGxsGrpMsgIdPair,bool))); connect(item, SIGNAL(vote(RsGxsGrpMsgIdPair,bool)), this, SLOT(submitVote(RsGxsGrpMsgIdPair,bool)));
mPosts.insert(post.mMeta.mMsgId, item); mPosts.insert(post.mMeta.mMsgId, item);
mPostItems.push_back(item); mPostItems.push_back(item);
} }
void PostedListWidget::loadPostCardView(const RsPostedPost &post) void PostedListWidget::loadPostCardView(const RsPostedPost& post)
{ {
/* Group is not always available because of the TokenQueue */ /* Group is not always available because of the TokenQueue */
RsPostedGroup dummyGroup;
dummyGroup.mMeta.mGroupId = groupId();
PostedCardView *cvitem = new PostedCardView(this, 0, dummyGroup, post, true, false); PostedCardView *cvitem = new PostedCardView(this, 0, mGroup.mMeta, post.mMeta.mMsgId, true, false);
connect(cvitem, SIGNAL(vote(RsGxsGrpMsgIdPair,bool)), this, SLOT(submitVote(RsGxsGrpMsgIdPair,bool))); connect(cvitem, SIGNAL(vote(RsGxsGrpMsgIdPair,bool)), this, SLOT(submitVote(RsGxsGrpMsgIdPair,bool)));
mCVPosts.insert(post.mMeta.mMsgId, cvitem); mCVPosts.insert(post.mMeta.mMsgId, cvitem);
@ -928,7 +924,7 @@ void PostedListWidget::insertPostedPosts(const std::vector<RsPostedPost>& posts)
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
/* insert new entry */ /* insert new entry */
loadPost(p); //loadPost(p);
loadPostCardView(p); loadPostCardView(p);
} }
} }
@ -937,7 +933,7 @@ void PostedListWidget::insertPostedPosts(const std::vector<RsPostedPost>& posts)
QMap<RsGxsMessageId, PostedItem*>::iterator pit; QMap<RsGxsMessageId, PostedItem*>::iterator pit;
for(pit = mPosts.begin(); pit != mPosts.end(); ++pit) for(pit = mPosts.begin(); pit != mPosts.end(); ++pit)
{ {
(*pit)->post().calculateScores(now); (*pit)->getPost().calculateScores(now);
} }
applyRanking(); applyRanking();
@ -1067,7 +1063,8 @@ bool PostedListWidget::getGroupData(RsGxsGenericGroupData*& data)
if(! rsPosted->getBoardsInfo(std::list<RsGxsGroupId>({groupId()}),groupInfo) || groupInfo.size() != 1) if(! rsPosted->getBoardsInfo(std::list<RsGxsGroupId>({groupId()}),groupInfo) || groupInfo.size() != 1)
return false; return false;
data = new RsPostedGroup(groupInfo[0]); mGroup = groupInfo[0];
data = new RsPostedGroup(mGroup);
return true; return true;
} }

2
retroshare-gui/src/gui/Posted/PostedListWidget.h
View File

@ -23,6 +23,7 @@
#include <QMap> #include <QMap>
#include "retroshare/rsposted.h"
#include "gui/gxs/GxsMessageFramePostWidget.h" #include "gui/gxs/GxsMessageFramePostWidget.h"
#include "gui/feeds/FeedHolder.h" #include "gui/feeds/FeedHolder.h"
@ -127,6 +128,7 @@ private:
uint32_t mTokenTypeVote; uint32_t mTokenTypeVote;
RsPostedGroup mGroup;
QMap<RsGxsMessageId, PostedItem*> mPosts; QMap<RsGxsMessageId, PostedItem*> mPosts;
QList<PostedItem*> mPostItems; QList<PostedItem*> mPostItems;

111
retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
View File

@ -95,23 +95,23 @@ GxsChannelPostItem::GxsChannelPostItem(FeedHolder *feedHolder, uint32_t feedId,
// mPost = post ; // mPost = post ;
// } // }
void GxsChannelPostItem::init(const RsGxsMessageId& messageId,const std::set<RsGxsMessageId>& older_versions) // void GxsChannelPostItem::init(const RsGxsMessageId& messageId,const std::set<RsGxsMessageId>& older_versions)
{ // {
QVector<RsGxsMessageId> v; // QVector<RsGxsMessageId> v;
//bool self = false; // //bool self = false;
//
for(std::set<RsGxsMessageId>::const_iterator it(older_versions.begin());it!=older_versions.end();++it) // for(std::set<RsGxsMessageId>::const_iterator it(older_versions.begin());it!=older_versions.end();++it)
v.push_back(*it) ; // v.push_back(*it) ;
//
if(older_versions.find(messageId) == older_versions.end()) // if(older_versions.find(messageId) == older_versions.end())
v.push_back(messageId); // v.push_back(messageId);
//
setMessageVersions(v) ; // setMessageVersions(v) ;
//
setup(); // setup();
//
mLoaded = false ; // mLoaded = false ;
} // }
void GxsChannelPostItem::paintEvent(QPaintEvent *e) void GxsChannelPostItem::paintEvent(QPaintEvent *e)
{ {
@ -267,6 +267,45 @@ void GxsChannelPostItem::loadComments()
comments(title); comments(title);
} }
void GxsChannelPostItem::loadGroup()
{
#ifdef DEBUG_ITEM
std::cerr << "GxsChannelGroupItem::loadGroup()";
std::cerr << std::endl;
#endif
RsThread::async([this]()
{
// 1 - get group data
std::vector<RsGxsChannelGroup> groups;
const std::list<RsGxsGroupId> groupIds = { groupId() };
if(!rsGxsChannels->getChannelsInfo(groupIds,groups)) // would be better to call channel Summaries for a single group
{
RsErr() << "GxsGxsChannelGroupItem::loadGroup() ERROR getting data" << std::endl;
return;
}
if (groups.size() != 1)
{
std::cerr << "GxsGxsChannelGroupItem::loadGroup() Wrong number of Items";
std::cerr << std::endl;
return;
}
RsGxsChannelGroup group(groups[0]);
RsQThreadUtils::postToObject( [group,this]()
{
/* Here it goes any code you want to be executed on the Qt Gui
* thread, for example to update the data model with new information
* after a blocking call to RetroShare API complete */
mGroupMeta = group.mMeta;
}, this );
});
}
void GxsChannelPostItem::loadMessage() void GxsChannelPostItem::loadMessage()
{ {
#ifdef DEBUG_ITEM #ifdef DEBUG_ITEM
@ -834,42 +873,4 @@ void GxsChannelPostItem::makeUpVote()
emit vote(msgId, true); emit vote(msgId, true);
} }
void GxsChannelPostItem::loadGroup()
{
#ifdef DEBUG_ITEM
std::cerr << "GxsChannelGroupItem::loadGroup()";
std::cerr << std::endl;
#endif
RsThread::async([this]()
{
// 1 - get group data
std::vector<RsGxsChannelGroup> groups;
const std::list<RsGxsGroupId> groupIds = { groupId() };
if(!rsGxsChannels->getChannelsInfo(groupIds,groups)) // would be better to call channel Summaries for a single group
{
RsErr() << "GxsGxsChannelGroupItem::loadGroup() ERROR getting data" << std::endl;
return;
}
if (groups.size() != 1)
{
std::cerr << "GxsGxsChannelGroupItem::loadGroup() Wrong number of Items";
std::cerr << std::endl;
return;
}
RsGxsChannelGroup group(groups[0]);
RsQThreadUtils::postToObject( [group,this]()
{
/* Here it goes any code you want to be executed on the Qt Gui
* thread, for example to update the data model with new information
* after a blocking call to RetroShare API complete */
mGroupMeta = group.mMeta;
}, this );
});
}

13
retroshare-gui/src/gui/feeds/GxsChannelPostItem.h
View File

@ -49,17 +49,12 @@ public:
GxsChannelPostItem(FeedHolder *feedHolder, uint32_t feedId, const RsGroupMetaData& group, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate, const std::set<RsGxsMessageId>& older_versions = std::set<RsGxsMessageId>()); GxsChannelPostItem(FeedHolder *feedHolder, uint32_t feedId, const RsGroupMetaData& group, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate, const std::set<RsGxsMessageId>& older_versions = std::set<RsGxsMessageId>());
// // This method can be called when additional information is known about the post. In this case, the widget will be initialized with some
// // minimap information from the post and completed when the use displays it, which shouldn't cost anything more.
//
// GxsChannelPostItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsChannelPost& post, bool isHome, bool autoUpdate, const std::set<RsGxsMessageId>& older_versions = std::set<RsGxsMessageId>());
virtual ~GxsChannelPostItem(); virtual ~GxsChannelPostItem();
uint64_t uniqueIdentifier() const override { return hash_64bits("GxsChannelPostItem " + messageId().toStdString()) ; } uint64_t uniqueIdentifier() const override { return hash_64bits("GxsChannelPostItem " + messageId().toStdString()) ; }
bool setGroup(const RsGxsChannelGroup &group, bool doFill = true); bool setGroup(const RsGxsChannelGroup& group, bool doFill = true);
bool setPost(const RsGxsChannelPost &post, bool doFill = true); bool setPost(const RsGxsChannelPost& post, bool doFill = true);
void setFileCleanUpWarning(uint32_t time_left); void setFileCleanUpWarning(uint32_t time_left);
@ -72,7 +67,7 @@ public:
static uint64_t computeIdentifier(const RsGxsMessageId& msgid) { return hash64("GxsChannelPostItem " + msgid.toStdString()) ; } static uint64_t computeIdentifier(const RsGxsMessageId& msgid) { return hash64("GxsChannelPostItem " + msgid.toStdString()) ; }
protected: protected:
void init(const RsGxsMessageId& messageId,const std::set<RsGxsMessageId>& older_versions); //void init(const RsGxsMessageId& messageId,const std::set<RsGxsMessageId>& older_versions);
/* FeedItem */ /* FeedItem */
virtual void doExpand(bool open); virtual void doExpand(bool open);
@ -81,7 +76,7 @@ protected:
// This does nothing except triggering the loading of the post data and comments. This function is mainly used to detect // This does nothing except triggering the loading of the post data and comments. This function is mainly used to detect
// when the post is actually made visible. // when the post is actually made visible.
virtual void paintEvent(QPaintEvent *); virtual void paintEvent(QPaintEvent *) override;
/* GxsGroupFeedItem */ /* GxsGroupFeedItem */
virtual QString groupName(); virtual QString groupName();