FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make restoring of messages work for TT-RSS

Browse Source
This commit is contained in:
Martin Rotter 2016-01-19 13:15:41 +01:00
parent 4ccbcbe394
commit d8217266ef
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -65,8 +65,8 @@ project(rssguard)
set(APP_NAME "RSS Guard") set(APP_NAME "RSS Guard")
set(APP_LOW_NAME "rssguard") set(APP_LOW_NAME "rssguard")
set(APP_VERSION "3.0.2") set(APP_VERSION "3.1.0")
set(FILE_VERSION "3,0,2,0") set(FILE_VERSION "3,1,0,0")
set(APP_AUTHOR "Martin Rotter") set(APP_AUTHOR "Martin Rotter")
set(APP_URL "http://bitbucket.org/skunkos/rssguard") set(APP_URL "http://bitbucket.org/skunkos/rssguard")
set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues") set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues")

7
resources/text/CHANGELOG
View File

@ -1,3 +1,10 @@
3.1.0
—————
Changed:
▪ TT-RSS plugin can now restore messages from local recycle bin.
3.0.2 3.0.2
————— —————

2
src/services/abstract/serviceroot.cpp
View File

@ -110,7 +110,7 @@ QList<Message> ServiceRoot::undeletedMessages() const {
return messages; return messages;
} }
void ServiceRoot::itemChanged(const QList<RootItem *> &items) { void ServiceRoot::itemChanged(const QList<RootItem*> &items) {
emit dataChanged(items); emit dataChanged(items);
} }

1
src/services/standard/standardserviceroot.cpp
View File

@ -498,7 +498,6 @@ bool StandardServiceRoot::onAfterSetMessagesRead(RootItem *selected_item, const
Q_UNUSED(read) Q_UNUSED(read)
selected_item->updateCounts(false); selected_item->updateCounts(false);
itemChanged(QList<RootItem*>() << selected_item); itemChanged(QList<RootItem*>() << selected_item);
return true; return true;
} }

12
src/services/tt-rss/ttrssserviceroot.cpp
View File

@ -275,11 +275,19 @@ bool TtRssServiceRoot::onAfterMessagesDelete(RootItem *selected_item, const QLis
} }
bool TtRssServiceRoot::onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList<Message> &messages) { bool TtRssServiceRoot::onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList<Message> &messages) {
return false; Q_UNUSED(selected_item)
Q_UNUSED(messages)
return true;
} }
bool TtRssServiceRoot::onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList<Message> &messages) { bool TtRssServiceRoot::onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList<Message> &messages) {
return false; Q_UNUSED(selected_item)
Q_UNUSED(messages)
updateCounts(true);
itemChanged(getSubTree());
return true;
} }
TtRssNetworkFactory *TtRssServiceRoot::network() const { TtRssNetworkFactory *TtRssServiceRoot::network() const {