* Added gxs Circle Helper Classes: GxsCircleLabel / Chooser.

* Added Circles into generic GxsGroupDialog.
 	 - Fixed up display of circles in GxsGroupDialog, 
	 - and correctly set GroupMetaData for circles.
 * Added new Circles Window to ApplicationWindow (doesn't do much yet).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5988 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/RetroShare.pro

@@ -4,11 +4,11 @@ CONFIG += qt gui uic qrc resources uitools idle bitdht
 CONFIG += photoshare 
 CONFIG += wikipoos
 CONFIG += identities
+CONFIG += circles
 CONFIG += gxsforums 
 CONFIG += posted
 CONFIG += unfinished
 CONFIG += gxsgui
-#CONFIG += circles
 #CONFIG += thewire
 
 #CONFIG += pluginmgr 
@@ -1037,6 +1037,8 @@ gxsgui {
 		gui/gxs/GxsForumGroupDialog.h \
 		gui/gxs/GxsIdChooser.h \
 		gui/gxs/GxsIdLabel.h \
+		gui/gxs/GxsCircleChooser.h \
+		gui/gxs/GxsCircleLabel.h \
 		gui/gxs/GxsIdTreeWidgetItem.h \
 
 #            gui/gxs/GxsMsgDialog.h \
@@ -1052,6 +1054,8 @@ gxsgui {
 		gui/gxs/GxsForumGroupDialog.cpp \
 		gui/gxs/GxsIdChooser.cpp \
 		gui/gxs/GxsIdLabel.cpp \
+		gui/gxs/GxsCircleChooser.cpp \
+		gui/gxs/GxsCircleLabel.cpp \
 		gui/gxs/GxsIdTreeWidgetItem.cpp \
 
 #            gui/gxs/GxsMsgDialog.cpp \

retroshare-gui/src/gui/Circles/CirclesDialog.cpp

@@ -0,0 +1,665 @@
+/*
+ * Retroshare Circle Plugin.
+ *
+ * Copyright 2012-2012 by Robert Fernie.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+#include <QFile>
+#include <QFileInfo>
+
+#include "gui/Circles/CirclesDialog.h"
+
+#include <retroshare/rsgxscircles.h>
+
+#include <iostream>
+#include <sstream>
+
+#include <QTimer>
+
+/******
+ * #define CIRCLE_DEBUG 1
+ *****/
+
+
+#if 0
+#define WIKIDIALOG_LISTING_GROUPDATA		2
+#define WIKIDIALOG_LISTING_PAGES		5
+#define WIKIDIALOG_MOD_LIST			6
+#define WIKIDIALOG_MOD_PAGES			7
+#define WIKIDIALOG_WIKI_PAGE			8
+
+#define WIKIDIALOG_EDITTREE_DATA		9
+
+#endif
+
+
+/** Constructor */
+CirclesDialog::CirclesDialog(QWidget *parent)
+: MainPage(parent)
+{
+	/* Invoke the Qt Designer generated object setup routine */
+	ui.setupUi(this);
+
+#if 0
+	mAddPageDialog = NULL;
+	mAddGroupDialog = NULL;
+	mEditDialog = NULL;
+
+	connect( ui.toolButton_NewGroup, SIGNAL(clicked()), this, SLOT(OpenOrShowAddGroupDialog()));
+	connect( ui.toolButton_NewPage, SIGNAL(clicked()), this, SLOT(OpenOrShowAddPageDialog()));
+	connect( ui.toolButton_Edit, SIGNAL(clicked()), this, SLOT(OpenOrShowEditDialog()));
+	connect( ui.toolButton_Republish, SIGNAL(clicked()), this, SLOT(OpenOrShowRepublishDialog()));
+
+	// Usurped until Refresh works normally
+	connect( ui.toolButton_Delete, SIGNAL(clicked()), this, SLOT(insertWikiGroups()));
+
+	connect( ui.treeWidget_Pages, SIGNAL(itemSelectionChanged()), this, SLOT(groupTreeChanged()));
+
+	QTimer *timer = new QTimer(this);
+	timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate()));
+	timer->start(1000);
+
+	/* setup TokenQueue */
+        rsWiki->generateDummyData();
+        mCircleQueue = new TokenQueue(rsWiki->getTokenService(), this);
+#endif
+
+	connect( ui.treeWidget_membership, SIGNAL(itemSelectionChanged()), this, SLOT(circle_selected()));
+	connect( ui.treeWidget_friends, SIGNAL(itemSelectionChanged()), this, SLOT(friend_selected()));
+	connect( ui.treeWidget_category, SIGNAL(itemSelectionChanged()), this, SLOT(category_selected()));
+
+
+}
+
+
+#if 0
+
+void CirclesDialog::checkUpdate()
+{
+
+	/* update */
+	if (!rsWiki)
+		return;
+
+	if (rsWiki->updated())
+	{
+		insertWikiGroups();
+	}
+
+	return;
+}
+
+
+
+
+void CirclesDialog::update()
+{
+	/* load all circles, personal groups 
+	 * into the lists.
+	 */
+
+	/* load friend list */
+
+	/* load categories */
+
+	std::list<RsGxsCircleId> public_circles;
+	rsGxsCircles->getPublicCircles(public_circle);
+
+
+
+}
+
+
+void CirclesDialog::circle_selected()
+{
+	/* update friend lists */
+
+	/* if personal group, update permissions */
+}
+
+
+void CirclesDialog::friend_selected()
+{
+	/* update circle lists */
+
+
+	/* update permission lists */
+}
+
+void CirclesDialog::category_selected()
+{
+
+
+
+}
+
+
+#endif
+
+
+#if 0
+
+
+void CirclesDialog::OpenOrShowAddPageDialog()
+{
+	std::string groupId = getSelectedGroup();
+	if (groupId == "")
+	{
+		std::cerr << "CirclesDialog::OpenOrShowAddPageDialog() No Group selected";
+		std::cerr << std::endl;
+		return;
+	}
+
+	if (!mEditDialog)
+	{
+		mEditDialog = new WikiEditDialog(NULL);
+	}
+
+	std::cerr << "CirclesDialog::OpenOrShowAddPageDialog() GroupId: " << groupId;
+	std::cerr << std::endl;
+
+	mEditDialog->setupData(groupId, "");
+	mEditDialog->setNewPage();
+
+	mEditDialog->show();
+}
+
+
+
+void CirclesDialog::OpenOrShowAddGroupDialog()
+{
+	newGroup();
+}
+
+/*********************** **** **** **** ***********************/
+/** New / Edit Groups          ********************************/
+/*********************** **** **** **** ***********************/
+
+void CirclesDialog::newGroup()
+{
+        WikiGroupDialog cf(mWikiQueue, this);
+        cf.wikitype();
+
+        cf.exec ();
+}
+
+void CirclesDialog::showGroupDetails()
+{
+	std::string groupId = getSelectedGroup();
+	if (groupId == "")
+	{
+		std::cerr << "CirclesDialog::showGroupDetails() No Group selected";
+		std::cerr << std::endl;
+		return;
+	}
+}
+
+void CirclesDialog::editGroupDetails()
+{
+	std::string groupId = getSelectedGroup();
+	if (groupId == "")
+	{
+		std::cerr << "CirclesDialog::editGroupDetails() No Group selected";
+		std::cerr << std::endl;
+		return;
+	}
+
+
+        //WikiGroupDialog cf (this);
+        //cf.existingGroup(groupId,  GXS_GROUP_DIALOG_EDIT_MODE);
+
+        //cf.exec ();
+}
+
+
+
+void CirclesDialog::OpenOrShowEditDialog()
+{
+	std::string groupId;
+	std::string pageId;
+	std::string origPageId;
+
+	if (!getSelectedPage(groupId, pageId, origPageId))
+	{
+		std::cerr << "CirclesDialog::OpenOrShowAddPageDialog() No Group or PageId selected";
+		std::cerr << std::endl;
+		return;
+	}
+
+	std::cerr << "CirclesDialog::OpenOrShowAddPageDialog()";
+	std::cerr << std::endl;
+
+	if (!mEditDialog)
+	{
+		mEditDialog = new WikiEditDialog(NULL);
+	}
+
+	mEditDialog->setupData(groupId, pageId);
+	mEditDialog->show();
+}
+
+void CirclesDialog::OpenOrShowRepublishDialog()
+{
+	OpenOrShowEditDialog();
+
+	std::string groupId;
+	std::string pageId;
+	std::string origPageId;
+
+	if (!getSelectedPage(groupId, pageId, origPageId))
+	{
+		std::cerr << "CirclesDialog::OpenOrShowAddRepublishDialog() No Group or PageId selected";
+		std::cerr << std::endl;
+		if (mEditDialog)
+		{
+			mEditDialog->hide();
+		}
+		return;
+	}
+
+	mEditDialog->setRepublishMode(origPageId);
+}
+
+
+void CirclesDialog::groupTreeChanged()
+{
+	/* */
+	std::string groupId;
+	std::string pageId;
+	std::string origPageId;
+
+	getSelectedPage(groupId, pageId, origPageId);
+	if (pageId == mPageSelected)
+	{
+		return; /* nothing changed */
+	}
+
+	if (pageId == "")
+	{
+		/* clear Mods */
+		clearGroupTree();
+		return;
+	}
+
+        RsGxsGrpMsgIdPair origPagePair = std::make_pair(groupId, origPageId);
+        RsGxsGrpMsgIdPair pagepair = std::make_pair(groupId, pageId);
+	requestWikiPage(pagepair);
+}
+
+void CirclesDialog::updateWikiPage(const RsWikiSnapshot &page)
+{
+#ifdef USE_PEGMMD_RENDERER
+	/* render as HTML */
+	int extensions = 0;
+	char *answer = markdown_to_string((char *) page.mPage.c_str(), extensions, HTML_FORMAT);
+
+	QString renderedText = QString::fromUtf8(answer);
+	ui.textBrowser->setHtml(renderedText);
+
+	// free answer.
+	free(answer);
+#else
+	/* render as HTML */
+	QString renderedText = "IN (dummy) RENDERED TEXT MODE:\n";
+	renderedText += QString::fromStdString(page.mPage);
+	ui.textBrowser->setPlainText(renderedText);
+#endif
+}
+
+
+void CirclesDialog::clearWikiPage()
+{
+	ui.textBrowser->setPlainText("");
+}
+
+
+void 	CirclesDialog::clearGroupTree()
+{
+	ui.treeWidget_Pages->clear();
+}
+
+
+#define WIKI_GROUP_COL_GROUPNAME	0
+#define WIKI_GROUP_COL_GROUPID		1
+
+#define WIKI_GROUP_COL_PAGENAME		0
+#define WIKI_GROUP_COL_PAGEID		1
+#define WIKI_GROUP_COL_ORIGPAGEID	2
+
+
+bool CirclesDialog::getSelectedPage(std::string &groupId, std::string &pageId, std::string &origPageId)
+{
+#ifdef WIKI_DEBUG 
+	std::cerr << "CirclesDialog::getSelectedPage()" << std::endl;
+#endif
+
+	/* get current item */
+	QTreeWidgetItem *item = ui.treeWidget_Pages->currentItem();
+
+	if (!item)
+	{
+		/* leave current list */
+#ifdef WIKI_DEBUG 
+		std::cerr << "CirclesDialog::getSelectedPage() Nothing selected" << std::endl;
+#endif
+		return false;
+	}
+
+	QTreeWidgetItem *parent = item->parent();
+
+	if (!parent)
+	{
+#ifdef WIKI_DEBUG 
+		std::cerr << "CirclesDialog::getSelectedPage() No Parent -> Group Selected" << std::endl;
+#endif
+		return false;
+	}
+
+
+	/* check if it has changed */
+	groupId = parent->text(WIKI_GROUP_COL_GROUPID).toStdString();
+	pageId = item->text(WIKI_GROUP_COL_PAGEID).toStdString();
+	origPageId = item->text(WIKI_GROUP_COL_ORIGPAGEID).toStdString();
+
+#ifdef WIKI_DEBUG 
+	std::cerr << "CirclesDialog::getSelectedPage() PageId: " << pageId << std::endl;
+#endif
+	return true;
+}
+
+
+std::string CirclesDialog::getSelectedGroup()
+{
+	std::string groupId;
+#ifdef WIKI_DEBUG 
+	std::cerr << "CirclesDialog::getSelectedGroup()" << std::endl;
+#endif
+
+	/* get current item */
+	QTreeWidgetItem *item = ui.treeWidget_Pages->currentItem();
+
+	if (!item)
+	{
+		/* leave current list */
+#ifdef WIKI_DEBUG 
+		std::cerr << "CirclesDialog::getSelectedGroup() Nothing selected" << std::endl;
+#endif
+		return groupId;
+	}
+
+	QTreeWidgetItem *parent = item->parent();
+
+	if (parent)
+	{
+		groupId = parent->text(WIKI_GROUP_COL_GROUPID).toStdString();
+#ifdef WIKI_DEBUG 
+		std::cerr << "CirclesDialog::getSelectedGroup() Page -> GroupId: " << groupId << std::endl;
+#endif
+		return groupId;
+	}
+
+	/* otherwise, we are on the group already */
+	groupId = item->text(WIKI_GROUP_COL_GROUPID).toStdString();
+#ifdef WIKI_DEBUG 
+	std::cerr << "CirclesDialog::getSelectedGroup() GroupId: " << groupId << std::endl;
+#endif
+	return groupId;
+}
+
+/************************** Request / Response *************************/
+/*** Loading Main Index ***/
+
+void CirclesDialog::insertWikiGroups()
+{
+	requestGroupList();
+}
+
+
+void CirclesDialog::requestGroupList()
+{
+	std::cerr << "CirclesDialog::requestGroupList()";
+	std::cerr << std::endl;
+
+	RsTokReqOptions opts;
+	opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
+
+	uint32_t token;
+	mWikiQueue->requestGroupInfo(token,  RS_TOKREQ_ANSTYPE_DATA, opts, WIKIDIALOG_LISTING_GROUPDATA);
+}
+
+
+void CirclesDialog::loadGroupData(const uint32_t &token)
+{
+	std::cerr << "CirclesDialog::loadGroupData()";
+	std::cerr << std::endl;
+
+	clearGroupTree();
+
+	std::vector<RsWikiCollection> datavector;
+	std::vector<RsWikiCollection>::iterator vit;
+
+        if (!rsWiki->getCollections(token, datavector))
+        {
+                std::cerr << "CirclesDialog::loadGroupData() Error getting GroupData";
+                std::cerr << std::endl;
+                return;
+        }
+
+        for(vit = datavector.begin(); vit != datavector.end(); vit++)
+        {
+		RsWikiCollection &group = *vit;
+
+		/* Add Widget, and request Pages */
+
+		std::cerr << "CirclesDialog::addGroup() GroupId: " << group.mMeta.mGroupId;
+		std::cerr << " Group: " << group.mMeta.mGroupName;
+		std::cerr << std::endl;
+
+		QTreeWidgetItem *groupItem = new QTreeWidgetItem();
+		groupItem->setText(WIKI_GROUP_COL_GROUPNAME, QString::fromStdString(group.mMeta.mGroupName));
+		groupItem->setText(WIKI_GROUP_COL_GROUPID, QString::fromStdString(group.mMeta.mGroupId));
+		ui.treeWidget_Pages->addTopLevelItem(groupItem);
+
+		/* request pages */
+		std::list<std::string> groupIds;	
+		groupIds.push_back(group.mMeta.mGroupId);
+
+		requestPages(groupIds);
+		//requestOriginalPages(groupIds);
+        }
+}
+
+
+void CirclesDialog::requestPages(const std::list<RsGxsGroupId> &groupIds)
+{
+	std::cerr << "CirclesDialog::requestPages()";
+	std::cerr << std::endl;
+
+	RsTokReqOptions opts;
+	opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA;
+        opts.mOptions = (RS_TOKREQOPT_MSG_LATEST | RS_TOKREQOPT_MSG_THREAD); // We want latest version of Thread Heads.
+	uint32_t token;
+	mWikiQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, WIKIDIALOG_LISTING_PAGES);
+}
+
+
+void CirclesDialog::loadPages(const uint32_t &token)
+{
+	std::cerr << "CirclesDialog::loadPages()";
+	std::cerr << std::endl;
+
+	/* find parent in GUI Tree - stick children */
+
+	QTreeWidgetItem *groupItem = NULL;
+
+	std::vector<RsWikiSnapshot> snapshots;
+	std::vector<RsWikiSnapshot>::iterator vit;
+        if (!rsWiki->getSnapshots(token, snapshots))
+	{
+		// ERROR
+		return;
+	}
+
+	for(vit = snapshots.begin(); vit != snapshots.end(); vit++)
+	{
+                RsWikiSnapshot page = *vit;
+		if (!groupItem)
+		{
+			/* find the entry */
+        		int itemCount = ui.treeWidget_Pages->topLevelItemCount();
+        		for (int nIndex = 0; nIndex < itemCount; nIndex++) 
+        		{
+				QTreeWidgetItem *tmpItem = ui.treeWidget_Pages->topLevelItem(nIndex);
+                		std::string tmpid = tmpItem->data(WIKI_GROUP_COL_GROUPID, 
+						Qt::DisplayRole).toString().toStdString();
+				if (tmpid == page.mMeta.mGroupId)
+				{
+                			groupItem = tmpItem;
+					break;
+				}
+			}
+
+			if (!groupItem)
+			{
+				/* error */
+				std::cerr << "CirclesDialog::loadPages() ERROR Unable to find group";
+				std::cerr << std::endl;
+				return;
+			}
+		}
+						
+
+		std::cerr << "CirclesDialog::loadPages() PageId: " << page.mMeta.mMsgId;
+		std::cerr << " Page: " << page.mMeta.mMsgName;
+		std::cerr << std::endl;
+
+		QTreeWidgetItem *pageItem = new QTreeWidgetItem();
+		pageItem->setText(WIKI_GROUP_COL_PAGENAME, QString::fromStdString(page.mMeta.mMsgName));
+		pageItem->setText(WIKI_GROUP_COL_PAGEID, QString::fromStdString(page.mMeta.mMsgId));
+		pageItem->setText(WIKI_GROUP_COL_ORIGPAGEID, QString::fromStdString(page.mMeta.mOrigMsgId));
+
+		groupItem->addChild(pageItem);
+	}
+}
+
+/***** Wiki *****/
+
+void CirclesDialog::requestWikiPage(const RsGxsGrpMsgIdPair &msgId)
+{
+	std::cerr << "CirclesDialog::requestWikiPage(" << msgId.first << "," << msgId.second << ")";
+	std::cerr << std::endl;
+
+	RsTokReqOptions opts;
+	opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA;
+
+	uint32_t token;
+
+	GxsMsgReq msgIds;
+	std::vector<RsGxsMessageId> &vect_msgIds = msgIds[msgId.first];
+	vect_msgIds.push_back(msgId.second);
+
+	mWikiQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, WIKIDIALOG_WIKI_PAGE);
+
+	//mWikiQueue->requestMsgRelatedInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, WIKIDIALOG_WIKI_PAGE);
+}
+
+
+void CirclesDialog::loadWikiPage(const uint32_t &token)
+{
+	std::cerr << "CirclesDialog::loadWikiPage()";
+	std::cerr << std::endl;
+
+	// Should only have one WikiPage....
+	std::vector<RsWikiSnapshot> snapshots;
+        if (!rsWiki->getSnapshots(token, snapshots))
+	{
+		std::cerr << "CirclesDialog::loadWikiPage() ERROR";
+		std::cerr << std::endl;
+
+		// ERROR
+		return;
+	}
+
+	if (snapshots.size() != 1) 
+	{
+		std::cerr << "CirclesDialog::loadWikiPage() SIZE ERROR";
+		std::cerr << std::endl;
+
+		// ERROR
+		return;
+	}
+
+
+	RsWikiSnapshot page = snapshots[0];
+	
+	std::cerr << "CirclesDialog::loadWikiPage() PageId: " << page.mMeta.mMsgId;
+	std::cerr << " Page: " << page.mMeta.mMsgName;
+	std::cerr << std::endl;
+
+	updateWikiPage(page);
+}
+
+#endif
+
+
+void CirclesDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
+{
+
+#if 0
+	std::cerr << "CirclesDialog::loadRequest() UserType: " << req.mUserType;
+	std::cerr << std::endl;
+	
+	if (queue == mWikiQueue)
+	{
+		/* now switch on req */
+		switch(req.mUserType)
+		{
+			case WIKIDIALOG_LISTING_GROUPDATA:
+				loadGroupData(req.mToken);
+				break;
+
+			case WIKIDIALOG_LISTING_PAGES:
+				loadPages(req.mToken);
+				break;
+
+			case WIKIDIALOG_WIKI_PAGE:
+				loadWikiPage(req.mToken);
+				break;
+
+#define GXSGROUP_NEWGROUPID             1
+			case GXSGROUP_NEWGROUPID:
+				insertWikiGroups();
+				break;
+			default:
+				std::cerr << "CirclesDialog::loadRequest() ERROR: INVALID TYPE";
+				std::cerr << std::endl;
+				break;
+		}
+	}
+
+#endif
+
+}
+	
+	
+	
+	
+
+

