From 787159debed7d635e58993af55a8e58bdfcfb0de Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 8 Sep 2008 12:41:46 +0000 Subject: [PATCH] Added a insertPastedText() method to ChanMsgDialog to allow inserting blue text while responding to msg git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@721 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MessagesDialog.cpp | 6 +----- retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp | 8 ++++++++ retroshare-gui/src/gui/msgs/ChanMsgDialog.h | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index c3880c10e..75c9ecdae 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -230,11 +230,7 @@ void MessagesDialog::replytomessage() doc.setHtml(QString::fromStdWString(msgInfo.msg)) ; std::string cited_text(doc.toPlainText().toStdString()) ; - std::string::size_type i=0 ; - while( (i=cited_text.find_first_of('\n',i+1)) < cited_text.size()) - cited_text.replace(i,1,std::string("\n> ")) ; - - nMsgDialog->insertMsgText( std::string("> ") + cited_text ) ; + nMsgDialog->insertPastedText(cited_text) ; nMsgDialog->addRecipient( msgInfo.srcId ) ; nMsgDialog->show(); nMsgDialog->activateWindow(); diff --git a/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp b/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp index 0d42f1830..eba52685c 100644 --- a/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp +++ b/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp @@ -505,6 +505,14 @@ void ChanMsgDialog::insertTitleText(std::string title) ui.titleEdit->setText(QString::fromStdString(title)); } +void ChanMsgDialog::insertPastedText(std::string msg) +{ + std::string::size_type i=0 ; + while( (i=msg.find_first_of('\n',i+1)) < msg.size()) + msg.replace(i,1,std::string("\n
> ")) ; + + ui.msgText->setHtml(QString("")+QString::fromStdString(std::string("> ") + msg)+"

") ; +} void ChanMsgDialog::insertMsgText(std::string msg) { diff --git a/retroshare-gui/src/gui/msgs/ChanMsgDialog.h b/retroshare-gui/src/gui/msgs/ChanMsgDialog.h index e85a43021..1d3653c6e 100644 --- a/retroshare-gui/src/gui/msgs/ChanMsgDialog.h +++ b/retroshare-gui/src/gui/msgs/ChanMsgDialog.h @@ -53,6 +53,7 @@ void insertSendList(); /* for Msgs */ void insertChannelSendList(); /* for Channels */ void insertFileList(); /* for Both */ void insertTitleText(std::string title); +void insertPastedText(std::string msg) ; void insertMsgText(std::string msg); void addRecipient(std::string id) ; void Create_New_Image_Tag( const QString urlremoteorlocal ); @@ -110,6 +111,7 @@ private slots: private: + void setTextColor(const QColor& col) ; void setupFileActions(); void setupEditActions(); void setupViewActions();