X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=48e75ba9d2bcf630c25d24bd02229cc808f72e23;hp=8c26056b1115486dff15ba56e038337c1982d23a;hb=997a62b68d7469a93f373476dd955c44eb051be0;hpb=d69da0b56103c347107fb490008b5c6b0d59e3df

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 8c26056b..48e75ba9 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -18,14 +18,26 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "client.h"
-#include "buffersyncer.h"
 #include "bufferview.h"
-#include "networkmodel.h"
+
+#include "bufferviewfilter.h"
+#include "buffersyncer.h"
+#include "client.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
 *****************************************/
@@ -55,19 +67,21 @@ 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();
   QTreeView::setModel(model);
   init();
+  if(!model)
+    return;
 
   // remove old Actions
   QList<QAction *> oldactions = header()->actions();
@@ -90,6 +104,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>();
 
@@ -115,9 +182,10 @@ void BufferView::keyPressEvent(QKeyEvent *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 && parent.data(NetworkModel::ItemActiveRole) == true) {
+  if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType
+     && (Global::SPUTDEV || parent.data(NetworkModel::ItemActiveRole) == true)) {
     // without updating the parent the expand will have no effect... Qt Bug?
-    update(parent); 
+    update(parent);
     expand(parent);
   }
 }
@@ -136,12 +204,16 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott
       continue;
 
     bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
-    if(isExpanded(networkIdx) != isActive)
-      setExpanded(networkIdx, isActive);
+    if(Global::SPUTDEV) {
+      if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, true);
+    } else {
+      if(isExpanded(networkIdx) != isActive)
+        setExpanded(networkIdx, isActive);
+    }
   }
 }
 
-			     
+
 void BufferView::toggleHeader(bool checked) {
   QAction *action = qobject_cast<QAction *>(sender());
   header()->setSectionHidden((action->property("column")).toInt(), !checked);
@@ -227,16 +299,20 @@ void BufferView::showContextMenu(const QPoint &pos) {
       network->requestDisconnect();
   } else
   if(result == joinChannelAction) {
+    // 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,
                                                 QDir::home().dirName(), &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));
       }
     }
+#endif
   } else
   if(result == joinBufferAction) {
     Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(channelname));
@@ -287,6 +363,8 @@ void BufferView::wheelEvent(QWheelEvent* event) {
 
 
 QSize BufferView::sizeHint() const {
+  return QTreeView::sizeHint();
+  
   if(!model())
     return QTreeView::sizeHint();
 
@@ -300,3 +378,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);
+}