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

icon for bazqux, some minor stuff

Browse Source
This commit is contained in:
Martin Rotter 2021-01-30 20:03:26 +01:00
parent 8526779242
commit 93bc23d69c
10 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -13,6 +13,9 @@ RSS Guard is simple, light and easy-to-use RSS/ATOM feed aggregator developed us
* [Tiny Tiny RSS](https://tt-rss.org),
* [Inoreader](https://www.inoreader.com),
* [Nextcloud News](https://apps.nextcloud.com/apps/news),
* [Gmail API](https://developers.google.com/gmail/api).
* [Gmail API](https://developers.google.com/gmail/api),
* [FreshRSS](https://freshrss.org),
* [The Old Reader](https://theoldreader.com),
* [Bazqux](https://bazqux.com).
Application icon was kindly contributed by Siddharth Yadav - @Siddharth_yd (Instagram), illustrationdesignsid@gmail.com (e-mail). Flag icons were provided by [IconDrawer](http://www.icondrawer.com).

2
pri/vars.pri
View File

@ -4,7 +4,7 @@ APP_REVERSE_NAME = "com.github.rssguard"
APP_LOW_H_NAME = ".rssguard"
APP_AUTHOR = "Martin Rotter"
APP_COPYRIGHT = "(C) 2011-2021 $$APP_AUTHOR"
APP_VERSION = "3.8.5"
APP_VERSION = "3.9.0"
APP_LONG_NAME = "$$APP_NAME $$APP_VERSION"
APP_EMAIL = "rotter.martinos@gmail.com"
APP_URL = "https://github.com/martinrotter/rssguard"

18
resources/docs/Documentation.md
View File

@ -11,6 +11,7 @@
* [Supported feed formats and online feed services](Feed-formats.md)
* [Message filtering](Message-filters.md)
* [Database backends](#database-backends)
* [Google Reader API](#google-reader-api)
* [Gmail](#gmail)
* [Labels](Labels.md)
* [Downloading files](#downloading-files)
@ -83,10 +84,14 @@ RSS Guard is simple (yet powerful) feed reader. It is able to fetch the most kno
* Nextcloud News (RSS Guard 3.1.0+),
* Inoreader (RSS Guard 3.5.0+),
* Gmail with e-mail sending (RSS Guard 3.7.1+).
* FreshRSS (RSS Guard 3.9.0+),
* The Old Reader (RSS Guard 3.9.0+),
* Bazqux (RSS Guard 3.9.0+).
* core:
* support for all feed formats (RSS/RDF/ATOM/JSON),
* full support of podcasts (RSS/ATOM/JSON),
* import/export of feeds to/from OPML 2.0,
* universal plugin for online services with [Google Reader API](#google-reader-api),
* possibility of using custom 3rd-party feed synchronization services,
* feed metadata fetching including icons,
* simple internal Chromium-based web viewer (or alternative version with simpler and much more lightweight internal viewer),
@ -137,6 +142,19 @@ MariaDB (MySQL) backend is there for users, who want to store their data in a ce
For database-related configuration see `Settings -> Data storage` dialog.
## Google Reader API
Starting with RSS Guard 3.9.0, there is a new plugin which offers synchronization with services using Google Reader API. Plugin was so far tested with FreshRSS, The Old Reader and Bazqux. All Google Reader API enabled services should work.
Note that Inoreader has its own separate plugin, because it uses OAuth as authentication method, therefore it is cleaner to have separate plugin.
Google Reader API integration in RSS Guard offers a way to set custom service endpoint even if you select service which is not self-hosted such as Bazqux, providing all users with greater flexibility and freedom.
<img src="images/greader-api-settings.png">
Note that even when all Google Reader API enabled services should follow the API, there are still some minor differences, primarily because Google Reader API has no strict documentation to follow and some services do not offer some features.
For example The Old Reader does not seem to offer tags/labels functionality, therefore tags/labels in RSS Guard are not synchronized, but you can still use offline labels.
## Gmail
RSS Guard includes Gmail plugin, which allows users to receive and send (!!!) e-mail messages. Plugin uses [Gmail API](https://developers.google.com/gmail/api) and offers some e-mail client-like features:
* Sending e-mail messages.

BIN
resources/docs/images/greader-api-settings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
resources/graphics/misc/bazqux.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

1
resources/rssguard.qrc
View File

@ -16,6 +16,7 @@
<file>graphics/misc/adblock.png</file>
<file>graphics/misc/adblock-disabled.png</file>
<file>graphics/misc/bazqux.png</file>
<file>graphics/misc/freshrss.png</file>
<file>graphics/misc/gmail.png</file>
<file>graphics/misc/google.png</file>

2
src/librssguard/miscellaneous/databasequeries.cpp
View File

@ -1694,7 +1694,7 @@ QList<ServiceRoot*> DatabaseQueries::getGreaderAccounts(const QSqlDatabase& db,
root->network()->setPassword(TextFactory::decrypt(query.value(3).toString()));
root->network()->setBaseUrl(query.value(4).toString());
root->network()->setBatchSize(query.value(5).toInt());
root->updateTitle();
root->updateTitleIcon();
fillBaseAccountData(db, root);

10
src/librssguard/services/greader/greaderserviceroot.cpp
View File

@ -139,7 +139,7 @@ void GreaderServiceRoot::saveAllCachedData(bool ignore_errors) {
}
}
void GreaderServiceRoot::updateTitle() {
void GreaderServiceRoot::updateTitleIcon() {
setTitle(QString("%1 (%2)").arg(m_network->username(),
m_network->serviceToString(m_network->service())));
@ -152,6 +152,10 @@ void GreaderServiceRoot::updateTitle() {
setIcon(qApp->icons()->miscIcon(QSL("freshrss")));
break;
case Service::Bazqux:
setIcon(qApp->icons()->miscIcon(QSL("bazqux")));
break;
default:
setIcon(GreaderEntryPoint().icon());
break;
@ -165,7 +169,7 @@ void GreaderServiceRoot::saveAccountDataToDatabase(bool creating_new) {
if (DatabaseQueries::overwriteGreaderAccount(database, m_network->username(),
m_network->password(), m_network->baseUrl(),
m_network->batchSize(), accountId())) {
updateTitle();
updateTitleIcon();
itemChanged(QList<RootItem*>() << this);
}
}
@ -173,7 +177,7 @@ void GreaderServiceRoot::saveAccountDataToDatabase(bool creating_new) {
if (DatabaseQueries::createGreaderAccount(database, accountId(), m_network->username(),
m_network->password(), m_network->service(),
m_network->baseUrl(), m_network->batchSize())) {
updateTitle();
updateTitleIcon();
}
}
}

2
src/librssguard/services/greader/greaderserviceroot.h
View File

@ -35,7 +35,7 @@ class GreaderServiceRoot : public ServiceRoot, public CacheForServiceRoot {
void setNetwork(GreaderNetwork* network);
GreaderNetwork* network() const;
void updateTitle();
void updateTitleIcon();
void saveAccountDataToDatabase(bool creating_new);
protected:

11
src/librssguard/services/greader/gui/greaderaccountdetails.cpp
View File

@ -11,8 +11,8 @@
GreaderAccountDetails::GreaderAccountDetails(QWidget* parent) : QWidget(parent) {
m_ui.setupUi(this);
for (auto serv : { GreaderServiceRoot::Service::FreshRss,
GreaderServiceRoot::Service::Bazqux,
for (auto serv : { GreaderServiceRoot::Service::Bazqux,
GreaderServiceRoot::Service::FreshRss,
GreaderServiceRoot::Service::TheOldReader }) {
m_ui.m_cmbService->addItem(GreaderNetwork::serviceToString(serv), QVariant::fromValue(serv));
}
@ -24,9 +24,10 @@ GreaderAccountDetails::GreaderAccountDetails(QWidget* parent) : QWidget(parent)
m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Information,
tr("No test done yet."),
tr("Here, results of connection test are shown."));
m_ui.m_lblLimitMessages->setText(
tr("Limiting number of downloaded messages per feed makes updating of feeds faster but if your feed contains "
"bigger number of messages than specified limit, then some messages might not be downloaded during feed update."));
m_ui.m_lblLimitMessages->setText(tr("Limiting number of downloaded messages per feed makes updating of "
"feeds faster, but if your feed contains bigger number of messages "
"than specified limit, then some older messages might not be "
"downloaded during feed update."));
connect(m_ui.m_spinLimitMessages, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, [=](int value) {
if (value <= 0) {