* Added Forward Message Button with Forward feature

* set for Reply Message/Forward Message correct WindowTitle from  Message Title
* Added for Forward Message insertForwardPastedText() function to add Forwarded Message in  a <blockquote>.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@841 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/MessagesDialog.cpp

@@ -44,11 +44,12 @@
 
 
 /* Images for context menu icons */
-#define IMAGE_MESSAGE        ":/images/folder-draft.png"
+#define IMAGE_MESSAGE		   ":/images/folder-draft.png"
-#define IMAGE_MESSAGEREPLY   ":/images/mail_reply.png"
+#define IMAGE_MESSAGEREPLY	   ":/images/mail_reply.png"
-#define IMAGE_MESSAGEREMOVE  ":/images/mail_delete.png"
+#define IMAGE_MESSAGEFORWARD	   ":/images/mail_forward.png"
-#define IMAGE_DOWNLOAD       ":/images/start.png"
+#define IMAGE_MESSAGEREMOVE 	   ":/images/message-mail-imapdelete.png"
-#define IMAGE_DOWNLOADALL    ":/images/startall.png"
+#define IMAGE_DOWNLOAD    	   ":/images/start.png"
+#define IMAGE_DOWNLOADALL          ":/images/startall.png"
 
 
 /** Constructor */
@@ -66,6 +67,8 @@ MessagesDialog::MessagesDialog(QWidget *parent)
   connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(newmessage()));
   connect(ui.removemessageButton, SIGNAL(clicked()), this, SLOT(removemessage()));
   connect(ui.replymessageButton, SIGNAL(clicked()), this, SLOT(replytomessage()));
+  connect(ui.forwardmessageButton, SIGNAL(clicked()), this, SLOT(forwardmessage()));
+
   //connect(ui.printbutton, SIGNAL(clicked()), this, SLOT(print()));
   connect(ui.actionPrint, SIGNAL(triggered()), this, SLOT(print()));
   connect(ui.actionPrintPreview, SIGNAL(triggered()), this, SLOT(printpreview()));
@@ -103,12 +106,13 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 	msglheader->resizeSection ( 3, 200 );
 	
 	ui.newmessageButton->setIcon(QIcon(QString(":/images/folder-draft24-pressed.png")));
-    ui.replymessageButton->setIcon(QIcon(QString(":/images/replymail-pressed.png")));
+    	ui.replymessageButton->setIcon(QIcon(QString(":/images/replymail-pressed.png")));
-    ui.removemessageButton->setIcon(QIcon(QString(":/images/deletemail-pressed.png")));
+	ui.forwardmessageButton->setIcon(QIcon(QString(":/images/mailforward24-hover.png")));
-    ui.printbutton->setIcon(QIcon(QString(":/images/print24.png")));
+    	ui.removemessageButton->setIcon(QIcon(QString(":/images/deletemail-pressed.png")));
+    	ui.printbutton->setIcon(QIcon(QString(":/images/print24.png")));
+
+	ui.forwardmessageButton->setToolTip(tr("Forward selected Message"));
  
-    /*Disabled Reply Button */
-    //ui.replymessageButton->setEnabled(false);
 
     QMenu * printmenu = new QMenu();
     printmenu->addAction(ui.actionPrint);
@@ -116,6 +120,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
     ui.printbutton->setMenu(printmenu);
 
 	 ui.msgWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
+	 ui.msgWidget->sortItems( 3, Qt::DescendingOrder );
 
 
   /* Hide platform specific features */
@@ -160,6 +165,12 @@ void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point )
 			connect( replytomsgAct , SIGNAL( triggered() ), this, SLOT( replytomessage() ) );
 			contextMnu.addAction( replytomsgAct);
 
+			forwardmsgAct = new QAction(QIcon(IMAGE_MESSAGEFORWARD), tr( "Forward Message" ), this );
+			connect( forwardmsgAct , SIGNAL( triggered() ), this, SLOT( forwardmessage() ) );
+			contextMnu.addAction( forwardmsgAct);
+
+			contextMnu.addSeparator(); 
+
 			removemsgAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Remove Message" ), this );
 			connect( removemsgAct , SIGNAL( triggered() ), this, SLOT( removemessage() ) );
 			contextMnu.addAction( removemsgAct);
@@ -225,6 +236,8 @@ void MessagesDialog::replytomessage()
 	//std::cerr << "MessagesDialog::newmessage()" << std::endl;
 	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)) ;
@@ -236,6 +249,41 @@ void MessagesDialog::replytomessage()
 	nMsgDialog->activateWindow();
 }
 
