Changeset 14580

Timestamp:

Oct 18, 2015, 11:48:10 AM (6 years ago)

Author:

mikedld

Message:

Display notifications via tray icon if dbus is not available

Location:

trunk/qt

Files:

• Application.cc (modified) (3 diffs)
• MainWindow.h (modified) (1 diff)

trunk/qt/Application.cc

@@ -20 +20 @@
 #include <QProcess>
 #include <QRect>
+#include <QSystemTrayIcon>
 
 #include <libtransmission/transmission.h>
@@ -546 +547 @@
 Application::notifyApp (const QString& title, const QString& body) const
 {
+  QDBusConnection bus = QDBusConnection::sessionBus ();
+  if (!bus.isConnected ())
+    {
+      myWindow->trayIcon ().showMessage (title, body);
+      return true;
+    }
+
   const QString dbusServiceName   = QString::fromUtf8 ("org.freedesktop.Notifications");
   const QString dbusInterfaceName = QString::fromUtf8 ("org.freedesktop.Notifications");
@@ -561 +569 @@
   args.append (static_cast<int32_t> (-1));            // use the default timeout period
   m.setArguments (args);
-  QDBusMessage replyMsg = QDBusConnection::sessionBus ().call (m);
+  QDBusMessage replyMsg = bus.call (m);
   //std::cerr << qPrintable (replyMsg.errorName ()) << std::endl;
   //std::cerr << qPrintable (replyMsg.errorMessage ()) << std::endl;

trunk/qt/MainWindow.h

@@ -53 +53 @@
     MainWindow (Session&, Prefs&, TorrentModel&, bool minized);
     virtual ~MainWindow ();
+
+    QSystemTrayIcon& trayIcon () { return myTrayIcon; }
 
   public slots: