From 8aaa4db85cbbd6266243dd5761fa0715b1480719 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Fri, 30 Aug 2013 16:30:23 +0000
Subject: [PATCH] Changed icons and default text fixed layout, at bottom
 display only Create and Cancel Buttons

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/gxs/GxsGroupDialog.ui  | 23 ++++++++++---------
 .../gui/gxschannels/GxsChannelGroupDialog.cpp |  5 +++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
index 5f5235a37..632dc6027 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>658</height>
+    <height>448</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -35,8 +35,8 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0" colspan="3">
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
        <widget class="QGroupBox" name="groupBoxLogo">
         <property name="title">
          <string/>
@@ -156,7 +156,7 @@
         </layout>
        </widget>
       </item>
-      <item row="0" column="3" rowspan="8">
+      <item row="0" column="1" rowspan="6">
        <widget class="QDockWidget" name="contactsdockWidget">
         <property name="enabled">
          <bool>true</bool>
@@ -243,7 +243,7 @@
         </widget>
        </widget>
       </item>
-      <item row="1" column="0" colspan="3">
+      <item row="1" column="0">
        <layout class="QVBoxLayout">
         <item>
          <widget class="QLabel" name="groupDescLabel">
@@ -257,7 +257,7 @@
         </item>
        </layout>
       </item>
-      <item row="2" column="0" colspan="3">
+      <item row="2" column="0">
        <widget class="QGroupBox" name="distribGroupBox">
         <property name="title">
          <string>Message Distribution</string>
@@ -323,7 +323,7 @@
         </layout>
        </widget>
       </item>
-      <item row="3" column="0" colspan="3">
+      <item row="3" column="0">
        <widget class="QGroupBox" name="publishGroupBox">
         <property name="title">
          <string>Publish Signatures</string>
@@ -366,7 +366,7 @@
         </layout>
        </widget>
       </item>
-      <item row="4" column="0" colspan="3">
+      <item row="4" column="0">
        <widget class="QGroupBox" name="personalGroupBox">
         <property name="title">
          <string>Personal Signatures</string>
@@ -402,7 +402,7 @@
         </layout>
        </widget>
       </item>
-      <item row="5" column="0" colspan="3">
+      <item row="5" column="0">
        <widget class="QGroupBox" name="commentGroupBox">
         <property name="title">
          <string>Comments</string>
@@ -431,7 +431,7 @@
         </layout>
        </widget>
       </item>
-      <item row="6" column="0" colspan="3">
+      <item row="6" column="0" colspan="2">
        <widget class="QFrame" name="extraFrame">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
@@ -441,7 +441,7 @@
         </property>
        </widget>
       </item>
-      <item row="7" column="1">
+      <item row="7" column="0" colspan="2">
        <widget class="QDialogButtonBox" name="buttonBox">
         <property name="standardButtons">
          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
@@ -479,6 +479,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
index e0b73142a..6c60ddf5b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
@@ -76,11 +76,14 @@ void GxsChannelGroupDialog::initUi()
 		setUiText(UITYPE_SERVICE_HEADER, tr("Edit Channel"));
 		break;
 	}
+	
+	setUiText(UITYPE_KEY_SHARE_CHECKBOX, tr("Add Channel Admins"));
+	setUiText(UITYPE_CONTACTS_DOCK, tr("Select Channel Admins"));
 }
 
 QPixmap GxsChannelGroupDialog::serviceImage()
 {
-	return QPixmap(":/images/konversation64.png");
+	return QPixmap(":/images/add_channel64.png");
 }
 
 bool GxsChannelGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta)