X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=086af0aa211dfc8a2aa90667cfe0c6e2ba3ed51f;hp=6ce560aaa9197fc6abbe526dd4f9a15360fbe14a;hb=ed955f89251b8bae600080fb79fd033843979cfa;hpb=db511df7b183771ae444f14d0aca42381ee0ae37

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 6ce560aa..086af0aa 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.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  *
@@ -20,52 +20,57 @@
 
 #include "bufferview.h"
 
+#include <QApplication>
+#include <QAction>
+#include <QFlags>
+#include <QHeaderView>
+#include <QLineEdit>
+#include <QMenu>
+#include <QMessageBox>
+#include <QSet>
+
 #include "action.h"
 #include "buffermodel.h"
 #include "bufferviewfilter.h"
 #include "buffersettings.h"
 #include "buffersyncer.h"
 #include "client.h"
+#include "contextmenuactionprovider.h"
+#include "graphicalui.h"
 #include "iconloader.h"
-#include "mappedselectionmodel.h"
 #include "network.h"
 #include "networkmodel.h"
-
+#include "contextmenuactionprovider.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),
-    showChannelList(tr("Show Channel List"), this),
-    _menuActions(this)
+  : QTreeView(parent)
 {
-  setupMenuActions();
-  showChannelList.setIcon(SmallIcon("format-list-unordered"));
-
-  connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(on_collapse(const QModelIndex &)));
-  connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(on_expand(const QModelIndex &)));
+  connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
+  connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
 
   setSelectionMode(QAbstractItemView::ExtendedSelection);
+
+  QAbstractItemDelegate *oldDelegate = itemDelegate();
+  BufferViewDelegate *tristateDelegate = new BufferViewDelegate(this);
+  setItemDelegate(tristateDelegate);
+  delete oldDelegate;
+
+  UiStyleSettings s("QtUiStyle/Fonts"); // li'l dirty here, but fonts are stored in QtUiStyle :/
+  s.notify("BufferView", this, SLOT(setCustomFont(QVariant)));
+  setCustomFont(s.value("BufferView", QFont()));
 }
 
 void BufferView::init() {
-  setIndentation(10);
   header()->setContextMenuPolicy(Qt::ActionsContextMenu);
   hideColumn(1);
   hideColumn(2);
+  setIndentation(10);
   expandAll();
 
   setAnimated(true);
@@ -80,34 +85,16 @@ void BufferView::init() {
   sortByColumn(0, Qt::AscendingOrder);
 
   // activated() fails on X11 and Qtopia at least
-#if defined Q_WS_QWS or defined Q_WS_X11
+#if defined Q_WS_QWS || defined Q_WS_X11
+  disconnect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
   connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex)));
 #else
   // afaik this is better on Mac and Windows
+  disconnect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
   connect(this, SIGNAL(activated(QModelIndex)), SLOT(joinChannel(QModelIndex)));
 #endif
 }
 
