X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.h;h=d1390c9b75347d22a74d0329d1c323172da7cf91;hp=578481b8f62917256297a73e8ecacf8bf79cfca4;hb=86bd6b1ffb870e65af6d830a2ea16471c348ed5a;hpb=16b0c5bdd6fdaf3e6844ea5ec32e61b20e441284 diff --git a/src/client/buffermodel.h b/src/client/buffermodel.h index 578481b8..d1390c9b 100644 --- a/src/client/buffermodel.h +++ b/src/client/buffermodel.h @@ -23,12 +23,13 @@ #include #include +#include #include "network.h" +#include "networkmodel.h" #include "types.h" #include "selectionmodelsynchronizer.h" -class NetworkModel; class QAbstractItemView; class BufferModel : public QSortFilterProxyModel { @@ -38,27 +39,37 @@ public: BufferModel(NetworkModel *parent = 0); bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const; - + inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; } inline QItemSelectionModel *standardSelectionModel() const { return _selectionModelSynchronizer.selectionModel(); } - + inline void synchronizeSelectionModel(QItemSelectionModel *selectionModel) { _selectionModelSynchronizer.synchronizeSelectionModel(selectionModel); } void synchronizeView(QAbstractItemView *view); inline QModelIndex currentIndex() { return standardSelectionModel()->currentIndex(); } + inline BufferId currentBuffer() { return currentIndex().data(NetworkModel::BufferIdRole).value(); } public slots: void setCurrentIndex(const QModelIndex &newCurrent); void switchToBuffer(const BufferId &bufferId); void switchToBufferIndex(const QModelIndex &bufferIdx); - + void switchToOrJoinBuffer(NetworkId network, const QString &bufferName, bool isQuery = false); + void switchToOrStartQuery(NetworkId network, const QString &nick) { + switchToOrJoinBuffer(network, nick, true); + } + void switchToBufferAfterCreation(NetworkId network, const QString &name); + private slots: void debug_currentChanged(QModelIndex current, QModelIndex previous); void newNetwork(NetworkId id); void networkConnectionChanged(Network::ConnectionState state); - + void newBuffers(const QModelIndex &parent, int start, int end); + private: + void newBuffer(BufferId bufferId); + SelectionModelSynchronizer _selectionModelSynchronizer; + QPair _bufferToSwitchTo; }; #endif // BUFFERMODEL_H