pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:martinrotter/rssguard

Browse source
This commit is contained in:
Martin Rotter 2021-11-16 07:41:23 +01:00
commit 3ef1a94a2d
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -9,7 +9,7 @@ RSS Guard
### [Discord server](https://discord.gg/7xbVMPPNqH) | [Downloads](https://github.com/martinrotter/rssguard/releases) | [Development builds](https://github.com/martinrotter/rssguard/releases/tag/devbuild) | [Documentation](https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md) ### [Discord server](https://discord.gg/7xbVMPPNqH) | [Downloads](https://github.com/martinrotter/rssguard/releases) | [Development builds](https://github.com/martinrotter/rssguard/releases/tag/devbuild) | [Documentation](https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md)
RSS Guard is simple RSS/ATOM feed reader for Windows, Linux or Mac OS X which can work with RSS/ATOM/JSON and also supports many online RSS services: RSS Guard is simple RSS/ATOM feed reader for Windows, Linux or macOS which can work with RSS/ATOM/JSON and also supports many online RSS services:
* [Tiny Tiny RSS](https://tt-rss.org), * [Tiny Tiny RSS](https://tt-rss.org),
* [Inoreader](https://www.inoreader.com) (via Google Reader API plugin), * [Inoreader](https://www.inoreader.com) (via Google Reader API plugin),
* [Nextcloud News](https://apps.nextcloud.com/apps/news), * [Nextcloud News](https://apps.nextcloud.com/apps/news),

2
build.pro
View file

@ -32,7 +32,7 @@
# {FEEDLY,GMAIL,INOREADER}_CLIENT_SECRET - preconfigured OAuth cliend SECRET. # {FEEDLY,GMAIL,INOREADER}_CLIENT_SECRET - preconfigured OAuth cliend SECRET.
# #
# Other information: # Other information:
# - supports Windows, Linux, Mac OS X, OS/2, Android, # - supports Windows, Linux, macOS, OS/2, Android,
# - Qt 5.9.0 or higher is required, # - Qt 5.9.0 or higher is required,
# - if you wish to make packages for Windows, then you must initialize all submodules within repository before compilation, # - if you wish to make packages for Windows, then you must initialize all submodules within repository before compilation,
# - C++ 11/17 is required. # - C++ 11/17 is required.

2
resources/docs/Documentation.md
View file

@ -320,7 +320,7 @@ Binary name (interpreter) must be always be specified, while arguments not. Be v
<img alt="alt-img" src="images/scrape-source.png" width="350px"> <img alt="alt-img" src="images/scrape-source.png" width="350px">
Note that the above examples are cross-platform and you can use the exact same command on Windows, Linux or Mac OS X, if your operating system is properly configured. Note that the above examples are cross-platform and you can use the exact same command on Windows, Linux or macOS, if your operating system is properly configured.
RSS Guard offers [placeholder](#userd-plac) `%data%` which is automatically replaced with full path to RSS Guard's [user data folder](#userd), allowing you to make your configuration fully portable. You can, therefore, use something like this as source script line: `bash#%data%/scripts/download-feed.sh`. RSS Guard offers [placeholder](#userd-plac) `%data%` which is automatically replaced with full path to RSS Guard's [user data folder](#userd), allowing you to make your configuration fully portable. You can, therefore, use something like this as source script line: `bash#%data%/scripts/download-feed.sh`.

2
resources/scripts/github-actions/build-linux-mac.sh
View file

@ -8,7 +8,7 @@ if [[ "$os" == *"ubuntu"* ]]; then
echo "We are building for GNU/Linux on Ubuntu." echo "We are building for GNU/Linux on Ubuntu."
is_linux=true is_linux=true
else else
echo "We are building for Mac OS X." echo "We are building for macOS."
is_linux=false is_linux=false
fi fi

4
src/librssguard/definitions/definitions.h
View file

@ -52,7 +52,7 @@
#define DEFAULT_SQL_MESSAGES_FILTER "0 > 1" #define DEFAULT_SQL_MESSAGES_FILTER "0 > 1"
#define MAX_MULTICOLUMN_SORT_STATES 3 #define MAX_MULTICOLUMN_SORT_STATES 3
#define RELEASES_LIST "https://api.github.com/repos/martinrotter/rssguard/releases" #define RELEASES_LIST "https://api.github.com/repos/martinrotter/rssguard/releases"
#define MSG_FILTERING_HELP "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Message-filters.md#message-filtering" #define MSG_FILTERING_HELP "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#fltr"
#define URL_REGEXP "^(http|https|feed|ftp):\\/\\/[\\w\\-_]+(\\.[\\w\\-_]+)+([\\w\\-\\.,@?^=%&amp;:/~\\+#]*[\\w\\-\\@?^=%&amp;/~\\+#])?$" #define URL_REGEXP "^(http|https|feed|ftp):\\/\\/[\\w\\-_]+(\\.[\\w\\-_]+)+([\\w\\-\\.,@?^=%&amp;:/~\\+#]*[\\w\\-\\@?^=%&amp;/~\\+#])?$"
#define SCRIPT_SOURCE_TYPE_REGEXP "^.+#.*$" #define SCRIPT_SOURCE_TYPE_REGEXP "^.+#.*$"
#define TEXT_TITLE_LIMIT 30 #define TEXT_TITLE_LIMIT 30
@ -256,7 +256,7 @@
#elif defined(Q_OS_OS2) #elif defined(Q_OS_OS2)
#define OS_ID "OS/2" #define OS_ID "OS/2"
#elif defined(Q_OS_OSX) #elif defined(Q_OS_OSX)
#define OS_ID "Mac OS X" #define OS_ID "macOS"
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
#define OS_ID "Windows" #define OS_ID "Windows"
#elif defined(Q_OS_ANDROID) #elif defined(Q_OS_ANDROID)

2
src/rssguard/main.cpp
View file

@ -30,7 +30,7 @@ int main(int argc, char* argv[]) {
QApplication::setDesktopFileName(APP_DESKTOP_ENTRY_FILE); QApplication::setDesktopFileName(APP_DESKTOP_ENTRY_FILE);
#endif #endif
// Ensure that ini format is used as application settings storage on Mac OS. // Ensure that ini format is used as application settings storage on macOS.
QSettings::setDefaultFormat(QSettings::IniFormat); QSettings::setDefaultFormat(QSettings::IniFormat);
#if defined(Q_OS_MACOS) #if defined(Q_OS_MACOS)