Fixed #79.

resources/text/CHANGELOG

@@ -3,7 +3,7 @@
 
 Fixed:
 <ul>
-<li>Fixed #76, #75, #82.</li>
+<li>Fixed #76, #75, #82, #79.</li>
 </ul>
 
 Added:

src/gui/formsettings.cpp

@@ -590,6 +590,7 @@ void FormSettings::selectSqlBackend(int index) {
 
 void FormSettings::loadGeneral() {
   m_ui->m_checkAutostart->setText(m_ui->m_checkAutostart->text().arg(APP_NAME));
+  m_ui->m_checkForUpdatesOnStart->setChecked(qApp->settings()->value(APP_CFG_GEN, "update_on_start", true).toBool());
 
   // Load auto-start status.
   SystemFactory::AutoStartStatus autostart_status = qApp->system()->getAutoStartStatus();
@@ -609,14 +610,15 @@ void FormSettings::loadGeneral() {
 }
 
 void FormSettings::saveGeneral() {
-  // If auto-start feature is available and user wants
+  // If auto-start feature is available and user wants to turn it on, then turn it on.
-  // to turn it on, then turn it on.
   if (m_ui->m_checkAutostart->isChecked()) {
     qApp->system()->setAutoStartStatus(SystemFactory::Enabled);
   }
   else {
     qApp->system()->setAutoStartStatus(SystemFactory::Disabled);
   }
+
+  qApp->settings()->setValue(APP_CFG_GEN, "update_on_start", m_ui->m_checkForUpdatesOnStart->isChecked());
 }
 
 void FormSettings::loadInterface() {

src/gui/formsettings.ui

@@ -116,6 +116,13 @@
          </property>
         </widget>
        </item>
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="m_checkForUpdatesOnStart">
+         <property name="text">
+          <string>Check for updates on application startup</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="m_pageDataStorage">

src/gui/systemtrayicon.cpp

@@ -52,7 +52,9 @@ SystemTrayIcon::SystemTrayIcon(const QString &normal_icon,
   : QSystemTrayIcon(parent),
     m_normalIcon(normal_icon),
     m_plainPixmap(plain_icon),
-    m_font(QFont())  {
+    m_font(QFont()),
+    m_bubbleClickTarget(NULL),
+    m_bubbleClickSlot(NULL) {
   qDebug("Creating SystemTrayIcon instance.");
 
   m_font.setBold(true);
@@ -62,8 +64,7 @@ SystemTrayIcon::SystemTrayIcon(const QString &normal_icon,
   setContextMenu(parent->trayMenu());
 
   // Create necessary connections.
-  connect(this, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+  connect(this, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(onActivated(QSystemTrayIcon::ActivationReason)));
-          this, SLOT(onActivated(QSystemTrayIcon::ActivationReason)));
 }
 
 SystemTrayIcon::~SystemTrayIcon() {
@@ -88,9 +89,7 @@ bool SystemTrayIcon::isSystemTrayAvailable() {
 }
 
 bool SystemTrayIcon::isSystemTrayActivated() {
-  return SystemTrayIcon::isSystemTrayAvailable() && qApp->settings()->value(APP_CFG_GUI,
+  return SystemTrayIcon::isSystemTrayAvailable() && qApp->settings()->value(APP_CFG_GUI, "use_tray_icon", true).toBool();
-                                                                            "use_tray_icon",
-                                                                            true).toBool();
 }
 
 void SystemTrayIcon::showPrivate() {
@@ -166,3 +165,23 @@ void SystemTrayIcon::setNumber(int number) {
     QSystemTrayIcon::setIcon(QIcon(background));
   }
 }
+
+void SystemTrayIcon::showMessage(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon icon,
+                                 int milliseconds_timeout_hint, QObject *click_target, const char *click_slot) {
+  if (m_bubbleClickTarget != NULL && m_bubbleClickSlot != NULL) {
+    // Disconnect previous bubble click signalling.
+    disconnect(this, SIGNAL(messageClicked()), m_bubbleClickTarget, m_bubbleClickSlot);
+  }
+
+  m_bubbleClickSlot = (char*) click_slot;
+  m_bubbleClickTarget = click_target;
+
+  if (click_target != NULL && click_slot != NULL) {
+    // Establish new connection for bubble click.
+    connect(this, SIGNAL(messageClicked()), click_target, click_slot);
+  }
+
+  // NOTE: If connections do not work, then use QMetaObject::invokeMethod(...).
+
+  QSystemTrayIcon::showMessage(title, message, icon, milliseconds_timeout_hint);
+}

src/gui/systemtrayicon.h

@@ -19,6 +19,9 @@
 #define SYSTEMTRAYICON_H
 
 #include <QSystemTrayIcon>
+
+#include "definitions/definitions.h"
+
 #include <QPointer>
 #include <QPixmap>
 #include <QMenu>
@@ -51,6 +54,13 @@ class SystemTrayIcon : public QSystemTrayIcon {
                             FormMain *parent = 0);
     virtual ~SystemTrayIcon();
 
+    // Sets the number to be visible in the tray icon, number <= 0 removes it.
+    void setNumber(int number = -1);
+    
+    void showMessage(const QString &title, const QString &message, MessageIcon icon = Information,
+                     int milliseconds_timeout_hint = TRAY_ICON_BUBBLE_TIMEOUT, QObject *click_target = NULL,
+                     const char *click_slot = NULL);
+
     // Returns true if tray icon CAN be constructed on this machine.
     static bool isSystemTrayAvailable();
 
@@ -58,9 +68,6 @@ class SystemTrayIcon : public QSystemTrayIcon {
     // application settings.
     static bool isSystemTrayActivated();
 
-    // Sets the number to be visible in the tray icon, number <= 0 removes it.
-    void setNumber(int number = -1);
-    
   public slots:
     void show();
 
@@ -72,6 +79,9 @@ class SystemTrayIcon : public QSystemTrayIcon {
     QIcon m_normalIcon;
     QPixmap m_plainPixmap;
     QFont m_font;
+
+    QObject *m_bubbleClickTarget;
+    char *m_bubbleClickSlot;
 };
 
 #endif // SYSTEMTRAYICON_H

src/main.cpp

@@ -33,6 +33,7 @@
 #include <QThread>
 #include <QTranslator>
 #include <QDebug>
+#include <QTimer>
 
 
 int main(int argc, char *argv[]) {
@@ -111,11 +112,14 @@ int main(int argc, char *argv[]) {
   // Display tray icon if it is enabled and available.
   if (SystemTrayIcon::isSystemTrayActivated()) {
     qApp->showTrayIcon();
+
+    if (qApp->settings()->value(APP_CFG_GEN, "update_on_start", true).toBool()) {
+      QTimer::singleShot(STARTUP_UPDATE_DELAY, application.system(), SLOT(checkForUpdatesAsynchronously()));
+    }
   }
 
   // Setup single-instance behavior.
-  QObject::connect(&application, SIGNAL(messageReceived(QString)),
+  QObject::connect(&application, SIGNAL(messageReceived(QString)), &application, SLOT(processExecutionMessage(QString)));
-                   &application, SLOT(processExecutionMessage(QString)));
 
   // Enter global event loop.
   return Application::exec();

src/miscellaneous/systemfactory.cpp

@@ -18,7 +18,9 @@
 #include "miscellaneous/systemfactory.h"
 
 #include "network-web/networkfactory.h"
+#include "gui/formmain.h"
 #include "miscellaneous/application.h"
+#include "miscellaneous/systemfactory.h"
 
 #if defined(Q_OS_WIN)
 #include <QSettings>
@@ -29,7 +31,17 @@
 #include <QDomDocument>
 #include <QDomElement>
 #include <QDomAttr>
+#include <QFuture>
+#include <QFutureWatcher>
 
+#if QT_VERSION >= 0x050000
+#include <QtConcurrent/QtConcurrentRun>
+#else
+#include <QtConcurrentRun>
+#endif
+
+
+typedef QPair<UpdateInfo, QNetworkReply::NetworkError> UpdateCheck;
 
 SystemFactory::SystemFactory(QObject *parent) : QObject(parent) {
 }
@@ -43,10 +55,7 @@ SystemFactory::AutoStartStatus SystemFactory::getAutoStartStatus() {
 #if defined(Q_OS_WIN)
   QSettings registry_key("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run",
                          QSettings::NativeFormat);
-  bool autostart_enabled = registry_key.value(APP_LOW_NAME,
+  bool autostart_enabled = registry_key.value(APP_LOW_NAME, "").toString().replace('\\', '/') == Application::applicationFilePath();
-                                              "").toString().replace('\\',
-                                                                     '/') ==
-                           Application::applicationFilePath();
 
   if (autostart_enabled) {
     return SystemFactory::Enabled;
@@ -200,3 +209,25 @@ UpdateInfo SystemFactory::parseUpdatesFile(const QByteArray &updates_file) {
 
   return update;
 }
+
+void SystemFactory::checkForUpdatesAsynchronously() {
+  QFutureWatcher<UpdateCheck> *watcher_for_future = new QFutureWatcher<UpdateCheck>(this);
+
+  connect(watcher_for_future, SIGNAL(finished()), this, SLOT(handleBackgroundUpdatesCheck()));
+  watcher_for_future->setFuture(QtConcurrent::run(this, &SystemFactory::checkForUpdates));
+}
+
+void SystemFactory::handleBackgroundUpdatesCheck() {
+  QFutureWatcher<UpdateCheck> *future_watcher = static_cast<QFutureWatcher<UpdateCheck>*>(sender());
+  UpdateCheck updates = future_watcher->result();
+
+  if (updates.second == QNetworkReply::NoError && updates.first.m_availableVersion != APP_VERSION) {
+    if (SystemTrayIcon::isSystemTrayActivated()) {
+       qApp->trayIcon()->showMessage(tr("New version available"),
+                                     tr("Click the bubble for more information."),
+                                     QSystemTrayIcon::Information,
+                                     TRAY_ICON_BUBBLE_TIMEOUT,
+                                     qApp->mainForm(), SLOT(showUpdates()));
+    }
+  }
+}

src/miscellaneous/systemfactory.h

@@ -88,6 +88,15 @@ class SystemFactory : public QObject {
     // Tries to download list with new updates.
     QPair<UpdateInfo, QNetworkReply::NetworkError> checkForUpdates();
 
+  public slots:
+    void checkForUpdatesAsynchronously();
+
+  private slots:
+    void handleBackgroundUpdatesCheck();
+
+  signals:
+    void updateCheckedAsynchronously(QPair<UpdateInfo, QNetworkReply::NetworkError> update_info);
+
   private:
     // Performs parsing of downloaded file with list of updates.
     UpdateInfo parseUpdatesFile(const QByteArray &updates_file);