retroshare-gui/src/gui/Circles/CirclesDialog.h

@@ -0,0 +1,93 @@
+/*
+ * Retroshare Circle.
+ *
+ * Copyright 2012-2012 by Robert Fernie.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+#ifndef MRK_CIRCLE_DIALOG_H
+#define MRK_CIRCLE_DIALOG_H
+
+#include "retroshare-gui/mainpage.h"
+#include "ui_CirclesDialog.h"
+
+//#include <retroshare/rscircles.h>
+
+#include "util/TokenQueue.h"
+
+#include <map>
+
+class CirclesDialog : public MainPage, public TokenResponse
+{
+  Q_OBJECT
+
+public:
+	CirclesDialog(QWidget *parent = 0);
+
+void 	loadRequest(const TokenQueue *queue, const TokenRequest &req);
+
+private slots:
+
+#if 0
+	void checkUpdate();
+	void OpenOrShowAddPageDialog();
+	void OpenOrShowAddGroupDialog();
+	void OpenOrShowEditDialog();
+	void OpenOrShowRepublishDialog();
+
+	void groupTreeChanged();
+
+	void newGroup();
+	void showGroupDetails();
+	void editGroupDetails();
+
+	void insertWikiGroups();
+#endif
+
+private:
+
+#if 0
+void 	clearWikiPage();
+void    clearGroupTree();
+
+void 	updateWikiPage(const RsWikiSnapshot &page);
+
+bool 	getSelectedPage(std::string &groupId, std::string &pageId, std::string &origPageId);	
+std::string getSelectedPage();
+std::string getSelectedGroup();
+
+void 	requestGroupList();
+void 	loadGroupData(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);
+#endif
+
+	TokenQueue *mCircleQueue;
+
+	/* UI - from Designer */
+	Ui::CirclesDialog ui;
+
+};
+
+#endif
+

