X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=bfdaf1e81e281a98243db4203588822ced10508c;hp=0c4e853bcab080580c2d8e5ab99a22569b9f7bb8;hb=bd6d28b16df0b712fa30198c235dddf559d076ef;hpb=08aac67d4dc813ed541a81d06fb83d9c4fec5834

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 0c4e853b..bfdaf1e8 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -19,15 +19,22 @@
  ***************************************************************************/
 
 #include <QHeaderView>
+#include <QScrollBar>
 #include <QDebug>
 #include <QMenu>
 
+#include "buffermodel.h"
+#include "client.h"
 #include "nickview.h"
-#include "nickmodel.h"
+#include "nickviewfilter.h"
 #include "networkmodel.h"
+#include "quasselui.h"
 #include "types.h"
-#include "client.h"
 
+class ExpandAllEvent : public QEvent {
+public:
+  ExpandAllEvent() : QEvent(QEvent::User) {}
+};
 
 NickView::NickView(QWidget *parent)
   : QTreeView(parent)
@@ -35,16 +42,21 @@ NickView::NickView(QWidget *parent)
   setIndentation(10);
   setAnimated(true);
   header()->hide();
+  setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setSortingEnabled(true);
   sortByColumn(0, Qt::AscendingOrder);
 
   setContextMenuPolicy(Qt::CustomContextMenu);
+  setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-  connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), 
-          this, SLOT(showContextMenu(const QPoint&)));
-}
+  connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(showContextMenu(const QPoint&)));
 
-NickView::~NickView() {
+#if defined Q_WS_QWS || defined Q_WS_X11
+  connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(startQuery(QModelIndex)));
+#else
+  // afaik this is better on Mac and Windows
+  connect(this, SIGNAL(activated(QModelIndex)), SLOT(startQuery(QModelIndex)));
+#endif
 }
 
 void NickView::init() {
@@ -53,8 +65,6 @@ void NickView::init() {
 
   for(int i = 1; i < model()->columnCount(); i++)
     setColumnHidden(i, true);
-
-  expandAll();
 }
 
 void NickView::setModel(QAbstractItemModel *model) {
@@ -62,24 +72,74 @@ 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);
 }
 
 void NickView::showContextMenu(const QPoint & pos ) {
   QModelIndex index = indexAt(pos);
-  QString username = index.sibling(index.row(), 0).data().toString();
-  BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+  if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType)
+    return;
 
-  QMenu nickContextMenu(this);
-  nickContextMenu.addAction(tr("context menu for %1").arg(username));
-  nickContextMenu.addSeparator();
+  QModelIndexList indexList = selectedIndexes();
+  // make sure the item we clicked on is first
+  indexList.removeAll(index);
+  indexList.prepend(index);
 
-  QAction *whoisAction = nickContextMenu.addAction(tr("WHOIS"));
-  QAction *result = nickContextMenu.exec(QCursor::pos());
+  QMenu contextMenu(this);
+  Client::mainUi()->actionProvider()->addActions(&contextMenu, indexList);
+  contextMenu.exec(QCursor::pos());
+}
+
+void NickView::startQuery(const QModelIndex &index) {
+  if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType)
+    return;
+
+  IrcUser *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+  NetworkId networkId = index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
+  if(!ircUser || !networkId.isValid())
+    return;
+
+  BufferId bufId = Client::networkModel()->bufferId(networkId, ircUser->nick());
+  if(bufId.isValid())
+    Client::bufferModel()->switchToBuffer(bufId);
+  else
+    Client::userInput(index.data(NetworkModel::BufferInfoRole).value<BufferInfo>(), QString("/QUERY %1").arg(ircUser->nick()));
+}
+
+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;
 
-  if (result == whoisAction ) {
-    Client::userInput(bufferInfo, "/WHOIS "+username);
+  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();
 }