From a0e426a52713377d51701e959ec4ecfa02a6c98f Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Sat, 28 Aug 2010 14:59:49 +0000
Subject: [PATCH] Added a Status Label for typing..., to display on top of the
 textedit and not more on statusbar.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/chat/PopupChatDialog.cpp          |  4 +-
 .../src/gui/chat/PopupChatDialog.ui           | 68 ++++++++++++-------
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
index aa6944e94..0122bf15a 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
@@ -360,6 +360,7 @@ void PopupChatDialog::contextMenu( QPoint point )
 void PopupChatDialog::resetStatusBar() 
 {
         statusBar()->showMessage(tr("Chatting with ") + QString::fromStdString(dialogName)) ;
+        ui.statusLabel->setText(QString("")) ;
 }
 
 void PopupChatDialog::updateStatusTyping()
@@ -376,7 +377,8 @@ void PopupChatDialog::updateStatusTyping()
 //
 void PopupChatDialog::updateStatusString(const QString& status_string)
 {
-	statusBar()->showMessage(status_string,5000) ; // displays info for 5 secs.
+	//statusBar()->showMessage(status_string,5000) ; // displays info for 5 secs.
+    ui.statusLabel->setText(status_string) ; // displays info for 5 secs.
 
 	QTimer::singleShot(5000,this,SLOT(resetStatusBar())) ;
 }
diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.ui b/retroshare-gui/src/gui/chat/PopupChatDialog.ui
index 82f9558e8..53ec892c8 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui
@@ -27,12 +27,9 @@
     <property name="bottomMargin">
      <number>0</number>
     </property>
-    <property name="horizontalSpacing">
+    <property name="spacing">
      <number>1</number>
     </property>
-    <property name="verticalSpacing">
-     <number>2</number>
-    </property>
     <item row="0" column="0" rowspan="3">
      <widget class="QFrame" name="frame">
       <property name="sizePolicy">
@@ -105,7 +102,7 @@
      <widget class="QFrame" name="avatarframe">
       <property name="maximumSize">
        <size>
-        <width>118</width>
+        <width>120</width>
         <height>16777215</height>
        </size>
       </property>
@@ -117,13 +114,13 @@
       </property>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>0</number>
+        <number>2</number>
        </property>
        <property name="topMargin">
         <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>0</number>
+        <number>2</number>
        </property>
        <property name="bottomMargin">
         <number>9</number>
@@ -291,7 +288,7 @@ border-image: url(:/images/closepressed.png)
        <enum>Qt::Vertical</enum>
       </property>
       <property name="handleWidth">
-       <number>5</number>
+       <number>2</number>
       </property>
       <widget class="QTextBrowser" name="textBrowser">
        <property name="sizePolicy">
@@ -331,24 +328,46 @@ p, li { white-space: pre-wrap; }
         <bool>false</bool>
        </property>
       </widget>
-      <widget class="QTextEdit" name="chattextEdit">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">QTextEdit{border: 1px solid #B8B6B1;
+      <widget class="QWidget" name="">
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <property name="spacing">
+         <number>1</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="statusLabel">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="indent">
+           <number>3</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QTextEdit" name="chattextEdit">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">QTextEdit{border: 1px solid #B8B6B1;
 border-radius: 6px;
 background: white;}</string>
-       </property>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </widget>
      </widget>
     </item>
@@ -810,6 +829,7 @@ border: 1px solid #CCCCCC;
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>