Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FeedReader:

Browse source 
- added notify in main window, systray icon and settings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-12-20 13:30:16 +00:00
parent b1d887b614
commit 0a499634dd
9 changed files with 270 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/FeedReader/FeedReader.pro
View file

@ -12,6 +12,7 @@ SOURCES = FeedReaderPlugin.cpp \
gui/FeedReaderNotify.cpp \
gui/FeedReaderConfig.cpp \
gui/FeedReaderStringDefs.cpp \
gui/FeedReaderUserNotify.cpp \
util/CURLWrapper.cpp \
util/XMLWrapper.cpp \
util/HTMLWrapper.cpp \
@ -28,6 +29,7 @@ HEADERS = FeedReaderPlugin.h \
gui/FeedReaderNotify.h \
gui/FeedReaderConfig.h \
gui/FeedReaderStringDefs.h \
gui/FeedReaderUserNotify.h \
util/CURLWrapper.h \
util/XMLWrapper.h \
util/HTMLWrapper.h \

6
plugins/FeedReader/gui/FeedReaderDialog.cpp
View file

@ -37,6 +37,7 @@
#include "gui/common/RSTreeWidgetItem.h"
#include "util/HandleRichText.h"
#include "gui/settings/rsharesettings.h"
#include "FeedReaderUserNotify.h"
#include "interface/rsFeedReader.h"
#include "retroshare/rsiface.h"
@ -178,6 +179,11 @@ FeedReaderDialog::~FeedReaderDialog()
delete(mNotify);
}
UserNotify *FeedReaderDialog::getUserNotify(QObject *parent)
{
return new FeedReaderUserNotify(this, mFeedReader, mNotify, parent);
}
void FeedReaderDialog::processSettings(bool load)
{
mProcessSettings = true;

2
plugins/FeedReader/gui/FeedReaderDialog.h
View file

@ -42,6 +42,8 @@ public:
FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent = 0);
~FeedReaderDialog();
virtual UserNotify *getUserNotify(QObject *parent);
protected:
virtual void showEvent(QShowEvent *e);
bool eventFilter(QObject *obj, QEvent *ev);

106
plugins/FeedReader/gui/FeedReaderUserNotify.cpp Normal file
View file

