From 452faffa4b544a9a433bbb11086d1da9a87a1ce1 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Mon, 6 Sep 2010 20:54:48 +0000
Subject: [PATCH] Added a pixmap Label for display the typing icon for Private
 Chat

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3452 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/chat/PopupChatDialog.cpp          |   4 +-
 .../src/gui/chat/PopupChatDialog.ui           |  36 +++++++++++++++---
 retroshare-gui/src/gui/images/typing.png      | Bin 877 -> 741 bytes
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
index c807145f7..cca7dc6b2 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
@@ -413,7 +413,8 @@ void PopupChatDialog::contextMenu( QPoint point )
 
 void PopupChatDialog::resetStatusBar() 
 {
-        ui.statusLabel->setText(QString("")) ;
+        ui.statusLabel->clear();
+        ui.typingpixmapLabel->clear();
 }
 
 void PopupChatDialog::updateStatusTyping()
@@ -435,6 +436,7 @@ void PopupChatDialog::updateStatusString(const QString& peer_id, const QString&
 {
     QString status = QString::fromStdString(rsPeers->getPeerName(peer_id.toStdString())) + " " + tr(status_string.toAscii());
     ui.statusLabel->setText(status) ; // displays info for 5 secs.
+    ui.typingpixmapLabel->setPixmap(QPixmap(":images/typing.png") );
 
     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 3a7d527aa..bf96ca57b 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui
@@ -222,7 +222,7 @@ border-image: url(:/images/avatarstatus_bg.png);
       <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QGridLayout" name="gridLayout">
+      <layout class="QGridLayout" name="gridLayout_4">
        <property name="leftMargin">
         <number>2</number>
        </property>
@@ -405,11 +405,11 @@ p, li { white-space: pre-wrap; }
        </property>
       </widget>
       <widget class="QWidget" name="layoutWidget">
-       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <layout class="QGridLayout" name="gridLayout_3">
         <property name="spacing">
-         <number>1</number>
+         <number>0</number>
         </property>
-        <item>
+        <item row="0" column="1">
          <widget class="QLabel" name="statusLabel">
           <property name="text">
            <string/>
@@ -422,7 +422,7 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item>
+        <item row="2" column="0" colspan="2">
          <widget class="QTextEdit" name="chattextEdit">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -443,6 +443,28 @@ background: white;}</string>
           </property>
          </widget>
         </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="typingpixmapLabel">
+          <property name="minimumSize">
+           <size>
+            <width>18</width>
+            <height>18</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>18</width>
+            <height>18</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>T</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </widget>
@@ -955,6 +977,10 @@ p, li { white-space: pre-wrap; }
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/images/typing.png b/retroshare-gui/src/gui/images/typing.png
index 316e83d60b0c4aabf97e9a913aaacd3e87e3fb04..28580e9a6938084f208998b9db945d363f8e9baa 100644
GIT binary patch
literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00004b3#c}2nYxW
zd<bNS00009a7bBm000Fs000Fs0k`caQUCw|8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10%A!-K~y-6t&~4&6hRoqpZT-9bK#0KcLoj)Jc-R(q_wgV3~4r;
zn?kVj6Zi$hFJNI4h{47~$PFB%F$n>SG(n3rXCorwMFdTCXD&NCe|BuLYho~sdEsq_
zd4Ds{Gw(aZdylIKdL<M9{O<)RB_V{|Ycv{*^?Lo55aK!jD5bs}A0K}>Iy&0&-fyRA
zdQJ){rAa9nrSxH|)q2`)x7+o49fXhzCr_tSj7Fo;;o;$vq9|UaY3eGFl#(&VUdM5~
zGCMm9N+}2-p!A~hqA1|K$9O!(a5(H+YagU(>dKw#ola*(2mxaZthI2?!8r%-eU;^!
zwH87M%+JrSP)gSUfW>iqLkRJ**=+vNOUOA{rTh|D6a}ocpp+uZvW0_#gB}O46h#rn
z<1rXx;G822L)2<D2qC~Z2c@(sR!Tu@UEMs2B5=-^D1c^`WtdDR$nzZDd#tUkVRv^I
zVHl#<>tSPK140Pw?CfB5brk?$jKOp|g;ENX(gp>vebxu>JqCjT_V@Q;t;Oc%CI*86
zj4{~T+k=#{GW<-wA^m=z5kkJr%*@QyYPCv|5CTyYAqWBxLg2lJF$Q^_Ln#HN6tXNs
zmSw|}laqz=`ELe6uqA}(lz=b{5r!ccV-?6b2dy=<)+O+xQtD2UBtOnJWRr9LHj1LS
zgp@{?pwe)yb)mJEd7eLBUS9rwuCq^JF919Wf?yH^!7s+x9Ho?<f+j^#e0I*gGsZki
zlH}86v$g;rGsfIalH|RVk`Y3#5khRY+x>Z=&HpiLw*lM-@H|b^ua^~F3i{u;vj6Be
X%nN3>AtaCj00000NkvXXu0mjf8(=#g

literal 877
zcmV-z1CsoSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)CUR>HxLPM+syy~0{Tfr
zK~#9!rISxc8+jbXUotUHGvhjnH6;>5)saFL0(z<i+ufU%*h6KPy$EJS@U%HEE>tf{
zwNjH>yw$eUgZ3mu>4?231Oycti3TGmGZ<8K1_$T&bN)DcYH8Umd)Rk<yzd`)AK-t=
z^F5=tx3{vTrKP>DuI^_+5biB6FMk{v8Tk{y^>+sh4GrBEMX@^)i98GjgLi|$pr7Y?
zlu9LJG8q&Kh2in>@h1S>&lxWO#N+X@rKP1;eSLjJ%d(!PQmOka%la9HK|Y^HI-Ldp
zG&eW@l}sl8_{Zg`RO<KR<71an>JASNy8zto?rxV->W0H%x4pgHEtN{HBuVbn)Ra9i
zF!0;wECT>NJw4An9?$K`$w>?j4q|?O9&2lBC=?3FX0s?OE5qU8AqXL0S=Q_K`+t&U
z`Stnv`6ZJ~CU3R1wLM>4T=dS(&7rBO37wstn4O))&dv^|r>7AJ1dz>UQD0w=*49=~
zN^dxhbC}EJ)_svkBwk%z?OR=4g&+u+n3%xK%nZ7^y0EaYfTN=$q|<3!U0s0?0?V>c
zQ&WS@&CUA&Uiv&9Pus@E1^}R{stOFlU~Fs*qobopBogT8=l~%EhGD=oP1v>#p65|n
zS=j>M1`~}&8J_2VC4|81^@8I#n5GGi;}DO>advhFRaIda1}LSVl!6cfMNxjp=kqhn
z`uh5AEEc;XisFx&rh(^q1OfpNLJ*Bcp=laS(}Zc7pp?QiO<0x%S(d%Ju7B`4j^l1^
zZ4IcZT5N1=1kdwdUePq|%SK8mY}<ye>&WGDP*wF*mgQ3)0Aw;5wYIkQu_%gb6%`c~
zKA#We<>k<I9ggGR`uZA|mzPi!1^fH^r^RCNog_)q7Z(@BZyMF#-~T8a4!>tv*2i%i
z8X6j)>pD(OPH=E=An)z%y_F>Cm0=hM0PKH-DUnG05(<T02!e3abzN6clux_6yKh!j
zR_1KmE&*`<lg3aeR1=HE9>}t+Zf|dI0?@t&=xhBAc+GHAX<U-B00000NkvXXu0mjf
Det?S$