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

plugins/FeedReader/gui/FeedReaderFeedNotify.cpp

@@ -20,6 +20,8 @@
  ****************************************************************/
 
 #include <QMutex>
+#include <QDateTime>
+#include <QBuffer>
 
 #include "FeedReaderFeedNotify.h"
 #include "FeedReaderNotify.h"
@@ -116,3 +118,24 @@ QWidget *FeedReaderFeedNotify::feedItem(FeedHolder *parent)
 
 	return new FeedReaderFeedItem(mFeedReader, mNotify, parent, feedInfo, msgInfo);
 }
+
+QWidget *FeedReaderFeedNotify::testFeedItem(FeedHolder *parent)
+{
+	FeedInfo feedInfo;
+	feedInfo.name = tr("Test").toUtf8().constData();
+
+	QByteArray faviconData;
+	QBuffer buffer(&faviconData);
+	buffer.open(QIODevice::WriteOnly);
+	if (QPixmap(":/images/Feed.png").scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation).save(&buffer, "ICO")) {
+		feedInfo.icon = faviconData.toBase64().constData();
+	}
+	buffer.close();
+
+	FeedMsgInfo msgInfo;
+	msgInfo.title = tr("Test message").toUtf8().constData();
+	msgInfo.description = tr("This is a test message.").toUtf8().constData();
+	msgInfo.pubDate = QDateTime::currentDateTime().toTime_t();
+
+	return new FeedReaderFeedItem(mFeedReader, mNotify, parent, feedInfo, msgInfo);
+}

plugins/FeedReader/gui/FeedReaderFeedNotify.h

@@ -31,6 +31,7 @@ class QMutex;
 class FeedReaderFeedNotify : public FeedNotify
 {
 	Q_OBJECT
+
 protected:
 	class FeedItem
 	{
@@ -50,6 +51,7 @@ public:
 	virtual bool notifyEnabled();
 	virtual void setNotifyEnabled(bool enabled);
 	virtual QWidget *feedItem(FeedHolder *parent);
+	virtual QWidget *testFeedItem(FeedHolder *parent);
 
 private slots:
 	void msgChanged(const QString &feedId, const QString &msgId, int type);

plugins/FeedReader/gui/FeedReaderUserNotify.cpp

@@ -26,10 +26,12 @@
 #include "gui/MainWindow.h"
 
 #include "interface/rsFeedReader.h"
+#include "retroshare/rsiface.h"
 
 FeedReaderUserNotify::FeedReaderUserNotify(FeedReaderDialog *feedReaderDialog, RsFeedReader *feedReader, FeedReaderNotify *notify, QObject *parent) :
 	UserNotify(parent), mFeedReaderDialog(feedReaderDialog), mFeedReader(feedReader), mNotify(notify)
 {
+	connect(mNotify, SIGNAL(feedChanged(QString,int)), this, SLOT(feedChanged(QString,int)), Qt::QueuedConnection);
 	connect(mNotify, SIGNAL(msgChanged(QString,QString,int)), this, SLOT(updateIcon()), Qt::QueuedConnection);
 }
 
@@ -86,3 +88,10 @@ void FeedReaderUserNotify::iconClicked()
 {
 	MainWindow::showWindow(mFeedReaderDialog);
 }
+
+void FeedReaderUserNotify::feedChanged(const QString &/*feedId*/, int type)
+{
+	if (type == NOTIFY_TYPE_DEL) {
+		updateIcon();
+	}
+}

plugins/FeedReader/gui/FeedReaderUserNotify.h

@@ -41,6 +41,9 @@ public:
 	virtual bool notifyBlink();
 	virtual void setNotifyEnabled(bool enabled, bool combined, bool blink);
 
+private slots:
+	void feedChanged(const QString &feedId, int type);
+
 private:
 	virtual QIcon getIcon();
 	virtual QIcon getMainIcon(bool hasNew);