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

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index fca441ee..6ce560aa 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -20,18 +20,19 @@
 
 #include "bufferview.h"
 
+#include "action.h"
 #include "buffermodel.h"
 #include "bufferviewfilter.h"
+#include "buffersettings.h"
 #include "buffersyncer.h"
 #include "client.h"
+#include "iconloader.h"
 #include "mappedselectionmodel.h"
 #include "network.h"
 #include "networkmodel.h"
 
 #include "uisettings.h"
 
-#include "global.h"
-
 #include <QAction>
 #include <QFlags>
 #include <QHeaderView>
@@ -49,36 +50,13 @@
 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),
-
-    _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)
-
+    _menuActions(this)
 {
-  // currently no events can be hidden -> disable actions
-  _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);
+  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 &)));
 
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 }
@@ -100,21 +78,39 @@ 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)));
+
+  // activated() fails on X11 and Qtopia at least
+#if defined Q_WS_QWS or defined Q_WS_X11
+  connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex)));
 #else
-  connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));  // Qtopia uses single click for activation
+  // afaik this is better on Mac and Windows
+  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();
-  if(QTreeView::model()) {
-    disconnect(QTreeView::model(), SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
-  }
-  
+
   QTreeView::setModel(model);
   init();
   // remove old Actions
@@ -127,8 +123,6 @@ void BufferView::setModel(QAbstractItemModel *model) {
   if(!model)
     return;
 
-  connect(model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
-  
   QString sectionName;
   QAction *showSection;
   for(int i = 1; i < model->columnCount(); i++) {
@@ -140,7 +134,7 @@ void BufferView::setModel(QAbstractItemModel *model) {
     connect(showSection, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
     header()->addAction(showSection);
   }
-  
+
 }
 
 void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) {
@@ -153,6 +147,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *
 
   if(model()) {
     disconnect(this, 0, model(), 0);
+    disconnect(model(), 0, this, 0);
   }
 
   if(!model_) {
@@ -160,6 +155,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *
   } else {
     BufferViewFilter *filter = new BufferViewFilter(model_, config);
     setModel(filter);
+    connect(filter, SIGNAL(configChanged()), this, SLOT(on_configChanged()));
   }
   setConfig(config);
 }
@@ -167,20 +163,20 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *
 void BufferView::setSelectionModel(QItemSelectionModel *selectionModel) {
   if(QTreeView::selectionModel())
     disconnect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-	       model(), SIGNAL(checkPreviousCurrentForRemoval(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)));
+            filter, SLOT(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
   }
 }
 
 void BufferView::setConfig(BufferViewConfig *config) {
   if(_config == config)
     return;
-  
+
   if(_config) {
     disconnect(_config, 0, this, 0);
   }
@@ -203,7 +199,7 @@ void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) {
     for(int i = 0; i < networkCount; i++) {
       child = model()->index(i, 0);
       if(networkId == model()->data(child, NetworkModel::NetworkIdRole).value<NetworkId>())
-	setRootIndex(child);
+        setRootIndex(child);
     }
   }
 }
@@ -215,7 +211,7 @@ void BufferView::joinChannel(const QModelIndex &index) {
     return;
 
   BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-  
+
   Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));
 }
 
@@ -242,7 +238,7 @@ void BufferView::removeSelectedBuffers(bool permanently) {
       continue;
 
     removedRows << bufferId;
-    
+
     if(permanently)
       config()->requestRemoveBufferPermanently(bufferId);
     else
@@ -256,7 +252,7 @@ void BufferView::rowsInserted(const QModelIndex & parent, int start, int 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);
@@ -264,19 +260,33 @@ void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
   }
 }
 
-void BufferView::layoutChanged() {
+void BufferView::on_configChanged() {
   Q_ASSERT(model());
 
-  // expand all active networks
+  // 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);
-    if(model()->rowCount(networkIdx) > 0 && model()->data(networkIdx, NetworkModel::ItemActiveRole) == true) {
+
+    bool expandNetwork = false;
+    if(_expandedState.contains(networkId))
+      expandNetwork = _expandedState[networkId];
+    else
+      expandNetwork = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool();
+
+    if(expandNetwork)
       expand(networkIdx);
-    } else {
+    else
       collapse(networkIdx);
-    }
   }
 
   // update selection to current one
@@ -288,16 +298,28 @@ void BufferView::layoutChanged() {
   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(topLeft.row(), 0);
+    QModelIndex networkIdx = topLeft.sibling(i, 0);
     if(model()->rowCount(networkIdx) == 0)
       continue;
 
@@ -310,7 +332,6 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott
   }
 }
 
