From d76e5eb34513ff1bea0b481f7e005232f40ba755 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 16 Feb 2016 06:35:47 +0100 Subject: [PATCH] Some cleanups. --- src/services/abstract/serviceroot.cpp | 12 ++++++++++ src/services/abstract/serviceroot.h | 6 +++-- src/services/standard/standardserviceroot.cpp | 8 ------- src/services/standard/standardserviceroot.h | 6 ----- src/services/tt-rss/gui/formeditaccount.cpp | 2 ++ src/services/tt-rss/gui/formeditaccount.ui | 24 +++++++++++++------ src/services/tt-rss/ttrssserviceroot.cpp | 10 +------- src/services/tt-rss/ttrssserviceroot.h | 20 +++++++++------- 8 files changed, 47 insertions(+), 41 deletions(-) diff --git a/src/services/abstract/serviceroot.cpp b/src/services/abstract/serviceroot.cpp index 2cee0e2f9..955034ddb 100755 --- a/src/services/abstract/serviceroot.cpp +++ b/src/services/abstract/serviceroot.cpp @@ -85,6 +85,18 @@ bool ServiceRoot::markAsReadUnread(RootItem::ReadStatus status) { } } +QList ServiceRoot::addItemMenu() { + return QList(); +} + +QList ServiceRoot::contextMenu() { + return serviceMenu(); +} + +QList ServiceRoot::serviceMenu() { + return QList(); +} + QList ServiceRoot::undeletedMessages() const { QList messages; const int account_id = accountId(); diff --git a/src/services/abstract/serviceroot.h b/src/services/abstract/serviceroot.h index d489b2a70..03cef3e2f 100755 --- a/src/services/abstract/serviceroot.h +++ b/src/services/abstract/serviceroot.h @@ -60,12 +60,14 @@ class ServiceRoot : public RootItem { // b) Add new category // c) ... // NOTE: Caller does NOT take ownership of created menu! - virtual QList addItemMenu() = 0; + virtual QList addItemMenu(); + + QList contextMenu(); // Returns list of specific actions to be shown in main window menu // bar in sections "Services -> 'this service'". // NOTE: Caller does NOT take ownership of created menu! - virtual QList serviceMenu() = 0; + virtual QList serviceMenu(); // Access to recycle bin of this account if there is any. virtual RecycleBin *recycleBin() const = 0; diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp index beca633fa..8ada7b09b 100755 --- a/src/services/standard/standardserviceroot.cpp +++ b/src/services/standard/standardserviceroot.cpp @@ -461,10 +461,6 @@ void StandardServiceRoot::exportFeeds() { form.data()->exec(); } -QList StandardServiceRoot::addItemMenu() { - return QList(); -} - QList StandardServiceRoot::serviceMenu() { if (m_serviceMenu.isEmpty()) { m_actionExportFeeds = new QAction(qApp->icons()->fromTheme("document-export"), tr("Export feeds"), this); @@ -479,7 +475,3 @@ QList StandardServiceRoot::serviceMenu() { return m_serviceMenu; } - -QList StandardServiceRoot::contextMenu() { - return serviceMenu(); -} diff --git a/src/services/standard/standardserviceroot.h b/src/services/standard/standardserviceroot.h index 57f18ae50..76a619783 100755 --- a/src/services/standard/standardserviceroot.h +++ b/src/services/standard/standardserviceroot.h @@ -58,15 +58,9 @@ class StandardServiceRoot : public ServiceRoot { // Access to recycle bin. RecycleBin *recycleBin() const; - // Return "add feed" and "add category" items. - QList addItemMenu(); - // Returns menu to be shown in "Services -> service" menu. QList serviceMenu(); - // Returns context menu. - QList contextMenu(); - // Returns context specific menu actions for given feed. QList getContextMenuForFeed(StandardFeed *feed); diff --git a/src/services/tt-rss/gui/formeditaccount.cpp b/src/services/tt-rss/gui/formeditaccount.cpp index 0be5421ab..a55fcdd25 100755 --- a/src/services/tt-rss/gui/formeditaccount.cpp +++ b/src/services/tt-rss/gui/formeditaccount.cpp @@ -33,6 +33,8 @@ FormEditAccount::FormEditAccount(QWidget *parent) setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint); setWindowIcon(qApp->icons()->fromTheme(QSL("application-ttrss"))); + m_ui->m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates " + "of feeds will be probably much slower and may time-out often.")); m_ui->m_lblDescription->setText(tr("Note that at least API level %1 is required.").arg(MINIMAL_API_LEVEL)); m_ui->m_txtHttpUsername->lineEdit()->setPlaceholderText(tr("HTTP authentication username")); m_ui->m_txtHttpPassword->lineEdit()->setPlaceholderText(tr("HTTP authentication password")); diff --git a/src/services/tt-rss/gui/formeditaccount.ui b/src/services/tt-rss/gui/formeditaccount.ui index c8338dad6..51324f9a0 100755 --- a/src/services/tt-rss/gui/formeditaccount.ui +++ b/src/services/tt-rss/gui/formeditaccount.ui @@ -33,7 +33,7 @@ - + Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported. @@ -84,7 +84,7 @@ - + Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported. @@ -138,14 +138,14 @@ - + &Test setup - + @@ -163,9 +163,6 @@ Force execution of server-side update when updating feeds from RSS Guard - - true - @@ -173,6 +170,19 @@ + + true + + + + + + + + + + true + diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp index c2ede1aef..645cc9f26 100755 --- a/src/services/tt-rss/ttrssserviceroot.cpp +++ b/src/services/tt-rss/ttrssserviceroot.cpp @@ -130,8 +130,8 @@ void TtRssServiceRoot::addNewFeed(const QString &url) { } QScopedPointer form_pointer(new FormEditFeed(this, qApp->mainForm())); - form_pointer.data()->execForAdd(url); + form_pointer.data()->execForAdd(url); qApp->feedUpdateLock()->unlock(); } @@ -169,10 +169,6 @@ QVariant TtRssServiceRoot::data(int column, int role) const { } } -QList TtRssServiceRoot::addItemMenu() { - return QList(); -} - RecycleBin *TtRssServiceRoot::recycleBin() const { return m_recycleBin; } @@ -188,10 +184,6 @@ QList TtRssServiceRoot::serviceMenu() { return m_serviceMenu; } -QList TtRssServiceRoot::contextMenu() { - return serviceMenu(); -} - bool TtRssServiceRoot::onBeforeSetMessagesRead(RootItem *selected_item, const QList &messages, RootItem::ReadStatus read) { Q_UNUSED(selected_item) diff --git a/src/services/tt-rss/ttrssserviceroot.h b/src/services/tt-rss/ttrssserviceroot.h index 59a9b65a7..ca0df7837 100755 --- a/src/services/tt-rss/ttrssserviceroot.h +++ b/src/services/tt-rss/ttrssserviceroot.h @@ -37,25 +37,16 @@ class TtRssServiceRoot : public ServiceRoot { void start(bool freshly_activated); void stop(); - QString code() const; - bool canBeEdited() const; bool canBeDeleted() const; bool editViaGui(); bool deleteViaGui(); - bool markAsReadUnread(ReadStatus status); - bool supportsFeedAdding() const; bool supportsCategoryAdding() const; - QVariant data(int column, int role) const; - - QList addItemMenu(); QList serviceMenu(); - QList contextMenu(); - RecycleBin *recycleBin() const; bool onBeforeSetMessagesRead(RootItem *selected_item, const QList &messages, ReadStatus read); @@ -83,9 +74,20 @@ class TtRssServiceRoot : public ServiceRoot { QStringList customIDsOfMessages(const QList > &changes); QStringList customIDsOfMessages(const QList &messages); + // Removes all messages/categories/feeds which are + // associated with this account. void removeOldFeedTree(bool including_messages); + + // Removes messages which do not belong to any + // existing feed. + // + // NOTE: This situation may happen if user deletes some feed + // from another machine and then performs sync-in on this machine. void removeLeftOverMessages(); void cleanAllItems(); + + // Takes new tree and adds its feeds/categories/whatever. + // Used in syncing. void storeNewFeedTree(RootItem *root); void loadFromDatabase();