From f79afbf7c39818177f97afc7ceb233a2e665f900 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Fri, 21 May 2010 23:49:01 +0000
Subject: [PATCH] Added to use now only the default Message Composer for
 MsgItem and PeerItem too, GeneralMessage needs to be removed soon.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2971 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/feeds/MsgItem.cpp  | 27 +++++++++++++++++++++--
 retroshare-gui/src/gui/feeds/PeerItem.cpp | 14 +++++++++++-
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/MsgItem.cpp b/retroshare-gui/src/gui/feeds/MsgItem.cpp
index 66bc100e1..33e6ed9f3 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp
@@ -28,6 +28,8 @@
 #include "rsiface/rsmsgs.h"
 #include "rsiface/rspeers.h"
 
+#include "gui/msgs/ChanMsgDialog.h"
+
 #include <iostream>
 
 /****
@@ -246,8 +248,29 @@ void MsgItem::replyMsg()
 #endif
 	if (mParent)
 	{
-		mParent->openMsg(FEEDHOLDER_MSG_MESSAGE, mPeerId, mMsgId);
-        }
+		//mParent->openMsg(FEEDHOLDER_MSG_MESSAGE, mPeerId, mMsgId);
+		
+		MessageInfo msgInfo;
+    if (!rsMsgs -> getMessage(mMsgId, msgInfo))
+		return ;
+
+    ChanMsgDialog *nMsgDialog = new ChanMsgDialog(true);
+    nMsgDialog->newMsg();
+    nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
+    nMsgDialog->setWindowTitle(tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ;
+
+    QTextDocument doc ;
+    doc.setHtml(QString::fromStdWString(msgInfo.msg)) ;
+    std::string cited_text(doc.toPlainText().toStdString()) ;
+
+    nMsgDialog->insertPastedText(cited_text) ;
+    nMsgDialog->addRecipient( msgInfo.srcId ) ;
+    nMsgDialog->show();
+    nMsgDialog->activateWindow();
+
+    /* window will destroy itself! */
+   
+  }
 }
 
 
diff --git a/retroshare-gui/src/gui/feeds/PeerItem.cpp b/retroshare-gui/src/gui/feeds/PeerItem.cpp
index bb958b694..0707b5289 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.cpp
+++ b/retroshare-gui/src/gui/feeds/PeerItem.cpp
@@ -24,8 +24,11 @@
 #include "FeedHolder.h"
 #include "../RsAutoUpdatePage.h"
 
+#include "rsiface/rsmsgs.h"
 #include "rsiface/rspeers.h"
 
+#include "gui/msgs/ChanMsgDialog.h"
+
 #include <iostream>
 #include <sstream>
 #include <time.h>
@@ -282,7 +285,16 @@ void PeerItem::sendMsg()
 
 	if (mParent)
 	{
-		mParent->openMsg(FEEDHOLDER_MSG_MESSAGE, mPeerId, "");
+		//mParent->openMsg(FEEDHOLDER_MSG_MESSAGE, mPeerId, "");
+
+    ChanMsgDialog *nMsgDialog = new ChanMsgDialog(true);
+    nMsgDialog->newMsg();
+
+    nMsgDialog->addRecipient( mPeerId ) ;
+    nMsgDialog->show();
+    nMsgDialog->activateWindow();
+
+    /* window will destroy itself! */
 	}
 }