X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.cpp;h=2a0883608cd507410cf2919a59fc0b78d134e8a9;hp=7be5bd4d335b831257d2476845dce1ee082ae2dd;hb=2e9492d9ef198bde37da1f858602ab9624c0a12a;hpb=8f9c35aefb50a0e1626907e19da87bdb107123b4

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 7be5bd4d..2a088360 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -28,6 +28,7 @@
 #include "qtuimessageprocessor.h"
 #include "qtuisettings.h"
 #include "qtuistyle.h"
+#include "systemtray.h"
 #include "toolbaractionprovider.h"
 #include "types.h"
 #include "util.h"
@@ -48,12 +49,12 @@ QtUi::QtUi() : GraphicalUi() {
   }
   _instance = this;
 
-  setContextMenuActionProvider(new ContextMenuActionProvider(this));
-  setToolBarActionProvider(new ToolBarActionProvider(this));
-
   QtUiSettings uiSettings;
   Quassel::loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
 
+  setContextMenuActionProvider(new ContextMenuActionProvider(this));
+  setToolBarActionProvider(new ToolBarActionProvider(this));
+
   setUiStyle(new QtUiStyle(this));
   _mainWin = new MainWin();
 
@@ -70,6 +71,8 @@ QtUi::~QtUi() {
 
 void QtUi::init() {
   _mainWin->init();
+  QtUiSettings uiSettings;
+  uiSettings.initAndNotify("UseSystemTrayIcon", this, SLOT(useSystemTrayChanged(QVariant)), true);
 }
 
 MessageModel *QtUi::createMessageModel(QObject *parent) {
@@ -88,6 +91,38 @@ void QtUi::disconnectedFromCore() {
   _mainWin->disconnectedFromCore();
 }
 
+void QtUi::useSystemTrayChanged(const QVariant &v) {
+  _useSystemTray = v.toBool();
+  SystemTray *tray = mainWindow()->systemTray();
+  if(_useSystemTray) {
+    if(tray->isSystemTrayAvailable())
+      tray->setVisible(true);
+  } else {
+    if(tray->isSystemTrayAvailable() && mainWindow()->isVisible())
+      tray->setVisible(false);
+  }
+}
+
+bool QtUi::haveSystemTray() {
+  return mainWindow()->systemTray()->isSystemTrayAvailable() && instance()->_useSystemTray;
+}
+
+bool QtUi::isHidingMainWidgetAllowed() const {
+  return haveSystemTray();
+}
+
+void QtUi::minimizeRestore(bool show) {
+  SystemTray *tray = mainWindow()->systemTray();
+  if(show) {
+    if(tray && !_useSystemTray)
+      tray->setVisible(false);
+  } else {
+    if(tray && _useSystemTray)
+      tray->setVisible(true);
+  }
+  GraphicalUi::minimizeRestore(show);
+}
+
 void QtUi::registerNotificationBackend(AbstractNotificationBackend *backend) {
   if(!_notificationBackends.contains(backend)) {
     _notificationBackends.append(backend);
@@ -109,7 +144,7 @@ const QList<AbstractNotificationBackend *> &QtUi::notificationBackends() {
 
 uint QtUi::invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text) {
   static int notificationId = 0;
-  //notificationId++;
+
   AbstractNotificationBackend::Notification notification(++notificationId, bufId, type, sender, text);
   _notifications.append(notification);
   foreach(AbstractNotificationBackend *backend, _notificationBackends)
@@ -120,11 +155,10 @@ uint QtUi::invokeNotification(BufferId bufId, AbstractNotificationBackend::Notif
 void QtUi::closeNotification(uint notificationId) {
   QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
   while(i != _notifications.end()) {
-    if((*i).notificationId == notificationId) {
+    if(i->notificationId == notificationId) {
       foreach(AbstractNotificationBackend *backend, _notificationBackends)
         backend->close(notificationId);
       i = _notifications.erase(i);
-      break;
     } else ++i;
   }
 }
@@ -132,9 +166,9 @@ void QtUi::closeNotification(uint notificationId) {
 void QtUi::closeNotifications(BufferId bufferId) {
   QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
   while(i != _notifications.end()) {
-    if(!bufferId.isValid() || (*i).bufferId == bufferId) {
+    if(!bufferId.isValid() || i->bufferId == bufferId) {
       foreach(AbstractNotificationBackend *backend, _notificationBackends)
-        backend->close((*i).notificationId);
+        backend->close(i->notificationId);
       i = _notifications.erase(i);
     } else ++i;
   }
@@ -148,17 +182,16 @@ void QtUi::notificationActivated(uint notificationId) {
   if(notificationId != 0) {
     QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
     while(i != _notifications.end()) {
-      if((*i).notificationId == notificationId) {
-        BufferId bufId = (*i).bufferId;
+      if(i->notificationId == notificationId) {
+        BufferId bufId = i->bufferId;
         if(bufId.isValid())
           Client::bufferModel()->switchToBuffer(bufId);
-        foreach(AbstractNotificationBackend *backend, _notificationBackends)
-          backend->close(notificationId);
-        _notifications.erase(i);
         break;
-      } else ++i;
+      }
+      ++i;
     }
   }
+  closeNotification(notificationId);
 
-  mainWindow()->forceActivated();
+  activateMainWidget();
 }