From 3ad5ec9deabc2807e8040cf033b2e53619a6005d Mon Sep 17 00:00:00 2001
From: sehraf <sehraf42@gmail.com>
Date: Sat, 22 Feb 2020 18:54:58 +0100
Subject: [PATCH 1/4] insert wiki/etc and plugins before the log tab

---
 retroshare-gui/src/gui/MainWindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 3e2bb53dd..0093f9530 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -423,7 +423,6 @@ void MainWindow::initStackedPage()
   PeopleDialog *peopleDialog = NULL;
   addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, &notify);
   #endif
-  addPage(newsFeed = new NewsFeed(ui->stackPages), grp, &notify);
 #ifdef RS_USE_WIKI
   WikiDialog *wikiDialog = NULL;
   addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, &notify);
@@ -494,6 +493,7 @@ void MainWindow::initStackedPage()
       }
   }
 
+  addPage(newsFeed = new NewsFeed(ui->stackPages), grp, &notify);
   addPage(settingsDialog = new SettingsPage(ui->stackPages),grp,&notify);
 
   /* Create the toolbar */

From 5cea8c433565dacbcf986178f517e1e6dbae2612 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 23 Feb 2020 21:12:32 +0100
Subject: [PATCH 2/4] Added to store the splitter position for the wiki dialog

* Added to store the splitter position for the wiki dialog
* Fixing the missed icon for Photoshare
* Correcting Indentation
---
 .../src/gui/PhotoShare/PhotoShare.ui          | 26 ++++++++--
 .../src/gui/WikiPoos/WikiDialog.cpp           | 29 +++++++++++-
 retroshare-gui/src/gui/WikiPoos/WikiDialog.h  | 47 +++++++++----------
 retroshare-gui/src/gui/WikiPoos/WikiDialog.ui |  2 +-
 4 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
index 78e3ed538..6e7d43503 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
@@ -20,7 +20,16 @@
    <item>
     <widget class="QFrame" name="toolBarFrame">
      <layout class="QHBoxLayout" name="horizontalLayout_5">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>2</number>
+      </property>
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <property name="rightMargin">
+       <number>2</number>
+      </property>
+      <property name="bottomMargin">
        <number>2</number>
       </property>
       <item>
@@ -29,8 +38,8 @@
          <string>Create Album</string>
         </property>
         <property name="icon">
-         <iconset resource="../images.qrc">
-          <normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
+         <iconset resource="Photo_images.qrc">
+          <normaloff>:/images/album_create_64.png</normaloff>:/images/album_create_64.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -140,7 +149,16 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
index 2fcd431aa..e75ece525 100644
--- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
+++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
@@ -28,7 +28,7 @@
 #include "WikiDialog.h"
 #include "gui/WikiPoos/WikiAddDialog.h"
 #include "gui/WikiPoos/WikiEditDialog.h"
-
+#include "gui/settings/rsharesettings.h"
 #include "gui/gxs/WikiGroupDialog.h"
 
 #include <retroshare/rswiki.h>