-void BufferView::setupMenuActions() {
-  _menuActions.addAction("ConnectNet", new Action(SmallIcon("network-connect"), tr("Connect"), this));
-  _menuActions.addAction("DisconnectNet", new Action(SmallIcon("network-disconnect"), tr("Disconnect"), this));
-  _menuActions.addAction("JoinChannel", new Action(tr("Join Channel"), this));
-  _menuActions.addAction("JoinBuffer", new Action(tr("Join"), this));
-  _menuActions.addAction("PartBuffer", new Action(tr("Part"), this));
-  _menuActions.addAction("HideBuffersTemporarily", new Action(tr("Hide Buffers"), this));
-  _menuActions.addAction("HideBuffersPermanently", new Action(tr("Hide Buffers Permanently"), this));
-  _menuActions.addAction("RemoveBuffer", new Action(tr("Delete Buffer"), this));
-  _menuActions.addAction("IgnoreList", new Action(tr("Ignore List"), this));
-  _menuActions.addAction("HideJoin", new Action(tr("Joins"), this))->setCheckable(true);
-  _menuActions.addAction("HidePart", new Action(tr("Parts"), this))->setCheckable(true);
-  _menuActions.addAction("HideQuit", new Action(tr("Quits"), this))->setCheckable(true);
-  _menuActions.addAction("HideNick", new Action(tr("Nick Changes"), this))->setCheckable(true);
-  _menuActions.addAction("HideMode", new Action(tr("Mode Changes"), this))->setCheckable(true);
-  _menuActions.addAction("HideDayChange", new Action(tr("Day Change"), this))->setCheckable(true);
-
-  connect(&_menuActions, SIGNAL(actionTriggered(QAction *)), SLOT(actionTriggered(QAction *)));
-}
-
 void BufferView::setModel(QAbstractItemModel *model) {
   delete selectionModel();
 
@@ -135,6 +122,7 @@ void BufferView::setModel(QAbstractItemModel *model) {
     header()->addAction(showSection);
   }
 
+  connect(model, SIGNAL(layoutChanged()), this, SLOT(on_layoutChanged()));
 }
 
 void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) {
@@ -186,14 +174,17 @@ void BufferView::setConfig(BufferViewConfig *config) {
     connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(setRootIndexForNetworkId(const NetworkId &)));
     setRootIndexForNetworkId(config->networkId());
   } else {
+    setIndentation(10);
     setRootIndex(QModelIndex());
   }
 }
 
 void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) {
   if(!networkId.isValid() || !model()) {
+    setIndentation(10);
     setRootIndex(QModelIndex());
   } else {
+    setIndentation(5);
     int networkCount = model()->rowCount();
     QModelIndex child;
     for(int i = 0; i < networkCount; i++) {
@@ -204,6 +195,13 @@ void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) {
   }
 }
 
+void BufferView::setCustomFont(const QVariant &v) {
+  QFont font = v.value<QFont>();
+  if(font.family().isEmpty())
+    font = QApplication::font();
+  setFont(font);
+}
+
 void BufferView::joinChannel(const QModelIndex &index) {
   BufferInfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
 
@@ -223,6 +221,46 @@ void BufferView::keyPressEvent(QKeyEvent *event) {
   QTreeView::keyPressEvent(event);
 }
 
+void BufferView::dropEvent(QDropEvent *event) {
+  QModelIndex index = indexAt(event->pos());
+
+  QRect indexRect = visualRect(index);
+  QPoint cursorPos = event->pos();
+
+  // check if we're really _on_ the item and not indicating a move to just above or below the item
+  const int margin = 2;
+  if(cursorPos.y() - indexRect.top() < margin
+     || indexRect.bottom() - cursorPos.y() < margin)
+    return QTreeView::dropEvent(event);
+
+  QList< QPair<NetworkId, BufferId> > bufferList = Client::networkModel()->mimeDataToBufferList(event->mimeData());
+  if(bufferList.count() != 1)
+    return QTreeView::dropEvent(event);
+
+  NetworkId networkId = bufferList[0].first;
+  BufferId bufferId2 = bufferList[0].second;
+
+  if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
+    return QTreeView::dropEvent(event);
+
+  if(index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer)
+    return QTreeView::dropEvent(event);
+
+  if(index.data(NetworkModel::NetworkIdRole).value<NetworkId>() != networkId)
+    return QTreeView::dropEvent(event);
+
+  BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value<BufferId>();
+  if(bufferId1 == bufferId2)
+    return QTreeView::dropEvent(event);
+
+  int res = QMessageBox::question(0, tr("Merge buffers permanently?"),
+				  tr("Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n This cannot be reversed!").arg(Client::networkModel()->bufferName(bufferId2)).arg(Client::networkModel()->bufferName(bufferId1)),
+				  QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
+  if(res == QMessageBox::Yes) {
+    Client::mergeBuffersPermanently(bufferId1, bufferId2);
+  }
+}
+
 void BufferView::removeSelectedBuffers(bool permanently) {
   if(!config())
     return;
@@ -246,17 +284,21 @@ void BufferView::removeSelectedBuffers(bool permanently) {
   }
 }
 
-void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
+void BufferView::rowsInserted(const QModelIndex &parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);
 
   // 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);
-    expand(parent);
+  setExpandedState(parent);
+}
+
+void BufferView::on_layoutChanged() {
+  int numNets = model()->rowCount(QModelIndex());
+  for(int row = 0; row < numNets; row++) {
+    QModelIndex networkIdx = model()->index(row, 0, QModelIndex());
+    setExpandedState(networkIdx);
   }
 }
 
@@ -275,39 +317,49 @@ void BufferView::on_configChanged() {
     if(!networkId.isValid())
       continue;
 
-    update(networkIdx);
-
-    bool expandNetwork = false;
-    if(_expandedState.contains(networkId))
-      expandNetwork = _expandedState[networkId];
-    else
-      expandNetwork = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool();
+    setExpandedState(networkIdx);
+  }
 
-    if(expandNetwork)
-      expand(networkIdx);
-    else
-      collapse(networkIdx);
+  if(config()) {
+    // update selection to current one
+    Client::bufferModel()->synchronizeView(this);
   }
+}
 
-  // update selection to current one
-  MappedSelectionModel *mappedSelectionModel = qobject_cast<MappedSelectionModel *>(selectionModel());
-  if(!config() || !mappedSelectionModel)
-    return;
+void BufferView::storeExpandedState(const QModelIndex &networkIdx) {
+  NetworkId networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value<NetworkId>();
 
-  mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current);
-  mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-}
+  int oldState = 0;
+  if(isExpanded(networkIdx))
+    oldState |= WasExpanded;
+  if(model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool())
+    oldState |= WasActive;
 
