X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=5f33df45ae892cc58e075974c765d2c093d1eb87;hp=aa82b58a82169daec140d2c018b4e4683aafc5b8;hb=f429bd6dfbea50ad4690875f1466a920f7a3b509;hpb=f1e45389df014fb5445ee96769bf02dcf34f1e21

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index aa82b58a..5f33df45 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -18,22 +18,72 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "client.h"
-#include "buffersyncer.h"
 #include "bufferview.h"
-#include "networkmodel.h"
+
+#include "buffermodel.h"
+#include "bufferviewfilter.h"
+#include "buffersyncer.h"
+#include "client.h"
+#include "iconloader.h"
+#include "mappedselectionmodel.h"
 #include "network.h"
+#include "networkmodel.h"
+
+#include "uisettings.h"
+
+#include <QAction>
+#include <QFlags>
+#include <QHeaderView>
+#include <QInputDialog>
+#include <QLineEdit>
+#include <QMenu>
+#include <QMessageBox>
+#include <QSet>
 
 /*****************************************
 * The TreeView showing the Buffers
 *****************************************/
 // Please be carefull when reimplementing methods which are used to inform the view about changes to the data
 // to be on the safe side: call QTreeView's method aswell
-BufferView::BufferView(QWidget *parent) : QTreeView(parent) {
-  setContextMenuPolicy(Qt::CustomContextMenu);
+BufferView::BufferView(QWidget *parent)
+  : QTreeView(parent),
+    showChannelList(tr("Show Channel List"), this),
+    _connectNetAction(tr("Connect"), this),
+    _disconnectNetAction(tr("Disconnect"), this),
+    _joinChannelAction(tr("Join Channel"), this),
+
+    _joinBufferAction(tr("Join"), this),
+    _partBufferAction(tr("Part"), this),
+    _hideBufferTemporarilyAction(tr("Hide buffers"), this),
+    _hideBufferPermanentlyAction(tr("Hide buffers permanently"), this),
+    _removeBufferAction(tr("Delete buffer"), this),
+    _ignoreListAction(tr("Ignore list"), this),
 
-  connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
-          this, SLOT(showContextMenu(const QPoint &)));
+    _hideJoinAction(tr("Join Events"), this),
+    _hidePartAction(tr("Part Events"), this),
+    _hideKillAction(tr("Kill Events"), this),
+    _hideQuitAction(tr("Quit Events"), this),
+    _hideModeAction(tr("Mode Events"), this)
+
+{
+  _hideJoinAction.setCheckable(true);
+  _hidePartAction.setCheckable(true);
+  _hideKillAction.setCheckable(true);
+  _hideQuitAction.setCheckable(true);
+  _hideModeAction.setCheckable(true);
+  _hideJoinAction.setEnabled(false);
+  _hidePartAction.setEnabled(false);
+  _ignoreListAction.setEnabled(false);
+  _hideKillAction.setEnabled(false);
+  _hideQuitAction.setEnabled(false);
+  _hideModeAction.setEnabled(false);
+
+  showChannelList.setIcon(SmallIcon("format-list-unordered"));
+
+  connect(this, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(on_collapse(const QModelIndex &)));
+  connect(this, SIGNAL(expanded(const QModelIndex &)), this, SLOT(on_expand(const QModelIndex &)));
+
+  setSelectionMode(QAbstractItemView::ExtendedSelection);
 }
 
 void BufferView::init() {
@@ -53,20 +103,20 @@ void BufferView::init() {
 
   setSortingEnabled(true);
   sortByColumn(0, Qt::AscendingOrder);
+#ifndef Q_WS_QWS
+  // this is a workaround to not join channels automatically... we need a saner way to navigate for qtopia anyway though,
+  // such as mark first, activate at second click...
   connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
-}
-
-void BufferView::setFilteredModel(QAbstractItemModel *model, BufferViewFilter::Modes mode, QList<NetworkId> nets) {
-  BufferViewFilter *filter = new BufferViewFilter(model, mode, nets);
-  setModel(filter);
-  connect(this, SIGNAL(removeBuffer(const QModelIndex &)), filter, SLOT(removeBuffer(const QModelIndex &)));
+#else
+  connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));  // Qtopia uses single click for activation
+#endif
 }
 
 void BufferView::setModel(QAbstractItemModel *model) {
   delete selectionModel();
+
   QTreeView::setModel(model);
   init();
-
   // remove old Actions
   QList<QAction *> oldactions = header()->actions();
   foreach(QAction *action, oldactions) {
@@ -74,9 +124,12 @@ void BufferView::setModel(QAbstractItemModel *model) {
     action->deleteLater();
   }
 
+  if(!model)
+    return;
+
   QString sectionName;
   QAction *showSection;
-  for(int i = 0; i < model->columnCount(); i++) {
+  for(int i = 1; i < model->columnCount(); i++) {
     sectionName = (model->headerData(i, Qt::Horizontal, Qt::DisplayRole)).toString();
     showSection = new QAction(sectionName, header());
     showSection->setCheckable(true);
@@ -85,7 +138,74 @@ void BufferView::setModel(QAbstractItemModel *model) {
     connect(showSection, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
     header()->addAction(showSection);
   }
-  
+
+}
+
+void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) {
+  BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
+  if(filter) {
+    filter->setConfig(config);
+    setConfig(config);
+    return;
+  }
+
+  if(model()) {
+    disconnect(this, 0, model(), 0);
+    disconnect(model(), 0, this, 0);
+  }
+
+  if(!model_) {
+    setModel(model_);
+  } else {
+    BufferViewFilter *filter = new BufferViewFilter(model_, config);
+    setModel(filter);
+    connect(filter, SIGNAL(configChanged()), this, SLOT(on_configChanged()));
+  }
+  setConfig(config);
+}
+
+void BufferView::setSelectionModel(QItemSelectionModel *selectionModel) {
+  if(QTreeView::selectionModel())
+    disconnect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+	       model(), SIGNAL(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
+
+  QTreeView::setSelectionModel(selectionModel);
+  BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
+  if(filter) {
+    connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+	    filter, SLOT(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
+  }
+}
+
+void BufferView::setConfig(BufferViewConfig *config) {
+  if(_config == config)
+    return;
+
+  if(_config) {
+    disconnect(_config, 0, this, 0);
+  }
+
+  _config = config;
+  if(config) {
+    connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(setRootIndexForNetworkId(const NetworkId &)));
+    setRootIndexForNetworkId(config->networkId());
+  } else {
+    setRootIndex(QModelIndex());
+  }
+}
+
+void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) {
+  if(!networkId.isValid() || !model()) {
+    setRootIndex(QModelIndex());
+  } else {
+    int networkCount = model()->rowCount();
+    QModelIndex child;
+    for(int i = 0; i < networkCount; i++) {
+      child = model()->index(i, 0);
+      if(networkId == model()->data(child, NetworkModel::NetworkIdRole).value<NetworkId>())
+	setRootIndex(child);
+    }
+  }
 }
 
 void BufferView::joinChannel(const QModelIndex &index) {
@@ -95,128 +215,385 @@ void BufferView::joinChannel(const QModelIndex &index) {
     return;
 
   BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-  
+
   Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));
 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {
   if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) {
     event->accept();
-    QModelIndex index = selectionModel()->selectedIndexes().first();
-    if(index.isValid()) {
-      emit removeBuffer(index);
-    }
+    removeSelectedBuffers();
   }
   QTreeView::keyPressEvent(event);
 }
 
-// ensure that newly inserted network nodes are expanded per default
+void BufferView::removeSelectedBuffers(bool permanently) {
+  if(!config())
+    return;
+
+  BufferId bufferId;
+  QSet<BufferId> removedRows;
+  foreach(QModelIndex index, selectionModel()->selectedIndexes()) {
+    if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
+      continue;
+
+    bufferId = index.data(NetworkModel::BufferIdRole).value<BufferId>();
+    if(removedRows.contains(bufferId))
+      continue;
+
+    removedRows << bufferId;
+
+    if(permanently)
+      config()->requestRemoveBufferPermanently(bufferId);
+    else
+      config()->requestRemoveBuffer(bufferId);
+  }
+}
+
 void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);
-  if(model()->rowCount(parent) == 1 && parent != QModelIndex()) {
+
+  // ensure that newly inserted network nodes are expanded per default
+  if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
+    return;
+
+  if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemActiveRole) == true) {
     // without updating the parent the expand will have no effect... Qt Bug?
-    update(parent); 
+    update(parent);
     expand(parent);
   }
 }
 
