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

* Added gxs Circle Helper Classes: GxsCircleLabel / Chooser.

Browse source 
* 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
This commit is contained in:
drbob 2012-12-15 23:11:11 +00:00
parent 95cbb57abf
commit 7935c5547f
13 changed files with 1667 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View file

@ -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));