From 561104297e944ad91b6ba9320d82ab3c3e15191d Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Sat, 16 Jan 2010 02:42:11 +0000
Subject: [PATCH] Fixed to check if Messages contains Re or Fwd to not add
 more. Added when Messages contains Re or Fwd change Message icon

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2052 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/MessagesDialog.cpp     |  88 ++++++++++++++----
 retroshare-gui/src/gui/images.qrc             |   4 +
 .../src/gui/images/message-mail-forwarded.png | Bin 0 -> 656 bytes
 .../images/message-mail-replied-forw-read.png | Bin 0 -> 842 bytes
 .../gui/images/message-mail-replied-forw.png  | Bin 0 -> 803 bytes
 5 files changed, 76 insertions(+), 16 deletions(-)
 create mode 100644 retroshare-gui/src/gui/images/message-mail-forwarded.png
 create mode 100644 retroshare-gui/src/gui/images/message-mail-replied-forw-read.png
 create mode 100644 retroshare-gui/src/gui/images/message-mail-replied-forw.png

diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index 1bb65cd3b..c875815a0 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -247,7 +247,18 @@ void MessagesDialog::replytomessage()
 	/* fill it in */
 	//std::cerr << "MessagesDialog::newmessage()" << std::endl;
 	nMsgDialog->newMsg();