+void BufferView::on_configChanged() {
+  Q_ASSERT(model());
+
+  // expand all active networks... collapse inactive ones... unless manually changed
+  QModelIndex networkIdx;
+  NetworkId networkId;
+  for(int row = 0; row < model()->rowCount(); row++) {
+    networkIdx = model()->index(row, 0);
+    if(model()->rowCount(networkIdx) ==  0)
+      continue;
+
+    networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value<NetworkId>();
+    if(!networkId.isValid())
+      continue;
+
+    update(networkIdx);
+
+    bool expandNetwork = false;
+    if(_expandedState.contains(networkId))
+      expandNetwork = _expandedState[networkId];
+    else
+      expandNetwork = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool();
+
+    if(expandNetwork)
+      expand(networkIdx);
+    else
+      collapse(networkIdx);
+  }
+
+  // update selection to current one
+  MappedSelectionModel *mappedSelectionModel = qobject_cast<MappedSelectionModel *>(selectionModel());
+  if(!config() || !mappedSelectionModel)
+    return;
+
+  mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current);
+  mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+}
+
+void BufferView::on_collapse(const QModelIndex &index) {
+  storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), false);
+}
+
+void BufferView::on_expand(const QModelIndex &index) {
+  storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), true);
+}
+
+void BufferView::storeExpandedState(NetworkId networkId, bool expanded) {
+  _expandedState[networkId] = expanded;
+}
+
+void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
+  QTreeView::dataChanged(topLeft, bottomRight);
+
+  // determine how many items have been changed and if any of them is a networkitem
+  // which just swichted from active to inactive or vice versa
+  if(topLeft.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
+    return;
+
+  for(int i = topLeft.row(); i <= bottomRight.row(); i++) {
+    QModelIndex networkIdx = topLeft.sibling(i, 0);
+    if(model()->rowCount(networkIdx) == 0)
+      continue;
+
+    bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
+#ifdef SPUTDEV
+    if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, true);
+#else
+    if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, isActive);
+#endif
+  }
+}
+
 void BufferView::toggleHeader(bool checked) {
   QAction *action = qobject_cast<QAction *>(sender());
   header()->setSectionHidden((action->property("column")).toInt(), !checked);
 }
 
