From: Alexander von Renteln <phon@quassel-irc.org>
Date: Tue, 5 Feb 2008 23:28:42 +0000 (+0000)
Subject: removed context menu in quasselclient from the left mouse click (very helpful for... 
X-Git-Tag: 0.2.0-alpha1~110
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=3fcd2acdd64bf220bbca4b23c719fc50b2e40532

removed context menu in quasselclient from the left mouse click (very helpful for mac users)
changed irchandler behaviour - only 401 replies get forwarded to user buffer
---

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index dba9f85f..df4c65bd 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -155,11 +155,16 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList<QByteAr
         emit displayMsg(Message::Error, "", params.join(" "), prefix);
         break;
       // Server error messages, display them in red. First param will be appended.
-      case 401: case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442:
+      case 401: 
       { QString channelName = params.takeFirst();
-      emit displayMsg(Message::Error, "", params.join(" ") + " " + channelName, prefix);
-      emit displayMsg(Message::Error, channelName, params.join(" ") + " " + channelName, prefix);
-      break;
+        emit displayMsg(Message::Error, "", params.join(" ") + " " + channelName, prefix);
+        emit displayMsg(Message::Error, channelName, params.join(" ") + " " + channelName, prefix);
+        break;
+      }
+      case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442:
+      { QString channelName = params.takeFirst();
+        emit displayMsg(Message::Error, "", params.join(" ") + " " + channelName, prefix);
+        break;
       }
       // Server error messages which will be displayed with a colon between the first param and the rest
       case 413: case 414: case 423: case 441: case 444: case 461:
diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 7ed3f58a..b7199dc1 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -245,7 +245,7 @@ void MainWin::setupSystray() {
   QString toolTip("left click to minimize the quassel client to tray");
   systray->setToolTip(toolTip);
 
-  QMenu *systrayMenu = new QMenu(this);
+  systrayMenu = new QMenu(this);
   systrayMenu->addAction(ui.actionAboutQuassel);
   systrayMenu->addSeparator();
   systrayMenu->addAction(ui.actionConnectCore);
@@ -253,8 +253,7 @@ void MainWin::setupSystray() {
   systrayMenu->addSeparator();
   systrayMenu->addAction(ui.actionQuit);
 
-  systray->setContextMenu(systrayMenu);
-  // systray->setContextMenuPolicy();
+//   systray->setContextMenu(systrayMenu);
 
   systray->show();
   connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
@@ -340,6 +339,9 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
       hide();
     }
   }
+  else {
+    systrayMenu->popup(QCursor::pos());
+  }
 }
 
 void MainWin::showNetworkDlg() {
diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 49d67781..12c639fc 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -82,6 +82,8 @@ class MainWin : public QMainWindow {
     Ui::MainWin ui;
     QtUi *gui;
 
+    QMenu *systrayMenu;
+
     void setupMenus();
     void setupViews();
     void setupNickWidget();