@ -0,0 +1,106 @@
/****************************************************************
* RetroShare is distributed under the following license:
*
* Copyright (C) 2012 RetroShare Team
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#include "FeedReaderUserNotify.h"
#include "FeedReaderNotify.h"
#include "FeedReaderDialog.h"
#include "gui/settings/rsharesettings.h"
#include "gui/MainWindow.h"
#include "interface/rsFeedReader.h"
FeedReaderUserNotify::FeedReaderUserNotify(FeedReaderDialog *feedReaderDialog, RsFeedReader *feedReader, FeedReaderNotify *notify, QObject *parent) :
UserNotify(parent), mFeedReaderDialog(feedReaderDialog), mFeedReader(feedReader), mNotify(notify)
{
connect(mNotify, SIGNAL(notifyMsgChanged(QString,QString,int)), this, SLOT(updateIcon()), Qt::QueuedConnection);
}
bool FeedReaderUserNotify::hasSetting(QString &name)
{
name = tr("FeedReader Message");
return true;
}
bool FeedReaderUserNotify::notifyEnabled()
{
bool enable = true;
Settings->beginGroup(QString("FeedReader"));
enable = Settings->value("TrayNotifyEnable", enable).toBool();
Settings->endGroup();
return enable;
}
bool FeedReaderUserNotify::notifyCombined()
{
bool combined = false;
Settings->beginGroup(QString("FeedReader"));
combined = Settings->value("TrayNotifyCombined", combined).toBool();
Settings->endGroup();
return combined;
}
bool FeedReaderUserNotify::notifyBlink()
{
bool blink = false;
Settings->beginGroup(QString("FeedReader"));
blink = Settings->value("TrayNotifyBlink", blink).toBool();
Settings->endGroup();
return blink;
}
void FeedReaderUserNotify::setNotifyEnabled(bool enabled, bool combined, bool blink)
{
Settings->beginGroup(QString("FeedReader"));
Settings->setValue("TrayNotifyEnable", enabled);
Settings->setValue("TrayNotifyCombined", combined);
Settings->setValue("TrayNotifyBlink", blink);
Settings->endGroup();
}
QIcon FeedReaderUserNotify::getIcon()
{
return QIcon(":/images/Feed.png");
}
QIcon FeedReaderUserNotify::getMainIcon(bool hasNew)
{
return hasNew ? QIcon(":/images/FeedReader.png") : QIcon(":/images/FeedReader.png");
}
unsigned int FeedReaderUserNotify::getNewCount()
{
uint32_t newMessageCount = 0;
mFeedReader->getMessageCount("", NULL, &newMessageCount, NULL);
return newMessageCount;
}
void FeedReaderUserNotify::iconClicked()
{
MainWindow::showWindow(mFeedReaderDialog);
}

55
plugins/FeedReader/gui/FeedReaderUserNotify.h Normal file
View file

@ -0,0 +1,55 @@
/****************************************************************
* RetroShare is distributed under the following license:
*
* Copyright (C) 2012 RetroShare Team
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#ifndef FEEDREADERUSERNOTIFY_H
#define FEEDREADERUSERNOTIFY_H
#include "gui/common/UserNotify.h"
class FeedReaderDialog;
class RsFeedReader;
class FeedReaderNotify;
class FeedReaderUserNotify : public UserNotify
{
Q_OBJECT
public:
FeedReaderUserNotify(FeedReaderDialog *feedReaderDialog, RsFeedReader *feedReader, FeedReaderNotify *notify, QObject *parent);
virtual bool hasSetting(QString &name);
virtual bool notifyEnabled();
virtual bool notifyCombined();
virtual bool notifyBlink();
virtual void setNotifyEnabled(bool enabled, bool combined, bool blink);
private:
virtual QIcon getIcon();
virtual QIcon getMainIcon(bool hasNew);
virtual unsigned int getNewCount();
virtual void iconClicked();
FeedReaderDialog *mFeedReaderDialog;
RsFeedReader *mFeedReader;
FeedReaderNotify *mNotify;
};
#endif // FEEDREADERUSERNOTIFY_H

54
plugins/FeedReader/services/p3FeedReader.cc
View file

@ -837,27 +837,47 @@ bool p3FeedReader::getMessageCount(const std::string &feedId, uint32_t *msgCount
RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/
std::map<std::string, RsFeedReaderFeed*>::iterator feedIt = mFeeds.find(feedId);
if (feedIt == mFeeds.end()) {
if (feedId.empty()) {
std::map<std::string, RsFeedReaderFeed*>::iterator feedIt;
for (feedIt = mFeeds.begin(); feedIt != mFeeds.end(); ++feedIt) {
RsFeedReaderFeed *fi = feedIt->second;
std::map<std::string, RsFeedReaderMsg*>::iterator msgIt;
for (msgIt = fi->msgs.begin(); msgIt != fi->msgs.end(); ++msgIt) {
RsFeedReaderMsg *mi = msgIt->second;
if (mi->flag & RS_FEEDMSG_FLAG_DELETED) {
continue;
}
if (msgCount) ++(*msgCount);
if (newCount && (mi->flag & RS_FEEDMSG_FLAG_NEW)) ++(*newCount);
if (unreadCount && (mi->flag & RS_FEEDMSG_FLAG_READ) == 0) ++(*unreadCount);
}
}
} else {
std::map<std::string, RsFeedReaderFeed*>::iterator feedIt = mFeeds.find(feedId);
if (feedIt == mFeeds.end()) {
#ifdef FEEDREADER_DEBUG
std::cerr << "p3FeedReader::getMessageCount - feed " << feedId << " not found" << std::endl;
std::cerr << "p3FeedReader::getMessageCount - feed " << feedId << " not found" << std::endl;
#endif
return false;
}
RsFeedReaderFeed *fi = feedIt->second;
std::map<std::string, RsFeedReaderMsg*>::iterator msgIt;
for (msgIt = fi->msgs.begin(); msgIt != fi->msgs.end(); ++msgIt) {
RsFeedReaderMsg *mi = msgIt->second;
if (mi->flag & RS_FEEDMSG_FLAG_DELETED) {
continue;
return false;
}
if (msgCount) ++(*msgCount);
if (newCount && (mi->flag & RS_FEEDMSG_FLAG_NEW)) ++(*newCount);
if (unreadCount && (mi->flag & RS_FEEDMSG_FLAG_READ) == 0) ++(*unreadCount);
RsFeedReaderFeed *fi = feedIt->second;
std::map<std::string, RsFeedReaderMsg*>::iterator msgIt;
for (msgIt = fi->msgs.begin(); msgIt != fi->msgs.end(); ++msgIt) {
RsFeedReaderMsg *mi = msgIt->second;
if (mi->flag & RS_FEEDMSG_FLAG_DELETED) {
continue;
}
if (msgCount) ++(*msgCount);
if (newCount && (mi->flag & RS_FEEDMSG_FLAG_NEW)) ++(*newCount);
if (unreadCount && (mi->flag & RS_FEEDMSG_FLAG_READ) == 0) ++(*unreadCount);
}
}
return true;