-void BufferView::showContextMenu(const QPoint &pos) {
-  QModelIndex index = indexAt(pos);
-  if(!index.isValid()) return;
-  QMenu contextMenu(this);
-  QAction *connectNetAction = new QAction(tr("Connect"), this);
-  QAction *disconnectNetAction = new QAction(tr("Disconnect"), this);
-
-  QAction *joinBufferAction = new QAction(tr("Join"), this);
-  QAction *partBufferAction = new QAction(tr("Part"), this);
-  QAction *removeBufferAction = new QAction(tr("Delete buffer"), this);
-
-  QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), this);
-  QAction *hideJoinAction = hideEventsMenu->addAction(tr("Join Events"));
-  QAction *hidePartAction = hideEventsMenu->addAction(tr("Part Events"));
-  QAction *hideKillAction = hideEventsMenu->addAction(tr("Kill Events"));
-  QAction *hideQuitAction = hideEventsMenu->addAction(tr("Quit Events"));
-  QAction *hideModeAction = hideEventsMenu->addAction(tr("Mode Events"));
-  hideJoinAction->setCheckable(true);
-  hidePartAction->setCheckable(true);
-  hideKillAction->setCheckable(true);
-  hideQuitAction->setCheckable(true);
-  hideModeAction->setCheckable(true);
-  hideJoinAction->setEnabled(false);
-  hidePartAction->setEnabled(false);
-  hideKillAction->setEnabled(false);
-  hideQuitAction->setEnabled(false);
-  hideModeAction->setEnabled(false);
-
-  QAction *ignoreListAction = new QAction(tr("Ignore list"), this);
-  ignoreListAction->setEnabled(false);
-  QAction *whoBufferAction = new QAction(tr("WHO"), this);
-
-  if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) {
-    if(index.data(NetworkModel::ItemActiveRole).toBool()) {
-      contextMenu.addAction(disconnectNetAction);
+bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState) {
+  if(!index.isValid())
+    return false;
+
+  ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool()
+    ? ActiveState
+    : InactiveState;
+
+  if(!(isActive & requiredActiveState))
+    return false;
+
+  return true;
+}
+
+void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
+  if(checkRequirements(index, requiredActiveState)) {
+    menu.addAction(&action);
+    action.setVisible(true);
+  } else {
+    action.setVisible(false);
+  }
+}
+
+void BufferView::addItemToMenu(QAction &action, QMenu &menu, bool condition) {
+  if(condition) {
+    menu.addAction(&action);
+    action.setVisible(true);
+  } else {
+    action.setVisible(false);
+  }
+}
+
+
+void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
+  if(checkRequirements(index, requiredActiveState)) {
+    menu.addMenu(&subMenu);
+    subMenu.setVisible(true);
+  } else {
+    subMenu.setVisible(false);
+  }
+}
+
+void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
+  if(checkRequirements(index, requiredActiveState)) {
+    menu.addSeparator();
+  }
+}
+
+QMenu *BufferView::createHideEventsSubMenu(QMenu &menu) {
+  // QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), &menu);
+  QMenu *hideEventsMenu = menu.addMenu(tr("Hide Events"));
+  hideEventsMenu->addAction(&_hideJoinAction);
+  hideEventsMenu->addAction(&_hidePartAction);
+  hideEventsMenu->addAction(&_hideKillAction);
+  hideEventsMenu->addAction(&_hideQuitAction);
+  hideEventsMenu->addAction(&_hideModeAction);
+  return hideEventsMenu;
+}
+
+void BufferView::contextMenuEvent(QContextMenuEvent *event) {
+  QModelIndex index = indexAt(event->pos());
+  if(!index.isValid())
+    index = rootIndex();
+  if(!index.isValid())
+    return;
+
+  const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value<NetworkId>());
+  Q_CHECK_PTR(network);
+
+  QPixmap connectionStateIcon;
+  if(network) {
+    if(network->connectionState() == Network::Initialized) {
+      connectionStateIcon = SmallIcon("network-connect");
+    } else if(network->connectionState() == Network::Disconnected) {
+      connectionStateIcon = SmallIcon("network-disconnect");
     } else {
-      contextMenu.addAction(connectNetAction);
+      connectionStateIcon = SmallIcon("network-wired");  // FIXME network-connecting
     }
   }
 