retroshare-gui/src/gui/Circles/CirclesDialog.ui

@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CirclesDialog</class>
+ <widget class="QWidget" name="CirclesDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>746</width>
+    <height>568</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QPushButton" name="pushButton_localgroup">
+       <property name="text">
+        <string>Create Personal Group</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_publicgroup">
+       <property name="text">
+        <string>Create Public Group</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton">
+       <property name="text">
+        <string>Refresh</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>378</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Showing details: </string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QGroupBox" name="groupBox_2">
+       <property name="title">
+        <string>Membership</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QTreeWidget" name="treeWidget_membership">
+          <column>
+           <property name="text">
+            <string>Name</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>IDs</string>
+           </property>
+          </column>
+          <item>
+           <property name="text">
+            <string>Personal Circles</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Public Circles</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="title">
+        <string>Peers</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QTreeWidget" name="treeWidget_friends">
+          <column>
+           <property name="text">
+            <string>Name</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Status</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>ID</string>
+           </property>
+          </column>
+          <item>
+           <property name="text">
+            <string>Friends</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Friends of Friends</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Others</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_3">
+       <property name="title">
+        <string>Permissions</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QCheckBox" name="checkBox_anon">
+          <property name="text">
+           <string>Anon Transfers</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBox_disc">
+          <property name="text">
+           <string>Discovery</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QTreeWidget" name="treeWidget_category">
+          <column>
+           <property name="text">
+            <string>Share Category</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="Circles_images.qrc"/>
+ </resources>
+ <connections/>
+</ui>