@@ -105,6 +105,9 @@ WikiDialog::WikiDialog(QWidget *parent) : RsGxsUpdateBroadcastPage(rsWiki, paren
 	/* setup TokenQueue */
 	mWikiQueue = new TokenQueue(rsWiki->getTokenService(), this);
 
+    // Set initial size of the splitter
+    ui.listSplitter->setStretchFactor(0, 0);
+    ui.listSplitter->setStretchFactor(1, 1);
 
 	/* Setup Group Tree */
 	mYourGroups = ui.groupTreeWidget->addCategoryItem(tr("My Groups"), QIcon(), true);
@@ -112,13 +115,37 @@ WikiDialog::WikiDialog(QWidget *parent) : RsGxsUpdateBroadcastPage(rsWiki, paren
 	mPopularGroups = ui.groupTreeWidget->addCategoryItem(tr("Popular Groups"), QIcon(), false);
 	mOtherGroups = ui.groupTreeWidget->addCategoryItem(tr("Other Groups"), QIcon(), false);
 
+	// load settings
+	processSettings(true);
 }
 
 WikiDialog::~WikiDialog()
 {
+	// save settings
+	processSettings(false);
+	
 	delete(mWikiQueue);
 }
 
+void WikiDialog::processSettings(bool load)
+{
+	Settings->beginGroup("WikiDialog");
+
+	if (load) {
+		// load settings
+
+		// state of splitter
+		ui.listSplitter->restoreState(Settings->value("SplitterList").toByteArray());
+	} else {
+		// save settings
+
+		// state of splitter
+		Settings->setValue("SplitterList", ui.listSplitter->saveState());
+	}
+
+	Settings->endGroup();
+}
+
 void WikiDialog::OpenOrShowAddPageDialog()
 {
 	RsGxsGroupId groupId = getSelectedGroup();
diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.h b/retroshare-gui/src/gui/WikiPoos/WikiDialog.h
index 8b78f4774..cf4154326 100644
--- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.h
+++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.h
@@ -44,7 +44,7 @@ class WikiDialog : public RsGxsUpdateBroadcastPage, public TokenResponse
 public:
 	WikiDialog(QWidget *parent = 0);
 	~WikiDialog();
-	
+
 	virtual QIcon iconPixmap() const { return QIcon(IMAGE_WIKI) ; } //MainPage
 	virtual QString pageName() const { return tr("Wiki Pages") ; } //MainPage
 	virtual QString helpText() const { return ""; } //MainPage
@@ -69,39 +69,38 @@ private slots:
 
 	// GroupTreeWidget stuff.
 	void groupListCustomPopupMenu(QPoint point);
-  void subscribeToGroup();
-  void unsubscribeToGroup();
+	void subscribeToGroup();
+	void unsubscribeToGroup();
 	void wikiGroupChanged(const QString &groupId);
-	
+
 	void todo();
 
 private:
 
-void 	clearWikiPage();
-void    clearGroupTree();
+	void clearWikiPage();
+	void clearGroupTree();
 
-void 	updateWikiPage(const RsWikiSnapshot &page);
+	void updateWikiPage(const RsWikiSnapshot &page);
 
-bool 	getSelectedPage(RsGxsGroupId &groupId, RsGxsMessageId &pageId, RsGxsMessageId &origPageId);
-std::string getSelectedPage();
-const RsGxsGroupId &getSelectedGroup();
+	bool getSelectedPage(RsGxsGroupId &groupId, RsGxsMessageId &pageId, RsGxsMessageId &origPageId);
+	std::string getSelectedPage();
+	const RsGxsGroupId &getSelectedGroup();
 
+	// Using GroupTreeWidget.
+	void wikiSubscribe(bool subscribe);
+	void GroupMetaDataToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo);
+	void insertGroupsData(const std::list<RsGroupMetaData> &wikiList);
 
-      // Using GroupTreeWidget.
-void    wikiSubscribe(bool subscribe);
-void 	GroupMetaDataToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo);
-void 	insertGroupsData(const std::list<RsGroupMetaData> &wikiList);
+	void processSettings(bool load);
 
+	void requestGroupMeta();
+	void loadGroupMeta(const uint32_t &token);
 
-void 	requestGroupMeta();
-void 	loadGroupMeta(const uint32_t &token);
-
-void 	requestPages(const std::list<RsGxsGroupId> &groupIds);
-void 	loadPages(const uint32_t &token);
-
-void 	requestWikiPage(const  RsGxsGrpMsgIdPair &msgId);
-void 	loadWikiPage(const uint32_t &token);
+	void requestPages(const std::list<RsGxsGroupId> &groupIds);
+	void loadPages(const uint32_t &token);
 
+	void requestWikiPage(const  RsGxsGrpMsgIdPair &msgId);
+	void loadWikiPage(const uint32_t &token);
 
 	TokenQueue *mWikiQueue;
 
@@ -110,7 +109,7 @@ void 	loadWikiPage(const uint32_t &token);
 	WikiEditDialog *mEditDialog;
 
 	std::string mGroupSelected;
-    RsGxsMessageId mPageSelected;
+	RsGxsMessageId mPageSelected;
 	std::string mModSelected;
 
 
@@ -118,7 +117,7 @@ void 	loadWikiPage(const uint32_t &token);
 	QTreeWidgetItem *mSubscribedGroups;
 	QTreeWidgetItem *mPopularGroups;
 	QTreeWidgetItem *mOtherGroups;
