FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-31 01:24:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Version bump.

Browse Source
This commit is contained in:
Martin Rotter 2015-12-19 07:55:07 +01:00
parent 64e3a6a843
commit 1888376403
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -65,8 +65,8 @@ project(rssguard)
set(APP_NAME "RSS Guard")
set(APP_LOW_NAME "rssguard")
set(APP_VERSION "3.0.1")
set(FILE_VERSION "3,0,1,0")
set(APP_VERSION "3.0.2")
set(FILE_VERSION "3,0,2,0")
set(APP_AUTHOR "Martin Rotter")
set(APP_URL "http://bitbucket.org/skunkos/rssguard")
set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues")

2
src/definitions/definitions.h.in
View File

@ -41,6 +41,8 @@
#define SERVICE_CODE_STD_RSS "std-rss"
#define SERVICE_CODE_TT_RSS "tt-rss"
#define ARGUMENTS_LIST_SEPARATOR "\n"
#define ENCLOSURES_OUTER_SEPARATOR '#'
#define ECNLOSURES_INNER_SEPARATOR '&'
#define URI_SCHEME_FEED "feed://"

2
src/main.cpp
View File

@ -69,7 +69,7 @@ int main(int argc, char *argv[]) {
// TODO: dat '\n' do konstant
// Check if another instance is running.
if (application.sendMessage((QStringList() << APP_IS_RUNNING << application.arguments().mid(1)).join(QSL("\n")))) {
if (application.sendMessage((QStringList() << APP_IS_RUNNING << application.arguments().mid(1)).join(ARGUMENTS_LIST_SEPARATOR))) {
qWarning("Another instance of the application is already running. Notifying it.");
return EXIT_FAILURE;
}

6
src/miscellaneous/application.cpp
View File

@ -159,9 +159,7 @@ void Application::restoreDatabaseSettings(bool restore_database, bool restore_se
void Application::processExecutionMessage(const QString &message) {
qDebug("Received '%s' execution message from another application instance.", qPrintable(message));
// TODO: dat '\n' do konstant a taky "feed:"
foreach (QString msg, message.split('\n')) {
foreach (QString msg, message.split(ARGUMENTS_LIST_SEPARATOR)) {
if (msg == APP_IS_RUNNING) {
showGuiMessage(APP_NAME, tr("Application is already running."), QSystemTrayIcon::Information);
mainForm()->display();
@ -169,7 +167,7 @@ void Application::processExecutionMessage(const QString &message) {
else if (msg == APP_QUIT_INSTANCE) {
quit();
}
else if (msg.startsWith(QL1S("feed:"))) {
else if (msg.startsWith(QL1S(URI_SCHEME_FEED))) {
// Application was running, and someone wants to add new feed.
StandardServiceRoot *root = qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->sourceModel()->standardServiceRoot();

1
src/services/tt-rss/ttrssserviceroot.h
View File

@ -69,6 +69,7 @@ class TtRssServiceRoot : public ServiceRoot {
bool onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList<Message> &messages);
bool onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList<Message> &messages);
// Access to network.
TtRssNetworkFactory *network() const;
// Returns list of custom IDS of all DB messages in given item.