From 7b15e568aa0ec6510eb60892a468e684c2f9958f Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Mon, 29 Jun 2015 19:13:06 +0200
Subject: [PATCH] Even better API.

---
 .../graphics/icons/mini-kfaenza/rssguard.png  | Bin 0 -> 5111 bytes
 src/definitions/definitions.h.in              |   2 +-
 src/gui/feedmessageviewer.cpp                 |   2 --
 src/gui/notifications/notification.cpp        |  21 +++++++++++++++---
 src/gui/notifications/notification.h          |   4 ++++
 src/gui/systemtrayicon.cpp                    |   6 ++---
 6 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 resources/graphics/icons/mini-kfaenza/rssguard.png

diff --git a/resources/graphics/icons/mini-kfaenza/rssguard.png b/resources/graphics/icons/mini-kfaenza/rssguard.png
new file mode 100644
index 0000000000000000000000000000000000000000..99e3bab2b5640b5d9bf4f5db9f48f5bf0d449a50
GIT binary patch
literal 5111
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
Z4*)u2PPb-Ab}Ik?002ovPDHLkV1hCX09XJ3

literal 0
HcmV?d00001

diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in
index b5acf1709..aebd05a72 100755
--- a/src/definitions/definitions.h.in
+++ b/src/definitions/definitions.h.in
@@ -68,7 +68,7 @@
 #define INTERNAL_URL_BLANK                    "about:blank"
 #define DEFAULT_AUTO_UPDATE_INTERVAL          15
 #define AUTO_UPDATE_INTERVAL                  60000
-#define STARTUP_UPDATE_DELAY                  1500
+#define STARTUP_UPDATE_DELAY                  15000
 #define TIMEZONE_OFFSET_LIMIT                 6
 #define CHANGE_EVENT_DELAY                    250
 #define FLAG_ICON_SUBFOLDER                   "flags"
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 8ffb92e9a..41f40369f 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -277,8 +277,6 @@ void FeedMessageViewer::updateMessageButtonsAvailability() {
   form_main->m_ui->m_actionSwitchImportanceOfSelectedMessages->setEnabled(atleast_one_message_selected);
 
   form_main->m_ui->m_actionRestoreSelectedMessagesFromRecycleBin->setEnabled(recycle_bin_selected && atleast_one_message_selected);
-
-  // TODO: To samo udělat s feedy, řešit pouze buttony, které se týkají výběru, ale také vzít v potaz, zda zrovna běží update.
 }
 
 void FeedMessageViewer::updateFeedButtonsAvailability() {
diff --git a/src/gui/notifications/notification.cpp b/src/gui/notifications/notification.cpp
index a0067e8fb..d51075b19 100644
--- a/src/gui/notifications/notification.cpp
+++ b/src/gui/notifications/notification.cpp
@@ -35,7 +35,7 @@
 
 
 Notification::Notification() : QWidget(0), m_title(QString()), m_text(QString()), m_icon(QPixmap()), m_screen(-1),
-  m_width(-1), m_height(-1), m_padding(5), m_widgetMargin(2 * m_padding) {
+  m_width(-1), m_height(-1), m_padding(5), m_widgetMargin(2 * m_padding), m_timerId(0) {
   setupWidget();
   loadSettings();
 }
@@ -49,7 +49,7 @@ bool Notification::areNotificationsActivated() {
 }
 
 void Notification::notify(const QString &text, const QString &title, const QIcon &icon) {
-  hide();
+  cancel();
 
   // Set new values.
   m_text = text;
@@ -60,12 +60,22 @@ void Notification::notify(const QString &text, const QString &title, const QIcon
   updateGeometries();
   repaint();
   show();
+
+  m_timerId = startTimer(10000);
 }
 
 void Notification::notify(const QString &text, const QString &title, QSystemTrayIcon::MessageIcon icon) {
   notify(text, title, MessageBox::iconForStatus((QMessageBox::Icon) icon));
 }
 
+void Notification::cancel() {
+  hide();
+
+  if (m_timerId != 0) {
+    killTimer(m_timerId);
+  }
+}
+
 void Notification::updateGeometries() {
   // Calculate width and height of notification with given icon and text.
   m_width = m_padding +
@@ -159,7 +169,7 @@ void Notification::paintEvent(QPaintEvent *event) {
 
 void Notification::mousePressEvent(QMouseEvent *event) {
   QWidget::mousePressEvent(event);
-  QTimer::singleShot(0, this, SLOT(hide()));
+  cancel();
 }
 
 void Notification::enterEvent(QEvent *event) {
@@ -172,6 +182,11 @@ void Notification::leaveEvent(QEvent *event) {
   repaint();
 }
 
+void Notification::timerEvent(QTimerEvent *event) {
+  QWidget::timerEvent(event);
+  cancel();
+}
+
 void Notification::loadSettings() {
   m_position = static_cast<Qt::Corner>(qApp->settings()->value(GROUP(GUI), SETTING(GUI::FancyNotificationsPosition)).toInt());
 }
diff --git a/src/gui/notifications/notification.h b/src/gui/notifications/notification.h
index 0390d57c4..2473b99bf 100644
--- a/src/gui/notifications/notification.h
+++ b/src/gui/notifications/notification.h
@@ -37,11 +37,14 @@ class Notification : public QWidget {
     void notify(const QString &text, const QString &title, const QIcon &icon);
     void notify(const QString &text, const QString &title, QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information);
 
+    void cancel();
+
   protected:
     void paintEvent(QPaintEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void enterEvent(QEvent *event);
     void leaveEvent(QEvent *event);
+    void timerEvent(QTimerEvent *event);
 
   private:
     void loadSettings();
@@ -61,6 +64,7 @@ class Notification : public QWidget {
     int m_height;
     int m_padding;
     int m_widgetMargin;
+    int m_timerId;
 };
 
 #endif // NOTIFICATION_H
diff --git a/src/gui/systemtrayicon.cpp b/src/gui/systemtrayicon.cpp
index 4bbadd712..63bfc9ea9 100755
--- a/src/gui/systemtrayicon.cpp
+++ b/src/gui/systemtrayicon.cpp
@@ -37,9 +37,9 @@ TrayIconMenu::~TrayIconMenu() {
 bool TrayIconMenu::event(QEvent *event) {
   if (Application::activeModalWidget() != NULL && event->type() == QEvent::Show) {
     QTimer::singleShot(0, this, SLOT(hide()));
-    qApp->trayIcon()->showMessage(QSL(APP_LONG_NAME),
-                                  tr("Close opened modal dialogs first."),
-                                  QSystemTrayIcon::Warning);
+    qApp->showGuiMessage(QSL(APP_LONG_NAME),
+                         tr("Close opened modal dialogs first."),
+                         QSystemTrayIcon::Warning, qApp->mainForm(), true);
   }
   return QMenu::event(event);
 }