diff --git a/resources/skins/dark/html_wrapper.html b/resources/skins/dark/html_wrapper.html
index 441e9c682..012f6975f 100755
--- a/resources/skins/dark/html_wrapper.html
+++ b/resources/skins/dark/html_wrapper.html
@@ -7233,6 +7233,10 @@ a.list-group-item-danger.active:focus {
.card-block {
padding: .4rem;
}
+ img {
+ max-height: 80%;
+ max-width: 80%;
+ }
diff --git a/resources/skins/vergilius/html_wrapper.html b/resources/skins/vergilius/html_wrapper.html
index 864d1f0a2..59dccfa2e 100755
--- a/resources/skins/vergilius/html_wrapper.html
+++ b/resources/skins/vergilius/html_wrapper.html
@@ -5929,6 +5929,10 @@
.card-block {
padding: .4rem;
}
+ img {
+ max-height: 80%;
+ max-width: 80%;
+ }
diff --git a/src/miscellaneous/feedreader.cpp b/src/miscellaneous/feedreader.cpp
index 7198a301f..f53ce1a35 100755
--- a/src/miscellaneous/feedreader.cpp
+++ b/src/miscellaneous/feedreader.cpp
@@ -224,7 +224,6 @@ void FeedReader::checkServicesForAsyncOperations(bool wait_for_future) {
if (m_cacheSaveFutureWatcher->future().isRunning()) {
qDebug("Previous future is still running.");
-
// If we want to wait for future synchronously, we want to make sure that
// we save all cached data (app exit).
if (wait_for_future) {
diff --git a/src/miscellaneous/feedreader.h b/src/miscellaneous/feedreader.h
index 46c0b8413..868b9a616 100755
--- a/src/miscellaneous/feedreader.h
+++ b/src/miscellaneous/feedreader.h
@@ -58,6 +58,7 @@ class FeedReader : public QObject {
// Schedules given feeds for update.
void updateFeeds(const QList &feeds);
+ // True if feed update is running right now.
bool isFeedUpdateRunning() const;
// Resets global auto-update intervals according to settings
diff --git a/src/services/owncloud/owncloudcategory.cpp b/src/services/owncloud/owncloudcategory.cpp
index c623efafc..f6196e391 100755
--- a/src/services/owncloud/owncloudcategory.cpp
+++ b/src/services/owncloud/owncloudcategory.cpp
@@ -17,6 +17,7 @@
#include "services/owncloud/owncloudcategory.h"
+#include "services/owncloud/owncloudserviceroot.h"
#include "miscellaneous/application.h"
#include "miscellaneous/iconfactory.h"
@@ -33,5 +34,14 @@ OwnCloudCategory::OwnCloudCategory(const QSqlRecord &record) : Category(nullptr)
setCustomId(record.value(CAT_DB_CUSTOM_ID_INDEX).toInt());
}
+OwnCloudServiceRoot *OwnCloudCategory::serviceRoot() const {
+ return qobject_cast(getParentServiceRoot());
+}
+
+bool OwnCloudCategory::markAsReadUnread(RootItem::ReadStatus status) {
+ serviceRoot()->addMessageStatesToCache(getParentServiceRoot()->customIDSOfMessagesForItem(this), status);
+ return serviceRoot()->markFeedsReadUnread(getSubTreeFeeds(), status);
+}
+
OwnCloudCategory::~OwnCloudCategory() {
}
diff --git a/src/services/owncloud/owncloudcategory.h b/src/services/owncloud/owncloudcategory.h
index f5567d71e..87dcd8cb6 100755
--- a/src/services/owncloud/owncloudcategory.h
+++ b/src/services/owncloud/owncloudcategory.h
@@ -21,6 +21,8 @@
#include "services/abstract/category.h"
+class OwnCloudServiceRoot;
+
class OwnCloudCategory : public Category {
Q_OBJECT
@@ -28,6 +30,11 @@ class OwnCloudCategory : public Category {
explicit OwnCloudCategory(RootItem *parent = nullptr);
explicit OwnCloudCategory(const QSqlRecord &record);
virtual ~OwnCloudCategory();
+
+ bool markAsReadUnread(ReadStatus status);
+
+ private:
+ OwnCloudServiceRoot *serviceRoot() const;
};
#endif // OWNCLOUDSERVICECATEGORY_H