Added a new StackedPage for the Show mode (GXS Group Dialog), clean up the code.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7798 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp

@@ -73,7 +73,7 @@ void PostedGroupDialog::initUi()
 	{
 	case MODE_CREATE:
 		setUiText(UITYPE_SERVICE_HEADER, tr("Create New Topic"));
-		setUiText(UITYPE_BUTTONBOX_OK, tr("Create Topic"));
+		setUiText(UITYPE_BUTTONBOX_OK, tr("Create"));
 		break;
 	case MODE_SHOW:
 		setUiText(UITYPE_SERVICE_HEADER, tr("Posted Topic"));

retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp

@@ -24,6 +24,7 @@
 #include <QMessageBox>
 
 #include "util/misc.h"
+#include "util/DateTime.h"
 #include "GxsGroupDialog.h"
 #include "gui/common/PeerDefs.h"
 #include "retroshare/rsgxsflags.h"
@@ -96,6 +97,7 @@ void GxsGroupDialog::init()
 	connect(ui.addLogoButton, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
 
 	ui.typePublic->setChecked(true);
+	ui.typePublic_3->setChecked(true);
 	updateCircleOptions();
 
 	connect(ui.typePublic, SIGNAL(clicked()), this , SLOT(updateCircleOptions()));
@@ -163,13 +165,13 @@ void GxsGroupDialog::initMode()
 		case MODE_CREATE:
 		{
 			ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-			ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create Forum"));
 			newGroup();
 		}
 		break;
 
 		case MODE_SHOW:
 		{
+			ui.stackedWidget->setCurrentIndex(1);
 			mReadonlyFlags = 0xffffffff; // Force all to readonly.
 			ui.buttonBox->setStandardButtons(QDialogButtonBox::Close);
 			requestGroup(mGrpMeta.mGroupId);
@@ -202,19 +204,23 @@ void GxsGroupDialog::setupDefaults()
 		if (mDefaultsFlags & GXS_GROUP_DEFAULTS_DISTRIB_PUBLIC)
 		{
 			ui.typePublic->setChecked(true);
+			ui.typePublic_3->setChecked(true);
 		}
 		else if (mDefaultsFlags & GXS_GROUP_DEFAULTS_DISTRIB_GROUP)
 		{
 			ui.typeGroup->setChecked(true);
+			ui.typeGroup_3->setChecked(true);
 		}
 		else if (mDefaultsFlags & GXS_GROUP_DEFAULTS_DISTRIB_LOCAL)
 		{
 			ui.typeLocal->setChecked(true);
+			ui.typeLocal_3->setChecked(true);
 		}
 		else
 		{
 			// default
 			ui.typePublic->setChecked(true);
+			ui.typePublic_3->setChecked(true);
 		}
 	}
 
@@ -265,20 +271,25 @@ void GxsGroupDialog::setupDefaults()
 		if (mDefaultsFlags & GXS_GROUP_DEFAULTS_COMMENTS_YES)
 		{
 			ui.comments_allowed->setChecked(true);
+			ui.comments_allowed_3->setChecked(true);
 		}
 		else if (mDefaultsFlags & GXS_GROUP_DEFAULTS_COMMENTS_NO)
 		{
 			ui.comments_no->setChecked(true);
+			ui.comments_no_3->setChecked(true);
 		}
 		else
 		{
 			// default
 			ui.comments_no->setChecked(true);
+			ui.comments_no_3->setChecked(true);
 		}
     }
 #ifndef RS_USE_CIRCLES
     ui.typeGroup->setEnabled(false);
     ui.typeLocal->setEnabled(false);
+    ui.typeGroup_3->setEnabled(false);
+    ui.typeLocal_3->setEnabled(false);
 #endif
 }
 
@@ -290,9 +301,9 @@ void GxsGroupDialog::setupVisibility()
 	ui.addLogoButton->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON);
 
 	ui.groupDesc->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION);
