From a9b56819cdde8fca9a626fab1eb406d29b3d0370 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Tue, 9 Dec 2014 18:17:32 +0000
Subject: [PATCH] Moved own frame for Avatar,status,nick display to the top of
 FriendsList.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/FriendsDialog.ui       | 120 ++++++++++--------
 .../src/gui/qss/stylesheet/Standard.qss       |   3 +-
 2 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui
index c0a317b84..d91fd02a3 100644
--- a/retroshare-gui/src/gui/FriendsDialog.ui
+++ b/retroshare-gui/src/gui/FriendsDialog.ui
@@ -10,8 +10,11 @@
     <height>491</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QFrame" name="titleBarFrame">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@@ -79,37 +82,17 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="FriendList" name="friendList" native="true">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>150</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>16777215</width>
-        <height>16777215</height>
-       </size>
-      </property>
-     </widget>
-     <widget class="QWidget" name="layoutWidget_1">
-      <layout class="QGridLayout" name="tabLayout">
-       <property name="verticalSpacing">
+     <widget class="QWidget" name="layoutWidget">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
         <number>1</number>
        </property>
-       <item row="0" column="0">
+       <item>
         <widget class="QFrame" name="headFrame">
          <property name="minimumSize">
           <size>
@@ -123,6 +106,9 @@
            <height>70</height>
           </size>
          </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
          <property name="frameShape">
           <enum>QFrame::Box</enum>
          </property>
@@ -136,6 +122,12 @@
           <property name="topMargin">
            <number>1</number>
           </property>
+          <property name="rightMargin">
+           <number>6</number>
+          </property>
+          <property name="bottomMargin">
+           <number>6</number>
+          </property>
           <item row="0" column="1" colspan="2">
            <widget class="StyledLabel" name="nicknameLabel">
             <property name="text">
@@ -156,20 +148,23 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="2" colspan="2">
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
+          <item row="0" column="0" rowspan="2">
+           <widget class="AvatarWidget" name="avatar">
+            <property name="minimumSize">
              <size>
-              <width>277</width>
-              <height>20</height>
+              <width>61</width>
+              <height>61</height>
              </size>
             </property>
-           </spacer>
+            <property name="maximumSize">
+             <size>
+              <width>61</width>
+              <height>61</height>
+             </size>
+            </property>
+           </widget>
           </item>
-          <item row="1" column="1">
+          <item row="1" column="1" colspan="3">
            <widget class="QToolButton" name="mypersonalstatusLabel">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -198,26 +193,39 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="0" rowspan="2">
-           <widget class="AvatarWidget" name="avatar">
-            <property name="minimumSize">
-             <size>
-              <width>61</width>
-              <height>61</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>61</width>
-              <height>61</height>
-             </size>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item>
+        <widget class="FriendList" name="friendList" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>150</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>16777215</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="layoutWidget_1">
+      <layout class="QGridLayout" name="tabLayout">
+       <property name="verticalSpacing">
+        <number>1</number>
+       </property>
+       <item row="0" column="0">
         <widget class="ChatTabWidget" name="tabWidget">
          <property name="currentIndex">
           <number>0</number>
@@ -226,6 +234,10 @@
           <bool>true</bool>
          </property>
          <widget class="QWidget" name="groupChatTab">
+          <attribute name="icon">
+           <iconset resource="images.qrc">
+            <normaloff>:/images/kblogger.png</normaloff>:/images/kblogger.png</iconset>
+          </attribute>
           <attribute name="title">
            <string>Broadcast</string>
           </attribute>
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index 4081f86fa..d57fc4f7e 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -54,7 +54,8 @@ GenCertDialog QPushButton#genButton:hover {
 
 FriendsDialog QFrame#headFrame {
 	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
-	border: 0px;
+	border: 1px;
+	border-radius: 4px;
 }
 
 FriendsDialog QFrame#headFrame > QLabel#nicknameLabel {