-void BufferView::on_collapse(const QModelIndex &index) {
-  storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), false);
+  _expandedState[networkId] = oldState;
 }
 
-void BufferView::on_expand(const QModelIndex &index) {
-  storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), true);
-}
+void BufferView::setExpandedState(const QModelIndex &networkIdx) {
+  if(model()->data(networkIdx, NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
+    return;
 
-void BufferView::storeExpandedState(NetworkId networkId, bool expanded) {
-  _expandedState[networkId] = expanded;
+  if(model()->rowCount(networkIdx) == 0)
+    return;
+
+  NetworkId networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value<NetworkId>();
+
+  bool networkActive = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool();
+  bool expandNetwork = networkActive;
+  if(_expandedState.contains(networkId)) {
+    int oldState = _expandedState[networkId];
+    if((bool)(oldState & WasActive) == networkActive)
+      expandNetwork = (bool)(oldState & WasExpanded);
+  }
+
+  if(expandNetwork != isExpanded(networkIdx)) {
+    update(networkIdx);
+    setExpanded(networkIdx, expandNetwork);
+  }
+  storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
 }
 
 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
@@ -320,15 +372,7 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott
 
   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
+    setExpandedState(networkIdx);
   }
 }
 
@@ -337,221 +381,57 @@ void BufferView::toggleHeader(bool checked) {
   header()->setSectionHidden((action->property("column")).toInt(), !checked);
 }
 
-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) {
-  addItemToMenu(action, menu, checkRequirements(index, requiredActiveState));
-}
-
-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, BufferId bufferId) {
-  int filter = BufferSettings(bufferId).messageFilter();
-  _menuActions.action("HideJoin")->setChecked(filter & Message::Join);
-  _menuActions.action("HidePart")->setChecked(filter & Message::Part);
-  _menuActions.action("HideQuit")->setChecked(filter & Message::Quit);
-  _menuActions.action("HideNick")->setChecked(filter & Message::Nick);
-  _menuActions.action("HideMode")->setChecked(filter & Message::Mode);
-  _menuActions.action("HideDayChange")->setChecked(filter & Message::DayChange);
-
-  QMenu *hideEventsMenu = menu->addMenu(tr("Hide Events"));
-  hideEventsMenu->addAction(_menuActions.action("HideJoin"));
-  hideEventsMenu->addAction(_menuActions.action("HidePart"));
-  hideEventsMenu->addAction(_menuActions.action("HideQuit"));
-  hideEventsMenu->addAction(_menuActions.action("HideNick"));
-  hideEventsMenu->addAction(_menuActions.action("HideMode"));
-  hideEventsMenu->addAction(_menuActions.action("HideDayChange"));
-  return hideEventsMenu;
-}
-
 void BufferView::contextMenuEvent(QContextMenuEvent *event) {
   QModelIndex index = indexAt(event->pos());
   if(!index.isValid())
     index = rootIndex();
-  if(!index.isValid())
-    return;
 
   QMenu contextMenu(this);
-  addActionsToMenu(&contextMenu, index);
-  if(!contextMenu.actions().isEmpty())
-    contextMenu.exec(QCursor::pos());
 
-}
-
-void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index) {
-  _menuIndex = index;
-  const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value<NetworkId>());
-  Q_CHECK_PTR(network);
-
-  NetworkModel::itemType itemType = static_cast<NetworkModel::itemType>(index.data(NetworkModel::ItemTypeRole).toInt());
-
-  switch(itemType) {
-  case NetworkModel::NetworkItemType:
-    showChannelList.setData(index.data(NetworkModel::NetworkIdRole));
-    addItemToMenu(&showChannelList, contextMenu, index, ActiveState);
-    addItemToMenu(_menuActions.action("DisconnectNet"), contextMenu, network->connectionState() != Network::Disconnected);
-    addItemToMenu(_menuActions.action("ConnectNet"), contextMenu, network->connectionState() == Network::Disconnected);
-    addSeparatorToMenu(contextMenu, index, ActiveState);
-    addItemToMenu(_menuActions.action("JoinChannel"), contextMenu, index, ActiveState);
-    break;
-  case NetworkModel::BufferItemType:
-    {
-      BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-      switch(bufferInfo.type()) {
-      case BufferInfo::ChannelBuffer:
-        addItemToMenu(_menuActions.action("JoinBuffer"), contextMenu, index, InactiveState);
-        addItemToMenu(_menuActions.action("PartBuffer"), contextMenu, index, ActiveState);
-        addItemToMenu(_menuActions.action("HideBuffersTemporarily"), contextMenu, (bool)config());
-        addItemToMenu(_menuActions.action("HideBuffersPermanently"), contextMenu, (bool)config());
-        addItemToMenu(_menuActions.action("RemoveBuffer"), contextMenu, index, InactiveState);
-        createHideEventsSubMenu(contextMenu, bufferInfo.bufferId());
-        addItemToMenu(_menuActions.action("IgnoreList"), contextMenu);
-        break;
-      case BufferInfo::QueryBuffer:
-        addItemToMenu(_menuActions.action("HideBuffersTemporarily"), contextMenu, (bool)config());
-        addItemToMenu(_menuActions.action("HideBuffersPermanently"), contextMenu, (bool)config());
-        addItemToMenu(_menuActions.action("RemoveBuffer"), contextMenu);
-        createHideEventsSubMenu(contextMenu, bufferInfo.bufferId());
-        break;
-      default:
-        addItemToMenu(_menuActions.action("HideBuffersTemporarily"), contextMenu, (bool)config());
-        addItemToMenu(_menuActions.action("HideBuffersPermanently"), contextMenu, (bool)config());
-        break;
-      }
-    }
-    break;
-  default:
-    return;
+  if(index.isValid()) {
+    addActionsToMenu(&contextMenu, index);
   }
-}
-
-void BufferView::actionTriggered(QAction *result) {
-  const Network *network = Client::network(_menuIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>());
-  Q_CHECK_PTR(network);
 
-  if(network && result == _menuActions.action("ConnectNet")) {
-    network->requestConnect();
-    return;
-  }
+  addFilterActions(&contextMenu, index);
 
-  if(network && result == _menuActions.action("DisconnectNet")) {
-    network->requestDisconnect();
-    return;
-  }
-
-if(result == _menuActions.action("JoinChannel")) {
-    // 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(_menuIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>()),
-                                     QString("/J %1").arg(channelName));
-    }
-#endif
-    return;
-  }
-
-  if(result == _menuActions.action("JoinBuffer")) {
-    BufferInfo bufferInfo = _menuIndex.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-    Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));
-    return;
-  }
-
-  if(result == _menuActions.action("PartBuffer")) {
-    BufferInfo bufferInfo = _menuIndex.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-    Client::instance()->userInput(bufferInfo, QString("/PART"));
-    return;
-  }
+  if(!contextMenu.actions().isEmpty())
+    contextMenu.exec(QCursor::pos());
+}
 
