FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-01 02:48:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Save.

Browse Source
This commit is contained in:
Martin Rotter 2020-12-17 15:03:39 +01:00
parent c232a2eb4c
commit d80942966c
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/icons.qrc
View File

@ -4,7 +4,6 @@
<file>./graphics/Faenza/actions/64/back.png</file>
<file>./graphics/Faenza/actions/64/call-start.png</file>
<file>./graphics/Faenza/actions/64/dialog-no.png</file>
<file>./graphics/Faenza/actions/64/dialog-ok.png</file>
<file>./graphics/Faenza/actions/64/dialog-yes.png</file>
<file>./graphics/Faenza/actions/64/document-edit.png</file>
<file>./graphics/Faenza/actions/64/document-export.png</file>
@ -75,7 +74,6 @@
<file>./graphics/Numix/22/actions/back.svg</file>
<file>./graphics/Numix/22/actions/call-start.svg</file>
<file>./graphics/Numix/22/actions/dialog-no.svg</file>
<file>./graphics/Numix/22/actions/dialog-ok.svg</file>
<file>./graphics/Numix/22/actions/dialog-yes.svg</file>
<file>./graphics/Numix/22/actions/document-edit.svg</file>
<file>./graphics/Numix/22/actions/document-export.svg</file>

23
src/librssguard/services/abstract/serviceroot.cpp
View File

@ -81,10 +81,25 @@ QList<QAction*> ServiceRoot::contextMenuMessagesList(const QList<Message>& messa
}
QList<QAction*> ServiceRoot::serviceMenu() {
if (m_serviceMenu.isEmpty() && isSyncable()) {
m_actionSyncIn = new QAction(qApp->icons()->fromTheme(QSL("view-refresh")), tr("Sync in"), this);
connect(m_actionSyncIn, &QAction::triggered, this, &ServiceRoot::syncIn);
m_serviceMenu.append(m_actionSyncIn);
if (m_serviceMenu.isEmpty()) {
if (isSyncable()) {
auto* act_sync_tree = new QAction(qApp->icons()->fromTheme(QSL("view-refresh")), tr("Sync in"), this);
connect(act_sync_tree, &QAction::triggered, this, &ServiceRoot::syncIn);
m_serviceMenu.append(act_sync_tree);
auto* cache = toCache();
if (cache != nullptr) {
auto* act_sync_cache = new QAction(qApp->icons()->fromTheme(QSL("view-refresh")), tr("Synchronize message cache"), this);
connect(act_sync_cache, &QAction::triggered, this, [cache]() {
cache->saveAllCachedData();
});
m_serviceMenu.append(act_sync_cache);
}
}
}
return m_serviceMenu;

1
src/librssguard/services/abstract/serviceroot.h
View File

@ -244,7 +244,6 @@ class ServiceRoot : public RootItem {
ImportantNode* m_importantNode;
LabelsNode* m_labelsNode;
int m_accountId;
QAction* m_actionSyncIn;
QList<QAction*> m_serviceMenu;
};

6
src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp
View File

@ -220,8 +220,10 @@ void InoreaderNetworkFactory::editLabels(const QString& state, bool assign, cons
for (const QString& id : msg_custom_ids) {
QString simplified_id = regex_short_id.match(id).captured();
auto numeric_id = simplified_id.toLongLong(nullptr, 16);
QString decimal_id = QString::number(numeric_id);
trimmed_ids.append(QString("i=") + simplified_id);
trimmed_ids.append(QString("i=") + decimal_id);
}
QStringList working_subset; working_subset.reserve(std::min(200, trimmed_ids.size()));
@ -230,7 +232,7 @@ void InoreaderNetworkFactory::editLabels(const QString& state, bool assign, cons
// Now, we perform messages update in batches (max 200 messages per batch).
while (!trimmed_ids.isEmpty()) {
// We take 200 IDs.
for (int i = 0; i < 200 && !trimmed_ids.isEmpty(); i++) {
for (int i = 0; i < 50 && !trimmed_ids.isEmpty(); i++) {
working_subset.append(trimmed_ids.takeFirst());
}