X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.cpp;h=3af42445ce240d332512ae446feffc640e6dfc1a;hp=e0f80ed12b6caec2448c0acc026c46def328552b;hb=aec9c711900a443bfa7860fa86c6e9c86b81a3e7;hpb=8010224cf5bfe5685dc2cf535e8dc1ec19c4c364

diff --git a/src/client/buffermodel.cpp b/src/client/buffermodel.cpp
index e0f80ed1..3af42445 100644
--- a/src/client/buffermodel.cpp
+++ b/src/client/buffermodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,58 +15,159 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "buffermodel.h"
 
-#include "networkmodel.h"
-#include "mappedselectionmodel.h"
-#include "buffer.h"
 #include <QAbstractItemView>
 
+#include "client.h"
+#include "networkmodel.h"
+#include "quassel.h"
+
 BufferModel::BufferModel(NetworkModel *parent)
-  : QSortFilterProxyModel(parent),
-    _selectionModelSynchronizer(this),
-    _propertyMapper(this)
+    : QSortFilterProxyModel(parent),
+    _selectionModelSynchronizer(this)
 {
-  setSourceModel(parent);
+    setSourceModel(parent);
+    if (Quassel::isOptionSet("debugbufferswitches")) {
+        connect(_selectionModelSynchronizer.selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
+            this, SLOT(debug_currentChanged(const QModelIndex &, const QModelIndex &)));
+    }
+    connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(newNetwork(NetworkId)));
+    connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(newBuffers(const QModelIndex &, int, int)));
+}
+
 
-  // initialize the Property Mapper
-  _propertyMapper.setModel(this);
-  _selectionModelSynchronizer.addRegularSelectionModel(_propertyMapper.selectionModel());
+bool BufferModel::filterAcceptsRow(int sourceRow, const QModelIndex &parent) const
+{
+    Q_UNUSED(sourceRow);
+    // only networks and buffers are allowed
+    if (!parent.isValid())
+        return true;
+    if (parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType)
+        return true;
+
+    return false;
 }
 
-BufferModel::~BufferModel() {
+
+void BufferModel::newNetwork(NetworkId id)
+{
+    const Network *net = Client::network(id);
+    Q_ASSERT(net);
+    connect(net, SIGNAL(connectionStateSet(Network::ConnectionState)),
+        this, SLOT(networkConnectionChanged(Network::ConnectionState)));
 }
 
-bool BufferModel::filterAcceptsRow(int sourceRow, const QModelIndex &parent) const {
-  Q_UNUSED(sourceRow);
-  // only networks and buffers are allowed
-  if(!parent.isValid())
-    return true;
-  if(parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType)
-    return true;
 
-  return false;
+void BufferModel::networkConnectionChanged(Network::ConnectionState state)
+{
+    switch (state) {
+    case Network::Connecting:
+    case Network::Initializing:
+        if (currentIndex().isValid())
+            return;
+        {
+            Network *net = qobject_cast<Network *>(sender());
+            Q_ASSERT(net);
+            setCurrentIndex(mapFromSource(Client::networkModel()->networkIndex(net->networkId())));
+        }
+        break;
+    default:
+        return;
+    }
 }
 
-void BufferModel::synchronizeSelectionModel(MappedSelectionModel *selectionModel) {
-  _selectionModelSynchronizer.addSelectionModel(selectionModel);
+
+void BufferModel::synchronizeView(QAbstractItemView *view)
+{
+    _selectionModelSynchronizer.synchronizeSelectionModel(view->selectionModel());
 }
 
-void BufferModel::synchronizeView(QAbstractItemView *view) {
-  MappedSelectionModel *mappedSelectionModel = new MappedSelectionModel(view->model());
-  _selectionModelSynchronizer.addSelectionModel(mappedSelectionModel);
-  Q_ASSERT(mappedSelectionModel);
-  delete view->selectionModel();
-  view->setSelectionModel(mappedSelectionModel);
+
+void BufferModel::setCurrentIndex(const QModelIndex &newCurrent)
+{
+    _selectionModelSynchronizer.selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::Current);
+    _selectionModelSynchronizer.selectionModel()->select(newCurrent, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
 }
 
-void BufferModel::mapProperty(int column, int role, QObject *target, const QByteArray &property) {
-  _propertyMapper.addMapping(column, role, target, property);
+
+void BufferModel::switchToBuffer(const BufferId &bufferId)
+{
+    QModelIndex source_index = Client::networkModel()->bufferIndex(bufferId);
+    setCurrentIndex(mapFromSource(source_index));
 }
 
-QModelIndex BufferModel::currentIndex() {
-  return propertyMapper()->selectionModel()->currentIndex();
+
+void BufferModel::switchToBufferIndex(const QModelIndex &bufferIdx)
+{
+    // we accept indexes that directly belong to us or our parent - nothing else
+    if (bufferIdx.model() == this) {
+        setCurrentIndex(bufferIdx);
+        return;
+    }
+
+    if (bufferIdx.model() == sourceModel()) {
+        setCurrentIndex(mapFromSource(bufferIdx));
+        return;
+    }
+
+    qWarning() << "BufferModel::switchToBufferIndex(const QModelIndex &):" << bufferIdx << "does not belong to BufferModel or NetworkModel";
+}
+
+
+void BufferModel::switchToOrJoinBuffer(NetworkId networkId, const QString &name, bool isQuery)
+{
+    BufferId bufId = Client::networkModel()->bufferId(networkId, name);
+    if (bufId.isValid()) {
+        QModelIndex targetIdx = Client::networkModel()->bufferIndex(bufId);
+        switchToBuffer(bufId);
+        if (!targetIdx.data(NetworkModel::ItemActiveRole).toBool()) {
+            qDebug() << "switchToOrJoinBuffer failed to switch even though bufId:" << bufId << "is valid.";
+            Client::userInput(BufferInfo::fakeStatusBuffer(networkId), QString(isQuery ? "/QUERY %1" : "/JOIN %1").arg(name));
+        }
+    }
+    else {
+        _bufferToSwitchTo = qMakePair(networkId, name);
+        Client::userInput(BufferInfo::fakeStatusBuffer(networkId), QString(isQuery ? "/QUERY %1" : "/JOIN %1").arg(name));
+    }
+}
+
+
+void BufferModel::debug_currentChanged(QModelIndex current, QModelIndex previous)
+{
+    Q_UNUSED(previous);
+    qDebug() << "Switched current Buffer: " << current << current.data().toString() << "Buffer:" << current.data(NetworkModel::BufferIdRole).value<BufferId>();
+}
+
+
+void BufferModel::newBuffers(const QModelIndex &parent, int start, int end)
+{
+    if (parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
+        return;
+
+    for (int row = start; row <= end; row++) {
+        QModelIndex child = parent.child(row, 0);
+        newBuffer(child.data(NetworkModel::BufferIdRole).value<BufferId>());
+    }
+}
+
+
+void BufferModel::newBuffer(BufferId bufferId)
+{
+    BufferInfo bufferInfo = Client::networkModel()->bufferInfo(bufferId);
+    if (_bufferToSwitchTo.first == bufferInfo.networkId()
+        && _bufferToSwitchTo.second == bufferInfo.bufferName()) {
+        _bufferToSwitchTo.first = 0;
+        _bufferToSwitchTo.second.clear();
+        switchToBuffer(bufferId);
+    }
+}
+
+
+void BufferModel::switchToBufferAfterCreation(NetworkId network, const QString &name)
+{
+    _bufferToSwitchTo = qMakePair(network, name);
 }