-  if(result == _menuActions.action("HideBuffersTemporarily")) {
-    removeSelectedBuffers();
-    return;
-  }
+void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index) {
+  QModelIndexList indexList = selectedIndexes();
+  // make sure the item we clicked on is first
+  indexList.removeAll(index);
+  indexList.prepend(index);
 
-  if(result == _menuActions.action("HideBuffersPermanently")) {
-    removeSelectedBuffers(true);
-    return;
-  }
+  GraphicalUi::contextMenuActionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config());
+}
 
-  if(result == _menuActions.action("RemoveBuffer")) {
-    BufferInfo bufferInfo = _menuIndex.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());
+void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index) {
+  BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
+  if(filter) {
+    QList<QAction *> filterActions = filter->actions(index);
+    if(!filterActions.isEmpty()) {
+      contextMenu->addSeparator();
+      foreach(QAction *action, filterActions) {
+	contextMenu->addAction(action);
+      }
     }
-    return;
   }
+}
 
-  if(result == _menuActions.action("HideJoin")) {
-    BufferId bufferId = _menuIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
-    BufferSettings(bufferId).filterMessage(Message::Join, result->isChecked());
-    return;
-  }
-  if(result == _menuActions.action("HidePart")) {
-    BufferId bufferId = _menuIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
-    BufferSettings(bufferId).filterMessage(Message::Part, result->isChecked());
-    return;
-  }
-  if(result == _menuActions.action("HideQuit")) {
-    BufferId bufferId = _menuIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
-    BufferSettings(bufferId).filterMessage(Message::Quit, result->isChecked());
-    return;
-  }
-  if(result == _menuActions.action("HideNick")) {
-    BufferId bufferId = _menuIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
-    BufferSettings(bufferId).filterMessage(Message::Nick, result->isChecked());
-    return;
+void BufferView::menuActionTriggered(QAction *result) {
+  ContextMenuActionProvider::ActionType type = (ContextMenuActionProvider::ActionType)result->data().toInt();
+  switch(type) {
+    case ContextMenuActionProvider::HideBufferTemporarily:
+      removeSelectedBuffers();
+      break;
+    case ContextMenuActionProvider::HideBufferPermanently:
+      removeSelectedBuffers(true);
+      break;
+    default:
+      return;
   }
-  if(result == _menuActions.action("HideMode")) {
-    BufferId bufferId = _menuIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
-    BufferSettings(bufferId).filterMessage(Message::Mode, result->isChecked());
-    return;
-  }
-  if(result == _menuActions.action("HideDayChange")) {
-    BufferId bufferId = _menuIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
-    BufferSettings(bufferId).filterMessage(Message::DayChange, result->isChecked());
-    return;
-  }
-
-  qWarning() << "Unhandled menu action";
 }
 
 void BufferView::wheelEvent(QWheelEvent* event) {
@@ -581,7 +461,6 @@ void BufferView::wheelEvent(QWheelEvent* event) {
 
 }
 
-
 QSize BufferView::sizeHint() const {
   return QTreeView::sizeHint();
 
@@ -599,6 +478,110 @@ QSize BufferView::sizeHint() const {
   return QSize(columnSize, 50);
 }
 
+
+// ****************************************
+//  BufferViewDelgate
+// ****************************************
+class ColorsChangedEvent : public QEvent {
+public:
+  ColorsChangedEvent() : QEvent(QEvent::User) {};
+};
+
+BufferViewDelegate::BufferViewDelegate(QObject *parent)
+  : QStyledItemDelegate(parent),
+    _updateColors(false)
+{
+  loadColors();
+
+  UiSettings s("QtUiStyle/Colors");
+  s.notify("inactiveActivityFG", this, SLOT(colorsChanged()));
+  s.notify("noActivityFG", this, SLOT(colorsChanged()));
+  s.notify("highlightActivityFG", this, SLOT(colorsChanged()));
+  s.notify("newMessageActivityFG", this, SLOT(colorsChanged()));
+  s.notify("otherActivityFG", this, SLOT(colorsChanged()));
+}
+
+void BufferViewDelegate::colorsChanged() {
+  // avoid mutliple unneded reloads of all colors
+  if(_updateColors)
+    return;
+  _updateColors = true;
+  QCoreApplication::postEvent(this, new ColorsChangedEvent());
+}
+
+void BufferViewDelegate::customEvent(QEvent *event) {
+  if(event->type() != QEvent::User)
+    return;
+
+  loadColors();
+  _updateColors = false;
+
+  event->accept();
+}
+
+void BufferViewDelegate::loadColors() {
+  UiSettings s("QtUiStyle/Colors");
+  _FgColorInactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))).value<QColor>();
+  _FgColorNoActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))).value<QColor>();
+  _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value<QColor>();
+  _FgColorNewMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))).value<QColor>();
+  _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value<QColor>();
+}
+
+bool BufferViewDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) {
+  if(event->type() != QEvent::MouseButtonRelease)
+    return QStyledItemDelegate::editorEvent(event, model, option, index);
+
+  if(!(model->flags(index) & Qt::ItemIsUserCheckable))
+    return QStyledItemDelegate::editorEvent(event, model, option, index);
+
+  QVariant value = index.data(Qt::CheckStateRole);
+  if(!value.isValid())
+    return QStyledItemDelegate::editorEvent(event, model, option, index);
+
+  QStyleOptionViewItemV4 viewOpt(option);
+  initStyleOption(&viewOpt, index);
+
+  QRect checkRect = viewOpt.widget->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, viewOpt.widget);
+  QMouseEvent *me = static_cast<QMouseEvent*>(event);
+
+  if(me->button() != Qt::LeftButton || !checkRect.contains(me->pos()))
+    return QStyledItemDelegate::editorEvent(event, model, option, index);
+
+  Qt::CheckState state = static_cast<Qt::CheckState>(value.toInt());
+  if(state == Qt::Unchecked)
+    state = Qt::PartiallyChecked;
+  else if(state == Qt::PartiallyChecked)
+    state = Qt::Checked;
+  else
+    state = Qt::Unchecked;
+  model->setData(index, state, Qt::CheckStateRole);
+  return true;
+}
+
+void BufferViewDelegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const {
+  QStyledItemDelegate::initStyleOption(option, index);
+
+  if(!index.isValid())
+    return;
+
+  BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
+
+  QColor fgColor = _FgColorNoActivity;
+  if(activity & BufferInfo::Highlight) {
+    fgColor = _FgColorHighlightActivity;
+  } else if(activity & BufferInfo::NewMessage) {
+    fgColor = _FgColorNewMessageActivity;
+  } else if(activity & BufferInfo::OtherActivity) {
+    fgColor = _FgColorOtherActivity;
+  } else if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool()) {
+    fgColor = _FgColorInactiveActivity;
+  }
+
+  option->palette.setColor(QPalette::Text, fgColor);
+}
+
+
 // ==============================
 //  BufferView Dock
 // ==============================
@@ -611,14 +594,6 @@ BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent)
   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);