doubleclick on nick now selects the buffer if buffer is available

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 7aa2082..75dd515 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -586,7 +586,7 @@ QVariant IrcUserItem::data(int column, int role) const {
 QString IrcUserItem::toolTip(int column) const {
   Q_UNUSED(column);
   QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
 QString IrcUserItem::toolTip(int column) const {
   Q_UNUSED(column);
   QStringList toolTip(QString("<b>%1</b>").arg(nickName()));

-  if(_ircUser->userModes() != "") toolTip[0].append(QString("(%1)").arg(_ircUser->userModes()));
+  if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));

   if(_ircUser->isAway()) toolTip[0].append(" is away");
   if(!_ircUser->awayMessage().isEmpty()) toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
   if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName());
   if(_ircUser->isAway()) toolTip[0].append(" is away");
   if(!_ircUser->awayMessage().isEmpty()) toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
   if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName());

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 78cb709..4691318 100644 (file)
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -25,6 +25,7 @@
 #include "nickview.h"
 #include "nickviewfilter.h"
 #include "networkmodel.h"
 #include "nickview.h"
 #include "nickviewfilter.h"
 #include "networkmodel.h"

+#include "buffermodel.h"

 #include "types.h"
 #include "client.h"
 
 #include "types.h"
 #include "client.h"
 


@@ -149,8 +150,25 @@ void NickView::showContextMenu(const QPoint & pos ) {
 
 void NickView::startQuery(const QModelIndex & index) {
   QString nick = nickFromModelIndex(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) {
 }
 
 void NickView::executeCommand(const BufferInfo & bufferInfo, const QString & command) {