X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=5c5862f3b02ff9dc15eaf6d889331fc5a66693a7;hb=0268b7f62826dc48155866f7f27b2987449a29f5;hp=92f6f587c3b66dbdbe00b9015b64009f1d91af9b;hpb=4980c92e1b3712824affe519e52e6696d68068ba;p=quassel.git

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 92f6f587..5c5862f3 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -23,7 +23,7 @@
 #include <QMenu>
 
 #include "nickview.h"
-#include "nickmodel.h"
+#include "nickviewfilter.h"
 #include "networkmodel.h"
 #include "types.h"
 #include "client.h"
@@ -76,9 +76,7 @@ void NickView::showContextMenu(const QPoint & pos ) {
 
   QAction *whoisAction = nickContextMenu.addAction(tr("WHOIS"));
   QAction *versionAction = nickContextMenu.addAction(tr("VERSION"));
-  versionAction->setEnabled(false);
   QAction *pingAction = nickContextMenu.addAction(tr("PING"));
-  pingAction->setEnabled(false);
 
   nickContextMenu.addSeparator();
 
@@ -97,7 +95,6 @@ void NickView::showContextMenu(const QPoint & pos ) {
   nickContextMenu.addSeparator();
 
   QAction *queryAction = nickContextMenu.addAction(tr("Query"));
-  queryAction->setEnabled(false);
   QAction *dccChatAction = nickContextMenu.addAction(tr("DCC-Chat"));
   dccChatAction->setEnabled(false);
   QAction *sendFileAction = nickContextMenu.addAction(tr("Send file"));
@@ -105,15 +102,16 @@ void NickView::showContextMenu(const QPoint & pos ) {
 
   QAction *result = nickContextMenu.exec(QCursor::pos());
 
-  if(result == whoisAction)    { Client::instance()->userInput(bufferInfo, "/WHOIS "+username); }
-  else if(result == versionAction)  { Client::instance()->userInput(bufferInfo, "/CTCP "+username+" VERSION"); }
-  else if(result == pingAction)     { Client::instance()->userInput(bufferInfo, "/CTCP "+username+" PING"); }
+  if(result == whoisAction)         { Client::instance()->userInput(bufferInfo, QString("/WHOIS %1 %1").arg(username)); }
+  else if(result == versionAction)  { Client::instance()->userInput(bufferInfo, QString("/CTCP %1 VERSION").arg(username)); }
+  else if(result == pingAction)     { Client::instance()->userInput(bufferInfo, QString("/CTCP %1 PING ").arg(username)); }
 
-  else if(result == opAction)       { Client::instance()->userInput(bufferInfo, "/OP "+username); }
-  else if(result == deOpAction)     { Client::instance()->userInput(bufferInfo, "/DEOP "+username); }
-  else if(result == voiceAction)    { Client::instance()->userInput(bufferInfo, "/VOICE "+username); }
-  else if(result == deVoiceAction)  { Client::instance()->userInput(bufferInfo, "/DEVOICE "+username); }
+  else if(result == opAction)       { Client::instance()->userInput(bufferInfo, "/OP " + username); }
+  else if(result == deOpAction)     { Client::instance()->userInput(bufferInfo, "/DEOP " + username); }
+  else if(result == voiceAction)    { Client::instance()->userInput(bufferInfo, "/VOICE " + username); }
+  else if(result == deVoiceAction)  { Client::instance()->userInput(bufferInfo, "/DEVOICE " + username); }
 
-  else if(result == kickAction)     { Client::instance()->userInput(bufferInfo, "/KICK "+username); }
-  else if(result == kickBanAction)  { Client::instance()->userInput(bufferInfo, "/KICKBAN "+username); }
+  else if(result == kickAction)     { Client::instance()->userInput(bufferInfo, "/KICK " + username); }
+  else if(result == kickBanAction)  { Client::instance()->userInput(bufferInfo, "/KICKBAN " + username); }
+  else if(result == queryAction)    { Client::instance()->userInput(bufferInfo, "/QUERY " + username); }
 }