projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Provide join-and-switch-to methods for join/query
[quassel.git]
/
src
/
client
/
buffermodel.h
diff --git
a/src/client/buffermodel.h
b/src/client/buffermodel.h
index
cb9ffc4
..
dbc614d
100644
(file)
--- a/
src/client/buffermodel.h
+++ b/
src/client/buffermodel.h
@@
-23,11
+23,13
@@
#include <QSortFilterProxyModel>
#include <QItemSelectionModel>
#include <QSortFilterProxyModel>
#include <QItemSelectionModel>
+#include <QPair>
+#include "network.h"
+#include "networkmodel.h"
#include "types.h"
#include "selectionmodelsynchronizer.h"
#include "types.h"
#include "selectionmodelsynchronizer.h"
-class NetworkModel;
class QAbstractItemView;
class BufferModel : public QSortFilterProxyModel {
class QAbstractItemView;
class BufferModel : public QSortFilterProxyModel {
@@
-37,25
+39,36
@@
public:
BufferModel(NetworkModel *parent = 0);
bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const;
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 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 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<BufferId>(); }
public slots:
void setCurrentIndex(const QModelIndex &newCurrent);
void switchToBuffer(const BufferId &bufferId);
void switchToBufferIndex(const QModelIndex &bufferIdx);
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);
+ }
private slots:
void debug_currentChanged(QModelIndex current, QModelIndex previous);
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:
private:
+ void newBuffer(BufferId bufferId);
+
SelectionModelSynchronizer _selectionModelSynchronizer;
SelectionModelSynchronizer _selectionModelSynchronizer;
+ QPair<NetworkId, QString> _bufferToSwitchTo;
};
#endif // BUFFERMODEL_H
};
#endif // BUFFERMODEL_H