+void MessagesDialog::forwardmessage()
+{
+	/* put msg on msgBoard, and switch to it. */
+
+	std::string cid;
+	std::string mid;
+
+	if(!getCurrentMsg(cid, mid))
+		return ;
+
+	mCurrCertId = cid;
+	mCurrMsgId  = mid;
+
+	MessageInfo msgInfo;
+	if (!rsMsgs -> getMessage(mid, msgInfo))
+		return ;
+
+	ChanMsgDialog *nMsgDialog = new ChanMsgDialog(true);
+	/* fill it in */
+	//std::cerr << "MessagesDialog::newmessage()" << std::endl;
+	nMsgDialog->newMsg();
+	nMsgDialog->insertTitleText( (QString("Fwd: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
+	nMsgDialog->setWindowTitle(tr("Fwd: ") + QString::fromStdWString(msgInfo.title) ) ;
+
+
+	QTextDocument doc ;
+	doc.setHtml(QString::fromStdWString(msgInfo.msg)) ;
+	std::string cited_text(doc.toPlainText().toStdString()) ;
+
+	nMsgDialog->insertForwardPastedText(cited_text) ;
+	nMsgDialog->addRecipient( msgInfo.srcId ) ;
+	nMsgDialog->show();
+	nMsgDialog->activateWindow();
+}
+
 void MessagesDialog::togglefileview()
 {
 	/* if msg header visible -> hide by changing splitter 
@@ -459,6 +507,7 @@ void MessagesDialog::insertMessages()
 			std::ostringstream out;
 			out << it -> count;
 			item -> setText(0, QString::fromStdString(out.str()));
+			item -> setTextAlignment( 0, Qt::AlignCenter );
 		}
 
 		item -> setText(4, QString::fromStdString(it->srcId));

retroshare-gui/src/gui/MessagesDialog.h

@@ -54,6 +54,8 @@ void updateMessages ( QTreeWidgetItem * item, int column );
   void newmessage();
 
   void replytomessage();
+  void forwardmessage();
+
   void print();
   void printpreview();
   
@@ -79,6 +81,7 @@ private:
    /** Defines the actions for the context menu */
   QAction* newmsgAct;
   QAction* replytomsgAct;
+  QAction* forwardmsgAct;
   QAction* removemsgAct;
 
   QAction* getRecAct;

retroshare-gui/src/gui/MessagesDialog.ui

@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>759</width>
-    <height>530</height>
+    <height>520</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -577,6 +577,31 @@ p, li { white-space: pre-wrap; }
     </widget>
    </item>
    <item row="0" column="2" >
+    <widget class="QPushButton" name="forwardmessageButton" >
+     <property name="minimumSize" >
+      <size>
+       <width>28</width>
+       <height>28</height>
+      </size>
+     </property>
+     <property name="maximumSize" >
+      <size>
+       <width>28</width>
+       <height>28</height>
+      </size>
+     </property>
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="iconSize" >
+      <size>
+       <width>24</width>
+       <height>24</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3" >
     <widget class="QPushButton" name="removemessageButton" >
      <property name="minimumSize" >
       <size>
@@ -610,7 +635,7 @@ p, li { white-space: pre-wrap; }
      </property>
     </widget>
    </item>
-   <item row="0" column="3" >
+   <item row="0" column="4" >
     <widget class="QPushButton" name="printbutton" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
@@ -641,20 +666,20 @@ p, li { white-space: pre-wrap; }
      </property>
     </widget>
    </item>
-   <item row="0" column="4" >
+   <item row="0" column="5" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>602</width>
+       <width>541</width>
-       <height>24</height>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="1" column="0" colspan="5" >
+   <item row="1" column="0" colspan="6" >
     <widget class="QSplitter" name="splitter_2" >
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>

retroshare-gui/src/gui/images.qrc

@@ -192,11 +192,14 @@
         <file>images/mail_delete.png</file>
         <file>images/mail_get.png</file>
         <file>images/mail_reply.png</file>
+	<file>images/mail_forward.png</file>
         <file>images/mail_send.png</file>
         <file>images/mail_new.png</file>
         <file>images/mail_send24.png</file>
+        <file>images/mailforward24-hover.png</file>
         <file>images/message-mail.png</file>
-        <file>images/message-mail-read.png</file>m
+        <file>images/message-mail-read.png</file>
+	<file>images/message-mail-imapdelete.png</file>
         <file>images/message-news.png</file>
         <file>images/message.png</file>
         <file>images/messenger.png</file>

retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp

@@ -514,6 +514,15 @@ void  ChanMsgDialog::insertPastedText(std::string msg)
 	ui.msgText->setHtml(QString("<HTML><font color=\"blue\">")+QString::fromStdString(std::string("> ") + msg)+"</font><br/><br/></HTML>") ;
 }
 
+void  ChanMsgDialog::insertForwardPastedText(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<BR/>> ")) ;
+
+	ui.msgText->setHtml(QString("<HTML><blockquote ><font color=\"blue\">")+QString::fromStdString(std::string("") + msg)+"</font><br/><br/></blockquote></HTML>") ;
+}
+
 void  ChanMsgDialog::insertMsgText(std::string msg)
 {
 	ui.msgText->setText(QString::fromStdString(msg));

retroshare-gui/src/gui/msgs/ChanMsgDialog.h

@@ -54,6 +54,7 @@ void  insertChannelSendList(); /* for Channels */
 void  insertFileList(); /* for Both */
 void  insertTitleText(std::string title);
 void  insertPastedText(std::string msg) ;
+void  insertForwardPastedText(std::string msg);
 void  insertMsgText(std::string msg);
 void	addRecipient(std::string id) ;
 void  Create_New_Image_Tag( const QString urlremoteorlocal );