X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=1aefaf70f775b7ce31b3eab5e6bdcd0c1854f602;hp=c0bddb75c387a4f48db1e5b5d66587e0dd338a77;hb=eb903042cd48f1e1907a963f7d2baf93b54b2476;hpb=d28b9ec38b6ea0bc473200fc2f1e65abd1b56bd6

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index c0bddb75..1aefaf70 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "client.h"
-//#include "buffer.h"
+#include "buffersyncer.h"
 #include "bufferview.h"
 #include "networkmodel.h"
 
@@ -29,11 +29,17 @@
 // 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);
+
+  connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
+          this, SLOT(showContextMenu(const QPoint &)));
 }
 
 void BufferView::init() {
   setIndentation(10);
   header()->setContextMenuPolicy(Qt::ActionsContextMenu);
+  hideColumn(1);
+  hideColumn(2);
   expandAll();
 
   setAnimated(true);
@@ -49,7 +55,7 @@ void BufferView::init() {
   connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
 }
 
-void BufferView::setFilteredModel(QAbstractItemModel *model, BufferViewFilter::Modes mode, QList<uint> nets) {
+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 &)));
@@ -73,7 +79,7 @@ void BufferView::setModel(QAbstractItemModel *model) {
     sectionName = (model->headerData(i, Qt::Horizontal, Qt::DisplayRole)).toString();
     showSection = new QAction(sectionName, header());
     showSection->setCheckable(true);
-    showSection->setChecked(true);
+    showSection->setChecked(!isColumnHidden(i));
     showSection->setProperty("column", i);
     connect(showSection, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
     header()->addAction(showSection);
@@ -82,12 +88,14 @@ void BufferView::setModel(QAbstractItemModel *model) {
 }
 
 void BufferView::joinChannel(const QModelIndex &index) {
-  BufferItem::Type bufferType = (BufferItem::Type)index.data(NetworkModel::BufferTypeRole).toInt();
+  BufferInfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
 
-  if(bufferType != BufferItem::ChannelType)
+  if(bufferType != BufferInfo::ChannelBuffer)
     return;
+
+  BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
   
-  Client::fakeInput(index.data(NetworkModel::BufferIdRole).value<BufferId>(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+  Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));
 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {
@@ -113,5 +121,28 @@ void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
 
 void BufferView::toggleHeader(bool checked) {
   QAction *action = qobject_cast<QAction *>(sender());
-  header()->setSectionHidden((action->property("column")).toInt(), not checked);
+  header()->setSectionHidden((action->property("column")).toInt(), !checked);
+}
+
+void BufferView::showContextMenu(const QPoint &pos) {
+  QModelIndex index = indexAt(pos);
+  if(!index.isValid() || index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType) return;
+  BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+  if(bufferInfo.type() != BufferInfo::ChannelBuffer && bufferInfo.type() != BufferInfo::QueryBuffer) return;
+  QMenu contextMenu(this);
+  QAction *removeBufferAction = contextMenu.addAction(tr("Delete buffer"));
+  if(bufferInfo.type() == BufferInfo::ChannelBuffer && index.data(NetworkModel::ItemActiveRole).toBool())
+     removeBufferAction->setEnabled(false);
+
+  QAction *result = contextMenu.exec(QCursor::pos());
+  if(result == removeBufferAction) {
+    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::bufferSyncer()->requestRemoveBuffer(bufferInfo.bufferId());
+    }
+  }
 }
+