-	ui.groupDescLabel->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION);
 
 	ui.distribGroupBox->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DISTRIBUTION);
+	ui.distribGroupBox_2->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DISTRIBUTION);
 
 	ui.publishGroupBox->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_PUBLISHSIGN);
 
@@ -301,6 +312,8 @@ void GxsGroupDialog::setupVisibility()
 	ui.personalGroupBox->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_PERSONALSIGN);
 
 	ui.commentGroupBox->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_COMMENTS);
+	ui.commentGroupBox_2->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_COMMENTS);
+	ui.commentslabel->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_COMMENTS);
 
 	ui.extraFrame->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_EXTRA);
 }
@@ -317,24 +330,19 @@ void GxsGroupDialog::setAllReadonly()
 
 void GxsGroupDialog::setupReadonly()
 {
-	ui.groupName->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_NAME));
 
-	//ui.groupLogo->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_ICON));
 	ui.addLogoButton->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_ICON));
 
-	ui.groupDesc->setReadOnly(mReadonlyFlags & GXS_GROUP_FLAGS_DESCRIPTION);
-	//ui.groupDescLabel->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_DESCRIPTION));
-
-	ui.distribGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_DISTRIBUTION));
-
 	ui.publishGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PUBLISHSIGN));
 
 	ui.pubKeyShare_cb->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_SHAREKEYS));
 
 	ui.personalGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PERSONALSIGN));
+	
 	ui.idChooser->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PERSONALSIGN));
 
-	ui.commentGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_COMMENTS));
+	ui.distribGroupBox_2->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_DISTRIBUTION));
+	ui.commentGroupBox_2->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_COMMENTS));
 
 	ui.extraFrame->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_EXTRA));
 #ifndef UNFINISHED
@@ -367,8 +375,31 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description)
 
 	/* setup name */
 	ui.groupName->setText(QString::fromUtf8(mGrpMeta.mGroupName.c_str()));
-	ui.headerFrame->setHeaderText(QString::fromUtf8(mGrpMeta.mGroupName.c_str()));
 	
+	/* Show Mode */
+	ui.nameline->setText(QString::fromUtf8(mGrpMeta.mGroupName.c_str()));
+	ui.popline->setText(QString::number( mGrpMeta.mPop)) ;
+	ui.postsline->setText(QString::number(mGrpMeta.mVisibleMsgCount));
+	ui.lastpostline->setText(DateTime::formatLongDateTime(mGrpMeta.mLastPost));
+	ui.IDline->setText(QString::fromStdString(mGrpMeta.mGroupId.toStdString()));
+	ui.descriptiontextEdit->setPlainText(description);
+	
+		switch (mode())
+  {
+		case MODE_CREATE:{
+		}
+		break;
+		case MODE_SHOW:{
+			ui.headerFrame->setHeaderText(QString::fromUtf8(mGrpMeta.mGroupName.c_str()));
+			if (mPicture.isNull())
+			return;
+			ui.headerFrame->setHeaderImage(mPicture);
+		}
+		break;
+		case MODE_EDIT:{
+		}
+		break;
+  }
 	/* set description */
 	ui.groupDesc->setPlainText(description);
 
@@ -376,13 +407,16 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description)
 	{
 		case GXS_CIRCLE_TYPE_YOUREYESONLY:
 			ui.typeLocal->setChecked(true);
+			ui.typeLocal_3->setChecked(true);
 			ui.localComboBox->loadCircles(GXS_CIRCLE_CHOOSER_PERSONAL, mGrpMeta.mInternalCircle);
 			break;
 		case GXS_CIRCLE_TYPE_PUBLIC:
 			ui.typePublic->setChecked(true);
+			ui.typePublic_3->setChecked(true);
 			break;
 		case GXS_CIRCLE_TYPE_EXTERNAL:
 			ui.typeGroup->setChecked(true);
+			ui.typeGroup_3->setChecked(true);
 			ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mGrpMeta.mCircleId);
 			break;
 		default:
