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

merging gxs_phase2 branch

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2013-06-04 21:00:43 +00:00
parent 1150366913
commit 325fa4f222
116 changed files with 6050 additions and 3596 deletions
Download patch file Download diff file Expand all files Collapse all files

15
retroshare-gui/src/gui/Circles/CreateCircleDialog.h
View file

@ -39,6 +39,9 @@ public:
CreateCircleDialog();
~CreateCircleDialog();
void editNewId(bool isExternal);
void editExistingId(std::string circleId);
#if 0
void newMsg(); /* cleanup */
#endif
@ -53,6 +56,9 @@ private slots:
void selectedId(QTreeWidgetItem*, QTreeWidgetItem*);
void selectedMember(QTreeWidgetItem*, QTreeWidgetItem*);
void createCircle();
void cancelDialog();
#if 0
/** Create the context popup menu and it's submenus */
void forumMessageCostumPopupMenu( QPoint point );
@ -94,13 +100,18 @@ private:
RsGroupMetaData mForumMeta;
#endif
void createCircle();
void setupForPersonalCircle();
void setupForExternalCircle();
bool mIsExistingCircle;
bool mIsExternalCircle;
void loadCircle(uint32_t token);
void loadIdentities(uint32_t token);
void requestCircle(const RsGxsGroupId &groupId);
void requestIdentities();
void requestGxsIdentities();
void getPgpIdentities();
TokenQueue *mCircleQueue;
TokenQueue *mIdQueue;