retroshare-gui/src/gui/Circles/Circles_images.qrc

@@ -0,0 +1,16 @@
+<RCC>
+	<qresource prefix="/" >
+		<file>images/arrow-left.png</file>
+		<file>images/arrow-right.png</file>
+		<file>images/resource-group-new.png</file>
+		<file>images/appointment-new.png</file>
+		<file>images/book2_32.png</file>
+		<file>images/story-editor.png</file>
+		<file>images/story-editor_48.png</file>
+		<file>images/republish.png</file>
+		<file>images/resource-group-new_48.png</file>
+		<file>images/wikibook_32.png</file>
+		<file>images/resource-group_64.png</file>
+		<file>images/appointment-new_64.png</file>
+	</qresource>
+</RCC>

retroshare-gui/src/gui/gxs/GxsCircleChooser.cpp

@@ -0,0 +1,108 @@
+/****************************************************************
+ *  RetroShare is distributed under the following license:
+ *
+ *  Copyright (C) 2008 Robert Fernie
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+#include "GxsCircleChooser.h"
+
+#include <algorithm>
+
+#include <retroshare/rspeers.h>
+
+#include <iostream>
+
+/** Constructor */
+GxsCircleChooser::GxsCircleChooser(QWidget *parent)
+: QComboBox(parent), mFlags(0)
+{
+	return;
+}
+
+void GxsCircleChooser::loadCircles(uint32_t chooserFlags)
+{
+	mFlags = chooserFlags;
+	loadGxsCircles();
+}
+
+
+bool MakeGxsCircleDesc(const RsGxsCircleId &id, QString &desc)
+{
+	RsGxsCircleDetails details;
+	
+	if (rsGxsCircles->getCircleDetails(id, details))
+	{
+		desc = QString::fromUtf8(details.mCircleName.c_str());
+	}
+	else
+	{
+		desc += "Unknown";
+	}
+
+	desc += " (Ext) [";
+	desc += QString::fromStdString(id.substr(0,5));
+	desc += "...]";
+
+	return true;
+}
+
+
+void GxsCircleChooser::loadGxsCircles()
+{
+	std::list<RsGxsCircleId> ids;
+	rsGxsCircles->getCircleIdList(ids);
+
+	if (ids.empty())
+	{
+		std::cerr << "GxsCircleChooser::loadGxsCircles() ERROR no ids";
+		std::cerr << std::endl;
+		return;
+	}	
+
+	std::list<RsGxsCircleId>::iterator it;
+	for(it = ids.begin(); it != ids.end(); it++)
+	{
+		/* add to Chooser */
+		QString str;
+		if (!MakeGxsCircleDesc(*it, str))
+		{
+			std::cerr << "GxsCircleChooser::loadGxsCircles() ERROR Desc for Id: " << *it;
+			std::cerr << std::endl;
+			continue;
+		}
+		QString id = QString::fromStdString(*it);
+
+		addItem(str, id);
+	}
+}
+
+bool GxsCircleChooser::getChosenCircle(RsGxsCircleId &id)
+{
+	if (count() < 1)
+	{
+		return false;
+	}
+
+	int idx = currentIndex();
+
+	QVariant var = itemData(idx);
+	id = var.toString().toStdString();
+
+	return true;
+}
+		

