removed context menu in quasselclient from the left mouse click (very helpful for...

changed irchandler behaviour - only 401 replies get forwarded to user buffer

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index dba9f85..df4c65b 100644 (file)
--- 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.
         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();
       { 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:
       }
       // 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 7ed3f58..b7199dc 100644 (file)
--- 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);
 
   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);
   systrayMenu->addAction(ui.actionAboutQuassel);
   systrayMenu->addSeparator();
   systrayMenu->addAction(ui.actionConnectCore);


@@ -253,8 +253,7 @@ void MainWin::setupSystray() {
   systrayMenu->addSeparator();
   systrayMenu->addAction(ui.actionQuit);
 
   systrayMenu->addSeparator();
   systrayMenu->addAction(ui.actionQuit);
 

-  systray->setContextMenu(systrayMenu);
-  // systray->setContextMenuPolicy();
+//   systray->setContextMenu(systrayMenu);

 
   systray->show();
   connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
 
   systray->show();
   connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),


@@ -340,6 +339,9 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
       hide();
     }
   }
       hide();
     }
   }

+  else {
+    systrayMenu->popup(QCursor::pos());
+  }

 }
 
 void MainWin::showNetworkDlg() {
 }
 
 void MainWin::showNetworkDlg() {

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 49d6778..12c639f 100644 (file)
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -82,6 +82,8 @@ class MainWin : public QMainWindow {
     Ui::MainWin ui;
     QtUi *gui;
 
     Ui::MainWin ui;
     QtUi *gui;
 

+    QMenu *systrayMenu;
+

     void setupMenus();
     void setupViews();
     void setupNickWidget();
     void setupMenus();
     void setupViews();
     void setupNickWidget();