ban-handler implemented (now also available in the context menu)

[quassel.git] / src / uisupport / nickview.cpp

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index a8de3bc..5470d69 100644 (file)
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include <QHeaderView>
  ***************************************************************************/
 
 #include <QHeaderView>

+#include <QScrollBar>

 #include <QDebug>
 #include <QMenu>
 
 #include <QDebug>
 #include <QMenu>
 


@@ -42,6 +43,7 @@ NickView::NickView(QWidget *parent)
   setIndentation(10);
   setAnimated(true);
   header()->hide();
   setIndentation(10);
   setAnimated(true);
   header()->hide();

+  setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

   setSortingEnabled(true);
   sortByColumn(0, Qt::AscendingOrder);
 
   setSortingEnabled(true);
   sortByColumn(0, Qt::AscendingOrder);
 


@@ -122,10 +124,9 @@ void NickView::showContextMenu(const QPoint & pos ) {
   QAction *deVoiceAction = modeMenu->addAction(tr("Devoice %1").arg(nick));
 
   QMenu *kickBanMenu = nickContextMenu.addMenu(tr("Kick/Ban"));
   QAction *deVoiceAction = modeMenu->addAction(tr("Devoice %1").arg(nick));
 
   QMenu *kickBanMenu = nickContextMenu.addMenu(tr("Kick/Ban"));

-  //TODO: add kick message from network identity (kick reason)

   QAction *kickAction = kickBanMenu->addAction(tr("Kick %1").arg(nick));
   QAction *kickAction = kickBanMenu->addAction(tr("Kick %1").arg(nick));

+  QAction *banAction = kickBanMenu->addAction(tr("Ban %1").arg(nick));

   QAction *kickBanAction = kickBanMenu->addAction(tr("Kickban %1").arg(nick));
   QAction *kickBanAction = kickBanMenu->addAction(tr("Kickban %1").arg(nick));

-  kickBanMenu->setEnabled(false);

   QAction *ignoreAction = nickContextMenu.addAction(tr("Ignore"));
   ignoreAction->setEnabled(false);
 
   QAction *ignoreAction = nickContextMenu.addAction(tr("Ignore"));
   ignoreAction->setEnabled(false);
 


@@ -150,7 +151,9 @@ void NickView::showContextMenu(const QPoint & pos ) {
   else if(action == deVoiceAction)  { executeCommand(bufferInfo, QString("/DEVOICE %1").arg(nick)); }
 
   else if(action == kickAction)     { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); }
   else if(action == deVoiceAction)  { executeCommand(bufferInfo, QString("/DEVOICE %1").arg(nick)); }
 
   else if(action == kickAction)     { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); }

-  else if(action == kickBanAction)  { executeCommand(bufferInfo, QString("/KICKBAN %1").arg(nick)); }
+  else if(action == banAction)      { executeCommand(bufferInfo, QString("/BAN %1").arg(nick)); }
+  else if(action == kickBanAction)  { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); 
+                                      executeCommand(bufferInfo, QString("/BAN %1").arg(nick)); }

   else if(action == queryAction)    { executeCommand(bufferInfo, QString("/QUERY %1").arg(nick)); }
 
 }
   else if(action == queryAction)    { executeCommand(bufferInfo, QString("/QUERY %1").arg(nick)); }
 
 }