retroshare-gui/src/gui/gxs/GxsCircleChooser.h

@@ -0,0 +1,45 @@
+/****************************************************************
+ *  RetroShare is distributed under the following license:
+ *
+ *  Copyright (C) 2008 Robert Fernie
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+
+#ifndef _GXS_CIRCLES_CHOOSER_H
+#define _GXS_CIRCLES_CHOOSER_H
+
+#include <QComboBox>
+#include <retroshare/rsgxscircles.h>
+
+class GxsCircleChooser : public QComboBox
+{
+        Q_OBJECT
+
+public:
+	GxsCircleChooser(QWidget *parent = NULL);
+
+	void loadCircles(uint32_t chooserFlags);
+	bool getChosenCircle(RsGxsCircleId &id);
+
+private:
+	void loadGxsCircles();
+	uint32_t mFlags;
+};
+
+#endif
+

retroshare-gui/src/gui/gxs/GxsCircleLabel.cpp

@@ -0,0 +1,103 @@
+/****************************************************************
+ *  RetroShare is distributed under the following license:
+ *
+ *  Copyright (C) 2008 Robert Fernie
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+#include "GxsCircleLabel.h"
+
+#include <algorithm>
+
+#include <retroshare/rspeers.h>
+
+#include <iostream>
+
+/** Constructor */
+GxsCircleLabel::GxsCircleLabel(QWidget *parent)
+:QLabel(parent), mTimer(NULL), mCount(0)
+{
+	mTimer = new QTimer(this);
+	mTimer->setSingleShot(true);
+	connect(mTimer, SIGNAL(timeout()), this, SLOT(loadId()));
+
+	return;
+}
+
+void GxsCircleLabel::setCircleId(const RsGxsCircleId &id)
+{
+	mId = id;
+	if (mId == "")
+	{
+		setText("No Circle");
+	}
+	else
+	{
+		loadGxsCircle();
+	}
+}
+
+bool GxsCircleLabel::getCircleId(RsGxsCircleId &id)
+{
+	id = mId;
+	return true;
+}
+
+static bool MakeCircleDesc(const RsGxsCircleId &id, QString &str)
+{
+	RsGxsCircleDetails details;
+	
+	if (!rsGxsCircles->getCircleDetails(id, details))
+	{
+		str = "Loading... " + QString::fromStdString(id.substr(0,5));
+		return false;
+	}
+
+	str = QString::fromUtf8(details.mCircleName.c_str());
+
+        str += " (Ext) [";
+        str += QString::fromStdString(id.substr(0,5));
+        str += "...]";
+
+	return true;
+}
+
+#define MAX_ATTEMPTS 3
+
+void GxsCircleLabel::loadGxsCircle()
+{
+	mCount++;
+
+	/* try and get details - if not there ... set callback */
+	QString desc;
+	bool loaded = MakeCircleDesc(mId, desc);
+
+	setText(desc);
+
+	if (loaded)
+	{
+		return;
+	}
+
+	if (mCount < MAX_ATTEMPTS)
+	{
+		/* timer event to try again (circles take longer) */
+		mTimer->setInterval(mCount * 3000);
+     		mTimer->start();
+	}
+}
+

