* Disabled own location display on Friends Frame.

* Removed the Fixed size for Messages ListWidget
* Update stylesheets

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

retroshare-gui/src/gui/FriendsDialog.cpp

@@ -215,7 +215,7 @@ FriendsDialog::FriendsDialog(QWidget *parent)
     // add self nick and Avatar to Friends.
     RsPeerDetails pd ;
     if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd)) {
-        ui.nicknameLabel->setText(PeerDefs::nameWithLocation(pd));
+        ui.nicknameLabel->setText(QString::fromUtf8(pd.name.c_str()));
     }
 
  QString hlp_str = tr(

retroshare-gui/src/gui/MessagesDialog.cpp

@@ -229,9 +229,11 @@ MessagesDialog::MessagesDialog(QWidget *parent)
     QMenu *viewmenu = new QMenu();
     viewmenu->addAction(ui.actionTextBesideIcon);
     viewmenu->addAction(ui.actionIconOnly);
-    //viewmenu->addAction(ui.actionTextUnderIcon);
     ui.viewtoolButton->setMenu(viewmenu);
     
+    // Set initial size of the splitter
+    ui.listSplitter->setStretchFactor(0, 0);
+
     /* add filter actions */
     ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), COLUMN_SUBJECT, tr("Search Subject"));
     ui.filterLineEdit->addFilter(QIcon(), tr("From"), COLUMN_FROM, tr("Search From"));

retroshare-gui/src/gui/MessagesDialog.ui

@@ -11,16 +11,7 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
+   <property name="margin">
-    <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>
    <item>
@@ -517,12 +508,6 @@
           <enum>Qt::Horizontal</enum>
          </property>
          <widget class="QFrame" name="sideBarFrame">
-          <property name="maximumSize">
-           <size>
-            <width>160</width>
-            <height>16777215</height>
-           </size>
-          </property>
           <layout class="QGridLayout" name="gridLayout_3">
            <property name="horizontalSpacing">
             <number>6</number>
@@ -541,12 +526,6 @@
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
-             <property name="maximumSize">
-              <size>
-               <width>160</width>
-               <height>130</height>
-              </size>
-             </property>
              <property name="contextMenuPolicy">
               <enum>Qt::CustomContextMenu</enum>
              </property>
@@ -629,12 +608,6 @@
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
-             <property name="maximumSize">
-              <size>
-               <width>160</width>
-               <height>16777215</height>
-              </size>
-             </property>
              <property name="baseSize">
               <size>
                <width>0</width>

retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp

@@ -93,9 +93,9 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
 
 	{
 	QIcon icon ;
-	icon.addPixmap(QPixmap(":/images/exit_32.png")) ;
+	icon.addPixmap(QPixmap(":/images/door_in.png")) ;
 	unsubscribeButton->setIcon(icon) ;
-	unsubscribeButton->setIconSize(QSize(22,22)) ;
+	unsubscribeButton->setIconSize(QSize(24,24)) ;
 	}
 
 	/* Initialize splitter */

retroshare-gui/src/gui/images.qrc

@@ -20,6 +20,7 @@
         <file>images/browsable_128_blue.png</file>
         <file>images/blank_128_green.png</file>
         <file>images/blank_128_blue.png</file>
+        <file>images/door_in.png</file>
         <file>images/tor-logo.png</file>
         <file>images/help/addafriend.png</file>
         <file>images/help/addfriendkey.png</file>

retroshare-gui/src/gui/qss/stylesheet/Standard.qss

@@ -156,6 +156,14 @@ ChatLobbyWidget QGroupBox::title#lobbyinfo_groupBox
 	background: transparent; 
 }
 
+ChatLobbyWidget QLabel#lobbyInfoLabel {
+	border: 1px solid #DCDC41;
+	border-radius: 6px;
+	background: #FFFFD7;
+	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
+}
+
+
 ChatLobbyDialog QFrame#participantsFrame {
 	border: transparent;
 }

retroshare-gui/src/qss/blue.qss

@@ -10,6 +10,14 @@ QFrame#titleBarFrame, QFrame#toolBarFrame {
                                      	border: 1px solid #87ADE4;
 }
 
+FriendsDialog QFrame#headFrame {
+   	 background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                     stop: 0 #E3EFFF, stop: 1 #87ADE4);
+                                     	border: 1px solid #87ADE4;
+	border: 1px;
+	border-radius: 4px;
+}
+
 HeaderFrame {
 	background-image: url(:/images/headerFrame.png);
 	border: 0px;

retroshare-gui/src/qss/silver.qss

@@ -8,6 +8,13 @@ QFrame#titleBarFrame, QFrame#toolBarFrame {
                                      stop: 0 #F9F9FF, stop: 1 #9F9DB9);
 }
 
+FriendsDialog QFrame#headFrame {
+     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                     stop: 0 #F9F9FF, stop: 1 #9F9DB9);
+	border: 1px;
+	border-radius: 4px;
+}
+
 HeaderFrame {
 	background-image: url(:/images/headerFrame.png);
 	border: 0px;

retroshare-gui/src/qss/uus.qss

@@ -11,7 +11,12 @@ QFrame#titleBarFrame, QFrame#toolBarFrame {
     border-image: url(qss/uus/uus.png);
 }
 
-
+FriendsDialog QFrame#headFrame {
+     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                     stop: 0 #BDDF7D, stop: 1 #49881F);
+	border: 1px;
+	border-radius: 4px;
+}
 
 HeaderFrame {
 	background-image: url(:/images/headerFrame.png);

retroshare-gui/src/qss/yeah.qss

@@ -3,6 +3,13 @@
                                        stop:0 lightgray, stop:1 darkgray);
 }
 
+FriendsDialog QFrame#headFrame {
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+                                       stop:0 #FBC957, stop:1 #D79704);
+	border: 1px;
+	border-radius: 4px;
+}
+
 QFrame#titleBarFrame, QFrame#toolBarFrame {
     background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
                                        stop:0 #FBC957, stop:1 #D79704);