From: Daniel Albers <daniel@lbers.com>
Date: Tue, 20 Oct 2009 21:42:22 +0000 (+0200)
Subject: make proper use of [QK]SystemTrayIcon->contextMenu()
X-Git-Tag: 0.6-beta1~203
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0f02627a552eb4c6811e12b6ded509ffed152e58

make proper use of [QK]SystemTrayIcon->contextMenu()

also adds nifty context menu title
---

diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp
index 140f9e27..225cd864 100644
--- a/src/qtui/systemtray.cpp
+++ b/src/qtui/systemtray.cpp
@@ -51,12 +51,16 @@ SystemTray::SystemTray(QObject *parent)
   connect(&_animationTimer, SIGNAL(timeout()), SLOT(nextPhase()));
 
   ActionCollection *coll = QtUi::actionCollection("General");
-  _trayMenu = new QMenu();
+  _trayMenu = _trayIcon->contextMenu();
+  if (!_trayMenu)
+    _trayMenu = new QMenu();
   _trayMenu->addAction(coll->action("ConnectCore"));
   _trayMenu->addAction(coll->action("DisconnectCore"));
   _trayMenu->addAction(coll->action("CoreInfo"));
+#ifndef HAVE_KDE
   _trayMenu->addSeparator();
   _trayMenu->addAction(coll->action("Quit"));
+#endif /* HAVE_KDE */
 
   _trayIcon->setContextMenu(_trayMenu);