X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.cpp;h=2a0883608cd507410cf2919a59fc0b78d134e8a9;hp=30064d6708a8a96ff8fe60f5dac062f384c8f89b;hb=2e9492d9ef198bde37da1f858602ab9624c0a12a;hpb=30063c5a63c6111787258b5c4ba8acdb03008667

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 30064d67..2a088360 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -71,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) {
@@ -89,12 +91,36 @@ 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() {
-#ifdef QT_NO_SYSTEMTRAYICON
-  return false;
-#else
-  return mainWindow()->systemTray()->isSystemTrayAvailable();
-#endif
+  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) {