@@ -593,10 +627,12 @@ void GxsGroupDialog::setGroupSignFlags(uint32_t signFlags)
 	    (signFlags & RSGXS_GROUP_SIGN_AUTHOR_IFNOPUBSIGN))
 	{
 		ui.comments_allowed->setChecked(true);
+		ui.comments_allowed_3->setChecked(true);
 	}
 	else
 	{
 		ui.comments_no->setChecked(true);
+		ui.comments_no_3->setChecked(true);
 	}
 }
 

retroshare-gui/src/gui/gxs/GxsGroupDialog.ui

@@ -6,41 +6,48 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>695</width>
+    <width>685</width>
-    <height>542</height>
+    <height>517</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Create New</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
+  <layout class="QGridLayout" name="gridLayout_5">
-   <property name="leftMargin">
+   <property name="horizontalSpacing">
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing">
     <number>0</number>
    </property>
-   <property name="topMargin">
+   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="HeaderFrame" name="headerFrame"/>
    </item>
-   <item row="2" column="0">
+   <item row="1" column="0">
-    <widget class="QFrame" name="frame">
+    <widget class="QStackedWidget" name="stackedWidget">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="createmode">
       <layout class="QGridLayout" name="gridLayout">
+       <property name="horizontalSpacing">
+        <number>6</number>
+       </property>
+       <property name="verticalSpacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>9</number>
+       </property>
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBoxLogo">
          <property name="title">
@@ -50,16 +57,7 @@
           <property name="spacing">
            <number>0</number>
           </property>
-         <property name="leftMargin">
+          <property name="margin">
-          <number>4</number>
-         </property>
-         <property name="topMargin">
-          <number>4</number>
-         </property>
-         <property name="rightMargin">
-          <number>4</number>
-         </property>
-         <property name="bottomMargin">
            <number>4</number>
           </property>
           <item>
@@ -127,16 +125,7 @@
               <property name="spacing">
                <number>9</number>
               </property>
-             <property name="leftMargin">
+              <property name="margin">
-              <number>3</number>
-             </property>
-             <property name="topMargin">
-              <number>3</number>
-             </property>
-             <property name="rightMargin">
-              <number>3</number>
-             </property>
-             <property name="bottomMargin">
                <number>3</number>
               </property>
               <item>
@@ -193,102 +182,6 @@
          </layout>
         </widget>
        </item>
-      <item row="0" column="1" rowspan="6">
-       <widget class="QDockWidget" name="contactsdockWidget">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>300</width>
-          <height>524287</height>
-         </size>
-        </property>
-        <property name="sizeIncrement">
-         <size>
-          <width>220</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="baseSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>check peers you would like to share private publish key with</string>
-        </property>
-        <property name="floating">
-         <bool>false</bool>
-        </property>
-        <property name="features">
-         <set>QDockWidget::NoDockWidgetFeatures</set>
-        </property>
-        <property name="windowTitle">
-         <string>Share Key With</string>
-        </property>
-        <widget class="QWidget" name="dockWidgetContents">
-         <layout class="QGridLayout" name="_2">
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="FriendSelectionWidget" name="keyShareList" native="true">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-              <horstretch>0</horstretch>
-              <verstretch>4</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>20</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>300</width>
-              <height>16777215</height>
-             </size>
-            </property>
-            <property name="sizeIncrement">
-             <size>
-              <width>220</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="baseSize">
-             <size>
-              <width>200</width>
-              <height>0</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
        <item row="3" column="0">
         <widget class="QGroupBox" name="publishGroupBox">
          <property name="title">
@@ -296,16 +189,16 @@
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_4">
           <property name="spacing">
-          <number>0</number>
+           <number>6</number>
           </property>
           <property name="leftMargin">
-          <number>4</number>
+           <number>9</number>
           </property>
           <property name="topMargin">
            <number>4</number>
           </property>
           <property name="rightMargin">
