Bump version.

This commit is contained in:
Martin Rotter 2016-08-13 20:16:27 +02:00
parent aefcc74e4b
commit 5a33076ac0
4 changed files with 29 additions and 2 deletions

View File

@ -64,7 +64,7 @@ APP_LOW_NAME = "rssguard"
APP_LOW_H_NAME = ".rssguard"
APP_AUTHOR = "Martin Rotter"
APP_COPYRIGHT = "(C) 2011-2016 $$APP_AUTHOR"
APP_VERSION = "3.3.3"
APP_VERSION = "3.3.4"
APP_LONG_NAME = "$$APP_NAME $$APP_VERSION"
APP_EMAIL = "rotter.martinos@gmail.com"
APP_URL = "https://github.com/martinrotter/rssguard"

View File

@ -39,6 +39,23 @@
int main(int argc, char *argv[]) {
bool run_as_cron = false;
for (int i; i < argc; i++) {
const QString str = QString::fromLocal8Bit(argv[i]);
if (str == "-h") {
qDebug("Usage: rssguard [OPTIONS]\n\n"
"Option\tMeaning\n"
"aaaa\tbbbb");
return EXIT_SUCCESS;
}
else if (str == "-cron") {
run_as_cron = true;
}
}
//: Abbreviation of language, e.g. en.
//: Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code.
//: Examples: "cs", "en", "it", "cs_CZ", "en_GB", "en_US".

View File

@ -20,6 +20,7 @@
#include "miscellaneous/iconfactory.h"
#include "miscellaneous/iofactory.h"
#include "miscellaneous/mutex.h"
#include "miscellaneous/feedreader.h"
#include "gui/feedsview.h"
#include "gui/feedmessageviewer.h"
#include "gui/messagebox.h"
@ -42,7 +43,7 @@
Application::Application(const QString &id, int &argc, char **argv)
: QtSingleApplication(id, argc, argv),
m_updateFeedsLock(nullptr), m_feedServices(QList<ServiceEntryPoint*>()), m_userActions(QList<QAction*>()), m_mainForm(nullptr),
m_feedReader(new FeedReader(this)), m_updateFeedsLock(nullptr), m_feedServices(QList<ServiceEntryPoint*>()), m_userActions(QList<QAction*>()), m_mainForm(nullptr),
m_trayIcon(nullptr), m_settings(nullptr), m_system(nullptr), m_skins(nullptr),
m_localization(nullptr), m_icons(nullptr), m_database(nullptr), m_downloadManager(nullptr) {
connect(this, SIGNAL(aboutToQuit()), this, SLOT(onAboutToQuit()));
@ -57,6 +58,10 @@ Application::~Application() {
qDeleteAll(m_feedServices);
}
FeedReader *Application::feedReader() {
return m_feedReader;
}
QList<ServiceEntryPoint*> Application::feedServices() {
if (m_feedServices.isEmpty()) {
// NOTE: All installed services create their entry points here.

View File

@ -46,6 +46,7 @@ class IconFactory;
class QAction;
class Mutex;
class QWebEngineDownloadItem;
class FeedReader;
class Application : public QtSingleApplication {
Q_OBJECT
@ -55,6 +56,8 @@ class Application : public QtSingleApplication {
explicit Application(const QString &id, int &argc, char **argv);
virtual ~Application();
FeedReader *feedReader();
// List of all installed "feed service plugins", including obligatory
// "standard" service entry point.
QList<ServiceEntryPoint*> feedServices();
@ -175,6 +178,8 @@ class Application : public QtSingleApplication {
void eliminateFirstRun();
void eliminateFirstRun(const QString &version);
FeedReader *m_feedReader;
// This read-write lock is used by application on its close.
// Application locks this lock for WRITING.
// This means that if application locks that lock, then