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

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 27858a96..aa82b58a 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -138,15 +138,18 @@ void BufferView::showContextMenu(const QPoint &pos) {
 
   QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), this);
   QAction *hideJoinAction = hideEventsMenu->addAction(tr("Join Events"));
-  QAction *hidePartAction = hideEventsMenu->addAction(tr("PartEvents"));
-  QAction *hideQuitAction = hideEventsMenu->addAction(tr("QuitEvents"));
+  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);
 
@@ -174,11 +177,17 @@ void BufferView::showContextMenu(const QPoint &pos) {
     contextMenu.addAction(ignoreListAction);
     contextMenu.addAction(whoBufferAction);
 
-    if(bufferInfo.type() == BufferInfo::ChannelBuffer && index.data(NetworkModel::ItemActiveRole).toBool()) {
-       removeBufferAction->setEnabled(false);
-       joinBufferAction->setVisible(false);
+    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);
+      }
     } else {
-       partBufferAction->setVisible(false);
+      joinBufferAction->setVisible(false);
+      partBufferAction->setVisible(false);
     }
   }
 
@@ -203,7 +212,7 @@ void BufferView::showContextMenu(const QPoint &pos) {
                                        "data, from the core's database!").arg(bufferInfo.bufferName()),
                                         QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
     if(res == QMessageBox::Yes) {
-        Client::bufferSyncer()->requestRemoveBuffer(bufferInfo.bufferId());
+      Client::removeBuffer(bufferInfo.bufferId());
     } 
   } else 
   if(result == whoBufferAction) {