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

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index e3206018..fca441ee 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -48,13 +48,15 @@
 // to be on the safe side: call QTreeView's method aswell
 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),
-    _hideBufferAction(tr("Hide selected buffers"), this),
+    _hideBufferTemporarilyAction(tr("Hide buffers"), this),
+    _hideBufferPermanentlyAction(tr("Hide buffers permanently"), this),
     _removeBufferAction(tr("Delete buffer"), this),
     _ignoreListAction(tr("Ignore list"), this),
 
@@ -158,8 +160,6 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *
   } else {
     BufferViewFilter *filter = new BufferViewFilter(model_, config);
     setModel(filter);
-    connect(this, SIGNAL(removeBuffer(const QModelIndex &)),
-	    filter, SLOT(removeBuffer(const QModelIndex &)));
   }
   setConfig(config);
 }
@@ -227,13 +227,26 @@ void BufferView::keyPressEvent(QKeyEvent *event) {
   QTreeView::keyPressEvent(event);
 }
 
-void BufferView::removeSelectedBuffers() {
-  QSet<int> removedRows;
+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 && !removedRows.contains(index.row())) {
-      removedRows << index.row();
-      emit removeBuffer(index);
-    }
+    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);
   }
 }
 
@@ -303,7 +316,7 @@ void BufferView::toggleHeader(bool checked) {
   header()->setSectionHidden((action->property("column")).toInt(), !checked);
 }
 
-bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates requiredActiveState) {
+bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState) {
   if(!index.isValid())
     return false;
 
@@ -311,9 +324,9 @@ bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates re
 //   if(!(itemType & validItemTypes))
 //     return false;
 
-  itemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool()
-    ? activeState
-    : inactiveState;
+  ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool()
+    ? ActiveState
+    : InactiveState;
 
   if(!(isActive & requiredActiveState))
     return false;
@@ -321,7 +334,7 @@ bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates re
   return true;
 }
 
-void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) {
+void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
   if(checkRequirements(index, requiredActiveState)) {
     menu.addAction(&action);
     action.setVisible(true);
@@ -340,7 +353,7 @@ void BufferView::addItemToMenu(QAction &action, QMenu &menu, bool condition) {
 }
 
 
-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);
@@ -349,7 +362,7 @@ void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &i
   }
 }
 
-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();
   }
@@ -391,32 +404,37 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
   
   switch(itemType) {
   case NetworkModel::NetworkItemType:
+    showChannelList.setData(index.data(NetworkModel::NetworkIdRole));
     _disconnectNetAction.setIcon(connectionStateIcon);
     _connectNetAction.setIcon(connectionStateIcon);
-    addItemToMenu(_disconnectNetAction, contextMenu, index, activeState);
-    addItemToMenu(_connectNetAction, contextMenu, index, inactiveState);
-    addSeparatorToMenu(contextMenu, index, activeState);
-    addItemToMenu(_joinChannelAction, contextMenu, index, activeState);
+    addItemToMenu(showChannelList, contextMenu, index, ActiveState);
+    addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState);
+    addItemToMenu(_connectNetAction, contextMenu, index, InactiveState);
+    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(_hideBufferAction, contextMenu, (bool)config());
-	addItemToMenu(_removeBufferAction, contextMenu, index, inactiveState);
+	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(_hideBufferAction, contextMenu, (bool)config());
+	addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
+	addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
 	addItemToMenu(_removeBufferAction, contextMenu);
 	createHideEventsSubMenu(contextMenu);
 	break;
       default:
-	addItemToMenu(_hideBufferAction, contextMenu, (bool)config());
+	addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config());
+	addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config());
 	break;
       }
     }
@@ -446,10 +464,11 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
     bool ok;
     QString channelName = QInputDialog::getText(this, tr("Join Channel"), tr("Input channel name:"), QLineEdit::Normal, QString(), &ok);
     if(ok && !channelName.isEmpty()) {
-      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(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));
+//       }
     }
 #endif
     return;
@@ -463,15 +482,20 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
 
   if(result == &_partBufferAction) {
     BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-    Client::instance()->userInput(bufferInfo, QString("/PART %1").arg(bufferInfo.bufferName()));
+    Client::instance()->userInput(bufferInfo, QString("/PART"));
     return;
   }
   
-  if(result == &_hideBufferAction) {
+  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?"),