-    RsGxsGroupId mGroupId; // From GroupTreeWidget
+	RsGxsGroupId mGroupId; // From GroupTreeWidget
 
 	/* UI - from Designer */
 	Ui::WikiDialog ui;
diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui b/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui
index e8666ed09..f5ad5ea65 100644
--- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui
+++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui
@@ -27,7 +27,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QSplitter" name="splitter">
+    <widget class="QSplitter" name="listSplitter">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>

From 44ecda293c3fffacdd42473cefceaa1a295b7afc Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 24 Feb 2020 16:26:29 +0100
Subject: [PATCH 3/4] restore changes

---
 .../src/gui/PhotoShare/PhotoShare.ui          | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
index 6e7d43503..78e3ed538 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
@@ -20,16 +20,7 @@
    <item>
     <widget class="QFrame" name="toolBarFrame">
      <layout class="QHBoxLayout" name="horizontalLayout_5">
-      <property name="leftMargin">
-       <number>2</number>
-      </property>
-      <property name="topMargin">
-       <number>2</number>
-      </property>
-      <property name="rightMargin">
-       <number>2</number>
-      </property>
-      <property name="bottomMargin">
+      <property name="margin">
        <number>2</number>
       </property>
       <item>
@@ -38,8 +29,8 @@
          <string>Create Album</string>
         </property>
         <property name="icon">
-         <iconset resource="Photo_images.qrc">
-          <normaloff>:/images/album_create_64.png</normaloff>:/images/album_create_64.png</iconset>
+         <iconset resource="../images.qrc">
+          <normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -149,16 +140,7 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
+      <property name="margin">
        <number>0</number>
       </property>
       <item>

From a050669a93fd8bdb839205ab7f00f8662f03f13d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 24 Feb 2020 22:21:38 +0100
Subject: [PATCH 4/4] remved tokenQueue from IdDetailsDialog and attempt to fix
 crash in Circles due to deleting an item that is still in the tree

---
 .../src/gui/Identity/IdDetailsDialog.cpp      | 112 ++++++-----------
 .../src/gui/Identity/IdDetailsDialog.h        |  13 +-
 .../src/gui/Identity/IdDetailsDialog.ui       |  29 ++---
 retroshare-gui/src/gui/Identity/IdDialog.cpp  | 114 +++---------------
 4 files changed, 67 insertions(+), 201 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp b/retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp
index ad0c261c9..3cd4cb93d 100644
--- a/retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp
@@ -22,6 +22,7 @@
 #include "IdDetailsDialog.h"
 #include "ui_IdDetailsDialog.h"
 #include "gui/gxs/GxsIdDetails.h"
+#include "util/qtthreadsutils.h"
 #include "gui/settings/rsharesettings.h"
 #include "gui/common/UIStateHelper.h"
 #include "gui/msgs/MessageComposer.h"
@@ -79,9 +80,6 @@ IdDetailsDialog::IdDetailsDialog(const RsGxsGroupId& id, QWidget *parent) :
 
 	mStateHelper->setActive(IDDETAILSDIALOG_REPLIST, false);
 
-	/* Create token queue */
-	mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this);
-
 	Settings->loadWidgetInformation(this);
 
 	ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/person.png"));
@@ -94,7 +92,7 @@ IdDetailsDialog::IdDetailsDialog(const RsGxsGroupId& id, QWidget *parent) :
 	
   connect(ui->inviteButton, SIGNAL(clicked()), this, SLOT(sendInvite()));
 	
-	requestIdDetails();
+	loadIdentity();
 }
 
 /** Destructor. */
@@ -103,7 +101,6 @@ IdDetailsDialog::~IdDetailsDialog()
 	Settings->saveWidgetInformation(this);
 
 	delete(ui);
-	delete(mIdQueue);
 }
 
 void IdDetailsDialog::toggleAutoBanIdentities(bool b)
@@ -135,40 +132,8 @@ static QString getHumanReadableDuration(uint32_t seconds)
         return QString(QObject::tr("%1 days ago")).arg(seconds/86400) ;
 }
 
