X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=6f1cc9d0598e28bc8ae74c81c437877f9245760f;hb=37c1534315c0c448b9991d2dc561691fe1b34c01;hp=0c93dbf89c66107c6e6e1d968fe19c5110d34e5e;hpb=a32e93fed93e5c4ba9b9c46496ba62433618fcfa;p=quassel.git

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 0c93dbf8..6f1cc9d0 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,32 +76,44 @@ 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();
-  
-  QMenu *modeMenu = nickContextMenu.addMenu(tr("modi"));
-  QAction *opAction = modeMenu->addAction(tr("OP %1").arg(username));
-  QAction *deOpAction = modeMenu->addAction(tr("de-OP %1").arg(username));
-  QAction *voiceAction = modeMenu->addAction(tr("VOICE %1").arg(username));
-  QAction *deVoiceAction = modeMenu->addAction(tr("de-VOICE %1").arg(username));
-  nickContextMenu.addSeparator();
-  
-  QMenu *kickBanMenu = nickContextMenu.addMenu(tr("kick / ban"));
-  QAction *kickAction = kickBanMenu->addAction(tr("KICK %1").arg(username));
-  QAction *kickBanAction = kickBanMenu->addAction(tr("KICK+BAN %1").arg(username));
+
+  QMenu *modeMenu = nickContextMenu.addMenu(tr("Modes"));
+  QAction *opAction = modeMenu->addAction(tr("Op %1").arg(username));
+  QAction *deOpAction = modeMenu->addAction(tr("Deop %1").arg(username));
+  QAction *voiceAction = modeMenu->addAction(tr("Voice %1").arg(username));
+  QAction *deVoiceAction = modeMenu->addAction(tr("Devoice %1").arg(username));
+
+  QMenu *kickBanMenu = nickContextMenu.addMenu(tr("Kick/Ban"));
+  QAction *kickAction = kickBanMenu->addAction(tr("Kick %1").arg(username));
+  QAction *kickBanAction = kickBanMenu->addAction(tr("Kickban %1").arg(username));
+  QAction *ignoreAction = nickContextMenu.addAction(tr("Ignore"));
+  ignoreAction->setEnabled(false);
+
   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"));
+  sendFileAction->setEnabled(false);
+
   QAction *result = nickContextMenu.exec(QCursor::pos());
 
-  if (result == whoisAction)    { Client::instance()->userInput(bufferInfo, "/WHOIS "+username); }
-  if (result == versionAction)  { Client::instance()->userInput(bufferInfo, "/CTCP "+username+" VERSION"); }
-  if (result == pingAction)     { Client::instance()->userInput(bufferInfo, "/CTCP "+username+" PING"); }
-  
-  if (result == opAction)       { Client::instance()->userInput(bufferInfo, "/OP "+username); }
-  if (result == deOpAction)     { Client::instance()->userInput(bufferInfo, "/DEOP "+username); }
-  if (result == voiceAction)    { Client::instance()->userInput(bufferInfo, "/VOICE "+username); }
-  if (result == deVoiceAction)  { Client::instance()->userInput(bufferInfo, "/DEVOICE "+username); }
-  
-  if (result == kickAction)     { Client::instance()->userInput(bufferInfo, "/KICK "+username); }
-  if (result == kickBanAction)  { Client::instance()->userInput(bufferInfo, "/KICKBAN "+username); }
+  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"); }
+
+  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); }
 }