From 9dce9f4a7d68ce203a767954a6ad0bde547e9972 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 8 Jul 2015 06:35:10 +0200 Subject: [PATCH 1/3] Qt 5.5 patch. --- src/qtsingleapplication/qtlocalpeer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qtsingleapplication/qtlocalpeer.cpp b/src/qtsingleapplication/qtlocalpeer.cpp index cc7d067e8..47f01205c 100644 --- a/src/qtsingleapplication/qtlocalpeer.cpp +++ b/src/qtsingleapplication/qtlocalpeer.cpp @@ -42,6 +42,7 @@ #include "qtlocalpeer.h" #include #include +#include #if defined(Q_OS_WIN) #include From 0f48b4fe3418737580a038572b58eb263df4c8a7 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 8 Jul 2015 10:04:57 +0200 Subject: [PATCH 2/3] Some messagebox stuff. --- src/core/feeddownloader.h | 2 ++ src/miscellaneous/application.cpp | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/core/feeddownloader.h b/src/core/feeddownloader.h index 8685ab3ee..e720ef603 100644 --- a/src/core/feeddownloader.h +++ b/src/core/feeddownloader.h @@ -35,6 +35,8 @@ struct FeedDownloadResults { return lhs.second > rhs.second; } + // QString represents title if the feed, int represents + // count of newly downloaded messages. QList > m_updatedFeeds; }; diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp index 6fc8c37bb..669a52653 100755 --- a/src/miscellaneous/application.cpp +++ b/src/miscellaneous/application.cpp @@ -128,13 +128,7 @@ void Application::processExecutionMessage(const QString &message) { qDebug("Received '%s' execution message from another application instance.", qPrintable(message)); if (message == APP_IS_RUNNING) { - if (SystemTrayIcon::isSystemTrayActivated()) { - qApp->trayIcon()->showMessage(APP_NAME, - tr("Application is already running."), - QSystemTrayIcon::Information, - TRAY_ICON_BUBBLE_TIMEOUT); - } - + showGuiMessage(APP_NAME, tr("Application is already running."), QSystemTrayIcon::Information); mainForm()->display(); } else if (message == APP_QUIT_INSTANCE) { From 61d4acec02f51d47ea4c7e69d973f4f4f7e22286 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 8 Jul 2015 10:05:16 +0200 Subject: [PATCH 3/3] Some messagebox stuff. --- src/network-web/webview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp index d919e66e7..7ef8f36a5 100755 --- a/src/network-web/webview.cpp +++ b/src/network-web/webview.cpp @@ -139,7 +139,7 @@ void WebView::saveCurrentPageToFile() { str << html_text; selected_file_handle.close(); } - else { + else { MessageBox::show(this, QMessageBox::Critical, tr("Cannot save web page"), tr("Web page cannot be saved because destination file is not writtable.")); }