improvements MessagesDialog:

- new read/unread state - stored locally
- show all recipients in Outbox, Sentbox and Draftbox


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

retroshare-gui/src/gui/MessagesDialog.h

@@ -33,6 +33,8 @@
 #include "mainpage.h"
 #include "ui_MessagesDialog.h"
 
+class RSettings;
+
 class MessagesDialog : public MainPage 
 {
   Q_OBJECT
@@ -43,7 +45,6 @@ public:
   /** Default Destructor */
   ~MessagesDialog();
 
-  void insertMsgTxtAndFiles(QModelIndex index = QModelIndex());
 // replaced by shortcut
 //  virtual void keyPressEvent(QKeyEvent *) ;
  void updateMessageSummaryList();
@@ -77,6 +78,9 @@ private slots:
   
   void removemessage();
   
+  void markAsRead();
+  void markAsUnread();
+
   void anchorClicked (const QUrl &);
   
   void getcurrentrecommended();
@@ -100,12 +104,15 @@ private:
   class QStandardItemModel *MessagesModel;
   QSortFilterProxyModel *proxyModel;
 
+  void insertMsgTxtAndFiles(QModelIndex index = QModelIndex(), bool bSetToRead = true);
+
   bool getCurrentMsg(std::string &cid, std::string &mid);
-  void setMsgAsRead(const QModelIndex &index); 
+  void setMsgAsReadUnread(const QList<int> &Rows, bool bRead);
 
   void setCurrentFileName(const QString &fileName);
 
-  int getSelectedMsgCount ();
+  int getSelectedMsgCount (QList<int> *pRowsRead, QList<int> *pRowsUnread);
+  bool isMessageRead(int nRow);
 
   /* internal handle splitter */
   void togglefileview_internal();
@@ -118,8 +125,8 @@ private:
   std::string mCurrMsgId;
 
   QString fileName;
-  
   QFont mFont;
+  RSettings *m_pConfig;
 
   // timer and index for showing message
   QTimer *timer;

retroshare-gui/src/gui/images.qrc

@@ -270,6 +270,9 @@
         <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-mail-state-read.png</file>
+        <file>images/message-mail-state-unread.png</file>
+        <file>images/message-mail-state-header.png</file>
         <file>images/message-news.png</file>
         <file>images/message.png</file>
         <file>images/messages_new.png</file>

retroshare-gui/src/gui/settings/MessagePage.cpp

@@ -22,12 +22,13 @@
 #include "MessagePage.h"
 #include "rshare.h"
 
+#include "rsharesettings.h"
+
 MessagePage::MessagePage(QWidget * parent, Qt::WFlags flags)
     : ConfigPage(parent, flags)
 {
     ui.setupUi(this);
     setAttribute(Qt::WA_QuitOnClose, false);
-
 }
 
 MessagePage::~MessagePage()
@@ -40,18 +41,19 @@ MessagePage::closeEvent (QCloseEvent * event)
     QWidget::closeEvent(event);
 }
 
-
 /** Saves the changes on this page */
 bool
 MessagePage::save(QString &errmsg)
 {
-	return true;
+    Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked());
+
+    return true;
 }
 
 /** Loads the settings for this page */
 void
 MessagePage::load()
 {
-
+    ui.setMsgToReadOnActivate->setChecked(Settings->getMsgSetToReadOnActivate());
 }
 

retroshare-gui/src/gui/settings/rsharesettings.cpp

@@ -345,3 +345,13 @@ void RshareSettings::loadWidgetInformation(QMainWindow *widget, QToolBar *toolBa
  loadWidgetInformation(widget);
 }
 
+/* Messages */
+bool RshareSettings::getMsgSetToReadOnActivate ()
+{
+    return valueFromGroup("MessageDialog", "SetMsgToReadOnActivate", true).toBool();
+}
+
+void RshareSettings::setMsgSetToReadOnActivate (bool bValue)
+{
+    setValueToGroup("MessageDialog", "SetMsgToReadOnActivate", bValue);
+}

retroshare-gui/src/gui/settings/rsharesettings.h

@@ -126,6 +126,10 @@ public:
   //! Method overload. Restore window and toolbar information.
   void loadWidgetInformation(QMainWindow *widget, QToolBar *toolBar);
 
+  /* Messages */
+  bool getMsgSetToReadOnActivate ();
+  void setMsgSetToReadOnActivate (bool bValue);
+
 protected:
   /** Default constructor. */
   RshareSettings();