doubleclick on nick now selects the buffer if buffer is available

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

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index ba96c1e..4691318 100644 (file)
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -25,12 +25,14 @@
 #include "nickview.h"
 #include "nickviewfilter.h"
 #include "networkmodel.h"
+#include "buffermodel.h"
 #include "types.h"
 #include "client.h"
 
 
 NickView::NickView(QWidget *parent)
-  : QTreeView(parent)
+  : QTreeView(parent),
+    _sizeHint(QTreeView::sizeHint())
 {
   setIndentation(10);
   setAnimated(true);
@@ -41,7 +43,7 @@ NickView::NickView(QWidget *parent)
   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& )));
 }
@@ -57,6 +59,7 @@ void NickView::init() {
     setColumnHidden(i, true);
 
   expandAll();
+  updateSizeHint();
 }
 
 void NickView::setModel(QAbstractItemModel *model) {
@@ -64,9 +67,21 @@ 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))
+    expand(parent);
+  updateSizeHint();
+}
+
+void NickView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
+  QTreeView::rowsAboutToBeRemoved(parent, start, end);
+  updateSizeHint();
+}
+
+void NickView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
+  QTreeView::dataChanged(topLeft, bottomRight);
+  updateSizeHint();
 }
 
 QString NickView::nickFromModelIndex(const QModelIndex & index) {
@@ -135,22 +150,44 @@ void NickView::showContextMenu(const QPoint & pos ) {
 
 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);
 }
 
-QSize NickView::sizeHint() const {
+void NickView::updateSizeHint() {
   if(!model())
-    return QTreeView::sizeHint();
-  
+    return;
+
   int columnSize = 0;
   for(int i = 0; i < model()->columnCount(); i++) {
     if(!isColumnHidden(i))
       columnSize += sizeHintForColumn(i);
   }
-  return QSize(columnSize, 50);
+
+  _sizeHint = QSize(columnSize, 50);
+}
+
+QSize NickView::sizeHint() const {
+  return _sizeHint;
 }