-  BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-  QString channelname = index.sibling(index.row(), 0).data().toString();
-
-  if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType) {
-    if(bufferInfo.type() != BufferInfo::ChannelBuffer && bufferInfo.type() != BufferInfo::QueryBuffer) return;
-    contextMenu.addAction(joinBufferAction);
-    contextMenu.addAction(partBufferAction);
-    contextMenu.addAction(removeBufferAction);
-    contextMenu.addMenu(hideEventsMenu);
-    contextMenu.addAction(ignoreListAction);
-    contextMenu.addAction(whoBufferAction);
-
-    if(bufferInfo.type() == BufferInfo::ChannelBuffer) {
-      if(index.data(NetworkModel::ItemActiveRole).toBool()) {
-        removeBufferAction->setEnabled(false);
-        removeBufferAction->setToolTip("To delete the buffer, part the channel first.");
-        joinBufferAction->setVisible(false);
-      } else {
-        partBufferAction->setVisible(false);
+  QMenu contextMenu(this);
+  NetworkModel::itemType itemType = static_cast<NetworkModel::itemType>(index.data(NetworkModel::ItemTypeRole).toInt());
+
+  switch(itemType) {
+  case NetworkModel::NetworkItemType:
+    showChannelList.setData(index.data(NetworkModel::NetworkIdRole));
+    _disconnectNetAction.setIcon(connectionStateIcon);
+    _connectNetAction.setIcon(connectionStateIcon);
+    addItemToMenu(showChannelList, contextMenu, index, ActiveState);
+    addItemToMenu(_disconnectNetAction, contextMenu, network->connectionState() != Network::Disconnected);
+    addItemToMenu(_connectNetAction, contextMenu, network->connectionState() == Network::Disconnected);
+    addSeparatorToMenu(contextMenu, index, ActiveState);
+    addItemToMenu(_joinChannelAction, contextMenu, index, ActiveState);
+    break;
+  case NetworkModel::BufferItemType:
+    {
+      BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+      switch(bufferInfo.type()) {
+      case BufferInfo::ChannelBuffer:
+	addItemToMenu(_joinBufferAction, contextMenu, index, InactiveState);
+	addItemToMenu(_partBufferAction, contextMenu, index, ActiveState);
+	addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
+	addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
+	addItemToMenu(_removeBufferAction, contextMenu, index, InactiveState);
+	createHideEventsSubMenu(contextMenu);
+	addItemToMenu(_ignoreListAction, contextMenu);
+	break;
+      case BufferInfo::QueryBuffer:
+	addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
+	addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
+	addItemToMenu(_removeBufferAction, contextMenu);
+	createHideEventsSubMenu(contextMenu);
+	break;
+      default:
+	addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
+	addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
+	break;
       }
-    } else {
-      joinBufferAction->setVisible(false);
-      partBufferAction->setVisible(false);
     }
+    break;
+  default:
+    return;
   }
 
+  if(contextMenu.actions().isEmpty())
+    return;
   QAction *result = contextMenu.exec(QCursor::pos());
-  if(result == connectNetAction || result == disconnectNetAction) {
-    const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value<NetworkId>());
-    if(!network) return;
-    if(network->connectionState() == Network::Disconnected) 
-      network->requestConnect();
-    else 
-      network->requestDisconnect();
-  } else
-  if(result == joinBufferAction) {
-    Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(channelname));
-  } else
-  if(result == partBufferAction) {
-    Client::instance()->userInput(bufferInfo, QString("/PART %1").arg(channelname));
-  } else
-  if(result == removeBufferAction) {
+
+  // Handle Result
+  if(network && result == &_connectNetAction) {
+    network->requestConnect();
+    return;
+  }
+
+  if(network && result == &_disconnectNetAction) {
+    network->requestDisconnect();
+    return;
+  }
+
+  if(result == &_joinChannelAction) {
+    // FIXME no QInputDialog in Qtopia
+#ifndef Q_WS_QWS
+    bool ok;
+    QString channelName = QInputDialog::getText(this, tr("Join Channel"), tr("Input channel name:"), QLineEdit::Normal, QString(), &ok);
+    if(ok && !channelName.isEmpty()) {
+      Client::instance()->userInput(BufferInfo::fakeStatusBuffer(index.data(NetworkModel::NetworkIdRole).value<NetworkId>()), QString("/J %1").arg(channelName));
+    }
+#endif
+    return;
+  }
+
+  if(result == &_joinBufferAction) {
+    BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+    Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));
+    return;
+  }
+
+  if(result == &_partBufferAction) {
+    BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+    Client::instance()->userInput(bufferInfo, QString("/PART"));
+    return;
+  }
+
+  if(result == &_hideBufferTemporarilyAction) {
+    removeSelectedBuffers();
+    return;
+  }
+
+  if(result == &_hideBufferPermanentlyAction) {
+    removeSelectedBuffers(true);
+    return;
+  }
+
+  if(result == &_removeBufferAction) {
+    BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
     int res = QMessageBox::question(this, tr("Remove buffer permanently?"),
                                     tr("Do you want to delete the buffer \"%1\" permanently? This will delete all related data, including all backlog "
                                        "data, from the core's database!").arg(bufferInfo.bufferName()),
                                         QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
     if(res == QMessageBox::Yes) {
       Client::removeBuffer(bufferInfo.bufferId());
-    } 
-  } else 
-  if(result == whoBufferAction) {
-    Client::instance()->userInput(bufferInfo, QString("/WHO %1").arg(channelname));
+    }
+    return;
   }
