X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=6b883d9a9b149c981d955e2ee6ef967eab7a574d;hp=3153ba8b571d4a39081076f85a952c778c5000a6;hb=fc81975a545211f3ccd3d25e266477adad2c9445;hpb=1aef6bf0d3d2a7ef469b9a9f68ceb891cc8a896c

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 3153ba8b..6b883d9a 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -19,15 +19,21 @@
  ***************************************************************************/
 
 #include <QHeaderView>
+#include <QScrollBar>
 #include <QDebug>
 #include <QMenu>
 
 #include "nickview.h"
 #include "nickviewfilter.h"
 #include "networkmodel.h"
+#include "buffermodel.h"
 #include "types.h"
 #include "client.h"
 
+class ExpandAllEvent : public QEvent {
+public:
+  ExpandAllEvent() : QEvent(QEvent::User) {}
+};
 
 NickView::NickView(QWidget *parent)
   : QTreeView(parent)
@@ -35,28 +41,24 @@ NickView::NickView(QWidget *parent)
   setIndentation(10);
   setAnimated(true);
   header()->hide();
+  setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setSortingEnabled(true);
   sortByColumn(0, Qt::AscendingOrder);
 
   setContextMenuPolicy(Qt::CustomContextMenu);
 
   connect(this, SIGNAL(customContextMenuRequested(const QPoint&)),
-          this, SLOT(showContextMenu(const QPoint&)));
+	  this, SLOT(showContextMenu(const QPoint&)));
   connect(this, SIGNAL(activated( const QModelIndex& )),
           this, SLOT(startQuery( const QModelIndex& )));
 }
 
-NickView::~NickView() {
-}
-
 void NickView::init() {
   if(!model())
     return;
 
   for(int i = 1; i < model()->columnCount(); i++)
     setColumnHidden(i, true);
-
-  expandAll();
 }
 
 void NickView::setModel(QAbstractItemModel *model) {
@@ -64,9 +66,17 @@ void NickView::setModel(QAbstractItemModel *model) {
   init();
 }
 
-void NickView::rowsInserted(const QModelIndex &index, int start, int end) {
-  QTreeView::rowsInserted(index, start, end);
-  expandAll();  // FIXME We need to do this more intelligently. Maybe a pimped TreeView?
+void NickView::rowsInserted(const QModelIndex &parent, int start, int end) {
+  QTreeView::rowsInserted(parent, start, end);
+  if(model()->data(parent, NetworkModel::ItemTypeRole) == NetworkModel::UserCategoryItemType && !isExpanded(parent)) {
+    QCoreApplication::postEvent(this, new ExpandAllEvent);
+  }
+}
+
+void NickView::setRootIndex(const QModelIndex &index) {
+  QAbstractItemView::setRootIndex(index);
+  if(index.isValid())
+    QCoreApplication::postEvent(this, new ExpandAllEvent);
 }
 
 QString NickView::nickFromModelIndex(const QModelIndex & index) {
@@ -100,10 +110,9 @@ void NickView::showContextMenu(const QPoint & pos ) {
   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 *banAction = kickBanMenu->addAction(tr("Ban %1").arg(nick));
   QAction *kickBanAction = kickBanMenu->addAction(tr("Kickban %1").arg(nick));
-  kickBanMenu->setEnabled(false);
   QAction *ignoreAction = nickContextMenu.addAction(tr("Ignore"));
   ignoreAction->setEnabled(false);
 
@@ -128,17 +137,64 @@ 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 == kickBanAction)  { executeCommand(bufferInfo, QString("/KICKBAN %1").arg(nick)); }
-  else if(action == queryAction)    { executeCommand(bufferInfo, QString("/QUERY %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)    { startQuery(index); }
 
 }
 
 void NickView::startQuery(const QModelIndex & index) {
   QString nick = nickFromModelIndex(index);
-  BufferInfo bufferInfo = bufferInfoFromModelIndex(index);
-  executeCommand(bufferInfo, QString("/QUERY %1").arg(nick));
+  bool activated = false;
+
+  if(QSortFilterProxyModel *nickviewFilter = qobject_cast<QSortFilterProxyModel *>(model())) {
+    // rootIndex() is the channel, parent() is the corresponding network
+    QModelIndex networkIndex = rootIndex().parent(); 
+    QModelIndex source_networkIndex = nickviewFilter->mapToSource(networkIndex);
+    for(int i = 0; i < Client::networkModel()->rowCount(source_networkIndex); i++) {
+      QModelIndex childIndex = source_networkIndex.child( i, 0);
+      if(nick.toLower() == childIndex.data().toString().toLower()) {
+        QModelIndex queryIndex = Client::bufferModel()->mapFromSource(childIndex);
+        Client::bufferModel()->setCurrentIndex(queryIndex);
+        activated = true;
+      }
+    }
+  }
+  if(!activated) {
+    BufferInfo bufferInfo = bufferInfoFromModelIndex(index);
+    executeCommand(bufferInfo, QString("/QUERY %1").arg(nick));
+  }
 }
 
 void NickView::executeCommand(const BufferInfo & bufferInfo, const QString & command) {
   Client::instance()->userInput(bufferInfo, command);
 }
+
+void NickView::customEvent(QEvent *event) {
+  // THIS IS A REPLACEMENT FOR expandAll()
+  /* WARNING: do not call expandAll()!
+   * it fucks up big time in combination with sorting and changing the rootIndex
+   * the following sequence of commands leads to unexpected behavior when inserting new items
+   * setSortingEnabled(true);
+   * setModel();
+   * expandAll();
+   * setRootIndex();
+   */
+  if(event->type() != QEvent::User)
+    return;
+
+  QModelIndex topLevelIdx;
+  for(int i = 0; i < model()->rowCount(rootIndex()); i++) {
+    topLevelIdx = model()->index(i, 0, rootIndex());
+    if(isExpanded(topLevelIdx))
+      continue;
+    else {
+      expand(topLevelIdx);
+      if(i < model()->rowCount(rootIndex()) - 1)
+        QCoreApplication::postEvent(this, new ExpandAllEvent);
+      break;
+    }
+  }
+  event->accept();
+}