Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 03:49:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Forgot to commit the changes in FeedReader plugin

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7685 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-11-16 01:42:57 +00:00
parent 756b9acf41
commit aa080e02f0
4 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
plugins/FeedReader/gui/FeedReaderFeedItem.cpp
View file

@ -34,7 +34,7 @@
/** Constructor */ /** Constructor */
FeedReaderFeedItem::FeedReaderFeedItem(RsFeedReader *feedReader, FeedReaderNotify *notify, FeedHolder *parent, const FeedInfo &feedInfo, const FeedMsgInfo &msgInfo) FeedReaderFeedItem::FeedReaderFeedItem(RsFeedReader *feedReader, FeedReaderNotify *notify, FeedHolder *parent, const FeedInfo &feedInfo, const FeedMsgInfo &msgInfo)
: QWidget(NULL), mFeedReader(feedReader), mNotify(notify), mParent(parent), ui(new Ui::FeedReaderFeedItem) : FeedItem(NULL), mFeedReader(feedReader), mNotify(notify), mParent(parent), ui(new Ui::FeedReaderFeedItem)
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
ui->setupUi(this); ui->setupUi(this);
@ -95,9 +95,16 @@ FeedReaderFeedItem::~FeedReaderFeedItem()
void FeedReaderFeedItem::toggle() void FeedReaderFeedItem::toggle()
{ {
mParent->lockLayout(this, true); expand(ui->expandFrame->isHidden());
}
if (ui->expandFrame->isHidden()) { void FeedReaderFeedItem::expand(bool open)
{
if (mParent) {
mParent->lockLayout(this, true);
}
if (open) {
ui->expandFrame->show(); ui->expandFrame->show();
ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
ui->expandButton->setToolTip(tr("Hide")); ui->expandButton->setToolTip(tr("Hide"));
@ -109,7 +116,11 @@ void FeedReaderFeedItem::toggle()
ui->expandButton->setToolTip(tr("Expand")); ui->expandButton->setToolTip(tr("Expand"));
} }
mParent->lockLayout(this, false); emit sizeChanged(this);
if (mParent) {
mParent->lockLayout(this, false);
}
} }
void FeedReaderFeedItem::removeItem() void FeedReaderFeedItem::removeItem()

7
plugins/FeedReader/gui/FeedReaderFeedItem.h
View file

