X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.cpp;h=1ae0c2e9d15878fa5871d168703e0ba87da9862e;hp=e6bafd7098d84828de0a4d337f609093c6e1e9d7;hb=3474e986630907fa2a3f4143012ac2a42796609e;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c diff --git a/src/client/buffermodel.cpp b/src/client/buffermodel.cpp index e6bafd70..1ae0c2e9 100644 --- a/src/client/buffermodel.cpp +++ b/src/client/buffermodel.cpp @@ -35,6 +35,7 @@ BufferModel::BufferModel(NetworkModel *parent) 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))); } bool BufferModel::filterAcceptsRow(int sourceRow, const QModelIndex &parent) const { @@ -48,6 +49,30 @@ bool BufferModel::filterAcceptsRow(int sourceRow, const QModelIndex &parent) con return false; } +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))); +} + +void BufferModel::networkConnectionChanged(Network::ConnectionState state) { + switch(state) { + case Network::Connecting: + case Network::Initializing: + if(currentIndex().isValid()) + return; + { + Network *net = qobject_cast(sender()); + Q_ASSERT(net); + setCurrentIndex(mapFromSource(Client::networkModel()->networkIndex(net->networkId()))); + } + break; + default: + return; + } +} + void BufferModel::synchronizeView(QAbstractItemView *view) { _selectionModelSynchronizer.synchronizeSelectionModel(view->selectionModel()); } @@ -77,6 +102,17 @@ void BufferModel::switchToBufferIndex(const QModelIndex &bufferIdx) { qWarning() << "BufferModel::switchToBufferIndex(const QModelIndex &):" << bufferIdx << "does not belong to BufferModel or NetworkModel"; } +void BufferModel::switchToOrJoinBuffer(NetworkId networkId, const QString &name) { + BufferId bufId = Client::networkModel()->bufferId(networkId, name); + if(bufId.isValid()) { + QModelIndex targetIdx = Client::networkModel()->bufferIndex(bufId); + switchToBuffer(bufId); + if(!targetIdx.data(NetworkModel::ItemActiveRole).toBool()) + Client::userInput(BufferInfo::fakeStatusBuffer(networkId), QString("/JOIN %1").arg(name)); + } else + Client::userInput(BufferInfo::fakeStatusBuffer(networkId), QString("/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();