retroshare-gui/src/gui/gxs/GxsCircleLabel.h

@@ -0,0 +1,51 @@
+/****************************************************************
+ *  RetroShare is distributed under the following license:
+ *
+ *  Copyright (C) 2008 Robert Fernie
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+
+#ifndef _GXS_CIRCLE_LABEL_H
+#define _GXS_CIRCLE_LABEL_H
+
+#include <QTimer>
+#include <QLabel>
+#include <retroshare/rsgxscircles.h>
+
+class GxsCircleLabel : public QLabel
+{
+        Q_OBJECT
+
+public:
+	GxsCircleLabel(QWidget *parent = NULL);
+
+	void setCircleId(const RsGxsCircleId &id);
+	bool getCircleId(RsGxsCircleId &id);
+
+private slots:
+	void loadGxsCircle();
+
+private:
+
+	QTimer *mTimer;
+	RsGxsCircleId mId;
+	int mCount;
+};
+
+#endif
+

retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp

@@ -29,6 +29,7 @@
 #include <algorithm>
 
 #include <retroshare/rspeers.h>
+#include <retroshare/rsgxscircles.h>
 
 #include <iostream>
 
@@ -78,6 +79,13 @@ void GxsGroupDialog::init()
 	connect( ui.groupLogo, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
 	connect( ui.addLogoButton, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
 
+	ui.typePublic->setChecked(true);
+	updateCircleOptions();
+
+	connect( ui.typePublic, SIGNAL(clicked()), this , SLOT(updateCircleOptions()));
+	connect( ui.typeGroup, SIGNAL(clicked()), this , SLOT(updateCircleOptions()));
+	connect( ui.typeLocal, SIGNAL(clicked()), this , SLOT(updateCircleOptions()));
+
 	if (!ui.pubKeyShare_cb->isChecked())
 	{
 		ui.contactsdockWidget->hide();
@@ -92,6 +100,7 @@ void GxsGroupDialog::init()
 	/* Setup Reasonable Defaults */
 
 	ui.idChooser->loadIds(0,"");