@ -22,7 +22,7 @@
#ifndef _FEEDREADERFEEDITEM_H #ifndef _FEEDREADERFEEDITEM_H
#define _FEEDREADERFEEDITEM_H #define _FEEDREADERFEEDITEM_H
#include <QWidget> #include "gui/feeds/FeedItem.h"
namespace Ui { namespace Ui {
class FeedReaderFeedItem; class FeedReaderFeedItem;
@ -34,7 +34,7 @@ class FeedHolder;
class FeedInfo; class FeedInfo;
class FeedMsgInfo; class FeedMsgInfo;
class FeedReaderFeedItem : public QWidget class FeedReaderFeedItem : public FeedItem
{ {
Q_OBJECT Q_OBJECT
@ -42,6 +42,9 @@ public:
FeedReaderFeedItem(RsFeedReader *feedReader, FeedReaderNotify *notify, FeedHolder *parent, const FeedInfo &feedInfo, const FeedMsgInfo &msgInfo); FeedReaderFeedItem(RsFeedReader *feedReader, FeedReaderNotify *notify, FeedHolder *parent, const FeedInfo &feedInfo, const FeedMsgInfo &msgInfo);
~FeedReaderFeedItem(); ~FeedReaderFeedItem();
/* FeedItem */
virtual void expand(bool open);
private slots: private slots:
/* default stuff */ /* default stuff */
void removeItem(); void removeItem();

18
plugins/FeedReader/gui/FeedReaderFeedNotify.cpp
View file

@ -82,16 +82,16 @@ void FeedReaderFeedNotify::msgChanged(const QString &feedId, const QString &msgI
mMutex->lock(); mMutex->lock();
FeedItem feedItem; FeedItemData feedItemData;
feedItem.mFeedId = feedId; feedItemData.mFeedId = feedId;
feedItem.mMsgId = msgId; feedItemData.mMsgId = msgId;
mPendingNewsFeed.push_back(feedItem); mPendingNewsFeed.push_back(feedItemData);
mMutex->unlock(); mMutex->unlock();
} }
QWidget *FeedReaderFeedNotify::feedItem(FeedHolder *parent) FeedItem *FeedReaderFeedNotify::feedItem(FeedHolder *parent)
{ {
bool msgPending = false; bool msgPending = false;
FeedInfo feedInfo; FeedInfo feedInfo;
@ -99,11 +99,11 @@ QWidget *FeedReaderFeedNotify::feedItem(FeedHolder *parent)
mMutex->lock(); mMutex->lock();
while (!mPendingNewsFeed.empty()) { while (!mPendingNewsFeed.empty()) {
FeedItem feedItem = mPendingNewsFeed.front(); FeedItemData feedItemData = mPendingNewsFeed.front();
mPendingNewsFeed.pop_front(); mPendingNewsFeed.pop_front();
if (mFeedReader->getFeedInfo(feedItem.mFeedId.toStdString(), feedInfo) && if (mFeedReader->getFeedInfo(feedItemData.mFeedId.toStdString(), feedInfo) &&
mFeedReader->getMsgInfo(feedItem.mFeedId.toStdString(), feedItem.mMsgId.toStdString(), msgInfo)) { mFeedReader->getMsgInfo(feedItemData.mFeedId.toStdString(), feedItemData.mMsgId.toStdString(), msgInfo)) {
if (msgInfo.flag.isnew) { if (msgInfo.flag.isnew) {
msgPending = true; msgPending = true;
break; break;
@ -119,7 +119,7 @@ QWidget *FeedReaderFeedNotify::feedItem(FeedHolder *parent)
return new FeedReaderFeedItem(mFeedReader, mNotify, parent, feedInfo, msgInfo); return new FeedReaderFeedItem(mFeedReader, mNotify, parent, feedInfo, msgInfo);
} }
QWidget *FeedReaderFeedNotify::testFeedItem(FeedHolder *parent) FeedItem *FeedReaderFeedNotify::testFeedItem(FeedHolder *parent)
{ {
FeedInfo feedInfo; FeedInfo feedInfo;
feedInfo.name = tr("Test").toUtf8().constData(); feedInfo.name = tr("Test").toUtf8().constData();

11
plugins/FeedReader/gui/FeedReaderFeedNotify.h
View file

@ -27,16 +27,17 @@
class RsFeedReader; class RsFeedReader;
class FeedReaderNotify; class FeedReaderNotify;
class QMutex; class QMutex;
class FeedItem;
class FeedReaderFeedNotify : public FeedNotify class FeedReaderFeedNotify : public FeedNotify
{ {
Q_OBJECT Q_OBJECT
protected: protected:
class FeedItem class FeedItemData
{ {
public: public:
FeedItem() {} FeedItemData() {}
public: public:
QString mFeedId; QString mFeedId;
@ -50,8 +51,8 @@ public:
virtual bool hasSetting(QString &name); virtual bool hasSetting(QString &name);
virtual bool notifyEnabled(); virtual bool notifyEnabled();
virtual void setNotifyEnabled(bool enabled); virtual void setNotifyEnabled(bool enabled);
virtual QWidget *feedItem(FeedHolder *parent); virtual FeedItem *feedItem(FeedHolder *parent);
virtual QWidget *testFeedItem(FeedHolder *parent); virtual FeedItem *testFeedItem(FeedHolder *parent);
private slots: private slots:
void msgChanged(const QString &feedId, const QString &msgId, int type); void msgChanged(const QString &feedId, const QString &msgId, int type);
@ -61,7 +62,7 @@ private:
FeedReaderNotify *mNotify; FeedReaderNotify *mNotify;
QMutex *mMutex; QMutex *mMutex;
QList<FeedItem> mPendingNewsFeed; QList<FeedItemData> mPendingNewsFeed;
}; };
#endif // FEEDREADERFEEDNOTIFY_H #endif // FEEDREADERFEEDNOTIFY_H