From 3fc6f6b2db99c03a352080c35c58c43b16d10a48 Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 9 Mar 2016 20:53:49 -0500 Subject: [PATCH] updated TODO(circles), removed useless context menu, added tooltips for circle distribution options --- TODO.circles.txt | 11 ++++++----- .../src/gui/Circles/CreateCircleDialog.ui | 17 +++++++++++++++-- retroshare-gui/src/gui/Identity/IdDialog.cpp | 3 +++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/TODO.circles.txt b/TODO.circles.txt index c1965d866..5fb91e6a7 100644 --- a/TODO.circles.txt +++ b/TODO.circles.txt @@ -6,7 +6,8 @@ GUI [X] make GUI update when creating a circle [ ] handle the display of encrypted forums/channels/etc when we do not have the keys [ ] disable posting to circles for which we do not have the rights - [ ] group "show details" should be made up to date for rstrinction options + [ ] warn about creating a circle without one of your ids in it + [ ] group "show details" should be made up to date for restrinction options [ ] allow to share circles publish rights Tests @@ -17,16 +18,16 @@ Tests [-] test #004: peers subscribed to encrypted circles shouldn't keep asking for the data if they cannot decrypt [X] test #005: peers can be added/removed from circles, and the circles update between friends [ ] test #006: peers subscribed to encrypted circles who recently got added to the circle should get the data - [ ] test #007: peers outside shouldn't be able to post (or posts shouldn't propagate) + [ ] test #007: peers outside a circle shouldn't be able to post (or posts shouldn't propagate) Backend [X] add debug output later RS_NXS_DEBUG_7 in rsgxsnetservice.cc for the crypto layer Bugs [X] Peers cannot be removed from a circle - [ ] Context menu should not allow to edit non admin circles + [X] Context menu should not allow to edit non admin circles [ ] Editing circles make them subscribed, even non admin ones. - [ ] Disable autosync for circles (in rsinit.cc) - [ ] Add explicit circle sync request for all grps restricted to a circle (same as IDs) + [X] Disable autosync for circles (in rsinit.cc) + [-] Add explicit circle sync request for all grps restricted to a circle (same as IDs) diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui index 057dad28b..53007831a 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui @@ -6,7 +6,7 @@ 0 0 - 681 + 881 515 @@ -266,7 +266,11 @@ - + + + <html><head/><body><p>The creator of a circle does not need to be known. It is however useful for public circles so that people know to whom to send a request for membership.</p></body></html> + + @@ -300,6 +304,9 @@ + + <html><head/><body><p>Publicly distributed circles are visible to your friends, which will get to know the circle data (Creator, members, etc)</p></body></html> + Public @@ -307,6 +314,9 @@ + + <html><head/><body><p>Self-restricted circles (the very existance of the circle, and its actual content) are only visible to the members of these circles. In practice the circle uses itself to limit its own distribution. </p></body></html> + Self-Restricted @@ -314,6 +324,9 @@ + + <html><head/><body><p>Circles can be restricted to the members of another circle. Only the members of that second circle will be allowed to see the new circle and its content (list of members, etc).</p></body></html> + Restricted to: diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 8471b2a58..1881af74a 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -387,6 +387,8 @@ void IdDialog::editExistingCircle() void IdDialog::CircleListCustomPopupMenu( QPoint ) { + // (cyril) Removed this because we have a edit button already. +#ifdef SUSPENDED QMenu contextMnu( this ); QTreeWidgetItem *item = ui->treeWidget_membership->currentItem(); @@ -397,6 +399,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint ) } contextMnu.exec(QCursor::pos()); +#endif } static void set_item_background(QTreeWidgetItem *item, uint32_t type)