From 38c6c6b448bd3d6978db31d6a5a5f41b590736ba Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 1 Jul 2015 10:32:56 +0200
Subject: [PATCH] Added more GUI messages, fixed loading of position, updated
 README.

---
 README.md                              | 3 ++-
 src/gui/dialogs/formsettings.cpp       | 1 +
 src/gui/feedmessageviewer.cpp          | 3 ++-
 src/gui/notifications/notification.cpp | 4 ++--
 src/gui/notifications/notification.h   | 5 ++++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7dc97cfb8..b6a43147b 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,8 @@ RSS Guard is written in C++. It is pretty fast even with tons of messages loaded
 * message filter with regular expressions,
 * feed metadata fetching including icons,
 * simple Adblock functionality,
-* Google suggest for internal web browser location bar,
+* customized popup notifications,
+* Google-based auto-completion for internal web browser location bar,
 * ability to cleanup internal message database with various options,
 * enhanced feed auto-updating with separate time intervals,
 * multiple data backend support,
diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp
index c125410b4..ff454d3c1 100755
--- a/src/gui/dialogs/formsettings.cpp
+++ b/src/gui/dialogs/formsettings.cpp
@@ -859,6 +859,7 @@ void FormSettings::saveInterface() {
 
   qApp->mainForm()->tabWidget()->checkTabBarVisibility();
   qApp->mainForm()->tabWidget()->feedMessageViewer()->refreshVisualProperties();
+  qApp->notification()->loadSettings();
 }
 
 bool FormSettings::eventFilter(QObject *obj, QEvent *e) {
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 5134f5e20..a68e35b24 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -258,7 +258,8 @@ void FeedMessageViewer::onFeedUpdatesFinished(FeedDownloadResults results) {
 
   if (!results.m_updatedFeeds.isEmpty()) {
     // Now, inform about results via GUI message/notification.
-    qApp->showGuiMessage(tr("New messages downloaded"), results.getOverview(10), QSystemTrayIcon::Information);
+    qApp->showGuiMessage(tr("New messages downloaded"), results.getOverview(10), QSystemTrayIcon::NoIcon,
+                         0, false, qApp->icons()->fromTheme(QSL("item-update-all")));
   }
 }
 
diff --git a/src/gui/notifications/notification.cpp b/src/gui/notifications/notification.cpp
index cffb4dd6d..7d2216688 100644
--- a/src/gui/notifications/notification.cpp
+++ b/src/gui/notifications/notification.cpp
@@ -147,10 +147,10 @@ void Notification::paintEvent(QPaintEvent *event) {
   painter.setFont(font());
 
   if (!underMouse()) {
-    painter.setOpacity(0.8);
+    painter.setOpacity(0.88);
   }
   else {
-    painter.setOpacity(0.95);
+    painter.setOpacity(0.97);
   }
 
   // Draw background.
diff --git a/src/gui/notifications/notification.h b/src/gui/notifications/notification.h
index f9a62c1cf..6ca6b9c9c 100644
--- a/src/gui/notifications/notification.h
+++ b/src/gui/notifications/notification.h
@@ -40,8 +40,12 @@ class Notification : public QWidget {
     void notify(const QString &text, const QString &title, QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information,
                 QObject *invokation_target = NULL, const char *invokation_slot = NULL);
 
+    // Cancels display of the notification.
     void cancel();
 
+    // Loads settings.
+    void loadSettings();
+
   protected:
     void paintEvent(QPaintEvent *event);
     void mousePressEvent(QMouseEvent *event);
@@ -53,7 +57,6 @@ class Notification : public QWidget {
     void clicked();
 
   private:
-    void loadSettings();
     void setupWidget();
     void updateGeometries();