X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=3b895d1e6930ed481cb0e20be74bfd5f876193c0;hb=7431a7bfe8419ed104621fb8e77b37e4e1943fd9;hp=bb19b75318e445001f42ffb5008fa00ff0ed68c4;hpb=2684aa5295d12e4f7c66b3011fc8b1819f3d1cbb;p=quassel.git

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index bb19b753..3b895d1e 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -18,16 +18,28 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "client.h"
-#include "buffersyncer.h"
 #include "bufferview.h"
-#include "networkmodel.h"
+
+#include "buffermodel.h"
+#include "bufferviewfilter.h"
+#include "buffersyncer.h"
+#include "client.h"
+#include "mappedselectionmodel.h"
 #include "network.h"
+#include "networkmodel.h"
 
 #include "uisettings.h"
 
 #include "global.h"
 
+#include <QAction>
+#include <QFlags>
+#include <QHeaderView>
+#include <QInputDialog>
+#include <QLineEdit>
+#include <QMenu>
+#include <QMessageBox>
+
 /*****************************************
 * The TreeView showing the Buffers
 *****************************************/
@@ -57,20 +69,23 @@ 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)));
-}
-
-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 &)));
+#else
+  connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));  // Qtopia uses single click for activation
+#endif
 }
 
 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
   QList<QAction *> oldactions = header()->actions();
   foreach(QAction *action, oldactions) {
@@ -78,6 +93,11 @@ void BufferView::setModel(QAbstractItemModel *model) {
     action->deleteLater();
   }
 
+  if(!model)
+    return;
+
+  connect(model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
+  
   QString sectionName;
   QAction *showSection;
   for(int i = 1; i < model->columnCount(); i++) {
@@ -92,6 +112,59 @@ void BufferView::setModel(QAbstractItemModel *model) {
   
 }
 
+void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) {
+  BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
+  if(filter) {
+    filter->setConfig(config);
+    setConfig(config);
+    return;
+  }
+
+  if(model()) {
+    disconnect(this, 0, model(), 0);
+  }
+
+  if(!model_) {
+    setModel(model_);
+  } else {
+    BufferViewFilter *filter = new BufferViewFilter(model_, config);
+    setModel(filter);
+    connect(this, SIGNAL(removeBuffer(const QModelIndex &)), filter, SLOT(removeBuffer(const QModelIndex &)));
+  }
+  setConfig(config);
+}
+
+void BufferView::setConfig(BufferViewConfig *config) {
+  if(_config == config)
+    return;
+  
+  if(_config) {
+    disconnect(_config, 0, this, 0);
+  }
+
+  _config = config;
+  if(config) {
+    connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(setRootIndexForNetworkId(const NetworkId &)));
+    setRootIndexForNetworkId(config->networkId());
+  } else {
+    setRootIndex(QModelIndex());
+  }
+}
+
+void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) {
+  if(!networkId.isValid() || !model()) {
+    setRootIndex(QModelIndex());
+  } else {
+    int networkCount = model()->rowCount();
+    QModelIndex child;
+    for(int i = 0; i < networkCount; i++) {
+      child = model()->index(i, 0);
+      if(networkId == model()->data(child, NetworkModel::NetworkIdRole).value<NetworkId>())
+	setRootIndex(child);
+    }
+  }
+}
+
 void BufferView::joinChannel(const QModelIndex &index) {
   BufferInfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
 
@@ -114,17 +187,44 @@ void BufferView::keyPressEvent(QKeyEvent *event) {
   QTreeView::keyPressEvent(event);
 }
 
-// ensure that newly inserted network nodes are expanded per default
 void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);
-  if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType
-     && (Global::SPUTDEV || parent.data(NetworkModel::ItemActiveRole) == true)) {
+
+  // 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);
   }
 }
 
+void BufferView::layoutChanged() {
+  Q_ASSERT(model());
+
+  // expand all active networks
+  QModelIndex networkIdx;
+  for(int row = 0; row < model()->rowCount(); row++) {
+    networkIdx = model()->index(row, 0);
+    update(networkIdx);
+    if(model()->rowCount(networkIdx) > 0 && model()->data(networkIdx, NetworkModel::ItemActiveRole) == true) {
+      expand(networkIdx);
+    } else {
+      collapse(networkIdx);
+    }
+  }
+
+  // update selection to current one
+  MappedSelectionModel *mappedSelectionModel = qobject_cast<MappedSelectionModel *>(selectionModel());
+  if(!config() || !mappedSelectionModel)
+    return;
+
+  mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current);
+  mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+}
+
 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
   QTreeView::dataChanged(topLeft, bottomRight);
   
@@ -139,12 +239,7 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott
       continue;
 
     bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
-    if(Global::SPUTDEV) {
-      if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, true);
-    } else {
-      if(isExpanded(networkIdx) != isActive)
-        setExpanded(networkIdx, isActive);
-    }
+    if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, isActive);
   }
 }
 
@@ -298,7 +393,7 @@ void BufferView::wheelEvent(QWheelEvent* event) {
 
 
 QSize BufferView::sizeHint() const {
-  return QSize(120, 50);
+  return QTreeView::sizeHint();
   
   if(!model())
     return QTreeView::sizeHint();
@@ -313,3 +408,28 @@ QSize BufferView::sizeHint() const {
   }
   return QSize(columnSize, 50);
 }
+
+// ==============================
+//  BufferView Dock
+// ==============================
+BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent)
+  : QDockWidget(config->bufferViewName(), parent)
+{
+  setObjectName("BufferViewDock-" + QString::number(config->bufferViewId()));
+  toggleViewAction()->setData(config->bufferViewId());
+  setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
+  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);
+}