From bd049a0bbdc37e13539c3ca4e62ed62ac1641f3a Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Wed, 3 Feb 2010 23:38:38 +0000
Subject: [PATCH] added nicklabel for MessengerWindow to show own name +
 location

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/MessengerWindow.cpp |   5 +
 retroshare-gui/src/gui/MessengerWindow.ui  | 173 ++++++++++++++-------
 2 files changed, 121 insertions(+), 57 deletions(-)

diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp
index 2a49b17f7..0e3d9facf 100644
--- a/retroshare-gui/src/gui/MessengerWindow.cpp
+++ b/retroshare-gui/src/gui/MessengerWindow.cpp
@@ -146,6 +146,7 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
   //loadstatus();
   
   displayMenu();
+  updateMessengerDisplay();
   
   /* Hide platform specific features */
 #ifdef Q_WS_WIN
@@ -244,6 +245,10 @@ void MessengerWindow::updateMessengerDisplay()
         // add self nick and Avatar to Friends.
         RsPeerDetails pd ;
         if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd)) {
+        
+                QString titleStr("<span style=\"font-size:14pt; font-weight:500;"
+                       "color:#FFFFFF;\">%1</span>");
+                ui.nicklabel->setText(titleStr.arg(QString::fromStdString(pd.name) + tr(" - ") + QString::fromStdString(pd.location))) ;
         }
 
         insertPeers() ;
diff --git a/retroshare-gui/src/gui/MessengerWindow.ui b/retroshare-gui/src/gui/MessengerWindow.ui
index d7367f9f4..e69581b0a 100644
--- a/retroshare-gui/src/gui/MessengerWindow.ui
+++ b/retroshare-gui/src/gui/MessengerWindow.ui
@@ -18,7 +18,7 @@
     <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout">
+   <layout class="QGridLayout" name="gridLayout">
     <property name="margin">
      <number>0</number>
     </property>
@@ -28,13 +28,14 @@
     <item row="0" column="0">
      <widget class="QFrame" name="messengerframetop">
       <property name="styleSheet">
-       <string notr="true">#messengerframetop {
+       <string notr="true">#messengerframetop { 
 border: none;
 background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
 stop: 0 #a6a6a6, stop: 0.08 #7f7f7f,
 stop: 0.39999 #717171, stop: 0.4 #626262,
 stop: 0.9 #4c4c4c, stop: 1 #333333);
-}</string>
+}
+</string>
       </property>
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
@@ -58,7 +59,7 @@ stop: 0.9 #4c4c4c, stop: 1 #333333);
        <property name="spacing">
         <number>0</number>
        </property>
-       <item row="0" column="0" colspan="4">
+       <item row="0" column="0" colspan="2">
         <layout class="QGridLayout">
          <item row="0" column="0">
           <widget class="QToolButton" name="avatarButton">
@@ -103,7 +104,7 @@ stop: 0.9 #4c4c4c, stop: 1 #333333);
            <property name="spacing">
             <number>6</number>
            </property>
-           <item row="0" column="0">
+           <item row="1" column="0">
             <widget class="QComboBox" name="statuscomboBox">
              <property name="enabled">
               <bool>false</bool>
@@ -162,54 +163,67 @@ p, li { white-space: pre-wrap; }
              </item>
             </widget>
            </item>
-           <item row="1" column="0">
+           <item row="2" column="0">
             <widget class="QLineEdit" name="messagelineEdit"/>
            </item>
+           <item row="0" column="0">
+            <widget class="QLabel" name="nicklabel">
+             <property name="text">
+              <string>TextLabel</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </item>
         </layout>
        </item>
-       <item row="1" column="0">
-        <widget class="QToolButton" name="shareButton">
-         <property name="toolTip">
-          <string>Share Files for your Friends</string>
-         </property>
-         <property name="styleSheet">
-          <string notr="true"/>
-         </property>
-         <property name="text">
-          <string>...</string>
-         </property>
-         <property name="icon">
-          <iconset resource="images.qrc">
-           <normaloff>:/images/friendsfolder24.png</normaloff>:/images/friendsfolder24.png</iconset>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>24</width>
-           <height>24</height>
-          </size>
-         </property>
-         <property name="autoRaise">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="3">
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>221</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="1" column="2">
+      </layout>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="QFrame" name="frame">
+      <property name="maximumSize">
+       <size>
+        <width>16777215</width>
+        <height>38</height>
+       </size>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">#frame { 
+border: none;
+background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+stop: 0 #a6a6a6, stop: 0.08 #7f7f7f,
+stop: 0.39999 #717171, stop: 0.4 #626262,
+stop: 0.9 #4c4c4c, stop: 1 #333333);
+}</string>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
+        <number>6</number>
+       </property>
+       <item>
         <widget class="QToolButton" name="addIMAccountButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>32</width>
+           <height>32</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -237,7 +251,39 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
+       <item>
+        <widget class="QToolButton" name="shareButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Share Files for your Friends</string>
+         </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset resource="images.qrc">
+           <normaloff>:/images/friendsfolder24.png</normaloff>:/images/friendsfolder24.png</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
         <widget class="QPushButton" name="displaypushButton">
          <property name="styleSheet">
           <string notr="true">QPushButton::menu-indicator { 
@@ -265,20 +311,23 @@ subcontrol-position: bottom right;
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>161</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </item>
     <item row="2" column="0">
-     <widget class="QFrame" name="logoframe">
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
      <layout class="QGridLayout">
       <property name="margin">
        <number>9</number>
@@ -310,6 +359,16 @@ subcontrol-position: bottom right;
       </item>
      </layout>
     </item>
+    <item row="3" column="0">
+     <widget class="QFrame" name="logoframe">
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar">