Fix image overflow, fix slow marking read/unread in nextcloud categories which contain MANY feeds.
This commit is contained in:
parent
f6ad603828
commit
6ede648ac8
@ -7233,6 +7233,10 @@ a.list-group-item-danger.active:focus {
|
|||||||
.card-block {
|
.card-block {
|
||||||
padding: .4rem;
|
padding: .4rem;
|
||||||
}
|
}
|
||||||
|
img {
|
||||||
|
max-height: 80%;
|
||||||
|
max-width: 80%;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -5929,6 +5929,10 @@
|
|||||||
.card-block {
|
.card-block {
|
||||||
padding: .4rem;
|
padding: .4rem;
|
||||||
}
|
}
|
||||||
|
img {
|
||||||
|
max-height: 80%;
|
||||||
|
max-width: 80%;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -224,7 +224,6 @@ void FeedReader::checkServicesForAsyncOperations(bool wait_for_future) {
|
|||||||
if (m_cacheSaveFutureWatcher->future().isRunning()) {
|
if (m_cacheSaveFutureWatcher->future().isRunning()) {
|
||||||
qDebug("Previous future is still running.");
|
qDebug("Previous future is still running.");
|
||||||
|
|
||||||
|
|
||||||
// If we want to wait for future synchronously, we want to make sure that
|
// If we want to wait for future synchronously, we want to make sure that
|
||||||
// we save all cached data (app exit).
|
// we save all cached data (app exit).
|
||||||
if (wait_for_future) {
|
if (wait_for_future) {
|
||||||
|
@ -58,6 +58,7 @@ class FeedReader : public QObject {
|
|||||||
// Schedules given feeds for update.
|
// Schedules given feeds for update.
|
||||||
void updateFeeds(const QList<Feed*> &feeds);
|
void updateFeeds(const QList<Feed*> &feeds);
|
||||||
|
|
||||||
|
// True if feed update is running right now.
|
||||||
bool isFeedUpdateRunning() const;
|
bool isFeedUpdateRunning() const;
|
||||||
|
|
||||||
// Resets global auto-update intervals according to settings
|
// Resets global auto-update intervals according to settings
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
#include "services/owncloud/owncloudcategory.h"
|
#include "services/owncloud/owncloudcategory.h"
|
||||||
|
|
||||||
|
#include "services/owncloud/owncloudserviceroot.h"
|
||||||
#include "miscellaneous/application.h"
|
#include "miscellaneous/application.h"
|
||||||
#include "miscellaneous/iconfactory.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());
|
setCustomId(record.value(CAT_DB_CUSTOM_ID_INDEX).toInt());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OwnCloudServiceRoot *OwnCloudCategory::serviceRoot() const {
|
||||||
|
return qobject_cast<OwnCloudServiceRoot*>(getParentServiceRoot());
|
||||||
|
}
|
||||||
|
|
||||||
|
bool OwnCloudCategory::markAsReadUnread(RootItem::ReadStatus status) {
|
||||||
|
serviceRoot()->addMessageStatesToCache(getParentServiceRoot()->customIDSOfMessagesForItem(this), status);
|
||||||
|
return serviceRoot()->markFeedsReadUnread(getSubTreeFeeds(), status);
|
||||||
|
}
|
||||||
|
|
||||||
OwnCloudCategory::~OwnCloudCategory() {
|
OwnCloudCategory::~OwnCloudCategory() {
|
||||||
}
|
}
|
||||||
|
@ -21,6 +21,8 @@
|
|||||||
#include "services/abstract/category.h"
|
#include "services/abstract/category.h"
|
||||||
|
|
||||||
|
|
||||||
|
class OwnCloudServiceRoot;
|
||||||
|
|
||||||
class OwnCloudCategory : public Category {
|
class OwnCloudCategory : public Category {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
@ -28,6 +30,11 @@ class OwnCloudCategory : public Category {
|
|||||||
explicit OwnCloudCategory(RootItem *parent = nullptr);
|
explicit OwnCloudCategory(RootItem *parent = nullptr);
|
||||||
explicit OwnCloudCategory(const QSqlRecord &record);
|
explicit OwnCloudCategory(const QSqlRecord &record);
|
||||||
virtual ~OwnCloudCategory();
|
virtual ~OwnCloudCategory();
|
||||||
|
|
||||||
|
bool markAsReadUnread(ReadStatus status);
|
||||||
|
|
||||||
|
private:
|
||||||
|
OwnCloudServiceRoot *serviceRoot() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // OWNCLOUDSERVICECATEGORY_H
|
#endif // OWNCLOUDSERVICECATEGORY_H
|
||||||
|
Loading…
x
Reference in New Issue
Block a user