Merging r820:825 from trunk to branches/0.3

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

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 78cb709..7a2c477 100644 (file)
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -19,23 +19,31 @@
  ***************************************************************************/
 
 #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"
 
+struct LazySizeHint {
+  LazySizeHint() : size(QSize()), needsUpdate(true) {};
+  QSize size;
+  bool needsUpdate;
+};
 
 NickView::NickView(QWidget *parent)
   : QTreeView(parent),
-    _sizeHint(QTreeView::sizeHint())
+    _sizeHint(new LazySizeHint())
 {
   setIndentation(10);
   setAnimated(true);
   header()->hide();
+  setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setSortingEnabled(true);
   sortByColumn(0, Qt::AscendingOrder);
 
@@ -48,6 +56,8 @@ NickView::NickView(QWidget *parent)
 }
 
 NickView::~NickView() {
+  delete _sizeHint;
+  _sizeHint = 0;
 }
 
 void NickView::init() {
@@ -58,7 +68,7 @@ void NickView::init() {
     setColumnHidden(i, true);
 
   expandAll();
-  updateSizeHint();
+  _sizeHint->needsUpdate = true;
 }
 
 void NickView::setModel(QAbstractItemModel *model) {
@@ -70,17 +80,17 @@ 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();
+  _sizeHint->needsUpdate = true;
 }
 
 void NickView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
   QTreeView::rowsAboutToBeRemoved(parent, start, end);
-  updateSizeHint();
+  _sizeHint->needsUpdate = true;
 }
 
 void NickView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
   QTreeView::dataChanged(topLeft, bottomRight);
-  updateSizeHint();
+  _sizeHint->needsUpdate = true;
 }
 
 QString NickView::nickFromModelIndex(const QModelIndex & index) {
@@ -114,10 +124,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);
 
@@ -142,34 +151,50 @@ 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::updateSizeHint() {
-  if(!model())
-    return;
-
-  int columnSize = 0;
-  for(int i = 0; i < model()->columnCount(); i++) {
-    if(!isColumnHidden(i))
-      columnSize += sizeHintForColumn(i);
-  }
-
-  _sizeHint = QSize(columnSize, 50);
-}
-
 QSize NickView::sizeHint() const {
-  return _sizeHint;
+  Q_CHECK_PTR(_sizeHint);
+  if(_sizeHint->needsUpdate && model()) {;
+    int columnSize = 0;
+    for(int i = 0; i < model()->columnCount(); i++) {
+      if(!isColumnHidden(i))
+       columnSize += sizeHintForColumn(i);
+    }
+    _sizeHint->size = QSize(columnSize, 50);
+    _sizeHint->needsUpdate = false;
+  }
+  return _sizeHint->size;
 }