-void IdDetailsDialog::insertIdDetails(uint32_t token)
+void IdDetailsDialog::loadIdentity(RsGxsIdGroup data)
 {
-	mStateHelper->setLoading(IDDETAILSDIALOG_IDDETAILS, false);
-
-	/* get details from libretroshare */
-	std::vector<RsGxsIdGroup> datavector;
-	if (!rsIdentity->getGroupData(token, datavector))
-	{
-		mStateHelper->setActive(IDDETAILSDIALOG_IDDETAILS, false);
-		mStateHelper->clear(IDDETAILSDIALOG_REPLIST);
-
-		ui->lineEdit_KeyId->setText("ERROR GETTING KEY!");
-
-		return;
-	}
-
-	if (datavector.size() != 1)
-	{
-#ifdef ID_DEBUG
-		std::cerr << "IdDetailsDialog::insertIdDetails() Invalid datavector size";
-#endif
-
-		mStateHelper->setActive(IDDETAILSDIALOG_IDDETAILS, false);
-		mStateHelper->clear(IDDETAILSDIALOG_IDDETAILS);
-
-		ui->lineEdit_KeyId->setText("INVALID DV SIZE");
-
-		return;
-	}
-
-	mStateHelper->setActive(IDDETAILSDIALOG_IDDETAILS, true);
-
-	RsGxsIdGroup &data = datavector[0];
-
 	/* get GPG Details from rsPeers */
 	RsPgpId ownPgpId  = rsPeers->getGPGOwnId();
 
@@ -361,42 +326,16 @@ void IdDetailsDialog::modifyReputation()
 	}
 	rsReputations->setOwnOpinion(id,op);
 
-#ifdef ID_DEBUG
-	std::cerr << "IdDialog::modifyReputation() ID: " << id << " Mod: " << mod;
-	std::cerr << std::endl;
-#endif
-
-#ifdef SUSPENDED
-    	// Cyril: apparently the old reputation system was in used here. It's based on GXS data exchange, and probably not
-    	// very efficient because of this.
-    
-	uint32_t token;
-	if (!rsIdentity->submitOpinion(token, id, false, op))
-	{
-#ifdef ID_DEBUG
-		std::cerr << "IdDialog::modifyReputation() Error submitting Opinion";
-		std::cerr << std::endl;
-#endif
-	}
-#endif
-
-#ifdef ID_DEBUG
-	std::cerr << "IdDialog::modifyReputation() queuingRequest(), token: " << token;
-	std::cerr << std::endl;
-#endif
-
 	// trigger refresh when finished.
 	// basic / anstype are not needed.
-    requestIdDetails();
+    loadIdentity();
 
 	return;
 }
 
-void IdDetailsDialog::requestIdDetails()
+void IdDetailsDialog::loadIdentity()
 {
-	mIdQueue->cancelActiveRequestTokens(IDDETAILSDIALOG_IDDETAILS);
-
-	if (mId.isNull())
+    if (mId.isNull())
 	{
 		mStateHelper->setActive(IDDETAILSDIALOG_IDDETAILS, false);
 		mStateHelper->setLoading(IDDETAILSDIALOG_IDDETAILS, false);
@@ -407,16 +346,42 @@ void IdDetailsDialog::requestIdDetails()
 
 	mStateHelper->setLoading(IDDETAILSDIALOG_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<RsGxsGroupId> groupIds;
-	groupIds.push_back(mId);
+        std::set<RsGxsId> ids( { RsGxsId(mId) } ) ;
+        std::vector<RsGxsIdGroup> ids_data;
+
+		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 );
+	});
 
-	mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDETAILSDIALOG_IDDETAILS);
 }
 
+#ifdef TO_REMOVE
 void IdDetailsDialog::requestRepList()
 {
 	// Removing this for the moment.
@@ -469,6 +434,7 @@ void IdDetailsDialog::loadRequest(const TokenQueue *queue, const TokenRequest &r
 		std::cerr << std::endl;
 	}
 }
