diff --git a/libretroshare/src/gxs/rsgxsnetservice.cc b/libretroshare/src/gxs/rsgxsnetservice.cc
index 893d8ec6b..580b11485 100644
--- a/libretroshare/src/gxs/rsgxsnetservice.cc
+++ b/libretroshare/src/gxs/rsgxsnetservice.cc
@@ -4401,7 +4401,7 @@ void RsGxsNetService::handleRecvSyncMessage(RsNxsSyncMsgReqItem *item,bool item_
bool peer_can_receive_update = locked_CanReceiveUpdate(item, grp_is_known);
if(item_was_encrypted)
- std::cerr << "(WW) received an encrypted msg sync request from peer " << item->PeerId() << ". This is outdated, but still supported (Tell your friend to upgrade his RS!)" << std::endl;
+ std::cerr << "(WW) got an encrypted msg sync req. from " << item->PeerId() << ". This will not send messages updates for group " << item->grpId << std::endl;
// Insert the PeerId in suppliers list for this grpId
#ifdef NXS_NET_DEBUG_6
diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
index 9e8f96075..47ca337ec 100644
--- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
+++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
@@ -138,6 +138,7 @@ void CreateCircleDialog::editExistingId(const RsGxsGroupId &circleId, const bool
else
{
ui.circleAdminLabel->setVisible(false) ;
+ ui.circleAdminLabel->hide();
ui.idChooser->setVisible(true) ;
}
@@ -634,6 +635,7 @@ void CreateCircleDialog::updateCircleGUI()
//ui.idChooser->setIdConstraintSet(ids) ;
ui.idChooser->setFlags(IDCHOOSER_NO_CREATE) ;
ui.circleAdminLabel->setVisible(false) ;
+ ui.circleAdminLabel->hide();
}
}
diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui
index ba8508462..fdfecb434 100644
--- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui
+++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui
@@ -6,7 +6,7 @@
0
0
- 924
+ 951
578
@@ -14,16 +14,7 @@
-
- 0
-
-
- 0
-
-
- 0
-
-
+
0
@@ -61,6 +52,9 @@
Qt::CustomContextMenu
+
+ <html><head/><body><p>Members of this list will be automatically proposed to join the circle (by accepting membership). They will</p><p>not receive data that is restricted to this circle until they do so.</p></body></html>
+
true
@@ -143,6 +137,31 @@
Known People
+ -
+
+
+ Qt::CustomContextMenu
+
+
+ true
+
+
+
+ Nickname
+
+
+
+
+ ID
+
+
+
+
+ Type
+
+
+
+
-
@@ -155,16 +174,7 @@
0
-
- 0
-
-
- 0
-
-
- 0
-
-
+
0
-
@@ -205,31 +215,6 @@
- -
-
-
- Qt::CustomContextMenu
-
-
- true
-
-
-
- Nickname
-
-
-
-
- ID
-
-
-
-
- Type
-
-
-
-
@@ -258,13 +243,23 @@
true
+
+ Qt::LeftToRight
+
- Name
+ Name:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
+
+
+ <html><head/><body><p>The circle name, contact author and invted member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.</p></body></html>
+
+
-
@@ -275,7 +270,7 @@
- Creator:
+ Contact author:
@@ -288,7 +283,7 @@
- <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>
+ <html><head/><body><p>The creator of a circle ia purely optional. It is however useful for public circles so that people know with whom to discuss membership aspects.</p></body></html>
@@ -324,7 +319,10 @@
- Distribution
+ Distribution:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -337,16 +335,7 @@
QFrame::Raised
-
- 2
-
-
- 2
-
-
- 2
-
-
+
2
-