Added a headerFrame to Service Permissions Dialog

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

retroshare-gui/src/gui/ServicePermissionDialog.cpp

@@ -32,6 +32,9 @@ ServicePermissionDialog::ServicePermissionDialog() :
 	ui->setupUi(this);
 
 	Settings->loadWidgetInformation(this);
+	
+	ui->headerFrame->setHeaderImage(QPixmap(":/images/user/servicepermissions64.png"));
+  ui->headerFrame->setHeaderText(tr("Service Permissions"));
 
 	connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(setPermissions()));
 	connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));

retroshare-gui/src/gui/ServicePermissionDialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>493</width>
-    <height>362</height>
+    <width>504</width>
+    <height>354</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,28 +20,61 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="FriendSelectionWidget" name="servicePermissionList" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="HeaderFrame" name="headerFrame">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <property name="lineWidth">
+      <number>1</number>
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="1" column="0">
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
      </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="FriendSelectionWidget" name="servicePermissionList" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QDialogButtonBox" name="buttonBox">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="standardButtons">
+         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>
+  <zorder>frame</zorder>
+  <zorder>headerFrame</zorder>
  </widget>
  <customwidgets>
   <customwidget>
@@ -50,6 +83,12 @@
    <header>gui/common/FriendSelectionWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>HeaderFrame</class>
+   <extends>QFrame</extends>
+   <header>gui/common/HeaderFrame.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="images.qrc"/>

retroshare-gui/src/gui/common/FriendList.cpp

@@ -69,6 +69,7 @@
 #define IMAGE_REMOVE             ":/images/delete.png"
 #define IMAGE_EXPAND             ":/images/edit_add24.png"
 #define IMAGE_COLLAPSE           ":/images/edit_remove24.png"
+#define IMAGE_PERMISSIONS        ":/images/admin-16.png"
 /* Images for Status icons */
 #define IMAGE_AVAILABLE          ":/images/user/identityavaiblecyan24.png"
 #define IMAGE_CONNECT2           ":/images/reload24.png"
@@ -507,7 +508,7 @@ void FriendList::peerTreeWidgetCostumPopupMenu()
     contextMnu.addSeparator();
 
     contextMnu.addAction(QIcon(IMAGE_EXPAND), tr("Recommend many friends to each others"), this, SLOT(recommendFriends()));
-    contextMnu.addAction(QIcon(IMAGE_EXPAND), tr("Service permissions matrix"), this, SLOT(servicePermission()));
+    contextMnu.addAction(QIcon(IMAGE_PERMISSIONS), tr("Service permissions matrix"), this, SLOT(servicePermission()));
 
     contextMnu.addSeparator();
 

retroshare-gui/src/gui/images.qrc

@@ -494,6 +494,7 @@
         <file>images/user/agt_forum128.png</file>
         <file>images/user/group16.png</file>
         <file>images/user/group24.png</file>
+        <file>images/user/servicepermissions64.png</file>
         <file>images/user/user_request16.png</file>
         <file>images/user/user_request48.png</file>
         <file>images/user/user_request_unknown48.png</file>