+
+}
+
+void BufferView::wheelEvent(QWheelEvent* event) {
+  if(UiSettings().value("MouseWheelChangesBuffers", QVariant(true)).toBool() == (bool)(event->modifiers() & Qt::AltModifier))
+    return QTreeView::wheelEvent(event);
+
+  int rowDelta = ( event->delta() > 0 ) ? -1 : 1;
+  QModelIndex currentIndex = selectionModel()->currentIndex();
+  QModelIndex resultingIndex;
+  if( model()->hasIndex(  currentIndex.row() + rowDelta, currentIndex.column(), currentIndex.parent() ) )
+    {
+      resultingIndex = currentIndex.sibling( currentIndex.row() + rowDelta, currentIndex.column() );
+    }
+    else //if we scroll into a the parent node...
+      {
+        QModelIndex parent = currentIndex.parent();
+        QModelIndex aunt = parent.sibling( parent.row() + rowDelta, parent.column() );
+        if( rowDelta == -1 )
+	  resultingIndex = aunt.child( model()->rowCount( aunt ) - 1, 0 );
+        else
+	  resultingIndex = aunt.child( 0, 0 );
+        if( !resultingIndex.isValid() )
+	  return;
+      }
+  selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
+  selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect );
+
 }
 
+
+QSize BufferView::sizeHint() const {
+  return QTreeView::sizeHint();
+
+  if(!model())
+    return QTreeView::sizeHint();
+
+  if(model()->rowCount() == 0)
+    return QSize(120, 50);
+
+  int columnSize = 0;
+  for(int i = 0; i < model()->columnCount(); i++) {
+    if(!isColumnHidden(i))
+      columnSize += sizeHintForColumn(i);
+  }
+  return QSize(columnSize, 50);
+}
+
+// ==============================
+//  BufferView Dock
+// ==============================
+BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent)
+  : QDockWidget(config->bufferViewName(), parent)
+{
+  setObjectName("BufferViewDock-" + QString::number(config->bufferViewId()));
+  toggleViewAction()->setData(config->bufferViewId());
+  setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
+  connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(bufferViewRenamed(const QString &)));
+}
+
+BufferViewDock::BufferViewDock(QWidget *parent)
+  : QDockWidget(tr("All Buffers"), parent)
+{
+  setObjectName("BufferViewDock--1");
+  toggleViewAction()->setData((int)-1);
+  setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
+}
+
+void BufferViewDock::bufferViewRenamed(const QString &newName) {
+  setWindowTitle(newName);
+  toggleViewAction()->setText(newName);
+}