FeedReader:

- Recalculate message count of the user notify when a feed with new items is deleted.
- Set deleted message to read and !new.
- Added test feed item in notify settings.

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

retroshare-gui/src/gui/NewsFeed.cpp

@@ -409,6 +409,24 @@ void NewsFeed::testFeeds(uint notifyFlags)
 	}
 }
 
+void NewsFeed::testFeed(FeedNotify *feedNotify)
+{
+	if (!instance) {
+		return;
+	}
+
+	if (!feedNotify) {
+		return;
+	}
+
+	QWidget *feedItem = feedNotify->testFeedItem(instance);
+	if (!feedItem) {
+		return;
+	}
+
+	instance->addFeedItem(feedItem);
+}
+
 void NewsFeed::addFeedItem(QWidget *item)
 {
 	item->setAttribute(Qt::WA_DeleteOnClose, true);

retroshare-gui/src/gui/NewsFeed.h

@@ -31,6 +31,7 @@ class RsFeedItem;
 class ForumNewItem;
 class ChanMsgItem;
 class ChatMsgItem;
+class FeedNotify;
 
 class NewsFeed : public MainPage, public FeedHolder, private Ui::NewsFeed
 {
@@ -48,6 +49,7 @@ public:
   virtual void openChat(std::string peerId);
 
   static void testFeeds(uint notifyFlags);
+  static void testFeed(FeedNotify *feedNotify);
 
 signals:
   void newsFeedChanged(int count);

retroshare-gui/src/gui/common/FeedNotify.cpp

@@ -48,3 +48,8 @@ QWidget *FeedNotify::feedItem(FeedHolder */*parent*/)
 {
 	return NULL;
 }
+
+QWidget *FeedNotify::testFeedItem(FeedHolder */*parent*/)
+{
+	return NULL;
+}

retroshare-gui/src/gui/common/FeedNotify.h

@@ -38,6 +38,7 @@ public:
 	virtual bool notifyEnabled();
 	virtual void setNotifyEnabled(bool /*enabled*/);
 	virtual QWidget *feedItem(FeedHolder */*parent*/);
+	virtual QWidget *testFeedItem(FeedHolder */*parent*/);
 };
 
 #endif // FEEDNOTIFY_H

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

@@ -285,6 +285,14 @@ void NotifyPage::notifyToggled()
 void NotifyPage::testNotify()
 {
     NewsFeed::testFeeds(getNewsFlags());
+
+    /* notify of plugins */
+    QList<FeedNotifySetting>::iterator feedNotifyIt;
+    for (feedNotifyIt = mFeedNotifySettingList.begin(); feedNotifyIt != mFeedNotifySettingList.end(); ++feedNotifyIt) {
+        if (feedNotifyIt->mEnabledCheckBox->isChecked()) {
+            NewsFeed::testFeed(feedNotifyIt->mFeedNotify);
+        }
+    }
 }
 
 void NotifyPage::testToaster()