Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added to use now only the default Message Composer for MsgItem and PeerItem too, GeneralMessage needs to be removed soon.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2971 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-05-21 23:49:01 +00:00
parent 5b9b0aba96
commit f79afbf7c3
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
retroshare-gui/src/gui/feeds/MsgItem.cpp
View File

@ -28,6 +28,8 @@
#include "rsiface/rsmsgs.h" #include "rsiface/rsmsgs.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "gui/msgs/ChanMsgDialog.h"
#include <iostream> #include <iostream>
/**** /****
@ -246,7 +248,28 @@ void MsgItem::replyMsg()
#endif #endif
if (mParent) 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! */
} }
} }

14
retroshare-gui/src/gui/feeds/PeerItem.cpp
View File

@ -24,8 +24,11 @@
#include "FeedHolder.h" #include "FeedHolder.h"
#include "../RsAutoUpdatePage.h" #include "../RsAutoUpdatePage.h"
#include "rsiface/rsmsgs.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "gui/msgs/ChanMsgDialog.h"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <time.h> #include <time.h>
@ -282,7 +285,16 @@ void PeerItem::sendMsg()
if (mParent) 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! */
} }
} }