+#endif
 
 QString IdDetailsDialog::inviteMessage()
 {
diff --git a/retroshare-gui/src/gui/Identity/IdDetailsDialog.h b/retroshare-gui/src/gui/Identity/IdDetailsDialog.h
index 672cb764f..ba53b2bba 100644
--- a/retroshare-gui/src/gui/Identity/IdDetailsDialog.h
+++ b/retroshare-gui/src/gui/Identity/IdDetailsDialog.h
@@ -32,7 +32,7 @@ class IdDetailsDialog;
 
 class UIStateHelper;
 
-class IdDetailsDialog : public QDialog, public TokenResponse
+class IdDetailsDialog : public QDialog
 {
 	Q_OBJECT
 
@@ -42,9 +42,6 @@ public:
 	/** Default destructor */
 	~IdDetailsDialog();
 
-	/* TokenResponse */
-	void loadRequest(const TokenQueue *queue, const TokenRequest &req);
-
 private slots:
 	void modifyReputation();
 	void toggleAutoBanIdentities(bool b);
@@ -52,15 +49,11 @@ private slots:
 	static QString inviteMessage();
 	void sendInvite();
 private :
-	void requestIdDetails();
-	void insertIdDetails(uint32_t token);
-	
-  void requestRepList();
-	void insertRepList(uint32_t token);
+	void loadIdentity();
+	void loadIdentity(RsGxsIdGroup data);
 
 private:
 	RsGxsGroupId mId;
-	TokenQueue *mIdQueue;
 	UIStateHelper *mStateHelper;
 
 	/** Qt Designer generated object */
diff --git a/retroshare-gui/src/gui/Identity/IdDetailsDialog.ui b/retroshare-gui/src/gui/Identity/IdDetailsDialog.ui
index 3faad4076..6a681f142 100644
--- a/retroshare-gui/src/gui/Identity/IdDetailsDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDetailsDialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>IdDetailsDialog</class>
- <widget class="QDialog" name="IdDetailsDialog">
+ <widget class="QWidget" name="IdDetailsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,14 +10,7 @@
     <height>475</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Person Details</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/logo/logo_32.png</normaloff>:/images/logo/logo_32.png</iconset>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_3">
+ <layout class="QGridLayout" name="gridLayout_3">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -500,16 +493,12 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>HeaderFrame</class>
-   <extends>QFrame</extends>
-   <header>gui/common/HeaderFrame.h</header>
-   <container>1</container>
+    <customwidget>
+	   <class>HeaderFrame</class>
+      <extends>QFrame</extends>
+     <header>gui/common/HeaderFrame.h</header>
+    <container>1</container>
   </customwidget>
- </customwidgets>
- <resources>
-  <include location="../images.qrc"/>
-  <include location="../icons.qrc"/>
- </resources>
- <connections/>
+  </customwidgets>
+ 
 </ui>
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index f52091eac..bf5502fea 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -709,14 +709,14 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
 		std::cerr << "  updating status of all identities for this circle:" << std::endl;
 #endif
 		// remove any identity that has an item, but no subscription flag entry
-		std::vector<QTreeWidgetItem*> to_delete ;
+		std::list<int> to_delete ;
 
 		for(uint32_t k=0; k < (uint32_t)item->childCount(); ++k)
 			if(details.mSubscriptionFlags.find(RsGxsId(item->child(k)->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString().toStdString())) == details.mSubscriptionFlags.end())
-				to_delete.push_back(item->child(k));
+				to_delete.push_front(k);	// front, so that we delete starting from the last one
 
-		for(uint32_t k=0;k<to_delete.size();++k)
-			delete to_delete[k] ;
+		for(auto index:to_delete)
+			delete item->takeChild(index);	// delete items starting from the largest index, because otherwise the count changes while deleting...
 
 		for(std::map<RsGxsId,uint32_t>::const_iterator it(details.mSubscriptionFlags.begin());it!=details.mSubscriptionFlags.end();++it)
 		{
@@ -730,13 +730,13 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
 #ifdef ID_DEBUG
 			std::cerr << "invited: " << invited << ", subscription: " << subscrb ;
 #endif
-			RSTreeWidgetItem *subitem = NULL ;
+            int subitem_index = -1;
 
 			// 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<RSTreeWidgetItem*>(item->child(k));
+                    subitem_index = k;
 #ifdef ID_DEBUG
 					std::cerr << " found existing sub item." << std::endl;
 #endif
@@ -745,8 +745,8 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
 
 			if(!(invited || subscrb))
 			{
-				if(subitem != NULL)
-					delete subitem ;
+				if(subitem_index >= 0)
+					delete item->takeChild(subitem_index) ;
 #ifdef ID_DEBUG
 				std::cerr << ". not relevant. Skipping." << std::endl;
 #endif
@@ -754,13 +754,15 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
 			}
 			// remove item if flags are not ok.
 
-			if(subitem && subitem->data(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole).toUInt() != it->second)
+			if(subitem_index >= 0 && item->child(subitem_index)->data(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole).toUInt() != it->second)
 			{
-				delete subitem ; 
-				subitem = NULL ;
+				delete item->takeChild(subitem_index) ;
+				subitem_index = -1 ;
 			}
 
-			if(!subitem)
+			QTreeWidgetItem *subitem(NULL);
+
+			if(subitem_index == -1)
 			{
 #ifdef ID_DEBUG
 				std::cerr << " no existing sub item. Creating new one." << std::endl;
@@ -804,6 +806,8 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
 
 				item->addChild(subitem) ;
 			}
+            else
+                subitem = item->child(subitem_index);
 
 			if(invited && !subscrb)
 			{
@@ -1140,92 +1144,6 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
     contextMnu.exec(QCursor::pos());
 }
 
-#ifdef SUSPENDED
-static void set_item_background(QTreeWidgetItem *item, uint32_t type)
-{
-	QBrush brush;
-	switch(type)
-	{
-		default:
-		case CLEAR_BACKGROUND:
-			brush = QBrush(Qt::white);
-			break;
-		case GREEN_BACKGROUND:
-			brush = QBrush(Qt::green);
-			break;
-		case BLUE_BACKGROUND:
-			brush = QBrush(Qt::blue);
-			break;
-		case RED_BACKGROUND:
-			brush = QBrush(Qt::red);
-			break;
-		case GRAY_BACKGROUND:
-			brush = QBrush(Qt::gray);
-			break;
-	}
-	item->setBackground (0, brush);
-}
-
-static void update_children_background(QTreeWidgetItem *item, uint32_t type)
-{
-	int count = item->childCount();
-	for(int i = 0; i < count; ++i)
-	{
-		QTreeWidgetItem *child = item->child(i);
-
-		if (child->childCount() > 0)
-		{
-			update_children_background(child, type);
-		}
-		set_item_background(child, type);
-	}
-}
-
-static void set_tree_background(QTreeWidget *tree, uint32_t type)
-{
-	std::cerr << "CirclesDialog set_tree_background()";
-	std::cerr << std::endl;
-
-	/* grab all toplevel */
-	int count = tree->topLevelItemCount();
-	for(int i = 0; i < count; ++i)
-	{
-		QTreeWidgetItem *item = tree->topLevelItem(i);
-		/* resursively clear child backgrounds */
-		update_children_background(item, type);
-		set_item_background(item, type);
-	}
-}
-
-static void check_mark_item(QTreeWidgetItem *item, const std::set<RsPgpId> &names, uint32_t col, uint32_t type)
-{
-	QString coltext = item->text(col);
-    RsPgpId colstr ( coltext.toStdString());
-	if (names.end() != names.find(colstr))
-	{
-		set_item_background(item, type);
-		std::cerr << "CirclesDialog check_mark_item: found match: " << colstr;
-		std::cerr << std::endl;
-	}
-}
-
-void IdDialog::circle_selected()
-{
-	QTreeWidgetItem *item = ui->treeWidget_membership->currentItem();
-
-#ifdef ID_DEBUG
-	std::cerr << "CirclesDialog::circle_selected() valid circle chosen";
-	std::cerr << std::endl;
-#endif
-	//set_item_background(item, BLUE_BACKGROUND);
-
-	QString coltext = (item->parent()->parent())? (item->parent()->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString()) : (item->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString());
-	RsGxsCircleId id ( coltext.toStdString()) ;
-
-    	requestCircleGroupData(id) ;
-}
-#endif
-    
 IdDialog::~IdDialog()
 {
 	rsEvents->unregisterEventsHandler(mEventHandlerId_identity);