+	
+	QString text = QString::fromStdWString(msgInfo.title);
+			
+	if (text.startsWith("Re:", Qt::CaseInsensitive))
+	{
+	nMsgDialog->insertTitleText( QString::fromStdWString(msgInfo.title).toStdString()) ;
+	}
+	else
+	{
 	nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
+	}
+	
 	nMsgDialog->setWindowTitle(tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ;
 
 
@@ -282,7 +293,17 @@ void MessagesDialog::replyallmessage()
 	/* fill it in */
 	//std::cerr << "MessagesDialog::newmessage()" << std::endl;
 	nMsgDialog->newMsg();
+	
+	QString text = QString::fromStdWString(msgInfo.title);
+			
+	if (text.startsWith("Re:", Qt::CaseInsensitive))
+	{
+	nMsgDialog->insertTitleText( QString::fromStdWString(msgInfo.title).toStdString()) ;
+	}
+	else
+	{
 	nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
+	}
 	nMsgDialog->setWindowTitle(tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ;
 
 
@@ -327,7 +348,18 @@ void MessagesDialog::forwardmessage()
 	/* fill it in */
 	//std::cerr << "MessagesDialog::newmessage()" << std::endl;
 	nMsgDialog->newMsg();
+	
+	QString text = QString::fromStdWString(msgInfo.title);
+			
+	if (text.startsWith("Fwd:", Qt::CaseInsensitive))
+	{
+	nMsgDialog->insertTitleText( QString::fromStdWString(msgInfo.title).toStdString()) ;
+	}
+	else
+	{
 	nMsgDialog->insertTitleText( (QString("Fwd: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
+	}
+	
 	nMsgDialog->setWindowTitle(tr("Fwd: ") + QString::fromStdWString(msgInfo.title) ) ;
 
 
@@ -585,6 +617,46 @@ void MessagesDialog::insertMessages()
 
 		// Subject
 		item -> setText(2, QString::fromStdWString(it->title));
+		
+		// Change Message icon when Subject is Re: or Fwd:
+		QString text = QString::fromStdWString(it->title);
+			
+    if (text.startsWith("Re:", Qt::CaseInsensitive))
+    {
+		item -> setIcon(2, (QIcon(":/images/message-mail-replied-read.png")));
+    }
+    else if (text.startsWith("Fwd:", Qt::CaseInsensitive))
+    {
+		item -> setIcon(2, (QIcon(":/images/message-mail-forwarded-read.png")));
+    }
+    else
+		{
+    item -> setIcon(2, (QIcon(":/images/message-mail-read.png")));
+		}
+		
+		if (it -> msgflags & RS_MSG_NEW)
+		{
+			for(int i = 0; i < 10; i++)
+			{
+				QFont qf = item->font(i);
+				qf.setBold(true);
+				item->setFont(i, qf);
+			}
+			QString text = QString::fromStdWString(it->title);
+			
+      if (text.startsWith("Re:", Qt::CaseInsensitive))
+      {
+      item -> setIcon(2, (QIcon(":/images/message-mail-replied.png")));
+      }
+      else if (text.startsWith("Fwd:", Qt::CaseInsensitive))
+      {
+      item -> setIcon(2, (QIcon(":/images/message-mail-forwarded.png")));
+      }
+      else
+      {
+      item -> setIcon(2, (QIcon(":/images/message-mail.png")));
+      }
+		}
 
 		// No of Files.
 		{
@@ -601,22 +673,6 @@ void MessagesDialog::insertMessages()
 			newSelected = item;
 		}
 
-		if (it -> msgflags & RS_MSG_NEW)
-		{
-			for(int i = 0; i < 10; i++)
-			{
-				QFont qf = item->font(i);
-				qf.setBold(true);
-				item->setFont(i, qf);
-				item -> setIcon(2, (QIcon(":/images/message-mail.png")));
-
-			}
-		}
-		else
-		{
-        item -> setIcon(2, (QIcon(":/images/message-mail-read.png")));
-		}
-
 		/* add to the list */
 		items.append(item);
 	}
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 82e44daf6..54d42f2be 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -13,6 +13,7 @@
         <file>images/btn_27.png</file>
         <file>images/btn_27_hover.png</file>
         <file>images/connect_established.png</file>
+        <file>images/connect_creating.png</file>
         <file>images/feedback_arrow.png</file>
         <file>images/feedback_arrow_hover.png</file>
         <file>images/feedback-bar-background.png</file>
@@ -261,6 +262,9 @@
         <file>images/message-mail-read.png</file>
         <file>images/message-mail-imapdelete.png</file>
         <file>images/message-mail-replied-read.png</file>
+        <file>images/message-mail-forwarded-read.png</file>
+        <file>images/message-mail-replied.png</file>
+        <file>images/message-mail-forwarded.png</file>
         <file>images/message-news.png</file>
         <file>images/message.png</file>
         <file>images/messenger.png</file>
diff --git a/retroshare-gui/src/gui/images/message-mail-forwarded.png b/retroshare-gui/src/gui/images/message-mail-forwarded.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7d9881a51948ebb97aaf4f2c2ff34e0d5dd810c
GIT binary patch
literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00007bV*G`2h<A?
z6)+|29T7MH000SaNLh0L04ERt04ERulxa~J00004XF*Lt006O%3;baP0006XNkl<Z
zc-rlfPe@cz6vlt^W~P~O#tF+A%0Mu)Kahf&#$*_@)m5};69hrDwYKgfLRu9q+SDd!
zQJWx&z@l=b#Xu4vYAM>3jx(0?=go88yYF@HZ5%gk+IQgcy?4$%-#zDi2mYI{@NOdK
zIwI~07vZ?b?*=NLv+WZ*J{1?XQyd(-n+mv&n+PUO(A3^dAQF?DE_gzsEz!nP=+?k7
zp;kedzbI$FGxzpGLS7m&gk*I>T@*6UaV!g;KO!lD64miz_zeuh!@$Aas!*7nCmIjP
zYFyocvG6g*_2XY@>Nw5X`^VU&9OL~nlsDvy$d^S`LJ6l-U^SDWWq&iff{tuS=ouKo
zcCjswr#CCK_MIU+`H1D2Dz`?Lu!`oN<YJz0Q)yb;_Yexnm+i`S1sJVuWmyQkyi;I&
zXoF`DdURl6+T!-PHLC0De0lMTL`RZv#HW+7%^iYB)S_>sS^xZ)tC4=<Z%FiM(qZC!
zp52{CSespx-IR2)I%;;BK*@6XUXsp%;9qq<b?Gqsdb&yW^pl;<%R!r35tXMbpqQeu
z5?610X44yHb<yDdm8=eqj)ggU(bMw9TABzPJw$G4g=BoIQGwb6%$0ePy#us`1jhy|
zk^oMQSX{Wa2|vwx-xb2bB(b-OS&lYlpeiUXPrs>eqR@c@2Z!lRy=Lm6-S8>dG}gD#
q+^We9!;@pBOP&;3i+?iN8|mLpS2jfLML8A#0000<MNUMnLSTY4RV$|e

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/images/message-mail-replied-forw-read.png b/retroshare-gui/src/gui/images/message-mail-replied-forw-read.png
new file mode 100644
index 0000000000000000000000000000000000000000..54340d00d089b164c51c92b67f050fb4894c9208
GIT binary patch
literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00007bV*G`2h<A@
z6Aml(Q9P9Z000SaNLh0L04ERt04ERulxa~J00004XF*Lt006O%3;baP0008nNkl<Z
zc-oaxTS!z<6kYeuIO;T`j^mVX9nox>93#{)D~&*uJ`zfQB1J?7g8T{UM>MFAD9|F%
zUP_tfN6`bp8v2mbe57Goqeu@copkUy%=^y0w{x$L9{SUUz1ipNz1G=hodc}dP55c+
z&=wGYxbN*3$|jyvzBOF)w>@hv9vORZ?o4&zP8l{aT8!18wJtPMJc>GMPrsHb)OTLW
zX4CAvM=6Wfr^q!?SC8f8_r0hwrv6JH5rVb=4HShEP@v)?;)B~9gLpXkSZpxrj8JJ3
z;IB|bNL@>%CvptDbdK*E`uUR+>Xfz?mkIdnX5(#F>d}~agN(_5XNmhfnEhbJ@{Dz0
zX<@#!pr*wvEey@9c(mBN0URa|N2%@>x~Jmca5C^REIbTgvnNBR9L$K|diqIQhV+#B
zNPvZs;LSp}2rNmhK%!cY!wE%@&>?X60Oy($g2_QM_5@R~^zsVQo=)>#4pq8(=tFdZ
z1gOleLw-!zreJP)8vA9P2n!Dc$F4{~f9wxMP0j-9^I8$9jDls<jEh<CFlS}{0`t}h
zM31*%Yr;0rMEX?%&=kns96U_tfu~2G!!~NdjM<611;beCxCife7r1Xj2p?-j_^w29
zBrl4|`Bn)u(Ka!8)v$~zg9GjN_lj%FuoI^1v50hkg=(k?QE4flC{6_PtQRcHt`G#N
z95Cbtii<@Hi}xmG{Us*)X|y-(K=gq_u#Sv@^SDGX@ALk?f{++*hah>MWaBp_Tbaix
zD5E2wN=n51rzx-=w@9)^AQck%7CXu>jl(U=!t`f9)E7^S#gkV8kdn=SbK4<P$PgT(
zfqiBXauxjt0TILT;|oG{yCIbW>KMCN$Sr4Zu+R;k%>|AjqkCOMagPXQT-3UVQkLax
zlRaHQEZZrvdYm*84e3aT?Z!YOD>e#(3AJ@6doGVx5R0csNFtsod<y)Z@x*(70ac?~
Uf|T9GaR2}S07*qoM6N<$g0(h!1poj5

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/images/message-mail-replied-forw.png b/retroshare-gui/src/gui/images/message-mail-replied-forw.png
new file mode 100644
index 0000000000000000000000000000000000000000..b465758f5b2a6cf4af0bf7aaf104e6beda655e73
GIT binary patch
literal 803
zcmV+;1Kj+HP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00007bV*G`2h<A@
z1Q8gWvgYUj000SaNLh0L04ERt04ERulxa~J00004XF*Lt006O%3;baP0008ANkl<Z
zc-n<hTSydP6#iy+cE?e7%hgTOP*>C>m#oMPT8gA1NGmtGP!AFz^i~l;7sz}lx?uL8
z&`U`5kgrkrk`OAQ_+V<Kn39)m)y-uuIWz9=-1=v9S1Y6+hI9V&{pZa0opX$cpL!S^
zC($Z=$Cw;|pG2sFXBabWMu;E8FxEMSxZ_B}bBaQ(6hNhR&uc<0F~yN-)DTOrS3n0G
zO?X5Bb()`X9F-~C;Uey7?JmvfY?O5i6g<UE6}S-(q?W-Q_mv>U(=+DbkFDp-Ihj@!
z<Ex3@fK5Kw&>&Iw+YSjY<~!KGD_aaK9%NiVks%9;Btw=J-Ri!iK#ED+o@*_;>AI{V
ztdBP1{f~A%@vO5BCF!N8DyoJp$x0$3pvH(1$j3qAg5bPfjCJ*=60m}nMFm$2S}@C<
zz(8miw_J~55*Z{VOC&K$-VlKb@s%hfJ`DfpH>7XbKtg(3D8u+C3+gLo(73-1`Idb0
z$dB7QhY*_M2~PejFA=i{F}#5JfkD`^Eif5HB12voqe?W1D%$UfcysJ6!rkxSn~37!
z(Mj-rK9TJ0?Snl(9cB|rlmsa9@?dCt&LZIfbiWGXO9zd-(lQ<Je2(EswGY={3-I=I
zAa_S07)I5TwSFWRFl-d%ZmWI?&Po{kU`$M6ykAD+nGn*7otPh;gdE{knkmG409vDR
zsl^U%A%c-kt!dOB<2-z&5SdN|d|C>;BSXl}rO5WJk)Tmwm|wVf_bVdo0r;kjXg=@J
z!Bclw>~oWcF&-%!Sr|(S@pH<9P1aCC0<BRIJQJ{&m4jwPIJPaKnE)>L5^64opawL`
zyiS{uc-U=A;Q8cL38YeZy0_D+$jck1ZCdVD7o5Ag(DPDUj;+Ds8!1F$lC~t8;3D$v
h{YU)&4;cyiegl-0PWxu(@@fD8002ovPDHLkV1h9HWz7Hp

literal 0
HcmV?d00001