+	ui.circleComboBox->loadCircles(0);
 
 	initMode();
 }
@@ -324,6 +333,8 @@ void GxsGroupDialog::createGroup()
 	meta.mGroupFlags = flags;
 	meta.mSignFlags = getGroupSignFlags();
 
+	setCircleParameters(meta);
+
 	if (service_CreateGroup(token, meta))
 	{
 		// get the Queue to handle response.
@@ -395,6 +406,80 @@ void GxsGroupDialog::setGroupSignFlags(uint32_t signFlags)
 	}
 }
 
+
+
+/**** Above logic is flawed, and will be removed shortly
+ *
+ *
+ ****/
+
+void GxsGroupDialog::updateCircleOptions()
+{
+	if (ui.typeGroup->isChecked())
+	{
+		ui.circleComboBox->setEnabled(true);
+		ui.circleComboBox->setVisible(true);
+	}
+	else 
+	{
+		ui.circleComboBox->setEnabled(false);
+		ui.circleComboBox->setVisible(false);
+	}
+
+	if (ui.typeLocal->isChecked())
+	{
+		ui.localComboBox->setEnabled(true);
+		ui.localComboBox->setVisible(true);
+	}
+	else 
+	{
+		ui.localComboBox->setEnabled(false);
+		ui.localComboBox->setVisible(false);
+	}
+}
+
+void GxsGroupDialog::setCircleParameters(RsGroupMetaData &meta)
+{
+	bool problem = false;
+	if (ui.typePublic->isChecked())
+	{
+		meta.mCircleType = GXS_CIRCLE_TYPE_PUBLIC;
+		meta.mCircleId.clear();
+	}
+	else if (ui.typeGroup->isChecked())
+	{
+		meta.mCircleType = GXS_CIRCLE_TYPE_EXTERNAL;
+		if (!ui.circleComboBox->getChosenCircle(meta.mCircleId))
+		{
+			problem = true;
+		}
+	}
+	else if (ui.typeGroup->isChecked())
+	{
+		meta.mCircleType = GXS_CIRCLE_TYPE_YOUREYESONLY;
+		meta.mCircleId.clear();
+		meta.mOriginator.clear();
+		meta.mInternalCircle = "Internal Circle Id";
+	
+		problem = true;
+	}
+	else
+	{
+		problem = true;
+	}
+
+	if (problem)
+	{
+		// error.
+		meta.mCircleType = GXS_CIRCLE_TYPE_PUBLIC;
+		meta.mCircleId.clear();
+		meta.mOriginator.clear();
+		meta.mInternalCircle.clear();
+	}
+}
+
+
+
 void GxsGroupDialog::cancelDialog()
 {
 	std::cerr << "GxsGroupDialog::cancelDialog() Should Close!";

retroshare-gui/src/gui/gxs/GxsGroupDialog.h

@@ -188,8 +188,14 @@ private slots:
 	// set private forum key share list
 	void setShareList();
 
+	void updateCircleOptions();
+
 private:
 
+
+	void setCircleParameters(RsGroupMetaData &meta);
+
+
 	void setGroupSignFlags(uint32_t signFlags);
 	uint32_t getGroupSignFlags();
 	void setupDefaults();

retroshare-gui/src/gui/gxs/GxsGroupDialog.ui

@@ -297,19 +297,16 @@
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_8">
            <item>
-            <widget class="QComboBox" name="groupComboBox">
+            <widget class="GxsCircleChooser" name="circleComboBox"/>
-             <item>
-              <property name="text">
-               <string>Select Group of Friends</string>
-              </property>
-             </item>
-            </widget>
            </item>
            <item>
             <spacer name="horizontalSpacer">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
@@ -319,24 +316,28 @@
             </spacer>
            </item>
            <item>
-            <widget class="QPushButton" name="editGroupsButton">
+            <widget class="QComboBox" name="localComboBox">
+             <item>
               <property name="text">
-              <string>Edit Groups</string>
+               <string>Some Friends</string>
               </property>
-            </widget>
              </item>
              <item>
-            <spacer name="horizontalSpacer_3">
+              <property name="text">
-             <property name="orientation">
+               <string>Another Group</string>
-              <enum>Qt::Horizontal</enum>
               </property>
-             <property name="sizeHint" stdset="0">
+             </item>
-              <size>
+             <item>
-               <width>40</width>
+              <property name="text">
-               <height>20</height>
+               <string>Family?</string>
-              </size>
               </property>
-            </spacer>
+             </item>
+             <item>
+              <property name="text">
+               <string>Enemies</string>
+              </property>
+             </item>
+            </widget>
            </item>
           </layout>
          </item>
@@ -491,6 +492,11 @@
    <header>gui/common/FriendSelectionWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>GxsCircleChooser</class>
+   <extends>QComboBox</extends>
+   <header>gui/gxs/GxsCircleChooser.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>

retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp

@@ -27,6 +27,7 @@
 #include <retroshare/rsiface.h>
 
 #include "gui/Identity/IdDialog.h"
+#include "gui/Circles/CirclesDialog.h"
 #include "gui/PhotoShare/PhotoShare.h"
 #include "gui/WikiPoos/WikiDialog.h"
 #include "gui/Posted/PostedDialog.h"
@@ -91,6 +92,10 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
     ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
                       createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp));
 
+    CirclesDialog *circlesDialog = NULL;
+    ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
+                      createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
+
     PhotoShare *photoShare = NULL;
     ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
                      createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));