-          <number>4</number>
+           <number>9</number>
           </property>
           <property name="bottomMargin">
            <number>4</number>
@@ -338,6 +231,19 @@
             </property>
            </widget>
           </item>
+          <item>
+           <spacer name="horizontalSpacer_7">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
@@ -348,16 +254,16 @@
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_6">
           <property name="spacing">
-          <number>0</number>
+           <number>6</number>
           </property>
           <property name="leftMargin">
-          <number>4</number>
+           <number>9</number>
           </property>
           <property name="topMargin">
            <number>4</number>
           </property>
           <property name="rightMargin">
-          <number>4</number>
+           <number>9</number>
           </property>
           <property name="bottomMargin">
            <number>4</number>
@@ -383,6 +289,19 @@
             </property>
            </widget>
           </item>
+          <item>
+           <spacer name="horizontalSpacer_6">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
@@ -393,16 +312,16 @@
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_5">
           <property name="spacing">
-          <number>0</number>
+           <number>6</number>
           </property>
           <property name="leftMargin">
-          <number>4</number>
+           <number>9</number>
           </property>
           <property name="topMargin">
            <number>4</number>
           </property>
           <property name="rightMargin">
-          <number>4</number>
+           <number>9</number>
           </property>
           <property name="bottomMargin">
            <number>4</number>
@@ -421,6 +340,19 @@
             </property>
            </widget>
           </item>
+          <item>
+           <spacer name="horizontalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
@@ -434,13 +366,6 @@
          </property>
         </widget>
        </item>
-      <item row="7" column="0" colspan="2">
-       <widget class="QDialogButtonBox" name="buttonBox">
-        <property name="standardButtons">
-         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-        </property>
-       </widget>
-      </item>
        <item row="2" column="0">
         <widget class="QGroupBox" name="distribGroupBox">
          <property name="sizePolicy">
@@ -453,6 +378,9 @@
           <string>Message Distribution</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout">
+          <property name="spacing">
+           <number>0</number>
+          </property>
           <item>
            <widget class="QRadioButton" name="typePublic">
             <property name="sizePolicy">
@@ -541,17 +469,13 @@
        </item>
        <item row="1" column="0">
         <widget class="QGroupBox" name="groupBox">
-        <layout class="QVBoxLayout">
+         <property name="title">
-         <item>
-          <widget class="QLabel" name="groupDescLabel">
-           <property name="text">
           <string>Description</string>
          </property>
-          </widget>
+         <layout class="QVBoxLayout">
-         </item>
           <item>
            <widget class="MimeTextEdit" name="groupDesc">
-           <property name="placeholderText">
+            <property name="placeholderText" stdset="0">
              <string>Set a descriptive description here</string>
             </property>
            </widget>
@@ -559,6 +483,387 @@
          </layout>
         </widget>
        </item>
