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

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index bfdaf1e8..8b157445 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,6 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "nickview.h"
+
+#include <QApplication>
 #include <QHeaderView>
 #include <QScrollBar>
 #include <QDebug>
@@ -25,22 +28,17 @@
 
 #include "buffermodel.h"
 #include "client.h"
+#include "contextmenuactionprovider.h"
+#include "graphicalui.h"
 #include "nickview.h"
 #include "nickviewfilter.h"
 #include "networkmodel.h"
-#include "quasselui.h"
 #include "types.h"
 
-class ExpandAllEvent : public QEvent {
-public:
-  ExpandAllEvent() : QEvent(QEvent::User) {}
-};
-
 NickView::NickView(QWidget *parent)
   : QTreeView(parent)
 {
   setIndentation(10);
-  setAnimated(true);
   header()->hide();
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setSortingEnabled(true);
@@ -49,6 +47,10 @@ NickView::NickView(QWidget *parent)
   setContextMenuPolicy(Qt::CustomContextMenu);
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 
+//   // breaks with Qt 4.8
+//   if(QString("4.8.0") > qVersion()) // FIXME breaks with Qt versions >= 4.10!
+     setAnimated(true);
+
   connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(showContextMenu(const QPoint&)));
 
 #if defined Q_WS_QWS || defined Q_WS_X11
@@ -65,38 +67,60 @@ void NickView::init() {
 
   for(int i = 1; i < model()->columnCount(); i++)
     setColumnHidden(i, true);
+
+  connect(selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), SIGNAL(selectionUpdated()));
+  connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SIGNAL(selectionUpdated()));
 }
 
-void NickView::setModel(QAbstractItemModel *model) {
-  QTreeView::setModel(model);
+void NickView::setModel(QAbstractItemModel *model_) {
+  if(model())
+    disconnect(model(), 0, this, 0);
+
+  QTreeView::setModel(model_);
   init();
 }
 
 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);
+    unanimatedExpandAll();
   }
 }
 
 void NickView::setRootIndex(const QModelIndex &index) {
   QAbstractItemView::setRootIndex(index);
   if(index.isValid())
-    QCoreApplication::postEvent(this, new ExpandAllEvent);
+    unanimatedExpandAll();
 }
 
-void NickView::showContextMenu(const QPoint & pos ) {
-  QModelIndex index = indexAt(pos);
-  if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType)
-    return;
+QModelIndexList NickView::selectedIndexes() const {
+  QModelIndexList indexList = QTreeView::selectedIndexes();
 
-  QModelIndexList indexList = selectedIndexes();
   // make sure the item we clicked on is first
-  indexList.removeAll(index);
-  indexList.prepend(index);
+  if(indexList.contains(currentIndex())) {
+    indexList.removeAll(currentIndex());
+    indexList.prepend(currentIndex());
+  }
+
+  return indexList;
+}
+
+void NickView::unanimatedExpandAll() {
+  // since of Qt Version 4.8.0 the default expandAll will not properly work if
+  // animations are enabled. Therefore we perform an unanimated expand when a
+  // model is set or a toplevel node is inserted.
+  bool wasAnimated = isAnimated();
+  setAnimated(false);
+  expandAll();
+  setAnimated(wasAnimated);
+}
+
+
+void NickView::showContextMenu(const QPoint &pos ) {
+  Q_UNUSED(pos);
 
   QMenu contextMenu(this);
-  Client::mainUi()->actionProvider()->addActions(&contextMenu, indexList);
+  GraphicalUi::contextMenuActionProvider()->addActions(&contextMenu, selectedIndexes());
   contextMenu.exec(QCursor::pos());
 }
 
@@ -109,37 +133,5 @@ void NickView::startQuery(const QModelIndex &index) {
   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;
-
-  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();
+  Client::bufferModel()->switchToOrStartQuery(networkId, ircUser->nick());
 }