FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #84 + properly display parent categories icon in "edit feed" dialog.

Browse Source
This commit is contained in:
Martin Rotter 2020-08-28 07:37:49 +02:00
parent b4f3b2993a
commit c5bd83e6af
19 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/text/CHANGELOG
View File

@ -4,7 +4,7 @@
Added:
▪ Gmail plugin is now able to send e-mail messages and also reply to them.
▪ Branch arrows in feeds list can now be displayed.
▪ Changes if read/important field in a message from a message filter are now synced
▪ Changes of read/important field in a message from a message filter are now synced
back to online services. (#258)
▪ Filterin mechanism now accepts constants named "MSG_ACCEPT" and "MSG_IGNORE"
which can be used instead of hardcoded values "1" and "2".

2
src/librssguard/gui/discoverfeedsbutton.cpp
View File

@ -48,7 +48,7 @@ void DiscoverFeedsButton::linkTriggered(QAction* action) {
ServiceRoot* root = static_cast<ServiceRoot*>(action->property("root").value<void*>());
if (root->supportsFeedAdding()) {
root->addNewFeed(url);
root->addNewFeed(qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->selectedItem(), url);
}
else {
qApp->showGuiMessage(tr("Not supported"),

4
src/librssguard/gui/feedsview.cpp
View File

@ -155,13 +155,13 @@ void FeedsView::sortByColumn(int column, Qt::SortOrder order) {
}
void FeedsView::addFeedIntoSelectedAccount() {
const RootItem* selected = selectedItem();
RootItem* selected = selectedItem();
if (selected != nullptr) {
ServiceRoot* root = selected->getParentServiceRoot();
if (root->supportsFeedAdding()) {
root->addNewFeed();
root->addNewFeed(selected);
}
else {
qApp->showGuiMessage(tr("Not supported"),

4
src/librssguard/services/abstract/gui/formfeeddetails.cpp
View File

@ -378,12 +378,12 @@ void FormFeedDetails::initialize() {
}
void FormFeedDetails::loadCategories(const QList<Category*>& categories, RootItem* root_item) {
m_ui->m_cmbParentCategory->addItem(root_item->icon(),
m_ui->m_cmbParentCategory->addItem(root_item->fullIcon(),
root_item->title(),
QVariant::fromValue((void*) root_item));
for (Category* category : categories) {
m_ui->m_cmbParentCategory->addItem(category->icon(),
m_ui->m_cmbParentCategory->addItem(category->fullIcon(),
category->title(),
QVariant::fromValue((void*) category));
}

28
src/librssguard/services/abstract/rootitem.cpp
View File

@ -171,18 +171,7 @@ QVariant RootItem::data(int column, int role) const {
case Qt::DecorationRole:
if (column == FDS_MODEL_TITLE_INDEX) {
QIcon ico = icon();
if (ico.isNull()) {
if (kind() == RootItem::Kind::Feed) {
return qApp->icons()->fromTheme(QSL("application-rss+xml"));
}
else if (kind() == RootItem::Kind::Category) {
return qApp->icons()->fromTheme(QSL("folder"));
}
}
return ico;
return fullIcon();
}
else {
return QVariant();
@ -398,6 +387,21 @@ void RootItem::setIcon(const QIcon& icon) {
m_icon = icon;
}
QIcon RootItem::fullIcon() const {
QIcon ico = icon();
if (ico.isNull()) {
if (kind() == RootItem::Kind::Feed) {
return qApp->icons()->fromTheme(QSL("application-rss+xml"));
}
else if (kind() == RootItem::Kind::Category) {
return qApp->icons()->fromTheme(QSL("folder"));
}
}
return ico;
}
int RootItem::id() const {
return m_id;
}

4
src/librssguard/services/abstract/rootitem.h
View File

@ -172,6 +172,10 @@ class RSSGUARD_DLLSPEC RootItem : public QObject {
QIcon icon() const;
void setIcon(const QIcon& icon);
// Returns icon, even if item has "default" icon set, then
// this icon is extra loaded and returned.
QIcon fullIcon() const;
// This ALWAYS represents primary column number/ID under which
// the item is stored in DB.
int id() const;

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

@ -266,7 +266,8 @@ void ServiceRoot::requestItemRemoval(RootItem* item) {
emit itemRemovalRequested(item);
}
void ServiceRoot::addNewFeed(const QString& url) {
void ServiceRoot::addNewFeed(RootItem* selected_item, const QString& url) {
Q_UNUSED(selected_item)
Q_UNUSED(url)
}

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

@ -158,7 +158,7 @@ class ServiceRoot : public RootItem {
virtual bool onAfterMessagesRestoredFromBin(RootItem* selected_item, const QList<Message>& messages);
public slots:
virtual void addNewFeed(const QString& url = QString());
virtual void addNewFeed(RootItem* selected_item, const QString& url = QString());
virtual void addNewCategory();
virtual void syncIn();

6
src/librssguard/services/inoreader/inoreaderserviceroot.cpp
View File

@ -138,12 +138,6 @@ RootItem* InoreaderServiceRoot::obtainNewTreeForSyncIn() const {
return m_network->feedsCategories(true);
}
void InoreaderServiceRoot::addNewFeed(const QString& url) {
Q_UNUSED(url)
}
void InoreaderServiceRoot::addNewCategory() {}
void InoreaderServiceRoot::saveAllCachedData(bool async) {
QPair<QMap<RootItem::ReadStatus, QStringList>, QMap<RootItem::Importance, QList<Message>>> msgCache = takeMessageCache();
QMapIterator<RootItem::ReadStatus, QStringList> i(msgCache.first);

2
src/librssguard/services/inoreader/inoreaderserviceroot.h
View File

@ -38,8 +38,6 @@ class InoreaderServiceRoot : public ServiceRoot, public CacheForServiceRoot {
void saveAllCachedData(bool async = true);
public slots:
void addNewFeed(const QString& url);
void addNewCategory();
void updateTitle();
private:

2
src/librssguard/services/owncloud/owncloudfeed.cpp
View File

@ -24,7 +24,7 @@ bool OwnCloudFeed::editViaGui() {
QScopedPointer<FormOwnCloudFeedDetails> form_pointer(new FormOwnCloudFeedDetails(serviceRoot(),
qApp->mainFormWidget()));
form_pointer->addEditFeed(this, nullptr);
form_pointer->addEditFeed(this, this);
return false;
}

8
src/librssguard/services/owncloud/owncloudserviceroot.cpp
View File

@ -155,7 +155,9 @@ void OwnCloudServiceRoot::saveAccountDataToDatabase() {
}
}
void OwnCloudServiceRoot::addNewFeed(const QString& url) {
void OwnCloudServiceRoot::addNewFeed(RootItem* selected_item, const QString& url) {
Q_UNUSED(selected_item)
if (!qApp->feedUpdateLock()->tryLock()) {
// Lock was not obtained because
// it is used probably by feed updater or application
@ -170,12 +172,10 @@ void OwnCloudServiceRoot::addNewFeed(const QString& url) {
QScopedPointer<FormOwnCloudFeedDetails> form_pointer(new FormOwnCloudFeedDetails(this, qApp->mainFormWidget()));
form_pointer->addEditFeed(nullptr, this, url);
form_pointer->addEditFeed(nullptr, selected_item, url);
qApp->feedUpdateLock()->unlock();
}
void OwnCloudServiceRoot::addNewCategory() {}
RootItem* OwnCloudServiceRoot::obtainNewTreeForSyncIn() const {
OwnCloudGetFeedsCategoriesResponse feed_cats_response = m_network->feedsCategories();

3
src/librssguard/services/owncloud/owncloudserviceroot.h
View File

@ -37,8 +37,7 @@ class OwnCloudServiceRoot : public ServiceRoot, public CacheForServiceRoot {
void saveAllCachedData(bool async = true);
public slots:
void addNewFeed(const QString& url);
void addNewCategory();
void addNewFeed(RootItem* selected_item, const QString& url);
private:
RootItem* obtainNewTreeForSyncIn() const;

5
src/librssguard/services/standard/standardfeed.cpp
View File

@ -76,9 +76,10 @@ StandardServiceRoot* StandardFeed::serviceRoot() const {
}
bool StandardFeed::editViaGui() {
QScopedPointer<FormStandardFeedDetails> form_pointer(new FormStandardFeedDetails(serviceRoot(), qApp->mainFormWidget()));
QScopedPointer<FormStandardFeedDetails> form_pointer(new FormStandardFeedDetails(serviceRoot(),
qApp->mainFormWidget()));
form_pointer.data()->addEditFeed(this, nullptr);
form_pointer->addEditFeed(this, this);
return false;
}

9
src/librssguard/services/standard/standardserviceroot.cpp
View File

@ -105,7 +105,7 @@ bool StandardServiceRoot::supportsCategoryAdding() const {
return true;
}
void StandardServiceRoot::addNewFeed(const QString& url) {
void StandardServiceRoot::addNewFeed(RootItem* selected_item, const QString& url) {
if (!qApp->feedUpdateLock()->tryLock()) {
// Lock was not obtained because
// it is used probably by feed updater or application
@ -118,9 +118,10 @@ void StandardServiceRoot::addNewFeed(const QString& url) {
return;
}
QScopedPointer<FormStandardFeedDetails> form_pointer(new FormStandardFeedDetails(this, qApp->mainFormWidget()));
QScopedPointer<FormStandardFeedDetails> form_pointer(new FormStandardFeedDetails(this,
qApp->mainFormWidget()));
form_pointer.data()->addEditFeed(nullptr, nullptr, url);
form_pointer->addEditFeed(nullptr, selected_item, url);
qApp->feedUpdateLock()->unlock();
}
@ -167,7 +168,7 @@ QString StandardServiceRoot::processFeedUrl(const QString& feed_url) {
void StandardServiceRoot::checkArgumentForFeedAdding(const QString& argument) {
if (argument.startsWith(QL1S(URI_SCHEME_FEED_SHORT))) {
addNewFeed(processFeedUrl(argument));
addNewFeed(nullptr, processFeedUrl(argument));
}
}

2
src/librssguard/services/standard/standardserviceroot.h
View File

@ -50,7 +50,7 @@ class StandardServiceRoot : public ServiceRoot {
void checkArgumentForFeedAdding(const QString& argument);
public slots:
void addNewFeed(const QString& url = QString());
void addNewFeed(RootItem* selected_item, const QString& url = QString());
void addNewCategory();
void importFeeds();
void exportFeeds();

2
src/librssguard/services/tt-rss/ttrssfeed.cpp
View File

@ -31,7 +31,7 @@ bool TtRssFeed::canBeEdited() const {
bool TtRssFeed::editViaGui() {
QPointer<FormTtRssFeedDetails> form_pointer = new FormTtRssFeedDetails(serviceRoot(), qApp->mainFormWidget());
form_pointer.data()->addEditFeed(this, nullptr);
form_pointer.data()->addEditFeed(this, this);
delete form_pointer.data();
return false;
}

10
src/librssguard/services/tt-rss/ttrssserviceroot.cpp
View File

@ -86,7 +86,9 @@ bool TtRssServiceRoot::supportsCategoryAdding() const {
return false;
}
void TtRssServiceRoot::addNewFeed(const QString& url) {
void TtRssServiceRoot::addNewFeed(RootItem* selected_item, const QString& url) {
Q_UNUSED(selected_item)
if (!qApp->feedUpdateLock()->tryLock()) {
// Lock was not obtained because
// it is used probably by feed updater or application
@ -101,14 +103,10 @@ void TtRssServiceRoot::addNewFeed(const QString& url) {
QScopedPointer<FormTtRssFeedDetails> form_pointer(new FormTtRssFeedDetails(this, qApp->mainFormWidget()));
form_pointer->addEditFeed(nullptr, this, url);
form_pointer->addEditFeed(nullptr, selected_item, url);
qApp->feedUpdateLock()->unlock();
}
void TtRssServiceRoot::addNewCategory() {
// NOTE: Do nothing.
}
bool TtRssServiceRoot::canBeEdited() const {
return true;
}

3
src/librssguard/services/tt-rss/ttrssserviceroot.h
View File

@ -42,8 +42,7 @@ class TtRssServiceRoot : public ServiceRoot, public CacheForServiceRoot {
void updateTitle();
public slots:
void addNewFeed(const QString& url = QString());
void addNewCategory();
void addNewFeed(RootItem* selected_item, const QString& url = QString());
private:
RootItem* obtainNewTreeForSyncIn() const;