-
 void BufferView::toggleHeader(bool checked) {
   QAction *action = qobject_cast<QAction *>(sender());
   header()->setSectionHidden((action->property("column")).toInt(), !checked);
@@ -320,10 +341,6 @@ bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates re
   if(!index.isValid())
     return false;
 
-//   NetworkModel::itemTypes itemType = static_cast<NetworkModel::itemTypes>(index.data(NetworkModel::ItemTypeRole).toInt());
-//   if(!(itemType & validItemTypes))
-//     return false;
-
   ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool()
     ? ActiveState
     : InactiveState;
@@ -334,170 +351,165 @@ bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates re
   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, const QModelIndex &index, ItemActiveStates requiredActiveState) {
+  addItemToMenu(action, menu, checkRequirements(index, requiredActiveState));
 }
 
-void BufferView::addItemToMenu(QAction &action, QMenu &menu, bool condition) {
+void BufferView::addItemToMenu(QAction *action, QMenu *menu, bool condition) {
   if(condition) {
-    menu.addAction(&action);
-    action.setVisible(true);
+    menu->addAction(action);
+    action->setVisible(true);
   } else {
-    action.setVisible(false);
+    action->setVisible(false);
   }
 }
 
-
-void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
+void BufferView::addItemToMenu(QMenu *subMenu, QMenu *menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
   if(checkRequirements(index, requiredActiveState)) {
-    menu.addMenu(&subMenu);
-    subMenu.setVisible(true);
+    menu->addMenu(subMenu);
+    subMenu->setVisible(true);
   } else {
-    subMenu.setVisible(false);
+    subMenu->setVisible(false);
   }
 }
 
-void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
+void BufferView::addSeparatorToMenu(QMenu *menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
   if(checkRequirements(index, requiredActiveState)) {
-    menu.addSeparator();
+    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);
+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::showContextMenu(const QPoint &pos) {
 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);
 
-  QIcon connectionStateIcon;
-  if(network) {
-    if(network->connectionState() == Network::Initialized) {
-      connectionStateIcon = QIcon(":/22x22/actions/network-connect");
-    } else if(network->connectionState() == Network::Disconnected) {
-      connectionStateIcon = QIcon(":/22x22/actions/network-disconnect");
-    } else {
-      connectionStateIcon = QIcon(":/22x22/actions/gear");
-    }
-  }
-  
-  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, index, ActiveState);
-    addItemToMenu(_connectNetAction, contextMenu, index, InactiveState);
+    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(_joinChannelAction, 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(_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;
+        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(_hideBufferTemporarilyAction, contextMenu, (bool)config());
-	addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
-	addItemToMenu(_removeBufferAction, contextMenu);
-	createHideEventsSubMenu(contextMenu);
-	break;
+        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(_hideBufferTemporarilyAction, contextMenu, (bool)config());
-	addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
-	break;
+        addItemToMenu(_menuActions.action("HideBuffersTemporarily"), contextMenu, (bool)config());
+        addItemToMenu(_menuActions.action("HideBuffersPermanently"), contextMenu, (bool)config());
+        break;
       }
     }
     break;
   default:
     return;
   }
-  
-  if(contextMenu.actions().isEmpty())
-    return;
-  QAction *result = contextMenu.exec(QCursor::pos());
-  
-  // Handle Result
-  if(network && result == &_connectNetAction) {
+}
+
+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;
   }
 
-  if(network && result == &_disconnectNetAction) {
+  if(network && result == _menuActions.action("DisconnectNet")) {
     network->requestDisconnect();
     return;
   }
 
-  if(result == &_joinChannelAction) {
+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(index.data(NetworkModel::NetworkIdRole).value<NetworkId>()), QString("/J %1").arg(channelName));
-//       BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-//       if(bufferInfo.isValid()) {
-//         Client::instance()->userInput(bufferInfo, QString("/J %1").arg(channelName));
-//       }
+      Client::instance()->userInput(BufferInfo::fakeStatusBuffer(_menuIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>()),
+                                     QString("/J %1").arg(channelName));
     }
 #endif
     return;
   }
 
-  if(result == &_joinBufferAction) {
-    BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+  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 == &_partBufferAction) {
-    BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+  if(result == _menuActions.action("PartBuffer")) {
+    BufferInfo bufferInfo = _menuIndex.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
     Client::instance()->userInput(bufferInfo, QString("/PART"));
     return;
   }
-  
-  if(result == &_hideBufferTemporarilyAction) {
+
+  if(result == _menuActions.action("HideBuffersTemporarily")) {
     removeSelectedBuffers();
     return;
   }
 
-  if(result == &_hideBufferPermanentlyAction) {
+  if(result == _menuActions.action("HideBuffersPermanently")) {
     removeSelectedBuffers(true);
     return;
   }
 
-  if(result == &_removeBufferAction) {
-    BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+  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()),
@@ -508,6 +520,38 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
     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;
+  }
+  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) {
@@ -534,13 +578,13 @@ void BufferView::wheelEvent(QWheelEvent* event) {
       }
   selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
   selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect );
-  
+
 }
 
 
 QSize BufferView::sizeHint() const {
   return QTreeView::sizeHint();
-  
+
   if(!model())
     return QTreeView::sizeHint();