From 5e6fc0ff59ee4f64012e02d637f721bf9bd11ae6 Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Mon, 15 Sep 2014 19:14:38 +0000
Subject: [PATCH] disabled group restriction when not using circles in
 forums/posted/channels. Also disabled key sharing since it is unfinished

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7538 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp |  9 ++-
 retroshare-gui/src/gui/gxs/GxsGroupDialog.ui  | 74 +++++++++++--------
 .../src/gui/gxsforums/GxsForumGroupDialog.cpp |  2 +-
 3 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
index e3e62a249..e96342ae4 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
@@ -279,7 +279,11 @@ void GxsGroupDialog::setupDefaults()
 			// default
 			ui.comments_no->setChecked(true);
 		}
-	}
+    }
+#ifndef RS_USE_CIRCLES
+    ui.typeGroup->setEnabled(false);
+    ui.typeLocal->setEnabled(false);
+#endif
 }
 
 void GxsGroupDialog::setupVisibility()
@@ -337,6 +341,9 @@ void GxsGroupDialog::setupReadonly()
 	ui.commentGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_COMMENTS));
 
 	ui.extraFrame->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_EXTRA));
+#ifndef UNFINISHED
+    ui.pubKeyShare_cb->setEnabled(false) ;
+#endif
 }
 
 void GxsGroupDialog::newGroup()
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
index 65e21a317..02a7036c1 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>695</width>
-    <height>577</height>
+    <height>588</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -132,41 +132,51 @@
                </property>
               </spacer>
              </item>
+             <item>
+              <widget class="QLabel" name="label_2">
+               <property name="toolTip">
+                <string>Will be used to send feedback</string>
+               </property>
+               <property name="text">
+                <string>Owner:</string>
+               </property>
+              </widget>
+             </item>
              <item>
               <widget class="GxsIdChooser" name="idChooser"/>
              </item>
              <item>
-           <widget class="QToolButton" name="toolButton_NewId">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::NoFocus</enum>
-            </property>
-            <property name="toolTip">
-             <string>Create new Identity</string>
-            </property>
-            <property name="text">
-             <string>New ID</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/identity/identity_create_32.png</normaloff>:/images/identity/identity_create_32.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>24</width>
-              <height>24</height>
-             </size>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
+              <widget class="QToolButton" name="toolButton_NewId">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="focusPolicy">
+                <enum>Qt::NoFocus</enum>
+               </property>
+               <property name="toolTip">
+                <string>Create new Identity</string>
+               </property>
+               <property name="text">
+                <string>New ID</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../images.qrc">
+                 <normaloff>:/images/identity/identity_create_32.png</normaloff>:/images/identity/identity_create_32.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+               <property name="autoRaise">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
              <item>
               <widget class="QCheckBox" name="pubKeyShare_cb">
                <property name="toolTip">
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
index cef0e70c6..a85456b3e 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
@@ -85,7 +85,7 @@ void GxsForumGroupDialog::initUi()
 	}
 
 	setUiText(UITYPE_KEY_SHARE_CHECKBOX, tr("Add Forum Admins"));
-	setUiText(UITYPE_CONTACTS_DOCK, tr("Select Forum Admins"));
+    setUiText(UITYPE_CONTACTS_DOCK, tr("Select Forum Admins"));
 }
 
 QPixmap GxsForumGroupDialog::serviceImage()