+       <item row="0" column="1" rowspan="6">
+        <widget class="QDockWidget" name="contactsdockWidget">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>300</width>
+           <height>524287</height>
+          </size>
+         </property>
+         <property name="sizeIncrement">
+          <size>
+           <width>220</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="baseSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>check peers you would like to share private publish key with</string>
+         </property>
+         <property name="floating">
+          <bool>false</bool>
+         </property>
+         <property name="features">
+          <set>QDockWidget::NoDockWidgetFeatures</set>
+         </property>
+         <property name="windowTitle">
+          <string>Share Key With</string>
+         </property>
+         <widget class="QWidget" name="dockWidgetContents">
+          <layout class="QGridLayout" name="_2">
+           <property name="margin">
+            <number>0</number>
+           </property>
+           <property name="spacing">
+            <number>0</number>
+           </property>
+           <item row="0" column="0">
+            <widget class="FriendSelectionWidget" name="keyShareList" native="true">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>4</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize">
+              <size>
+               <width>20</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>300</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="sizeIncrement">
+              <size>
+               <width>220</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>200</width>
+               <height>0</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="showmode">
+      <layout class="QGridLayout" name="gridLayout_6">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string>Info</string>
+         </property>
+         <layout class="QGridLayout" name="_3">
+          <item row="6" column="1">
+           <widget class="QGroupBox" name="distribGroupBox_2">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="title">
+             <string/>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_2">
+             <property name="margin">
+              <number>6</number>
+             </property>
+             <item row="0" column="1">
+              <widget class="QRadioButton" name="typeGroup_3">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Restricted to Group</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../images.qrc">
+                 <normaloff>:/images/user/agt_forum24.png</normaloff>:/images/user/agt_forum24.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>16</width>
+                 <height>16</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QRadioButton" name="typePublic_3">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Public</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../images.qrc">
+                 <normaloff>:/images/network.png</normaloff>:/images/network.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>16</width>
+                 <height>16</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <widget class="QRadioButton" name="typeLocal_3">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Only For Your Friends</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../images.qrc">
+                 <normaloff>:/images/user/friends24.png</normaloff>:/images/user/friends24.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>16</width>
+                 <height>16</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="3">
+              <spacer name="horizontalSpacer_4">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QGroupBox" name="commentGroupBox_2">
+            <property name="title">
+             <string/>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_14">
+             <property name="spacing">
+              <number>6</number>
+             </property>
+             <property name="margin">
+              <number>6</number>
+             </property>
+             <item>
+              <widget class="QRadioButton" name="comments_allowed_3">
+               <property name="text">
+                <string>Comments allowed</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QRadioButton" name="comments_no_3">
+               <property name="text">
+                <string>Comments not allowed</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_3">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_3">
+            <property name="text">
+             <string>Name</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="nameline">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="popline">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="IDline">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="lastpostline">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>ID</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>Last Post</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="text">
+             <string>Popularity</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="postsline">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_6">
+            <property name="text">
+             <string>Posts</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="commentslabel">
+            <property name="text">
+             <string>Comments</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
+             <string>Type</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QGridLayout" name="_4">
+          <item row="0" column="0">
+           <widget class="QTextEdit" name="descriptiontextEdit">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="1">
+       <widget class="QDialogButtonBox" name="buttonBox">
+        <property name="standardButtons">
+         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>

retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp

@@ -96,7 +96,7 @@ void GroupShareKey::setTyp()
         
         ui->headerFrame->setHeaderImage(QPixmap(":/images/posted_64.png"));    
         ui->headerFrame->setHeaderText(tr("Share Posted"));
-        ui->sharekeyinfo_label->setText(tr("You can let your friends know about your Posted by sharing it with them. Select the Friends with which you want to Share your Posted."));     
+        ui->sharekeyinfo_label->setText(tr("You can let your friends know about your Topic by sharing it with them. Select the Friends with which you want to Share your Topic."));
 
     }
     else

retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp

@@ -75,7 +75,7 @@ void GxsChannelGroupDialog::initUi()
 	{
 	case MODE_CREATE:
 		setUiText(UITYPE_SERVICE_HEADER, tr("Create New Channel"));
-		setUiText(UITYPE_BUTTONBOX_OK, tr("Create Channel"));
+		setUiText(UITYPE_BUTTONBOX_OK, tr("Create"));
 		break;
 	case MODE_SHOW:
 		setUiText(UITYPE_SERVICE_HEADER, tr("Channel"));

retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp

@@ -73,7 +73,7 @@ void GxsForumGroupDialog::initUi()
 	{
 	case MODE_CREATE:
 		setUiText(UITYPE_SERVICE_HEADER, tr("Create New Forum"));
-		setUiText(UITYPE_BUTTONBOX_OK, tr("Create Forum"));
+		setUiText(UITYPE_BUTTONBOX_OK, tr("Create"));
 		break;
 	case MODE_SHOW:
 		setUiText(UITYPE_SERVICE_HEADER, tr("Forum"));