From 8e153b4acceef7ca167319efbc14d4ac2b17bfb0 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 6 Feb 2020 19:57:23 +0100 Subject: [PATCH 01/12] started removal of GxsBroadcastBase class --- libretroshare/src/gxs/rsgenexchange.cc | 1 + libretroshare/src/retroshare/rsidentity.h | 1 + libretroshare/src/services/p3postbase.cc | 12 +++--- libretroshare/src/services/p3postbase.h | 3 -- libretroshare/src/services/p3posted.h | 5 --- libretroshare/src/services/p3wiki.cc | 2 - libretroshare/src/services/p3wire.cc | 2 - .../src/gui/Circles/CirclesDialog.cpp | 2 +- .../src/gui/Circles/CirclesDialog.h | 2 +- retroshare-gui/src/gui/Identity/IdDialog.cpp | 38 ++++++++++--------- retroshare-gui/src/gui/Identity/IdDialog.h | 2 +- .../src/gui/People/PeopleDialog.cpp | 8 ++-- retroshare-gui/src/gui/People/PeopleDialog.h | 4 +- .../src/gui/Posted/PostedDialog.cpp | 6 --- .../src/gui/common/FriendSelectionWidget.cpp | 2 +- .../src/gui/common/FriendSelectionWidget.h | 2 +- retroshare-gui/src/gui/gxs/GxsFeedItem.cpp | 2 + retroshare-gui/src/gui/gxs/GxsFeedItem.h | 2 +- .../src/gui/gxs/GxsGroupFeedItem.cpp | 9 ++++- retroshare-gui/src/gui/gxs/GxsGroupFeedItem.h | 4 +- .../src/gui/gxs/GxsGroupFrameDialog.cpp | 22 ++++------- .../src/gui/gxs/GxsGroupFrameDialog.h | 3 +- retroshare-gui/src/gui/gxs/GxsIdChooser.cpp | 7 ++-- retroshare-gui/src/gui/gxs/GxsIdChooser.h | 2 +- .../src/gui/gxs/GxsMessageFramePostWidget.cpp | 4 +- .../src/gui/gxs/GxsMessageFrameWidget.cpp | 2 +- .../src/gui/gxs/GxsMessageFrameWidget.h | 2 +- retroshare-gui/src/gui/gxs/GxsUserNotify.cpp | 12 +++--- .../src/gui/gxs/RsGxsUpdateBroadcastBase.h | 2 +- .../src/gui/gxs/RsGxsUpdateBroadcastPage.h | 2 +- .../gui/gxs/RsGxsUpdateBroadcastWidget.cpp | 2 + .../src/gui/gxs/RsGxsUpdateBroadcastWidget.h | 2 +- .../src/gui/gxschannels/GxsChannelDialog.cpp | 6 --- .../src/gui/gxschannels/GxsChannelDialog.h | 2 +- .../gui/gxsforums/GxsForumThreadWidget.cpp | 4 +- .../src/gui/gxsforums/GxsForumsDialog.cpp | 6 --- .../gui/statistics/GxsTransportStatistics.cpp | 2 +- .../gui/statistics/GxsTransportStatistics.h | 2 +- retroshare-gui/src/retroshare-gui.pro | 12 +++--- .../services/gxs/gxstestservice.cc | 2 - 40 files changed, 94 insertions(+), 113 deletions(-) diff --git a/libretroshare/src/gxs/rsgenexchange.cc b/libretroshare/src/gxs/rsgenexchange.cc index a973bc1ef..ff54d48a1 100644 --- a/libretroshare/src/gxs/rsgenexchange.cc +++ b/libretroshare/src/gxs/rsgenexchange.cc @@ -1112,6 +1112,7 @@ static void addMessageChanged(std::map > void RsGenExchange::receiveChanges(std::vector& changes) { + std::cerr << "*********************************** RsGenExchange::receiveChanges()" << std::endl; #ifdef GEN_EXCH_DEBUG std::cerr << "RsGenExchange::receiveChanges()" << std::endl; #endif diff --git a/libretroshare/src/retroshare/rsidentity.h b/libretroshare/src/retroshare/rsidentity.h index 2874ccc91..d30e55978 100644 --- a/libretroshare/src/retroshare/rsidentity.h +++ b/libretroshare/src/retroshare/rsidentity.h @@ -309,6 +309,7 @@ enum class RsGxsIdentityEventCode: uint8_t UNKNOWN = 0x00, NEW_IDENTITY = 0x01, DELETED_IDENTITY = 0x02, + UPDATED_IDENTITY = 0x03, }; struct RsGxsIdentityEvent: public RsEvent diff --git a/libretroshare/src/services/p3postbase.cc b/libretroshare/src/services/p3postbase.cc index 309c3ee16..faaa1efb3 100644 --- a/libretroshare/src/services/p3postbase.cc +++ b/libretroshare/src/services/p3postbase.cc @@ -174,11 +174,6 @@ void p3PostBase::notifyChanges(std::vector &changes) delete *it; } - -#ifdef POSTBASE_DEBUG - std::cerr << "p3PostBase::notifyChanges() -> receiveChanges()"; - std::cerr << std::endl; -#endif } void p3PostBase::service_tick() @@ -615,7 +610,9 @@ void p3PostBase::background_loadMsgs(const uint32_t &token, bool unprocessed) #endif changes.push_back(msgChanges); - receiveHelperChanges(changes); + //receiveHelperChanges(changes); + + notifyChanges(changes); } else { @@ -768,7 +765,8 @@ void p3PostBase::background_updateVoteCounts(const uint32_t &token) #endif changes.push_back(msgChanges); - receiveHelperChanges(changes); + //receiveHelperChanges(changes); + notifyChanges(changes); } else { diff --git a/libretroshare/src/services/p3postbase.h b/libretroshare/src/services/p3postbase.h index 1e63b0dcd..8fc305b45 100644 --- a/libretroshare/src/services/p3postbase.h +++ b/libretroshare/src/services/p3postbase.h @@ -72,9 +72,6 @@ class p3PostBase: public RsGenExchange, public GxsTokenQueue, public RsTickEvent virtual void service_tick(); - // This should be overloaded to call RsGxsIfaceHelper::receiveChanges(). -virtual void receiveHelperChanges(std::vector& changes) = 0; - protected: virtual void notifyChanges(std::vector& changes); diff --git a/libretroshare/src/services/p3posted.h b/libretroshare/src/services/p3posted.h index 402f69298..494a6cf5d 100644 --- a/libretroshare/src/services/p3posted.h +++ b/libretroshare/src/services/p3posted.h @@ -53,11 +53,6 @@ virtual void notifyChanges(std::vector& changes) public: -virtual void receiveHelperChanges(std::vector& changes) -{ - return RsGxsIfaceHelper::receiveChanges(changes); -} - // Posted Specific DataTypes. virtual bool getGroupData(const uint32_t &token, std::vector &groups); virtual bool getPostData(const uint32_t &token, std::vector &posts, std::vector &cmts); diff --git a/libretroshare/src/services/p3wiki.cc b/libretroshare/src/services/p3wiki.cc index 26c33881a..1d770b5e5 100644 --- a/libretroshare/src/services/p3wiki.cc +++ b/libretroshare/src/services/p3wiki.cc @@ -102,8 +102,6 @@ void p3Wiki::notifyChanges(std::vector& changes) { std::cerr << "p3Wiki::notifyChanges() New stuff"; std::cerr << std::endl; - - RsGxsIfaceHelper::receiveChanges(changes); } /* Specific Service Data */ diff --git a/libretroshare/src/services/p3wire.cc b/libretroshare/src/services/p3wire.cc index 23d31198f..fda88f7a2 100644 --- a/libretroshare/src/services/p3wire.cc +++ b/libretroshare/src/services/p3wire.cc @@ -88,8 +88,6 @@ void p3Wire::notifyChanges(std::vector& changes) { std::cerr << "p3Wire::notifyChanges() New stuff"; std::cerr << std::endl; - - RsGxsIfaceHelper::receiveChanges(changes); } /* Specific Service Data */ diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.cpp b/retroshare-gui/src/gui/Circles/CirclesDialog.cpp index 64dff16df..41fd4e9f2 100644 --- a/retroshare-gui/src/gui/Circles/CirclesDialog.cpp +++ b/retroshare-gui/src/gui/Circles/CirclesDialog.cpp @@ -50,7 +50,7 @@ /** Constructor */ CirclesDialog::CirclesDialog(QWidget *parent) - : RsGxsUpdateBroadcastPage(rsGxsCircles, parent) + : MainPage(parent) { /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.h b/retroshare-gui/src/gui/Circles/CirclesDialog.h index ecaff3f29..4d39986ac 100644 --- a/retroshare-gui/src/gui/Circles/CirclesDialog.h +++ b/retroshare-gui/src/gui/Circles/CirclesDialog.h @@ -31,7 +31,7 @@ class UIStateHelper; -class CirclesDialog : public RsGxsUpdateBroadcastPage, public TokenResponse +class CirclesDialog : public MainPage, public TokenResponse { Q_OBJECT diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index cb9a2242d..bf93ded07 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -37,7 +37,7 @@ #include "gui/common/UIStateHelper.h" #include "gui/common/UserNotify.h" #include "gui/gxs/GxsIdDetails.h" -#include "gui/gxs/RsGxsUpdateBroadcastBase.h" +//#include "gui/gxs/RsGxsUpdateBroadcastBase.h" #include "gui/msgs/MessageComposer.h" #include "gui/settings/rsharesettings.h" #include "util/qtthreadsutils.h" @@ -142,9 +142,7 @@ class TreeWidgetItem : public QTreeWidgetItem }; /** Constructor */ -IdDialog::IdDialog(QWidget *parent) : - RsGxsUpdateBroadcastPage(rsIdentity, parent), - ui(new Ui::IdDialog) +IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog) { ui->setupUi(this); @@ -156,9 +154,9 @@ IdDialog::IdDialog(QWidget *parent) : mEventHandlerId_circles = 0; rsEvents->registerEventsHandler(RsEventType::GXS_CIRCLES, [this](std::shared_ptr event) { RsQThreadUtils::postToObject( [=]() { handleEvent_main_thread(event); }, this ); }, mEventHandlerId_circles ); - // This is used to grab the broadcast of changes from p3GxsCircles, which is discarded by the current dialog, since it expects data for p3Identity only. - mCirclesBroadcastBase = new RsGxsUpdateBroadcastBase(rsGxsCircles, this); - connect(mCirclesBroadcastBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateCirclesDisplay(bool))); + // This is used to grab the broadcast of changes from p3GxsCircles, which is discarded by the current dialog, since it expects data for p3Identity only. + //mCirclesBroadcastBase = new RsGxsUpdateBroadcastBase(rsGxsCircles, this); + //connect(mCirclesBroadcastBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateCirclesDisplay(bool))); ownItem = new QTreeWidgetItem(); ownItem->setText(0, tr("My own identities")); @@ -419,8 +417,14 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr event) { case RsGxsIdentityEventCode::DELETED_IDENTITY: case RsGxsIdentityEventCode::NEW_IDENTITY: + case RsGxsIdentityEventCode::UPDATED_IDENTITY: requestIdList(); + + if(!mId.isNull() && mId == e->mIdentityId) + requestIdDetails(); + + break; default: break; } @@ -2205,16 +2209,16 @@ void IdDialog::updateDisplay(bool complete) } requestCircleGroupMeta(); - std::set grpIds; - getAllGrpIds(grpIds); - if (!getGrpIds().empty()) { - requestIdList(); - - if (!mId.isNull() && grpIds.find(mId)!=grpIds.end()) { - requestIdDetails(); - requestRepList(); - } - } +// std::set grpIds; +// getAllGrpIds(grpIds); +// if (!getGrpIds().empty()) { +// requestIdList(); +// +// if (!mId.isNull() && grpIds.find(mId)!=grpIds.end()) { +// requestIdDetails(); +// requestRepList(); +// } +// } } void IdDialog::addIdentity() diff --git a/retroshare-gui/src/gui/Identity/IdDialog.h b/retroshare-gui/src/gui/Identity/IdDialog.h index e4c73229d..40a975eb8 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.h +++ b/retroshare-gui/src/gui/Identity/IdDialog.h @@ -45,7 +45,7 @@ struct CircleUpdateOrder uint32_t action ; }; -class IdDialog : public RsGxsUpdateBroadcastPage, public TokenResponse +class IdDialog : public MainPage, public TokenResponse { Q_OBJECT diff --git a/retroshare-gui/src/gui/People/PeopleDialog.cpp b/retroshare-gui/src/gui/People/PeopleDialog.cpp index 626df8206..ca7075c00 100644 --- a/retroshare-gui/src/gui/People/PeopleDialog.cpp +++ b/retroshare-gui/src/gui/People/PeopleDialog.cpp @@ -25,7 +25,7 @@ #include "gui/msgs/MessageComposer.h" #include "gui/RetroShareLink.h" #include "gui/gxs/GxsIdDetails.h" -#include "gui/gxs/RsGxsUpdateBroadcastBase.h" +//#include "gui/gxs/RsGxsUpdateBroadcastBase.h" #include "gui/Identity/IdDetailsDialog.h" #include "gui/Identity/IdDialog.h" #include "gui/MainWindow.h" @@ -53,7 +53,7 @@ const uint32_t PeopleDialog::PD_CIRCLES = 0x0004 ; /** Constructor */ PeopleDialog::PeopleDialog(QWidget *parent) - : RsGxsUpdateBroadcastPage(rsIdentity, parent) + : MainPage(parent) { setupUi(this); @@ -61,8 +61,8 @@ PeopleDialog::PeopleDialog(QWidget *parent) mIdentityQueue = new TokenQueue(rsIdentity->getTokenService(), this); mCirclesQueue = new TokenQueue(rsGxsCircles->getTokenService(), this); // This is used to grab the broadcast of changes from p3GxsCircles, which is discarded by the current dialog, since it expects data for p3Identity only. - mCirclesBroadcastBase = new RsGxsUpdateBroadcastBase(rsGxsCircles, this); - connect(mCirclesBroadcastBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateCirclesDisplay(bool))); + //mCirclesBroadcastBase = new RsGxsUpdateBroadcastBase(rsGxsCircles, this); + //connect(mCirclesBroadcastBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateCirclesDisplay(bool))); tabWidget->removeTab(1); diff --git a/retroshare-gui/src/gui/People/PeopleDialog.h b/retroshare-gui/src/gui/People/PeopleDialog.h index bf8e7b1ea..808c61a26 100644 --- a/retroshare-gui/src/gui/People/PeopleDialog.h +++ b/retroshare-gui/src/gui/People/PeopleDialog.h @@ -33,7 +33,7 @@ #define IMAGE_IDENTITY ":/icons/png/people.png" -class PeopleDialog : public RsGxsUpdateBroadcastPage, public Ui::PeopleDialog, public TokenResponse +class PeopleDialog : public MainPage, public Ui::PeopleDialog, public TokenResponse { Q_OBJECT @@ -97,7 +97,7 @@ private: TokenQueue *mIdentityQueue; TokenQueue *mCirclesQueue; - RsGxsUpdateBroadcastBase *mCirclesBroadcastBase ; + //RsGxsUpdateBroadcastBase *mCirclesBroadcastBase ; FlowLayout *_flowLayoutExt; std::map _gxs_identity_widgets ; diff --git a/retroshare-gui/src/gui/Posted/PostedDialog.cpp b/retroshare-gui/src/gui/Posted/PostedDialog.cpp index e696db36c..b7a098f60 100644 --- a/retroshare-gui/src/gui/Posted/PostedDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedDialog.cpp @@ -60,13 +60,7 @@ void PostedDialog::handleEvent_main_thread(std::shared_ptr event) switch(e->mPostedEventCode) { case RsPostedEventCode::NEW_MESSAGE: - updateMessageSummaryList(e->mPostedGroupId); - break; - case RsPostedEventCode::UPDATED_MESSAGE: // [[fallthrough]]; - updateDisplay(false); - break; - case RsPostedEventCode::READ_STATUS_CHANGED: // [[fallthrough]]; updateMessageSummaryList(e->mPostedGroupId); break; diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp index 2770622fe..9cad929e0 100644 --- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp +++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp @@ -80,7 +80,7 @@ static void setSelected(FriendSelectionWidget::Modus modus, QTreeWidgetItem *ite } FriendSelectionWidget::FriendSelectionWidget(QWidget *parent) - : RsGxsUpdateBroadcastPage(rsIdentity,parent), ui(new Ui::FriendSelectionWidget) + : QWidget(parent), ui(new Ui::FriendSelectionWidget) { ui->setupUi(this); diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.h b/retroshare-gui/src/gui/common/FriendSelectionWidget.h index 3b7a3db6c..50fb30f07 100644 --- a/retroshare-gui/src/gui/common/FriendSelectionWidget.h +++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.h @@ -34,7 +34,7 @@ class FriendSelectionWidget; class QTreeWidgetItem; class RSTreeWidgetItemCompareRole; -class FriendSelectionWidget : public RsGxsUpdateBroadcastPage, public TokenResponse +class FriendSelectionWidget : public QWidget, public TokenResponse { Q_OBJECT diff --git a/retroshare-gui/src/gui/gxs/GxsFeedItem.cpp b/retroshare-gui/src/gui/gxs/GxsFeedItem.cpp index 98873445a..2f11fe00e 100644 --- a/retroshare-gui/src/gui/gxs/GxsFeedItem.cpp +++ b/retroshare-gui/src/gui/gxs/GxsFeedItem.cpp @@ -86,6 +86,7 @@ void GxsFeedItem::copyMessageLink() } } +#ifdef TO_REMOVE void GxsFeedItem::fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete) { GxsGroupFeedItem::fillDisplay(updateBroadcastBase, complete); @@ -101,6 +102,7 @@ void GxsFeedItem::fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, boo requestMessage(); } } +#endif void GxsFeedItem::requestMessage() { diff --git a/retroshare-gui/src/gui/gxs/GxsFeedItem.h b/retroshare-gui/src/gui/gxs/GxsFeedItem.h index 9b0fa9474..91fda9cf6 100644 --- a/retroshare-gui/src/gui/gxs/GxsFeedItem.h +++ b/retroshare-gui/src/gui/gxs/GxsFeedItem.h @@ -50,7 +50,7 @@ protected: /* GxsGroupFeedItem */ virtual bool isLoading(); - virtual void fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete); + //virtual void fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete); /* TokenResponse */ virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req); diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp index 1f5b09cb8..b8d60dd24 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp @@ -51,6 +51,7 @@ GxsGroupFeedItem::GxsGroupFeedItem(FeedHolder *feedHolder, uint32_t feedId, cons mLoadQueue = NULL; +#ifdef TO_REMOVE if (mGxsIface && autoUpdate) { /* Connect to update broadcast */ mUpdateBroadcastBase = new RsGxsUpdateBroadcastBase(mGxsIface); @@ -58,6 +59,7 @@ GxsGroupFeedItem::GxsGroupFeedItem(FeedHolder *feedHolder, uint32_t feedId, cons } else { mUpdateBroadcastBase = NULL; } +#endif } GxsGroupFeedItem::~GxsGroupFeedItem() @@ -71,10 +73,12 @@ GxsGroupFeedItem::~GxsGroupFeedItem() delete mLoadQueue; } +#ifdef TO_REMOVE if (mUpdateBroadcastBase) { delete(mUpdateBroadcastBase); } +#endif } bool GxsGroupFeedItem::initLoadQueue() @@ -139,9 +143,11 @@ void GxsGroupFeedItem::copyGroupLink() void GxsGroupFeedItem::fillDisplaySlot(bool complete) { - fillDisplay(mUpdateBroadcastBase, complete); + requestGroup(); +// fillDisplay(mUpdateBroadcastBase, complete); } +#ifdef TO_REMOVE void GxsGroupFeedItem::fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool /*complete*/) { std::set grpIds; @@ -150,6 +156,7 @@ void GxsGroupFeedItem::fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase if (grpIds.find(groupId()) != grpIds.end()) requestGroup(); } +#endif /***********************************************************/ diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.h b/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.h index 9696490d9..6c9c8d21d 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.h +++ b/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.h @@ -56,7 +56,7 @@ protected: virtual void loadGroup(const uint32_t &token) = 0; virtual RetroShareLink::enumType getLinkType() = 0; virtual QString groupName() = 0; - virtual void fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete); + //virtual void fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete); /* TokenResponse */ virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req); @@ -77,7 +77,7 @@ private slots: private: RsGxsGroupId mGroupId; - RsGxsUpdateBroadcastBase *mUpdateBroadcastBase; +// RsGxsUpdateBroadcastBase *mUpdateBroadcastBase; uint32_t mNextTokenType; uint32_t mTokenTypeGroup; }; diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp index d2aa30ce3..bb092454b 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp @@ -68,7 +68,7 @@ /** Constructor */ GxsGroupFrameDialog::GxsGroupFrameDialog(RsGxsIfaceHelper *ifaceImpl, QWidget *parent,bool allow_dist_sync) -: RsGxsUpdateBroadcastPage(ifaceImpl, parent) +: MainPage(parent) { /* Invoke the Qt Designer generated object setup routine */ ui = new Ui::GxsGroupFrameDialog(); @@ -179,7 +179,9 @@ void GxsGroupFrameDialog::showEvent(QShowEvent *event) initUi(); } - RsGxsUpdateBroadcastPage::showEvent(event); + updateDisplay(true); + +// RsGxsUpdateBroadcastPage::showEvent(event); } void GxsGroupFrameDialog::processSettings(bool load) @@ -239,25 +241,15 @@ void GxsGroupFrameDialog::setHideTabBarWithOneTab(bool hideTabBarWithOneTab) void GxsGroupFrameDialog::updateDisplay(bool complete) { - if (complete || !getGrpIds().empty() || !getGrpIdsMeta().empty()) { - /* Update group list */ - requestGroupSummary(); - } else { - /* Update all groups of changed messages */ - std::map > msgIds; - getAllMsgIds(msgIds); - - for (auto msgIt = msgIds.begin(); msgIt != msgIds.end(); ++msgIt) { - updateMessageSummaryList(msgIt->first); - } - } + if(complete) // || !getGrpIds().empty() || !getGrpIdsMeta().empty()) { + requestGroupSummary(); /* Update group list */ updateSearchResults() ; } void GxsGroupFrameDialog::updateSearchResults() { - const std::set& reqs = getSearchResults(); + const std::set& reqs = getSearchRequests(); for(auto it(reqs.begin());it!=reqs.end();++it) { diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h index 29a22d781..86cf3252a 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h +++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h @@ -44,7 +44,7 @@ class UIStateHelper; struct RsGxsCommentService; class GxsCommentDialog; -class GxsGroupFrameDialog : public RsGxsUpdateBroadcastPage, public TokenResponse +class GxsGroupFrameDialog : public MainPage, public TokenResponse { Q_OBJECT @@ -98,6 +98,7 @@ protected: void updateMessageSummaryList(RsGxsGroupId groupId); + virtual const std::set getSearchRequests() const { return std::set(); } // overload this for subclasses that provide distant search private slots: void todo(); diff --git a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp index e4e20dfd8..60d813111 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp @@ -51,8 +51,8 @@ GxsIdChooser::GxsIdChooser(QWidget *parent) : QComboBox(parent), mFlags(IDCHOOSER_ANON_DEFAULT) { - mBase = new RsGxsUpdateBroadcastBase(rsIdentity, this); - connect(mBase, SIGNAL(fillDisplay(bool)), this, SLOT(fillDisplay(bool))); +// mBase = new RsGxsUpdateBroadcastBase(rsIdentity, this); +// connect(mBase, SIGNAL(fillDisplay(bool)), this, SLOT(fillDisplay(bool))); /* Initialize ui */ setSizeAdjustPolicy(QComboBox::AdjustToContents); @@ -94,7 +94,8 @@ void GxsIdChooser::fillDisplay(bool complete) void GxsIdChooser::showEvent(QShowEvent *event) { - mBase->showEvent(event); +// mBase->showEvent(event); + updateDisplay(true); QComboBox::showEvent(event); } diff --git a/retroshare-gui/src/gui/gxs/GxsIdChooser.h b/retroshare-gui/src/gui/gxs/GxsIdChooser.h index dbd9fb91f..3cee770eb 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdChooser.h +++ b/retroshare-gui/src/gui/gxs/GxsIdChooser.h @@ -86,7 +86,7 @@ private: uint32_t mAllowedCount ; std::set mConstraintIdsSet ; // leave empty if all allowed - RsGxsUpdateBroadcastBase *mBase; +// RsGxsUpdateBroadcastBase *mBase; }; #endif diff --git a/retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp b/retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp index bff646b01..ed7e910d2 100644 --- a/retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp +++ b/retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp @@ -55,7 +55,7 @@ void GxsMessageFramePostWidget::groupIdChanged() emit groupChanged(this); - fillComplete(); + updateDisplay(true); } QString GxsMessageFramePostWidget::groupName(bool /*withUnreadCount*/) @@ -107,6 +107,7 @@ void GxsMessageFramePostWidget::updateDisplay(bool complete) return; } +#ifdef TO_REMOVE bool updateGroup = false; const std::set &grpIdsMeta = getGrpIdsMeta(); @@ -133,6 +134,7 @@ void GxsMessageFramePostWidget::updateDisplay(bool complete) if (updateGroup) { requestGroupData(); } +#endif } void GxsMessageFramePostWidget::fillThreadAddPost(const QVariant &post, bool related, int current, int count) diff --git a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp index 4e8780435..8d9a89a47 100644 --- a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp +++ b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp @@ -24,7 +24,7 @@ #include GxsMessageFrameWidget::GxsMessageFrameWidget(RsGxsIfaceHelper *ifaceImpl, QWidget *parent) - : RsGxsUpdateBroadcastWidget(ifaceImpl, parent) + : QWidget(parent) { mNextTokenType = 0; diff --git a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h index 41b98dc6b..9b9a8e34e 100644 --- a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h +++ b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h @@ -27,7 +27,7 @@ struct RsGxsIfaceHelper; class UIStateHelper; -class GxsMessageFrameWidget : public RsGxsUpdateBroadcastWidget, public TokenResponse +class GxsMessageFrameWidget : public QWidget, public TokenResponse { Q_OBJECT diff --git a/retroshare-gui/src/gui/gxs/GxsUserNotify.cpp b/retroshare-gui/src/gui/gxs/GxsUserNotify.cpp index ec2e0b09a..bca319e9a 100644 --- a/retroshare-gui/src/gui/gxs/GxsUserNotify.cpp +++ b/retroshare-gui/src/gui/gxs/GxsUserNotify.cpp @@ -19,7 +19,7 @@ *******************************************************************************/ #include "GxsUserNotify.h" -#include "gui/gxs/RsGxsUpdateBroadcastBase.h" +//#include "gui/gxs/RsGxsUpdateBroadcastBase.h" #include "retroshare/rsgxsifacehelper.h" @@ -36,8 +36,8 @@ GxsUserNotify::GxsUserNotify(RsGxsIfaceHelper *ifaceImpl, QObject *parent) : mTokenService = mInterface->getTokenService(); mTokenQueue = new TokenQueue(mInterface->getTokenService(), this); - mBase = new RsGxsUpdateBroadcastBase(ifaceImpl); - connect(mBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateIcon())); + //mBase = new RsGxsUpdateBroadcastBase(ifaceImpl); + //connect(mBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateIcon())); } GxsUserNotify::~GxsUserNotify() @@ -45,9 +45,9 @@ GxsUserNotify::~GxsUserNotify() if (mTokenQueue) { delete(mTokenQueue); } - if (mBase) { - delete(mBase); - } + //if (mBase) { + //delete(mBase); + //} } void GxsUserNotify::startUpdate() diff --git a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.h b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.h index ef19a1967..8c603ae84 100644 --- a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.h +++ b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.h @@ -47,7 +47,7 @@ public: const std::map > &getMsgIds() { return mMsgIds; } const std::map > &getMsgIdsMeta() { return mMsgIdsMeta; } void getAllMsgIds(std::map > &msgIds); - const std::set& getSearchResults() { return mTurtleResults ; } + const std::set& getSearchRequests() { return mTurtleResults ; } protected: void fillComplete(); diff --git a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h index ebf1000af..2e13e0910 100644 --- a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h +++ b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h @@ -52,7 +52,7 @@ public: const std::map > &getMsgIdsMeta(); void getAllMsgIds(std::map > &msgIds); - virtual const std::set getSearchResults() const { return std::set(); } // overload this for subclasses that provide distant search + virtual const std::set getSearchRequests() const { return std::set(); } // overload this for subclasses that provide distant search protected: virtual void showEvent(QShowEvent *event); diff --git a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.cpp b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.cpp index 98c6354e1..07e55cd94 100644 --- a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.cpp +++ b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.cpp @@ -49,10 +49,12 @@ const std::set &RsGxsUpdateBroadcastWidget::getGrpIds() return mBase->getGrpIds(); } +#ifdef TO_REMOVE const std::set& RsGxsUpdateBroadcastWidget::getSearchResults() { return mBase->getSearchResults(); } +#endif const std::set &RsGxsUpdateBroadcastWidget::getGrpIdsMeta() { return mBase->getGrpIdsMeta(); diff --git a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.h b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.h index d1404b656..016c58214 100644 --- a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.h +++ b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.h @@ -51,7 +51,7 @@ public: const std::map > &getMsgIds(); const std::map > &getMsgIdsMeta(); void getAllMsgIds(std::map > &msgIds); - const std::set& getSearchResults() ; + const std::set& getSearchquests() ; RsGxsIfaceHelper *interfaceHelper() { return mInterfaceHelper; } diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp index e8534e8f7..6588d85c2 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp @@ -65,13 +65,7 @@ void GxsChannelDialog::handleEvent_main_thread(std::shared_ptr ev switch(e->mChannelEventCode) { case RsChannelEventCode::NEW_MESSAGE: - updateMessageSummaryList(e->mChannelGroupId); - break; - case RsChannelEventCode::UPDATED_MESSAGE: // [[fallthrough]]; - updateDisplay(false); - break; - case RsChannelEventCode::READ_STATUS_CHANGED: updateMessageSummaryList(e->mChannelGroupId); break; diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h index 1ab59ca1e..9413b3057 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h @@ -48,7 +48,7 @@ protected: virtual QString getHelpString() const ; virtual void groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata); virtual bool getDistantSearchResults(TurtleRequestId id, std::map& group_infos); - virtual const std::set getSearchResults() const override { return mSearchResults ; } + virtual const std::set getSearchRequests() const override { return mSearchResults ; } virtual TurtleRequestId distantSearch(const QString& search_string) ; virtual void checkRequestGroup(const RsGxsGroupId& grpId) ; diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp index 85343fdb8..f47f0a1d0 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp @@ -311,7 +311,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget { ui->setupUi(this); - setUpdateWhenInvisible(true); + //setUpdateWhenInvisible(true); //mUpdating = false; mUnreadCount = 0; @@ -680,6 +680,7 @@ void GxsForumThreadWidget::updateDisplay(bool complete) complete = true; } +#ifdef TO_REMOVE if(!complete) { #ifdef DEBUG_FORUMS @@ -725,6 +726,7 @@ void GxsForumThreadWidget::updateDisplay(bool complete) } } } +#endif if(complete) // need to update the group data, reload the messages etc. { diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp index 71766ca63..f37d88736 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp @@ -60,13 +60,7 @@ void GxsForumsDialog::handleEvent_main_thread(std::shared_ptr eve switch(e->mForumEventCode) { case RsForumEventCode::NEW_MESSAGE: - updateMessageSummaryList(e->mForumGroupId); - break; - case RsForumEventCode::UPDATED_MESSAGE: // [[fallthrough]]; - updateDisplay(false); - break; - case RsForumEventCode::READ_STATUS_CHANGED: updateMessageSummaryList(e->mForumGroupId); break; diff --git a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp index b5a42264e..cde8c74da 100644 --- a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp @@ -78,7 +78,7 @@ //#define DEBUG_GXSTRANS_STATS 1 GxsTransportStatistics::GxsTransportStatistics(QWidget *parent) - : RsGxsUpdateBroadcastPage(rsGxsTrans,parent) + : MainPage(parent) { setupUi(this) ; diff --git a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h index a1591ad16..2cf8c78b4 100644 --- a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h +++ b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h @@ -60,7 +60,7 @@ public: std::map messages_metas ; }; -class GxsTransportStatistics: public RsGxsUpdateBroadcastPage, public TokenResponse, public Ui::GxsTransportStatistics +class GxsTransportStatistics: public MainPage, public TokenResponse, public Ui::GxsTransportStatistics { Q_OBJECT diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 188bd9546..8f49a1525 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -1394,9 +1394,9 @@ gxsgui { gui/gxs/GxsMessageFramePostWidget.h \ gui/gxs/GxsGroupFeedItem.h \ gui/gxs/GxsFeedItem.h \ - gui/gxs/RsGxsUpdateBroadcastBase.h \ - gui/gxs/RsGxsUpdateBroadcastWidget.h \ - gui/gxs/RsGxsUpdateBroadcastPage.h \ +# gui/gxs/RsGxsUpdateBroadcastBase.h \ +# gui/gxs/RsGxsUpdateBroadcastWidget.h \ +# gui/gxs/RsGxsUpdateBroadcastPage.h \ gui/gxs/GxsGroupShareKey.h \ gui/gxs/GxsUserNotify.h \ gui/gxs/GxsFeedWidget.h \ @@ -1431,9 +1431,9 @@ gxsgui { gui/gxs/GxsMessageFramePostWidget.cpp \ gui/gxs/GxsGroupFeedItem.cpp \ gui/gxs/GxsFeedItem.cpp \ - gui/gxs/RsGxsUpdateBroadcastBase.cpp \ - gui/gxs/RsGxsUpdateBroadcastWidget.cpp \ - gui/gxs/RsGxsUpdateBroadcastPage.cpp \ +# gui/gxs/RsGxsUpdateBroadcastBase.cpp \ +# gui/gxs/RsGxsUpdateBroadcastWidget.cpp \ +# gui/gxs/RsGxsUpdateBroadcastPage.cpp \ gui/gxs/GxsUserNotify.cpp \ gui/gxs/GxsFeedWidget.cpp \ util/TokenQueue.cpp \ diff --git a/tests/unittests/libretroshare/services/gxs/gxstestservice.cc b/tests/unittests/libretroshare/services/gxs/gxstestservice.cc index e30309942..8d1799507 100644 --- a/tests/unittests/libretroshare/services/gxs/gxstestservice.cc +++ b/tests/unittests/libretroshare/services/gxs/gxstestservice.cc @@ -82,8 +82,6 @@ void GxsTestService::notifyChanges(std::vector& changes) { std::cerr << "GxsTestService::notifyChanges() New stuff"; std::cerr << std::endl; - - RsGxsIfaceHelper::receiveChanges(changes); } /* Specific Service Data */ From 41a81fa5d17edf229cd024747096fd695cb47594 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 9 Feb 2020 20:54:11 +0100 Subject: [PATCH 02/12] fixed notifications in posted --- libretroshare/src/services/p3posted.h | 7 ----- .../src/gui/Posted/PostedListWidget.cpp | 27 +++++++++++++++++++ .../src/gui/Posted/PostedListWidget.h | 3 +++ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/libretroshare/src/services/p3posted.h b/libretroshare/src/services/p3posted.h index 494a6cf5d..ddae541d9 100644 --- a/libretroshare/src/services/p3posted.h +++ b/libretroshare/src/services/p3posted.h @@ -44,13 +44,6 @@ class p3Posted: public p3PostBase, public RsPosted p3Posted(RsGeneralDataService* gds, RsNetworkExchangeService* nes, RsGixs* gixs); virtual RsServiceInfo getServiceInfo(); - protected: - -virtual void notifyChanges(std::vector& changes) -{ - return p3PostBase::notifyChanges(changes); -} - public: // Posted Specific DataTypes. diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.cpp b/retroshare-gui/src/gui/Posted/PostedListWidget.cpp index 0d7960804..544689912 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.cpp +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.cpp @@ -105,6 +105,11 @@ PostedListWidget::PostedListWidget(const RsGxsGroupId &postedId, QWidget *parent /* load settings */ processSettings(true); + mEventHandlerId = 0; + // Needs to be asynced because this function is likely to be called by another thread! + + rsEvents->registerEventsHandler(RsEventType::GXS_POSTED, [this](std::shared_ptr event) { RsQThreadUtils::postToObject( [=]() { handleEvent_main_thread(event); }, this ); }, mEventHandlerId ); + /* Initialize GUI */ setGroupId(postedId); } @@ -116,6 +121,28 @@ PostedListWidget::~PostedListWidget() delete(ui); } +void PostedListWidget::handleEvent_main_thread(std::shared_ptr event) +{ + const RsGxsPostedEvent *e = dynamic_cast(event.get()); + + if(!e) + return; + + switch(e->mPostedEventCode) + { + case RsPostedEventCode::UPDATED_POSTED_GROUP: + case RsPostedEventCode::NEW_POSTED_GROUP: + case RsPostedEventCode::UPDATED_MESSAGE: + case RsPostedEventCode::NEW_MESSAGE: + if(e->mPostedGroupId == groupId()) + updateDisplay(true); + break; + default: + break; + } +} + + void PostedListWidget::processSettings(bool load) { Settings->beginGroup(QString("PostedListWidget")); diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.h b/retroshare-gui/src/gui/Posted/PostedListWidget.h index fa9f25c8e..6e9a89bae 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.h +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.h @@ -57,6 +57,8 @@ public: virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req); protected: + void handleEvent_main_thread(std::shared_ptr event); + /* GxsMessageFramePostWidget */ virtual bool insertGroupData(const uint32_t &token, RsGroupMetaData &metaData); virtual void insertAllPosts(const uint32_t &token, GxsMessageFramePostThread *thread); @@ -126,6 +128,7 @@ private: /* UI - from Designer */ Ui::PostedListWidget *ui; + RsEventsHandlerId_t mEventHandlerId ; }; #endif From 372b87148cbb8ca423ec5190f3469db33cefa0ac Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 9 Feb 2020 22:29:36 +0100 Subject: [PATCH 03/12] fixed text in share publish perms --- retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp index bb092454b..666d8fc27 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp @@ -440,7 +440,7 @@ void GxsGroupFrameDialog::groupTreeCustomPopupMenu(QPoint point) actnn = ctxMenu2->addAction(tr(" Indefinitly"),this,SLOT(setStorePostsDelay())) ; actnn->setData(QVariant( 0)) ; if(current_store_time == 0) { actnn->setEnabled(false);actnn->setIcon(QIcon(":/images/start.png"));} if (shareKeyType()) { - action = contextMnu.addAction(QIcon(IMAGE_SHARE), tr("Share publish permissions"), this, SLOT(sharePublishKey())); + action = contextMnu.addAction(QIcon(IMAGE_SHARE), tr("Share publish permissions..."), this, SLOT(sharePublishKey())); action->setEnabled(!mGroupId.isNull() && isPublisher); } From 07527cfeadf67c7c1170bf7f4bc9ff9e449e2f34 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 10 Feb 2020 20:39:52 +0100 Subject: [PATCH 04/12] fixed notifications in identity --- libretroshare/src/services/p3idservice.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libretroshare/src/services/p3idservice.cc b/libretroshare/src/services/p3idservice.cc index 861c5c224..ada91943f 100644 --- a/libretroshare/src/services/p3idservice.cc +++ b/libretroshare/src/services/p3idservice.cc @@ -625,7 +625,7 @@ void p3IdService::notifyChanges(std::vector &changes) RsGxsGroupChange *groupChange = dynamic_cast(changes[i]); - if (groupChange && !groupChange->metaChange()) + if (groupChange) { #ifdef DEBUG_IDS std::cerr << "p3IdService::notifyChanges() Found Group Change Notification"; @@ -653,6 +653,14 @@ void p3IdService::notifyChanges(std::vector &changes) switch(groupChange->getType()) { case RsGxsNotify::TYPE_PUBLISHED: + { + auto ev = std::make_shared(); + ev->mIdentityId = *git; + ev->mIdentityEventCode = RsGxsIdentityEventCode::UPDATED_IDENTITY; + rsEvents->postEvent(ev); + } + break; + case RsGxsNotify::TYPE_RECEIVED_NEW: { auto ev = std::make_shared(); From 1a250f51384100fa4608b172fae65b5389a5ce1c Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 10 Feb 2020 22:33:21 +0100 Subject: [PATCH 05/12] half-removed token queue system from IdDialog.cpp --- libretroshare/src/services/p3gxscircles.cc | 3 +- retroshare-gui/src/gui/Identity/IdDialog.cpp | 237 ++++++++++--------- retroshare-gui/src/gui/Identity/IdDialog.h | 10 +- 3 files changed, 135 insertions(+), 115 deletions(-) diff --git a/libretroshare/src/services/p3gxscircles.cc b/libretroshare/src/services/p3gxscircles.cc index cb3b4a3ff..7104d67d7 100644 --- a/libretroshare/src/services/p3gxscircles.cc +++ b/libretroshare/src/services/p3gxscircles.cc @@ -484,7 +484,7 @@ void p3GxsCircles::notifyChanges(std::vector &changes) RsGxsMsgChange *msgChange = dynamic_cast(*it); RsGxsNotify *c = *it; - if (msgChange && !msgChange->metaChange()) + if (msgChange) { #ifdef DEBUG_CIRCLES std::cerr << " Found circle Message Change Notification" << std::endl; @@ -521,6 +521,7 @@ void p3GxsCircles::notifyChanges(std::vector &changes) rsEvents->postEvent(ev); } + mCircleCache.erase(circle_id); } } diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index bf93ded07..cb40d4b06 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -393,15 +393,8 @@ IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog) /* Setup TokenQueue */ mCircleQueue = new TokenQueue(rsGxsCircles->getTokenService(), this); - requestCircleGroupMeta(); - - // This timer shouldn't be needed, but it is now, because the update of subscribe status and appartenance to the - // circle doesn't trigger a proper GUI update. - - QTimer *tmer = new QTimer(this) ; - connect(tmer,SIGNAL(timeout()),this,SLOT(updateCirclesDisplay())) ; - - tmer->start(10000) ; // update every 10 secs. + updateCircles(); + updateIdList(); } void IdDialog::handleEvent_main_thread(std::shared_ptr event) @@ -419,7 +412,7 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr event) case RsGxsIdentityEventCode::NEW_IDENTITY: case RsGxsIdentityEventCode::UPDATED_IDENTITY: - requestIdList(); + updateIdList(); if(!mId.isNull() && mId == e->mIdentityId) requestIdDetails(); @@ -445,7 +438,7 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr event) case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_JOIN: case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_REVOQUED: - requestCircleGroupMeta(); + updateCircles(); default: break; } @@ -475,7 +468,7 @@ void IdDialog::toggleAutoBanIdentities(bool b) if(!id.isNull()) { rsReputations->banNode(id,b) ; - requestIdList(); + updateIdList(); } } @@ -490,12 +483,13 @@ void IdDialog::updateCirclesDisplay() #ifdef ID_DEBUG std::cerr << "!!Updating circles display!" << std::endl; #endif - requestCircleGroupMeta() ; + updateCircles() ; } /************************** Request / Response *************************/ /*** Loading Main Index ***/ +#ifdef TO_REMOVE void IdDialog::requestCircleGroupMeta() { mStateHelper->setLoading(CIRCLESDIALOG_GROUPMETA, true); @@ -513,9 +507,6 @@ void IdDialog::requestCircleGroupMeta() uint32_t token; mCircleQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_SUMMARY, opts, CIRCLESDIALOG_GROUPMETA); } - -// should update this code to be called and modify the tree widget accordingly -#ifdef SUSPENDED void IdDialog::requestCircleGroupData(const RsGxsCircleId& circle_id) { mStateHelper->setLoading(CIRCLESDIALOG_GROUPDATA, true); @@ -538,26 +529,44 @@ void IdDialog::requestCircleGroupData(const RsGxsCircleId& circle_id) } #endif -void IdDialog::loadCircleGroupMeta(const uint32_t &token) +void IdDialog::updateCircles() { - mStateHelper->setLoading(CIRCLESDIALOG_GROUPMETA, false); + RsThread::async([this]() + { + // 1 - get message data from p3GxsForums +#ifdef DEBUG_FORUMS + std::cerr << "Retrieving post data for post " << mThreadId << std::endl; +#endif + + std::list circle_metas ; + + if(!rsGxsCircles->getCirclesSummaries(circle_metas)) + { + std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve circles group info list" << std::endl; + return; + } + + RsQThreadUtils::postToObject( [circle_metas,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 */ + + loadCircles(circle_metas); + + }, this ); + + }); +} + +void IdDialog::loadCircles(const std::list& groupInfo) +{ #ifdef ID_DEBUG std::cerr << "CirclesDialog::loadCircleGroupMeta()"; std::cerr << std::endl; #endif - std::list groupInfo; - std::list::iterator vit; - - if (!rsGxsCircles->getGroupSummary(token,groupInfo)) - { - std::cerr << "CirclesDialog::loadCircleGroupMeta() Error getting GroupMeta"; - std::cerr << std::endl; - mStateHelper->setActive(CIRCLESDIALOG_GROUPMETA, false); - return; - } - mStateHelper->setActive(CIRCLESDIALOG_GROUPMETA, true); /* add the top level item */ @@ -585,7 +594,7 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token) std::list own_identities ; rsIdentity->getOwnIds(own_identities) ; - for(vit = groupInfo.begin(); vit != groupInfo.end();++vit) + for(auto vit = groupInfo.begin(); vit != groupInfo.end();++vit) { #ifdef ID_DEBUG std::cerr << "CirclesDialog::loadCircleGroupMeta() GroupId: " << vit->mGroupId << " Group: " << vit->mGroupName << std::endl; @@ -891,6 +900,7 @@ static void mark_matching_tree(QTreeWidget *w, const std::set& members, } } +#ifdef TO_REMOVE void IdDialog::loadCircleGroupData(const uint32_t& token) { #ifdef ID_DEBUG @@ -985,8 +995,8 @@ void IdDialog::updateCircleGroup(const uint32_t& token) rsGxsCircles->updateGroup(token2,cg) ; mCircleUpdates.erase(it) ; - requestCircleGroupMeta(); } +#endif bool IdDialog::getItemCircleId(QTreeWidgetItem *item,RsGxsCircleId& id) { @@ -1011,8 +1021,6 @@ void IdDialog::createExternalCircle() CreateCircleDialog dlg; dlg.editNewId(true); dlg.exec(); - - requestCircleGroupMeta(); // update GUI } void IdDialog::showEditExistingCircle() { @@ -1027,8 +1035,6 @@ void IdDialog::showEditExistingCircle() dlg.editExistingId(RsGxsGroupId(id),true,!(subscribe_flags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN)) ; dlg.exec(); - - requestCircleGroupMeta(); // update GUI } void IdDialog::grantCircleMembership() @@ -1453,7 +1459,7 @@ void IdDialog::filterToggled(const bool &value) QAction *source = qobject_cast(QObject::sender()); if (source) { filter = source->data().toInt(); - requestIdList(); + updateIdList(); } } } @@ -1470,13 +1476,13 @@ void IdDialog::updateSelection() if (id != mId) { mId = id; requestIdDetails(); - requestRepList(); + //updateRepList(); } } -void IdDialog::requestIdList() +void IdDialog::updateIdList() { //Disable by default, will be enable by insertIdDetails() ui->removeIdentity->setEnabled(false); @@ -1485,16 +1491,53 @@ void IdDialog::requestIdList() if (!mIdQueue) return; - mStateHelper->setLoading(IDDIALOG_IDLIST, true); + int accept = filter; - mIdQueue->cancelActiveRequestTokens(IDDIALOG_IDLIST); - RsTokReqOptions opts; - opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; + RsThread::async([this]() + { + // 1 - get message data from p3GxsForums - uint32_t token; +#ifdef DEBUG_FORUMS + std::cerr << "Retrieving post data for post " << mThreadId << std::endl; +#endif - mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, IDDIALOG_IDLIST); + std::list identity_metas ; + + if (!rsIdentity->getIdentitiesSummaries(identity_metas)) + { + std::cerr << "IdDialog::insertIdList() Error getting GroupData" << std::endl; + return; + } + + std::set ids; + for(auto it(identity_metas.begin());it!=identity_metas.end();++it) + ids.insert(RsGxsId((*it).mGroupId)); + + std::vector groups; + + if(!rsIdentity->getIdentitiesInfo(ids,groups)) + { + std::cerr << "IdDialog::insertIdList() Error getting identities info" << std::endl; + return; + } + + std::map ids_set; + + for(auto it(groups.begin());it!=groups.end();++it) + ids_set[(*it).mMeta.mGroupId] = *it; + + RsQThreadUtils::postToObject( [ids_set,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 */ + + loadIdentities(ids_set); + + }, this ); + + }); } bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept) @@ -1656,8 +1699,10 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, return true; } -void IdDialog::insertIdList(uint32_t token) +void IdDialog::loadIdentities(const std::map& ids_set_const) { + auto ids_set(ids_set_const); + //First: Get current item to restore after RsGxsGroupId oldCurrentId = mIdToNavigate; { @@ -1666,35 +1711,7 @@ void IdDialog::insertIdList(uint32_t token) oldCurrentId = RsGxsGroupId(oldCurrent->text(RSID_COL_KEYID).toStdString()); } } - - mStateHelper->setLoading(IDDIALOG_IDLIST, false); - - int accept = filter; - - //RsGxsIdGroup data; - std::vector datavector; - //std::vector::iterator vit; - - if (!rsIdentity->getGroupData(token, datavector)) - { -#ifdef ID_DEBUG - std::cerr << "IdDialog::insertIdList() Error getting GroupData"; - std::cerr << std::endl; -#endif - - mStateHelper->setActive(IDDIALOG_IDLIST, false); - mStateHelper->clear(IDDIALOG_IDLIST); - clearPerson(); - - return; - } - - // turn that vector into a std::set, to avoid a linear search - - std::map ids_set ; - - for(uint32_t i=0;isetActive(IDDIALOG_IDLIST, true); @@ -1709,27 +1726,27 @@ void IdDialog::insertIdList(uint32_t token) while ((item = *itemIterator) != NULL) { ++itemIterator; - std::map::iterator it = ids_set.find(RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString())) ; + auto it = ids_set.find(RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString())) ; if(it == ids_set.end()) { if(item != allItem && item != contactsItem && item != ownItem) delete(item); - - continue ; - } - - QTreeWidgetItem *parent_item = item->parent() ; - - if( (parent_item == allItem && it->second.mIsAContact) || (parent_item == contactsItem && !it->second.mIsAContact)) - { - delete item ; // do not remove from the list, so that it is added again in the correct place. - continue ; - } - + + continue ; + } + + QTreeWidgetItem *parent_item = item->parent() ; + + if( (parent_item == allItem && it->second.mIsAContact) || (parent_item == contactsItem && !it->second.mIsAContact)) + { + delete item ; // do not remove from the list, so that it is added again in the correct place. + continue ; + } + if (!fillIdListItem(it->second, item, ownPgpId, accept)) delete(item); - + ids_set.erase(it); // erase, so it is not considered to be a new item } @@ -2167,7 +2184,7 @@ void IdDialog::modifyReputation() // trigger refresh when finished. // basic / anstype are not needed. requestIdDetails(); - requestIdList(); + updateIdList(); return; } @@ -2201,13 +2218,13 @@ void IdDialog::updateDisplay(bool complete) if (complete) { /* Fill complete */ - requestIdList(); + updateIdList(); //requestIdDetails(); requestRepList(); + updateCircles(); return; } - requestCircleGroupMeta(); // std::set grpIds; // getAllGrpIds(grpIds); @@ -2356,9 +2373,9 @@ void IdDialog::loadRequest(const TokenQueue * queue, const TokenRequest &req) { switch(req.mUserType) { - case IDDIALOG_IDLIST: - insertIdList(req.mToken); - break; +// case IDDIALOG_IDLIST: +// insertIdList(req.mToken); +// break; case IDDIALOG_IDDETAILS: insertIdDetails(req.mToken); @@ -2383,6 +2400,7 @@ void IdDialog::loadRequest(const TokenQueue * queue, const TokenRequest &req) } } +#ifdef TO_REMOVE if(queue == mCircleQueue) { #ifdef ID_DEBUG @@ -2393,17 +2411,17 @@ void IdDialog::loadRequest(const TokenQueue * queue, const TokenRequest &req) /* now switch on req */ switch(req.mUserType) { - case CIRCLESDIALOG_GROUPMETA: - loadCircleGroupMeta(req.mToken); - break; +// case CIRCLESDIALOG_GROUPMETA: +// loadCircleGroupMeta(req.mToken); +// break; - case CIRCLESDIALOG_GROUPDATA: - loadCircleGroupData(req.mToken); - break; - - case CIRCLESDIALOG_GROUPUPDATE: - updateCircleGroup(req.mToken); - break; +// case CIRCLESDIALOG_GROUPDATA: +// loadCircleGroupData(req.mToken); +// break; +// +// case CIRCLESDIALOG_GROUPUPDATE: +// updateCircleGroup(req.mToken); +// break; default: std::cerr << "CirclesDialog::loadRequest() ERROR: INVALID TYPE"; @@ -2411,6 +2429,7 @@ void IdDialog::loadRequest(const TokenQueue * queue, const TokenRequest &req) break; } } +#endif } void IdDialog::IdListCustomPopupMenu( QPoint ) @@ -2744,7 +2763,7 @@ void IdDialog::negativePerson() } requestIdDetails(); - requestIdList(); + updateIdList(); } void IdDialog::neutralPerson() @@ -2760,7 +2779,7 @@ void IdDialog::neutralPerson() } requestIdDetails(); - requestIdList(); + updateIdList(); } void IdDialog::positivePerson() { @@ -2775,7 +2794,7 @@ void IdDialog::positivePerson() } requestIdDetails(); - requestIdList(); + updateIdList(); } void IdDialog::addtoContacts() @@ -2789,7 +2808,7 @@ void IdDialog::addtoContacts() rsIdentity->setAsRegularContact(RsGxsId(Id),true); } - requestIdList(); + updateIdList(); } void IdDialog::removefromContacts() @@ -2803,7 +2822,7 @@ QList selected_items = ui->idTreeWidget->selectedItems(); rsIdentity->setAsRegularContact(RsGxsId(Id),false); } - requestIdList(); + updateIdList(); } void IdDialog::on_closeInfoFrameButton_clicked() diff --git a/retroshare-gui/src/gui/Identity/IdDialog.h b/retroshare-gui/src/gui/Identity/IdDialog.h index 40a975eb8..5f5365775 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.h +++ b/retroshare-gui/src/gui/Identity/IdDialog.h @@ -63,11 +63,12 @@ public: protected: virtual void updateDisplay(bool complete); - void loadCircleGroupMeta(const uint32_t &token); - void loadCircleGroupData(const uint32_t &token); - void updateCircleGroup(const uint32_t& token); + void updateIdList(); + void loadIdentities(const std::map &ids_set); + + void updateCircles(); + void loadCircles(const std::list& circle_metas); - void requestCircleGroupMeta(); //void requestCircleGroupData(const RsGxsCircleId& circle_id); bool getItemCircleId(QTreeWidgetItem *item,RsGxsCircleId& id) ; @@ -123,7 +124,6 @@ private: void requestIdDetails(); void insertIdDetails(uint32_t token); - void requestIdList(); void requestIdData(std::list &ids); bool fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept); void insertIdList(uint32_t token); From e4f243694bb3e4c9547b90caf46997f35203c70c Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 11 Feb 2020 08:36:35 +0100 Subject: [PATCH 06/12] finished removing token queue from IdDialog.cpp --- libretroshare/src/retroshare/rsgxscircles.h | 12 +- libretroshare/src/services/p3gxscircles.cc | 30 +++ libretroshare/src/services/p3gxscircles.h | 4 + retroshare-gui/src/gui/Identity/IdDialog.cpp | 186 +++++++++---------- retroshare-gui/src/gui/Identity/IdDialog.h | 13 +- 5 files changed, 132 insertions(+), 113 deletions(-) diff --git a/libretroshare/src/retroshare/rsgxscircles.h b/libretroshare/src/retroshare/rsgxscircles.h index ed38f5c2d..ab8448611 100644 --- a/libretroshare/src/retroshare/rsgxscircles.h +++ b/libretroshare/src/retroshare/rsgxscircles.h @@ -312,7 +312,7 @@ public: RsGxsCircleMsg& msg) =0; /** - * @brief Invite identities to circle + * @brief Invite identities to circle (admin key is required) * @jsonapi{development} * @param[in] identities ids of the identities to invite * @param[in] circleId Id of the circle you own and want to invite ids in @@ -321,6 +321,16 @@ public: virtual bool inviteIdsToCircle( const std::set& identities, const RsGxsCircleId& circleId ) = 0; + /** + * @brief Remove identities from circle (admin key is required) + * @jsonapi{development} + * @param[in] identities ids of the identities to remove from the invite list + * @param[in] circleId Id of the circle you own and want to invite ids in + * @return false if something failed, true otherwhise + */ + virtual bool revokeIdsFromCircle( const std::set& identities, + const RsGxsCircleId& circleId ) = 0; + /** * @brief Request circle membership, or accept circle invitation * @jsonapi{development} diff --git a/libretroshare/src/services/p3gxscircles.cc b/libretroshare/src/services/p3gxscircles.cc index 7104d67d7..63270e235 100644 --- a/libretroshare/src/services/p3gxscircles.cc +++ b/libretroshare/src/services/p3gxscircles.cc @@ -365,6 +365,36 @@ bool p3GxsCircles::inviteIdsToCircle( const std::set& identities, return editCircle(circleGrp); } +bool p3GxsCircles::revokeIdsFromCircle( const std::set& identities, const RsGxsCircleId& circleId ) +{ + const std::list circlesIds{ RsGxsGroupId(circleId) }; + std::vector circlesInfo; + + if(!getCirclesInfo(circlesIds, circlesInfo)) + { + std::cerr << __PRETTY_FUNCTION__ << "Error! Failure getting group data." << std::endl; + return false; + } + + if(circlesInfo.empty()) + { + std::cerr << __PRETTY_FUNCTION__ << "Error! Circle: " << circleId.toStdString() << " not found!" << std::endl; + return false; + } + + RsGxsCircleGroup& circleGrp = circlesInfo[0]; + + if(!(circleGrp.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN)) + { + std::cerr << __PRETTY_FUNCTION__ << "Error! Attempt to edit non-own " << "circle: " << circleId.toStdString() << std::endl; + return false; + } + + circleGrp.mInvitedMembers.erase(identities.begin(), identities.end()); + + return editCircle(circleGrp); +} + bool p3GxsCircles::exportCircleLink( std::string& link, const RsGxsCircleId& circleId, bool includeGxsData, const std::string& baseUrl, std::string& errMsg ) diff --git a/libretroshare/src/services/p3gxscircles.h b/libretroshare/src/services/p3gxscircles.h index da93142cc..1f91964f0 100644 --- a/libretroshare/src/services/p3gxscircles.h +++ b/libretroshare/src/services/p3gxscircles.h @@ -208,6 +208,10 @@ public: bool inviteIdsToCircle( const std::set& identities, const RsGxsCircleId& circleId ) override; + /// @see RsGxsCircles + bool revokeIdsFromCircle( const std::set& identities, + const RsGxsCircleId& circleId ) override; + /// @see RsGxsCircles bool getCircleRequest(const RsGxsGroupId& circleId, const RsGxsMessageId& msgId, diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index cb40d4b06..ffdc2fe80 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -146,8 +146,6 @@ IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog) { ui->setupUi(this); - mIdQueue = NULL; - mEventHandlerId_identity = 0; rsEvents->registerEventsHandler(RsEventType::GXS_IDENTITY, [this](std::shared_ptr event) { RsQThreadUtils::postToObject( [=]() { handleEvent_main_thread(event); }, this ); }, mEventHandlerId_identity ); @@ -358,8 +356,6 @@ IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog) QHeaderView * idheader = ui->idTreeWidget->header(); QHeaderView_setSectionResizeModeColumn(idheader, RSID_COL_VOTES, QHeaderView::ResizeToContents); - mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this); - mStateHelper->setActive(IDDIALOG_IDDETAILS, false); mStateHelper->setActive(IDDIALOG_REPLIST, false); @@ -389,10 +385,6 @@ IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog) connect(ui->treeWidget_membership, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(CircleListCustomPopupMenu(QPoint))); connect(ui->autoBanIdentities_CB, SIGNAL(toggled(bool)), this, SLOT(toggleAutoBanIdentities(bool))); - - /* Setup TokenQueue */ - mCircleQueue = new TokenQueue(rsGxsCircles->getTokenService(), this); - updateCircles(); updateIdList(); } @@ -415,7 +407,7 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr event) updateIdList(); if(!mId.isNull() && mId == e->mIdentityId) - requestIdDetails(); + updateIdentity(); break; default: @@ -1039,54 +1031,36 @@ void IdDialog::showEditExistingCircle() void IdDialog::grantCircleMembership() { - RsGxsCircleId circle_id ; + RsGxsCircleId circle_id ; if(!getItemCircleId(ui->treeWidget_membership->currentItem(),circle_id)) return; - RsGxsId gxs_id_to_revoke(qobject_cast(sender())->data().toString().toStdString()); + RsGxsId gxs_id_to_grant(qobject_cast(sender())->data().toString().toStdString()); - RsTokReqOptions opts; - opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; + RsThread::async([circle_id,gxs_id_to_grant]() + { + // 1 - get message data from p3GxsForums - std::list grps ; - grps.push_back(RsGxsGroupId(circle_id)); - - uint32_t token; - mCircleQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, grps, CIRCLESDIALOG_GROUPUPDATE); - - CircleUpdateOrder c ; - c.token = token ; - c.gxs_id = gxs_id_to_revoke ; - c.action = CircleUpdateOrder::GRANT_MEMBERSHIP ; - - mCircleUpdates[token] = c ; + rsGxsCircles->inviteIdsToCircle(std::set( { gxs_id_to_grant } ),circle_id); + }); } void IdDialog::revokeCircleMembership() { - RsGxsCircleId circle_id ; + RsGxsCircleId circle_id ; if(!getItemCircleId(ui->treeWidget_membership->currentItem(),circle_id)) return; RsGxsId gxs_id_to_revoke(qobject_cast(sender())->data().toString().toStdString()); - RsTokReqOptions opts; - opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; + RsThread::async([circle_id,gxs_id_to_revoke]() + { + // 1 - get message data from p3GxsForums - std::list grps ; - grps.push_back(RsGxsGroupId(circle_id)); - - uint32_t token; - mCircleQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, grps, CIRCLESDIALOG_GROUPUPDATE); - - CircleUpdateOrder c ; - c.token = token ; - c.gxs_id = gxs_id_to_revoke ; - c.action = CircleUpdateOrder::REVOKE_MEMBERSHIP ; - - mCircleUpdates[token] = c ; + rsGxsCircles->revokeIdsFromCircle(std::set( { gxs_id_to_revoke } ),circle_id); + }); } void IdDialog::acceptCircleSubscription() @@ -1394,7 +1368,6 @@ IdDialog::~IdDialog() processSettings(false); delete(ui); - delete(mIdQueue); } static QString getHumanReadableDuration(uint32_t seconds) @@ -1475,7 +1448,7 @@ void IdDialog::updateSelection() if (id != mId) { mId = id; - requestIdDetails(); + updateIdentity(); //updateRepList(); } } @@ -1488,12 +1461,8 @@ void IdDialog::updateIdList() ui->removeIdentity->setEnabled(false); ui->editIdentity->setEnabled(false); - if (!mIdQueue) - return; - int accept = filter; - RsThread::async([this]() { // 1 - get message data from p3GxsForums @@ -1788,10 +1757,8 @@ void IdDialog::loadIdentities(const std::map& ids_set updateSelection(); } -void IdDialog::requestIdDetails() +void IdDialog::updateIdentity() { - mIdQueue->cancelActiveRequestTokens(IDDIALOG_IDDETAILS); - if (mId.isNull()) { mStateHelper->setActive(IDDIALOG_IDDETAILS, false); @@ -1804,53 +1771,48 @@ void IdDialog::requestIdDetails() mStateHelper->setLoading(IDDIALOG_IDDETAILS, true); - RsTokReqOptions opts; - opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; + RsThread::async([this]() + { +#ifdef ID_DEBUG + std::cerr << "Retrieving post data for identity " << mThreadId << std::endl; +#endif - uint32_t token; - std::list groupIds; - groupIds.push_back(mId); + std::set ids( { RsGxsId(mId) } ) ; + std::vector ids_data; - mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_IDDETAILS); + if(!rsIdentity->getIdentitiesInfo(ids,ids_data)) + { + std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve identities group info for id " << mId << std::endl; + return; + } + + if(ids_data.size() != 1) + { + std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve exactly one group info for id " << mId << std::endl; + return; + } + RsGxsIdGroup group(ids_data[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 */ + + loadIdentity(group); + + }, this ); + }); } -void IdDialog::insertIdDetails(uint32_t token) +void IdDialog::loadIdentity(RsGxsIdGroup data) { mStateHelper->setLoading(IDDIALOG_IDDETAILS, false); /* get details from libretroshare */ - RsGxsIdGroup data; - std::vector datavector; - if (!rsIdentity->getGroupData(token, datavector)) - { - mStateHelper->setActive(IDDIALOG_IDDETAILS, false); - mStateHelper->clear(IDDIALOG_REPLIST); - clearPerson(); - - ui->lineEdit_KeyId->setText("ERROR GETTING KEY!"); - - return; - } - - if (datavector.size() != 1) - { -#ifdef ID_DEBUG - std::cerr << "IdDialog::insertIdDetails() Invalid datavector size"; -#endif - - mStateHelper->setActive(IDDIALOG_IDDETAILS, false); - mStateHelper->clear(IDDIALOG_IDDETAILS); - clearPerson(); - - ui->lineEdit_KeyId->setText("INVALID DV SIZE"); - - return; - } mStateHelper->setActive(IDDIALOG_IDDETAILS, true); - data = datavector[0]; - /* get GPG Details from rsPeers */ RsPgpId ownPgpId = rsPeers->getGPGOwnId(); @@ -2183,7 +2145,7 @@ void IdDialog::modifyReputation() // trigger refresh when finished. // basic / anstype are not needed. - requestIdDetails(); + updateIdentity(); updateIdList(); return; @@ -2220,7 +2182,7 @@ void IdDialog::updateDisplay(bool complete) /* Fill complete */ updateIdList(); //requestIdDetails(); - requestRepList(); + //requestRepList(); updateCircles(); return; @@ -2298,6 +2260,7 @@ void IdDialog::filterIds() ui->idTreeWidget->filterItems(filterColumn, text); } +#ifdef TO_REMOVE void IdDialog::requestRepList() { // Removing this for the moment. @@ -2373,9 +2336,10 @@ void IdDialog::loadRequest(const TokenQueue * queue, const TokenRequest &req) { switch(req.mUserType) { -// case IDDIALOG_IDLIST: -// insertIdList(req.mToken); -// break; +#ifdef TO_REMOVE + case IDDIALOG_IDLIST: + insertIdList(req.mToken); + break; case IDDIALOG_IDDETAILS: insertIdDetails(req.mToken); @@ -2397,6 +2361,7 @@ void IdDialog::loadRequest(const TokenQueue * queue, const TokenRequest &req) std::cerr << "IdDialog::loadRequest() ERROR"; std::cerr << std::endl; break; +#endif } } @@ -2431,6 +2396,7 @@ void IdDialog::loadRequest(const TokenQueue * queue, const TokenRequest &req) } #endif } +#endif void IdDialog::IdListCustomPopupMenu( QPoint ) { @@ -2618,22 +2584,36 @@ void IdDialog::copyRetroshareLink() if(! rsIdentity->getIdDetails(gxs_id,details)) return ; - if (!mIdQueue) - return; + RsThread::async([gxs_id,details,this]() + { +#ifdef ID_DEBUG + std::cerr << "Retrieving post data for identity " << mThreadId << std::endl; +#endif + std::string radix,errMsg; - mStateHelper->setLoading(IDDIALOG_SERIALIZED_GROUP, true); + if(!rsIdentity->exportIdentityLink( radix, gxs_id, true, std::string(), errMsg)) + { + std::cerr << "Cannot retrieve identity data " << mId << " to create a link. Error:" << errMsg << std::endl; + return ; + } - mIdQueue->cancelActiveRequestTokens(IDDIALOG_SERIALIZED_GROUP); + RsQThreadUtils::postToObject( [radix,details,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 */ - std::list ids ; - ids.push_back(RsGxsGroupId(gxs_id)) ; + QList urls ; - RsTokReqOptions opts; - opts.mReqType = GXS_REQUEST_TYPE_GROUP_SERIALIZED_DATA; + RetroShareLink link = RetroShareLink::createIdentity(details.mId,QString::fromUtf8(details.mNickname.c_str()),QString::fromStdString(radix)) ; + urls.push_back(link); - uint32_t token; + RSLinkClipboard::copyLinks(urls) ; - mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, ids, IDDIALOG_SERIALIZED_GROUP); + QMessageBox::information(NULL,tr("information"),tr("This identity link was copied to your clipboard. Paste it in a mail, or a message to transmit the identity to someone.")) ; + + }, this ); + }); } void IdDialog::chatIdentity() @@ -2762,7 +2742,7 @@ void IdDialog::negativePerson() rsReputations->setOwnOpinion(RsGxsId(Id), RsOpinion::NEGATIVE); } - requestIdDetails(); + updateIdentity(); updateIdList(); } @@ -2778,7 +2758,7 @@ void IdDialog::neutralPerson() rsReputations->setOwnOpinion(RsGxsId(Id), RsOpinion::NEUTRAL); } - requestIdDetails(); + updateIdentity(); updateIdList(); } void IdDialog::positivePerson() @@ -2793,7 +2773,7 @@ void IdDialog::positivePerson() rsReputations->setOwnOpinion(RsGxsId(Id), RsOpinion::POSITIVE); } - requestIdDetails(); + updateIdentity(); updateIdList(); } diff --git a/retroshare-gui/src/gui/Identity/IdDialog.h b/retroshare-gui/src/gui/Identity/IdDialog.h index 5f5365775..c7d6f7088 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.h +++ b/retroshare-gui/src/gui/Identity/IdDialog.h @@ -45,7 +45,7 @@ struct CircleUpdateOrder uint32_t action ; }; -class IdDialog : public MainPage, public TokenResponse +class IdDialog : public MainPage { Q_OBJECT @@ -57,8 +57,6 @@ public: virtual QString pageName() const { return tr("People") ; } //MainPage virtual QString helpText() const { return ""; } //MainPage - void loadRequest(const TokenQueue *queue, const TokenRequest &req); - void navigate(const RsGxsId& gxs_id) ; // shows the info about this particular ID protected: virtual void updateDisplay(bool complete); @@ -66,6 +64,9 @@ protected: void updateIdList(); void loadIdentities(const std::map &ids_set); + void updateIdentity(); + void loadIdentity(RsGxsIdGroup id_data); + void updateCircles(); void loadCircles(const std::list& circle_metas); @@ -121,9 +122,6 @@ private: void processSettings(bool load); QString createUsageString(const RsIdentityUsage& u) const; - void requestIdDetails(); - void insertIdDetails(uint32_t token); - void requestIdData(std::list &ids); bool fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept); void insertIdList(uint32_t token); @@ -139,9 +137,6 @@ private: void clearPerson(); private: - TokenQueue *mIdQueue; - TokenQueue *mCircleQueue; - UIStateHelper *mStateHelper; QTreeWidgetItem *contactsItem; From f75d0add474ffff0b2ca148d32749e920882e099 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 11 Feb 2020 16:37:53 +0100 Subject: [PATCH 07/12] added notification for circle cache updates to avoid the need for an additional UI timer --- libretroshare/src/retroshare/rsgxscircles.h | 4 ++ libretroshare/src/services/p3gxscircles.cc | 43 ++++++++++++++++---- libretroshare/src/services/p3gxscircles.h | 2 + retroshare-gui/src/gui/Identity/IdDialog.cpp | 1 + 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/libretroshare/src/retroshare/rsgxscircles.h b/libretroshare/src/retroshare/rsgxscircles.h index ab8448611..61e743323 100644 --- a/libretroshare/src/retroshare/rsgxscircles.h +++ b/libretroshare/src/retroshare/rsgxscircles.h @@ -187,6 +187,10 @@ enum class RsGxsCircleEventCode: uint8_t /** mCircleId contains the circle id */ NEW_CIRCLE = 0x06, + + /** no additional information. Simply means that the info previously from the cache has changed. */ + CACHE_DATA_UPDATED = 0x07, + }; struct RsGxsCircleEvent: RsEvent diff --git a/libretroshare/src/services/p3gxscircles.cc b/libretroshare/src/services/p3gxscircles.cc index 63270e235..8d5e878c1 100644 --- a/libretroshare/src/services/p3gxscircles.cc +++ b/libretroshare/src/services/p3gxscircles.cc @@ -103,6 +103,7 @@ #define MIN_CIRCLE_LOAD_GAP 5 #define GXS_CIRCLE_DELAY_TO_FORCE_MEMBERSHIP_UPDATE 60 // re-check every 1 mins. Normally this shouldn't be necessary since notifications inform abotu new messages. #define GXS_CIRCLE_DELAY_TO_CHECK_MEMBERSHIP_UPDATE 60 // re-check every 1 mins. Normally this shouldn't be necessary since notifications inform abotu new messages. +#define GXS_CIRCLE_DELAY_TO_SEND_CACHE_UPDATED_EVENT 10 // do not send cache update events more often than every 10 secs. /********************************************************************************/ /******************* Startup / Tick ******************************************/ @@ -117,11 +118,13 @@ p3GxsCircles::p3GxsCircles( RsGxsCircles(static_cast(*this)), GxsTokenQueue(this), RsTickEvent(), mIdentities(identities), mPgpUtils(pgpUtils), mCircleMtx("p3GxsCircles"), - mCircleCache(DEFAULT_MEM_CACHE_SIZE, "GxsCircleCache" ) + mCircleCache(DEFAULT_MEM_CACHE_SIZE, "GxsCircleCache" ), + mCacheUpdated(false) { // Kick off Cache Testing, + Others. //RsTickEvent::schedule_in(CIRCLE_EVENT_CACHETEST, CACHETEST_PERIOD); mLastCacheMembershipUpdateTS = 0 ; + mLastCacheUpdateEvent = 0; RsTickEvent::schedule_now(CIRCLE_EVENT_LOADIDS); @@ -490,7 +493,21 @@ void p3GxsCircles::service_tick() GxsTokenQueue::checkRequests(); // GxsTokenQueue handles all requests. rstime_t now = time(NULL); - if(now > mLastCacheMembershipUpdateTS + GXS_CIRCLE_DELAY_TO_CHECK_MEMBERSHIP_UPDATE) + + if(mCacheUpdated && now > mLastCacheUpdateEvent + GXS_CIRCLE_DELAY_TO_SEND_CACHE_UPDATED_EVENT) + { + if(rsEvents) + { + auto ev = std::make_shared(); + ev->mCircleEventType = RsGxsCircleEventCode::CACHE_DATA_UPDATED; + rsEvents->postEvent(ev); + } + + mLastCacheUpdateEvent = now; + mCacheUpdated = false; + } + + if(now > mLastCacheMembershipUpdateTS + GXS_CIRCLE_DELAY_TO_CHECK_MEMBERSHIP_UPDATE) { checkCircleCache(); mLastCacheMembershipUpdateTS = now ; @@ -552,6 +569,7 @@ void p3GxsCircles::notifyChanges(std::vector &changes) } mCircleCache.erase(circle_id); + mCacheUpdated = true; } } @@ -577,6 +595,7 @@ void p3GxsCircles::notifyChanges(std::vector &changes) { RsStackMutex stack(mCircleMtx); /********** STACK LOCKED MTX ******/ mCircleCache.erase(RsGxsCircleId(*git)); + mCacheUpdated = true; } } } @@ -646,6 +665,7 @@ void p3GxsCircles::notifyChanges(std::vector &changes) { RsStackMutex stack(mCircleMtx); /********** STACK LOCKED MTX ******/ mCircleCache.erase(RsGxsCircleId(*git)); + mCacheUpdated = true; } } @@ -700,7 +720,6 @@ bool p3GxsCircles::getCircleDetails( } } - return true; } } @@ -1462,6 +1481,7 @@ bool p3GxsCircles::cache_load_for_token(uint32_t token) RsTickEvent::schedule_in(CIRCLE_EVENT_RELOADIDS, GXSID_LOAD_CYCLE, id.toStdString()); } + mCacheUpdated = true; } return true; @@ -1498,6 +1518,8 @@ bool p3GxsCircles::locked_processLoadingCacheEntry(RsGxsCircleCache& cache) if(mIdentities->haveKey(pit->first)) { pit->second.subscription_flags |= GXS_EXTERNAL_CIRCLE_FLAGS_KEY_AVAILABLE; + + mCacheUpdated = true; #ifdef DEBUG_CIRCLES std::cerr << " Key is now available!"<< std::endl; #endif @@ -1573,8 +1595,8 @@ bool p3GxsCircles::locked_processLoadingCacheEntry(RsGxsCircleCache& cache) // We can check for self inclusion in the circle right away, since own ids are always loaded. // that allows to subscribe/unsubscribe uncomplete circles - - locked_checkCircleCacheForAutoSubscribe(cache); + + locked_checkCircleCacheForAutoSubscribe(cache); locked_checkCircleCacheForMembershipUpdate(cache); // always store in cache even if uncomplete. But do not remove the loading items so that they can be kept in loading state. @@ -1718,8 +1740,8 @@ bool p3GxsCircles::locked_checkCircleCacheForAutoSubscribe(RsGxsCircleCache &cac if(it2 != cache.mMembershipStatus.end()) { - in_admin_list = in_admin_list || bool(it2->second.subscription_flags & GXS_EXTERNAL_CIRCLE_FLAGS_IN_ADMIN_LIST) ; - member_request= member_request|| bool(it2->second.subscription_flags & GXS_EXTERNAL_CIRCLE_FLAGS_SUBSCRIBED) ; + in_admin_list = in_admin_list || bool(it2->second.subscription_flags & GXS_EXTERNAL_CIRCLE_FLAGS_IN_ADMIN_LIST) ; + member_request= member_request|| bool(it2->second.subscription_flags & GXS_EXTERNAL_CIRCLE_FLAGS_SUBSCRIBED) ; } } @@ -1748,6 +1770,8 @@ bool p3GxsCircles::locked_checkCircleCacheForAutoSubscribe(RsGxsCircleCache &cac RsGenExchange::setGroupStatusFlags(token2, RsGxsGroupId(cache.mCircleId), 0, GXS_SERV::GXS_GRP_STATUS_UNPROCESSED); cache.mGroupStatus &= ~GXS_SERV::GXS_GRP_STATUS_UNPROCESSED; + + mCacheUpdated = true; return true; } @@ -1771,6 +1795,7 @@ bool p3GxsCircles::locked_checkCircleCacheForAutoSubscribe(RsGxsCircleCache &cac cache.mGroupStatus &= ~GXS_SERV::GXS_GRP_STATUS_UNPROCESSED; + mCacheUpdated = true; return true ; } } @@ -2427,6 +2452,7 @@ bool p3GxsCircles::processMembershipRequests(uint32_t token) else std::cerr << " (EE) unknown subscription order type: " << item->subscription_type ; + mCacheUpdated = true; #ifdef DEBUG_CIRCLES std::cerr << " UPDATING" << std::endl; #endif @@ -2441,7 +2467,8 @@ bool p3GxsCircles::processMembershipRequests(uint32_t token) } data.mLastUpdatedMembershipTS = time(NULL) ; - } + mCacheUpdated = true; + } RsStackMutex stack(mCircleMtx); /********** STACK LOCKED MTX ******/ uint32_t token2; diff --git a/libretroshare/src/services/p3gxscircles.h b/libretroshare/src/services/p3gxscircles.h index 1f91964f0..26aca35a7 100644 --- a/libretroshare/src/services/p3gxscircles.h +++ b/libretroshare/src/services/p3gxscircles.h @@ -345,6 +345,8 @@ public: uint32_t mDummyIdToken; std::list mDummyPgpLinkedIds; std::list mDummyOwnIds; + bool mCacheUpdated ; + rstime_t mLastCacheUpdateEvent; RS_SET_CONTEXT_DEBUG_LEVEL(2) }; diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index ffdc2fe80..dfe81a07c 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -429,6 +429,7 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr event) case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_LEAVE: case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_JOIN: case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_REVOQUED: + case RsGxsCircleEventCode::CACHE_DATA_UPDATED: updateCircles(); default: From 4c54d9d633f03dcae993599e11037d9520c8fa63 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 11 Feb 2020 22:14:29 +0100 Subject: [PATCH 08/12] added missing case for IDs events --- libretroshare/src/services/p3idservice.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libretroshare/src/services/p3idservice.cc b/libretroshare/src/services/p3idservice.cc index ada91943f..fd360d4ed 100644 --- a/libretroshare/src/services/p3idservice.cc +++ b/libretroshare/src/services/p3idservice.cc @@ -4732,6 +4732,8 @@ void p3IdService::handle_event(uint32_t event_type, const std::string &/*elabel* case GXSID_EVENT_REQUEST_IDS: requestIdsFromNet(); break; + case GXSID_EVENT_REPUTATION: + break; default: RsErr() << __PRETTY_FUNCTION__ << " Unknown Event Type: " << event_type << std::endl; From dc0b8c491c9e073fc00d25d6f5c442a5e4c14696 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 11 Feb 2020 22:14:55 +0100 Subject: [PATCH 09/12] using GxsIdRSTreeWidgetItem to display circle members --- retroshare-gui/src/gui/Identity/IdDialog.cpp | 31 ++++++++++------- retroshare-gui/src/gui/gxs/GxsIdLabel.cpp | 33 ++++++++++--------- retroshare-gui/src/gui/gxs/GxsIdLabel.h | 5 ++- .../src/gui/gxs/GxsIdTreeWidgetItem.cpp | 8 +++-- .../src/gui/gxs/GxsIdTreeWidgetItem.h | 6 ++-- 5 files changed, 51 insertions(+), 32 deletions(-) diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index dfe81a07c..f77fd2e19 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -37,6 +37,7 @@ #include "gui/common/UIStateHelper.h" #include "gui/common/UserNotify.h" #include "gui/gxs/GxsIdDetails.h" +#include "gui/gxs/GxsIdTreeWidgetItem.h" //#include "gui/gxs/RsGxsUpdateBroadcastBase.h" #include "gui/msgs/MessageComposer.h" #include "gui/settings/rsharesettings.h" @@ -767,13 +768,13 @@ void IdDialog::loadCircles(const std::list& groupInfo) #ifdef ID_DEBUG std::cerr << "invited: " << invited << ", subscription: " << subscrb ; #endif - QTreeWidgetItem *subitem = NULL ; + GxsIdRSTreeWidgetItem *subitem = NULL ; // see if the item already exists for(uint32_t k=0; k < (uint32_t)item->childCount(); ++k) if(item->child(k)->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString().toStdString() == it->first.toStdString()) { - subitem = item->child(k); + subitem = dynamic_cast(item->child(k)); #ifdef ID_DEBUG std::cerr << " found existing sub item." << std::endl; #endif @@ -802,20 +803,22 @@ void IdDialog::loadCircles(const std::list& groupInfo) #ifdef ID_DEBUG std::cerr << " no existing sub item. Creating new one." << std::endl; #endif - subitem = new QTreeWidgetItem(item); + subitem = new GxsIdRSTreeWidgetItem(NULL,GxsIdDetails::ICON_TYPE_AVATAR,false); + + subitem->setId(it->first,CIRCLEGROUP_CIRCLE_COL_GROUPNAME,true); RsIdentityDetails idd ; bool has_id = rsIdentity->getIdDetails(it->first,idd) ; - QPixmap pixmap ; + // QPixmap pixmap ; - if(idd.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idd.mAvatar.mData, idd.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) - pixmap = GxsIdDetails::makeDefaultIcon(it->first,GxsIdDetails::SMALL) ; + // if(idd.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idd.mAvatar.mData, idd.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) + // pixmap = GxsIdDetails::makeDefaultIcon(it->first,GxsIdDetails::SMALL) ; - if(has_id) - subitem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, QString::fromUtf8(idd.mNickname.c_str())) ; - else - subitem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, tr("Unknown ID:")+QString::fromStdString(it->first.toStdString())) ; + // if(has_id) + // subitem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, QString::fromUtf8(idd.mNickname.c_str())) ; + // else + // subitem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, tr("Unknown ID:")+QString::fromStdString(it->first.toStdString())) ; QString tooltip ; tooltip += tr("Identity ID: ")+QString::fromStdString(it->first.toStdString()) ; @@ -836,7 +839,7 @@ void IdDialog::loadCircles(const std::list& groupInfo) subitem->setData(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole, QVariant(it->second)) ; subitem->setData(CIRCLEGROUP_CIRCLE_COL_GROUPID, Qt::UserRole, QString::fromStdString(it->first.toStdString())) ; - subitem->setIcon(RSID_COL_NICKNAME, QIcon(pixmap)); + //subitem->setIcon(RSID_COL_NICKNAME, QIcon(pixmap)); item->addChild(subitem) ; } @@ -1565,7 +1568,9 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, return false; if (!item) + { item = new TreeWidgetItem(); + } item->setText(RSID_COL_NICKNAME, QString::fromUtf8(data.mMeta.mGroupName.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE)); @@ -1747,6 +1752,10 @@ void IdDialog::loadIdentities(const std::map& ids_set else allItem->addChild(item); } + GxsIdLabel *label = new GxsIdLabel(); + label->setId(RsGxsId(data.mMeta.mGroupId)) ; + + ui->treeWidget_membership->setItemWidget(item,0,label) ; } /* count items */ diff --git a/retroshare-gui/src/gui/gxs/GxsIdLabel.cpp b/retroshare-gui/src/gui/gxs/GxsIdLabel.cpp index 7cfd5565d..6cb741d14 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdLabel.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdLabel.cpp @@ -22,35 +22,38 @@ #include "GxsIdDetails.h" /** Constructor */ -GxsIdLabel::GxsIdLabel(QWidget *parent) - : QLabel(parent) +GxsIdLabel::GxsIdLabel(bool show_tooltip,QWidget *parent) + : QLabel(parent),mShowTooltip(show_tooltip) { } static void fillLabelCallback(GxsIdDetailsType type, const RsIdentityDetails &details, QObject *object, const QVariant &/*data*/) { - QLabel *label = dynamic_cast(object); + GxsIdLabel *label = dynamic_cast(object); if (!label) { return; } label->setText(GxsIdDetails::getNameForType(type, details)); - QString toolTip; + if(label->showTooltip()) + { + QString toolTip; - switch (type) { - case GXS_ID_DETAILS_TYPE_EMPTY: - case GXS_ID_DETAILS_TYPE_LOADING: - case GXS_ID_DETAILS_TYPE_FAILED: - case GXS_ID_DETAILS_TYPE_BANNED: - break; + switch (type) { + case GXS_ID_DETAILS_TYPE_EMPTY: + case GXS_ID_DETAILS_TYPE_LOADING: + case GXS_ID_DETAILS_TYPE_FAILED: + case GXS_ID_DETAILS_TYPE_BANNED: + break; - case GXS_ID_DETAILS_TYPE_DONE: - toolTip = GxsIdDetails::getComment(details); - break; + case GXS_ID_DETAILS_TYPE_DONE: + toolTip = GxsIdDetails::getComment(details); + break; + } + + label->setToolTip(toolTip); } - - label->setToolTip(toolTip); } void GxsIdLabel::setId(const RsGxsId &id) diff --git a/retroshare-gui/src/gui/gxs/GxsIdLabel.h b/retroshare-gui/src/gui/gxs/GxsIdLabel.h index 03d68f6e7..4cf7c9e44 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdLabel.h +++ b/retroshare-gui/src/gui/gxs/GxsIdLabel.h @@ -29,13 +29,16 @@ class GxsIdLabel : public QLabel Q_OBJECT public: - GxsIdLabel(QWidget *parent = NULL); + GxsIdLabel(bool show_tooltip=true,QWidget *parent = NULL); void setId(const RsGxsId &id); bool getId(RsGxsId &id); + bool showTooltip() const { return mShowTooltip; } + private: RsGxsId mId; + bool mShowTooltip; }; #endif diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp index f6709922a..5bfcdf93b 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp @@ -26,8 +26,8 @@ #define BANNED_IMAGE ":/icons/yellow_biohazard64.png" /** Constructor */ -GxsIdRSTreeWidgetItem::GxsIdRSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, uint32_t icon_mask,QTreeWidget *parent) - : QObject(NULL), RSTreeWidgetItem(compareRole, parent), mColumn(0), mIconTypeMask(icon_mask) +GxsIdRSTreeWidgetItem::GxsIdRSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, uint32_t icon_mask,bool auto_tooltip,QTreeWidget *parent) + : QObject(NULL), RSTreeWidgetItem(compareRole, parent), mColumn(0), mIconTypeMask(icon_mask),mAutoTooltip(auto_tooltip) { init(); } @@ -72,7 +72,9 @@ static void fillGxsIdRSTreeWidgetItemCallback(GxsIdDetailsType type, const RsIde } int column = item->idColumn(); - item->setToolTip(column, GxsIdDetails::getComment(details)); + + if(item->autoTooltip()) + item->setToolTip(column, GxsIdDetails::getComment(details)); item->setText(column, GxsIdDetails::getNameForType(type, details)); item->setData(column, Qt::UserRole, QString::fromStdString(details.mId.toStdString())); diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h index 6e910b63b..85c4de40f 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h @@ -41,7 +41,7 @@ class GxsIdRSTreeWidgetItem : public QObject, public RSTreeWidgetItem Q_OBJECT public: - GxsIdRSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, uint32_t icon_mask,QTreeWidget *parent = NULL); + GxsIdRSTreeWidgetItem(const RSTreeWidgetItemCompareRole *compareRole, uint32_t icon_mask,bool auto_tooltip=true,QTreeWidget *parent = NULL); void setId(const RsGxsId &id, int column, bool retryWhenFailed); bool getId(RsGxsId &id); @@ -57,6 +57,7 @@ public: void setBannedState(bool b) { mBannedState = b; } // does not actually change the state, but used instead by callbacks to leave a trace void updateBannedState() ; // checks reputation, and update is needed + bool autoTooltip() const { return mAutoTooltip; } private slots: void startProcess(); @@ -66,8 +67,9 @@ private: RsGxsId mId; int mColumn; bool mIdFound; - bool mBannedState ; + bool mBannedState ; bool mRetryWhenFailed; + bool mAutoTooltip; RsReputationLevel mReputationLevel; uint32_t mIconTypeMask; RsGxsImage mAvatar; From 01c4534a20795a79d8ed19b19a69212bd0f6de28 Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 12 Feb 2020 21:10:35 +0100 Subject: [PATCH 10/12] load/save prefered identity for voting in posted --- .../src/gui/Posted/PostedListWidget.cpp | 38 +++++++++++++++---- .../src/gui/Posted/PostedListWidget.ui | 18 +++++---- 2 files changed, 41 insertions(+), 15 deletions(-) diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.cpp b/retroshare-gui/src/gui/Posted/PostedListWidget.cpp index 544689912..c4f17d60b 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.cpp +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.cpp @@ -27,6 +27,7 @@ #include "util/qtthreadsutils.h" #include "gui/gxs/GxsIdDetails.h" #include "PostedCreatePostDialog.h" +#include "gui/settings/rsharesettings.h" #include "PostedItem.h" #include "PostedCardView.h" #include "gui/common/UIStateHelper.h" @@ -113,6 +114,7 @@ PostedListWidget::PostedListWidget(const RsGxsGroupId &postedId, QWidget *parent /* Initialize GUI */ setGroupId(postedId); } + PostedListWidget::~PostedListWidget() { // save settings @@ -147,16 +149,37 @@ void PostedListWidget::processSettings(bool load) { Settings->beginGroup(QString("PostedListWidget")); - if (load) { + if (load) + { // load settings - /* View mode */ setViewMode(Settings->value("viewMode", VIEW_MODE_CLASSIC).toInt()); - } else { + + RsGxsId voteId(Settings->value("defaultIdentity",QString()).toString().toStdString()); + + if(!voteId.isNull()) + ui->idChooser->setChosenId(voteId); + + } + else + { // save settings /* View mode */ Settings->setValue("viewMode", viewMode()); + + RsGxsId voteId; + + switch (ui->idChooser->getChosenId(voteId)) + { + case GxsIdChooser::KnowId: + case GxsIdChooser::UnKnowId: Settings->setValue("defaultIdentity",QString::fromStdString(voteId.toStdString())); + break; + default: + case GxsIdChooser::NoId: + case GxsIdChooser::None: + break; + } } Settings->endGroup(); @@ -310,10 +333,10 @@ void PostedListWidget::submitVote(const RsGxsGrpMsgIdPair &msgId, bool up) std::cerr << "PostedListWidget::createPost() ERROR GETTING AuthorId!, Vote Failed"; std::cerr << std::endl; - QMessageBox::warning(this, tr("RetroShare"),tr("Please create or choose a Signing Id before Voting"), QMessageBox::Ok, QMessageBox::Ok); + QMessageBox::warning(this, tr("RetroShare"),tr("Please create or choose a default identity to use for voting"), QMessageBox::Ok, QMessageBox::Ok); return; - }//switch (ui.idChooser->getChosenId(authorId)) + } RsGxsVote vote; @@ -322,11 +345,10 @@ void PostedListWidget::submitVote(const RsGxsGrpMsgIdPair &msgId, bool up) vote.mMeta.mParentId = msgId.second; vote.mMeta.mAuthorId = authorId; - if (up) { + if (up) vote.mVoteType = GXS_VOTE_UP; - } else { //if (up) + else vote.mVoteType = GXS_VOTE_DOWN; - }//if (up) #ifdef DEBUG_POSTED_LIST_WIDGET std::cerr << "PostedListWidget::submitVote()"; diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.ui b/retroshare-gui/src/gui/Posted/PostedListWidget.ui index 304a79c76..0db9f4c3b 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.ui +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.ui @@ -6,8 +6,8 @@ 0 0 - 616 - 595 + 950 + 771 @@ -250,7 +250,11 @@ - + + + <html><head/><body><p>Default identity used when voting</p></body></html> + + @@ -508,7 +512,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Description</span></p></body></html> @@ -557,7 +561,7 @@ p, li { white-space: pre-wrap; } 0 0 - 614 + 98 16 @@ -613,7 +617,7 @@ p, li { white-space: pre-wrap; } 0 0 - 614 + 948 16 @@ -667,9 +671,9 @@ p, li { white-space: pre-wrap; } - + From e4dc72169c3f4b9ebb45310a08eb5fac78260f24 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 17 Feb 2020 23:13:41 +0100 Subject: [PATCH 11/12] switched from GxsIdRSTreeWidgetItem to GxsIdItemDelegate, so as to avoid the whole timer system to load ids in Circles list --- retroshare-gui/src/gui/Identity/IdDialog.cpp | 12 ++++++------ retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h | 13 ++++++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index f77fd2e19..4a4ec6530 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -170,7 +170,8 @@ IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog) contactsItem->setData(RSID_COL_VOTES, Qt::DecorationRole,0xff); ui->treeWidget_membership->clear(); - + ui->treeWidget_membership->setItemDelegateForColumn(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,new GxsIdTreeItemDelegate()); + mExternalOtherCircleItem = NULL ; mExternalBelongingCircleItem = NULL ; @@ -768,13 +769,13 @@ void IdDialog::loadCircles(const std::list& groupInfo) #ifdef ID_DEBUG std::cerr << "invited: " << invited << ", subscription: " << subscrb ; #endif - GxsIdRSTreeWidgetItem *subitem = NULL ; + RSTreeWidgetItem *subitem = NULL ; // see if the item already exists for(uint32_t k=0; k < (uint32_t)item->childCount(); ++k) if(item->child(k)->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString().toStdString() == it->first.toStdString()) { - subitem = dynamic_cast(item->child(k)); + subitem = dynamic_cast(item->child(k)); #ifdef ID_DEBUG std::cerr << " found existing sub item." << std::endl; #endif @@ -803,9 +804,8 @@ void IdDialog::loadCircles(const std::list& groupInfo) #ifdef ID_DEBUG std::cerr << " no existing sub item. Creating new one." << std::endl; #endif - subitem = new GxsIdRSTreeWidgetItem(NULL,GxsIdDetails::ICON_TYPE_AVATAR,false); - - subitem->setId(it->first,CIRCLEGROUP_CIRCLE_COL_GROUPNAME,true); + subitem = new RSTreeWidgetItem(NULL); + subitem->setData(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,Qt::UserRole,QString::fromStdString(it->first.toStdString())); RsIdentityDetails idd ; bool has_id = rsIdentity->getIdDetails(it->first,idd) ; diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h index 85c4de40f..8e7cccb3f 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h @@ -90,14 +90,17 @@ public: QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override { + RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); + + if(id.isNull()) + return QStyledItemDelegate::sizeHint(option,index); + QStyleOptionViewItemV4 opt = option; initStyleOption(&opt, index); // disable default icon opt.icon = QIcon(); const QRect r = option.rect; - - RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); QString str; QList icons; QString comment; @@ -128,6 +131,11 @@ public: return ; } + RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); + + if(id.isNull()) + return QStyledItemDelegate::paint(painter,option,index); + QStyleOptionViewItemV4 opt = option; initStyleOption(&opt, index); @@ -138,7 +146,6 @@ public: const QRect r = option.rect; - RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); QString str; QString comment; From 09c5d9363159c9701ad0d49e8c4a05eb26a5b87b Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 18 Feb 2020 10:50:55 +0100 Subject: [PATCH 12/12] moved elided label paint method to static so that it can be used by other item delegates --- retroshare-gui/src/gui/common/ElidedLabel.cpp | 92 +++++++++------- retroshare-gui/src/gui/common/ElidedLabel.h | 2 + .../src/gui/gxs/GxsIdTreeWidgetItem.cpp | 101 ++++++++++++++++++ .../src/gui/gxs/GxsIdTreeWidgetItem.h | 97 +---------------- 4 files changed, 163 insertions(+), 129 deletions(-) diff --git a/retroshare-gui/src/gui/common/ElidedLabel.cpp b/retroshare-gui/src/gui/common/ElidedLabel.cpp index 02c3881ff..15cdbd1ed 100644 --- a/retroshare-gui/src/gui/common/ElidedLabel.cpp +++ b/retroshare-gui/src/gui/common/ElidedLabel.cpp @@ -74,19 +74,9 @@ void ElidedLabel::clear() void ElidedLabel::paintEvent(QPaintEvent *event) { QLabel::paintEvent(event); - QList > lLines; - QString elidedLastLine = ""; + QPainter painter(this); - QFontMetrics fontMetrics = painter.fontMetrics(); - QRect cr = contentsRect(); - cr.adjust(margin(), margin(), -margin(), -margin()); - - bool didElide = false; - QChar ellipsisChar(0x2026);//= "…" - int lineSpacing = fontMetrics.lineSpacing(); - int y = 0; - - QString plainText = ""; + QString plainText = ""; if (mOnlyPlainText) { plainText = mContent; @@ -95,13 +85,38 @@ void ElidedLabel::paintEvent(QPaintEvent *event) td.setHtml(mContent); plainText = td.toPlainText(); } + QRect cr(contentsRect()); + cr.adjust(margin(), margin(), -margin(), -margin()); + + bool didElide = paintElidedLine(painter,plainText,cr,alignment(),wordWrap(),true,mRectElision); + + //Send signal if changed + + if (didElide != mElided) + { + mElided = didElide; + emit elisionChanged(didElide); + } +} + +bool ElidedLabel::paintElidedLine(QPainter& painter,QString plainText,const QRect& cr,Qt::Alignment alignment,bool wordWrap,bool drawRoundRect,QRect& rectElision) +{ + QList > lLines; + QString elidedLastLine = ""; + QFontMetrics fontMetrics = painter.fontMetrics(); + + bool didElide = false; + QChar ellipsisChar(0x2026);//= "…" + int lineSpacing = fontMetrics.lineSpacing(); + int y = 0; + plainText = plainText.replace("\n",QChar(QChar::LineSeparator)); plainText = plainText.replace("\r",QChar(QChar::LineSeparator)); QTextLayout textLayout(plainText, painter.font()); QTextOption to = textLayout.textOption(); - to.setAlignment(alignment()); - to.setWrapMode(wordWrap() ? QTextOption::WrapAtWordBoundaryOrAnywhere : QTextOption::NoWrap); + to.setAlignment(alignment); + to.setWrapMode(wordWrap ? QTextOption::WrapAtWordBoundaryOrAnywhere : QTextOption::NoWrap); textLayout.setTextOption(to); textLayout.beginLayout(); @@ -115,7 +130,7 @@ void ElidedLabel::paintEvent(QPaintEvent *event) line.setLineWidth(cr.width()); int nextLineY = y + lineSpacing; - if ((cr.height() >= nextLineY + lineSpacing) && wordWrap()) { + if ((cr.height() >= nextLineY + lineSpacing) && wordWrap) { //Line written normaly, next line will too lLines.append(QPair(line, QPoint(0, y))); y = nextLineY; @@ -123,8 +138,7 @@ void ElidedLabel::paintEvent(QPaintEvent *event) //The next line can't be written. QString lastLine = plainText.mid(line.textStart()).split(QChar(QChar::LineSeparator)).at(0); QTextLine lineEnd = textLayout.createLine(); - if (!lineEnd.isValid() && (wordWrap() - || (fontMetrics.width(lastLine) < cr.width()))) { + if (!lineEnd.isValid() && (wordWrap || (fontMetrics.width(lastLine) < cr.width()))) { //No more text for next line so this one is OK lLines.append(QPair(line, QPoint(0, y))); elidedLastLine=""; @@ -150,11 +164,11 @@ void ElidedLabel::paintEvent(QPaintEvent *event) if (didElide) iHeight += lineSpacing; //Compute lines translation with alignment - if (alignment() & Qt::AlignTop) + if (alignment & Qt::AlignTop) iTransY = 0; - if (alignment() & Qt::AlignBottom) + if (alignment & Qt::AlignBottom) iTransY = cr.height() - iHeight; - if (alignment() & Qt::AlignVCenter) + if (alignment & Qt::AlignVCenter) iTransY = (cr.height() - iHeight) / 2; QPair pair; @@ -166,7 +180,8 @@ void ElidedLabel::paintEvent(QPaintEvent *event) } //Print last elided line - if (didElide) { + if (didElide) + { int width = fontMetrics.width(elidedLastLine); if (lastPos.y() == -1){ y = iTransY;// Only one line @@ -175,32 +190,35 @@ void ElidedLabel::paintEvent(QPaintEvent *event) } if (width < cr.width()){ //Text don't taking all line (with line break), so align it - if (alignment() & Qt::AlignLeft) + if (alignment & Qt::AlignLeft) iTransX = 0; - if (alignment() & Qt::AlignRight) + if (alignment & Qt::AlignRight) iTransX = cr.width() - width; - if (alignment() & Qt::AlignHCenter) + if (alignment & Qt::AlignHCenter) iTransX = (cr.width() - width) / 2; - if (alignment() & Qt::AlignJustify) + if (alignment & Qt::AlignJustify) iTransX = 0; } painter.drawText(QPoint(iTransX + cr.left(), y + fontMetrics.ascent() + cr.top()), elidedLastLine); //Draw button to get ToolTip - mRectElision = QRect(iTransX + width - fontMetrics.width(ellipsisChar) + cr.left() - , y + cr.top() - , fontMetrics.width(ellipsisChar) - , fontMetrics.height() - 1); - painter.drawRoundRect(mRectElision); - } else { - mRectElision = QRect(); - } - //Send signal if changed - if (didElide != mElided) { - mElided = didElide; - emit elisionChanged(didElide); + if(drawRoundRect) + { + rectElision = QRect(iTransX + width - fontMetrics.width(ellipsisChar) + cr.left() + , y + cr.top() + , fontMetrics.width(ellipsisChar) + , fontMetrics.height() - 1); + painter.drawRoundRect(rectElision); + } + else + rectElision = QRect(); } + else + rectElision = QRect(); + + return didElide; + } void ElidedLabel::mousePressEvent(QMouseEvent *ev) diff --git a/retroshare-gui/src/gui/common/ElidedLabel.h b/retroshare-gui/src/gui/common/ElidedLabel.h index 3b935e444..866af18ed 100644 --- a/retroshare-gui/src/gui/common/ElidedLabel.h +++ b/retroshare-gui/src/gui/common/ElidedLabel.h @@ -48,6 +48,8 @@ public: QColor textColor() const { return mTextColor; } void setTextColor(const QColor &color); + static bool paintElidedLine(QPainter& painter, QString plainText, const QRect &cr, Qt::Alignment alignment, bool wordWrap, bool drawRoundRect, QRect &rectElision); + public slots: void setText(const QString &text); void setOnlyPlainText(const bool &value); diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp index 5bfcdf93b..39e0f0216 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp @@ -178,3 +178,104 @@ QVariant GxsIdRSTreeWidgetItem::data(int column, int role) const return RSTreeWidgetItem::data(column, role); } + +QSize GxsIdTreeItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const +{ + RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); + + if(id.isNull()) + return QStyledItemDelegate::sizeHint(option,index); + + QStyleOptionViewItemV4 opt = option; + initStyleOption(&opt, index); + + // disable default icon + opt.icon = QIcon(); + const QRect r = option.rect; + QString str; + QList icons; + QString comment; + + QFontMetricsF fm(option.font); + float f = fm.height(); + + QIcon icon ; + + if(!GxsIdDetails::MakeIdDesc(id, true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) + { + icon = GxsIdDetails::getLoadingIcon(id); + launchAsyncLoading(); + } + else + icon = *icons.begin(); + + QPixmap pix = icon.pixmap(r.size()); + + return QSize(1.2*(pix.width() + fm.width(str)),std::max(1.1*pix.height(),1.4*fm.height())); +} + + +void GxsIdTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex& index) const +{ + if(!index.isValid()) + { + std::cerr << "(EE) attempt to draw an invalid index." << std::endl; + return ; + } + + RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); + + if(id.isNull()) + return QStyledItemDelegate::paint(painter,option,index); + + QStyleOptionViewItemV4 opt = option; + initStyleOption(&opt, index); + + // disable default icon + opt.icon = QIcon(); + // draw default item + QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &opt, painter, 0); + + QRect r = option.rect; + + QString str; + QString comment; + + QFontMetricsF fm(painter->font()); + float f = fm.height(); + + QIcon icon ; + + if(id.isNull()) + { + str = tr("[Notification]"); + icon = QIcon(":/icons/logo_128.png"); + } + else if(! computeNameIconAndComment(id,str,icon,comment)) + if(mReloadPeriod > 3) + { + str = tr("[Unknown]"); + icon = QIcon(); + } + else + { + icon = GxsIdDetails::getLoadingIcon(id); + launchAsyncLoading(); + } + + QPixmap pix = icon.pixmap(r.size()); + const QPoint p = QPoint(r.height()/2.0, (r.height() - pix.height())/2); + + // draw pixmap at center of item + painter->drawPixmap(r.topLeft() + p, pix); + //painter->drawText(r.topLeft() + QPoint(r.height()+ f/2.0 + f/2.0,f*1.0), str); + + //cr.adjust(margin(), margin(), -margin(), -margin()); + + QRect mRectElision; + + r.adjust(pix.height()+f,(r.height()-f)/2.0,0,0); + + bool didElide = ElidedLabel::paintElidedLine(*painter,str,r,Qt::AlignLeft,false,false,mRectElision); + +} diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h index 8e7cccb3f..fa225856d 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h @@ -24,10 +24,11 @@ #include #include #include -#include -#include +#include "retroshare/rsidentity.h" +#include "retroshare/rspeers.h" #include "gui/common/RSTreeWidgetItem.h" +#include "gui/common/ElidedLabel.h" #include "gui/gxs/GxsIdDetails.h" /***** @@ -88,96 +89,8 @@ public: mReloadPeriod = 0; } - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override - { - RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); - - if(id.isNull()) - return QStyledItemDelegate::sizeHint(option,index); - - QStyleOptionViewItemV4 opt = option; - initStyleOption(&opt, index); - - // disable default icon - opt.icon = QIcon(); - const QRect r = option.rect; - QString str; - QList icons; - QString comment; - - QFontMetricsF fm(option.font); - float f = fm.height(); - - QIcon icon ; - - if(!GxsIdDetails::MakeIdDesc(id, true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) - { - icon = GxsIdDetails::getLoadingIcon(id); - launchAsyncLoading(); - } - else - icon = *icons.begin(); - - QPixmap pix = icon.pixmap(r.size()); - - return QSize(1.2*(pix.width() + fm.width(str)),std::max(1.1*pix.height(),1.4*fm.height())); - } - - virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex& index) const override - { - if(!index.isValid()) - { - std::cerr << "(EE) attempt to draw an invalid index." << std::endl; - return ; - } - - RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); - - if(id.isNull()) - return QStyledItemDelegate::paint(painter,option,index); - - QStyleOptionViewItemV4 opt = option; - initStyleOption(&opt, index); - - // disable default icon - opt.icon = QIcon(); - // draw default item - QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &opt, painter, 0); - - const QRect r = option.rect; - - QString str; - QString comment; - - QFontMetricsF fm(painter->font()); - float f = fm.height(); - - QIcon icon ; - - if(id.isNull()) - { - str = tr("[Notification]"); - icon = QIcon(":/icons/logo_128.png"); - } - else if(! computeNameIconAndComment(id,str,icon,comment)) - if(mReloadPeriod > 3) - { - str = tr("[Unknown]"); - icon = QIcon(); - } - else - { - icon = GxsIdDetails::getLoadingIcon(id); - launchAsyncLoading(); - } - - QPixmap pix = icon.pixmap(r.size()); - const QPoint p = QPoint(r.height()/2.0, (r.height() - pix.height())/2); - - // draw pixmap at center of item - painter->drawPixmap(r.topLeft() + p, pix); - painter->drawText(r.topLeft() + QPoint(r.height()+ f/2.0 + f/2.0,f*1.0), str); - } + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex& index) const override; void launchAsyncLoading() const {