diff --git a/CMakeLists.txt b/CMakeLists.txt index b815c9655..eb31fb9de 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,8 +65,8 @@ project(rssguard) set(APP_NAME "RSS Guard") set(APP_LOW_NAME "rssguard") -set(APP_VERSION "3.0.2") -set(FILE_VERSION "3,0,2,0") +set(APP_VERSION "3.1.0") +set(FILE_VERSION "3,1,0,0") set(APP_AUTHOR "Martin Rotter") set(APP_URL "http://bitbucket.org/skunkos/rssguard") set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues") diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index c4868cfa4..7c04665f9 100755 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -1,3 +1,10 @@ +3.1.0 +————— + +Changed: + +▪ TT-RSS plugin can now restore messages from local recycle bin. + 3.0.2 ————— diff --git a/src/services/abstract/serviceroot.cpp b/src/services/abstract/serviceroot.cpp index 09949f8fd..58612d52e 100755 --- a/src/services/abstract/serviceroot.cpp +++ b/src/services/abstract/serviceroot.cpp @@ -110,7 +110,7 @@ QList ServiceRoot::undeletedMessages() const { return messages; } -void ServiceRoot::itemChanged(const QList &items) { +void ServiceRoot::itemChanged(const QList &items) { emit dataChanged(items); } diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp index 3d3559461..351abf8be 100755 --- a/src/services/standard/standardserviceroot.cpp +++ b/src/services/standard/standardserviceroot.cpp @@ -498,7 +498,6 @@ bool StandardServiceRoot::onAfterSetMessagesRead(RootItem *selected_item, const Q_UNUSED(read) selected_item->updateCounts(false); - itemChanged(QList() << selected_item); return true; } diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp index 34a0703b9..9fd29a815 100755 --- a/src/services/tt-rss/ttrssserviceroot.cpp +++ b/src/services/tt-rss/ttrssserviceroot.cpp @@ -275,11 +275,19 @@ bool TtRssServiceRoot::onAfterMessagesDelete(RootItem *selected_item, const QLis } bool TtRssServiceRoot::onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList &messages) { - return false; + Q_UNUSED(selected_item) + Q_UNUSED(messages) + + return true; } bool TtRssServiceRoot::onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList &messages) { - return false; + Q_UNUSED(selected_item) + Q_UNUSED(messages) + + updateCounts(true); + itemChanged(getSubTree()); + return true; } TtRssNetworkFactory *TtRssServiceRoot::network() const {