projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add buffer filtering support.
[quassel.git]
/
src
/
uisupport
/
bufferview.h
diff --git
a/src/uisupport/bufferview.h
b/src/uisupport/bufferview.h
index
8a57664
..
a06c1f0
100644
(file)
--- a/
src/uisupport/bufferview.h
+++ b/
src/uisupport/bufferview.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-26,18
+26,18
@@
#include <QDockWidget>
#include <QModelIndex>
#include <QStyledItemDelegate>
#include <QDockWidget>
#include <QModelIndex>
#include <QStyledItemDelegate>
-#include <QTreeView>
#include <QPointer>
#include "actioncollection.h"
#include "bufferviewconfig.h"
#include "networkmodel.h"
#include <QPointer>
#include "actioncollection.h"
#include "bufferviewconfig.h"
#include "networkmodel.h"
+#include "treeviewtouch.h"
#include "types.h"
/*****************************************
* The TreeView showing the Buffers
*****************************************/
#include "types.h"
/*****************************************
* The TreeView showing the Buffers
*****************************************/
-class BufferView : public
QTreeView
+class BufferView : public
TreeViewTouch
{
Q_OBJECT
{
Q_OBJECT
@@
-52,7
+52,6
@@
public:
void setModel(QAbstractItemModel *model);
void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config);
void setModel(QAbstractItemModel *model);
void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config);
- virtual void setSelectionModel(QItemSelectionModel *selectionModel);
void setConfig(BufferViewConfig *config);
inline BufferViewConfig *config() { return _config; }
void setConfig(BufferViewConfig *config);
inline BufferViewConfig *config() { return _config; }
@@
-67,6
+66,7
@@
public slots:
void nextBuffer();
void previousBuffer();
void hideCurrentBuffer();
void nextBuffer();
void previousBuffer();
void hideCurrentBuffer();
+ void filterTextChanged(QString filterString);
signals:
void removeBuffer(const QModelIndex &);
signals:
void removeBuffer(const QModelIndex &);
@@
-76,12
+76,17
@@
protected:
virtual void keyPressEvent(QKeyEvent *);
virtual void dropEvent(QDropEvent *event);
virtual void rowsInserted(const QModelIndex &parent, int start, int end);
virtual void keyPressEvent(QKeyEvent *);
virtual void dropEvent(QDropEvent *event);
virtual void rowsInserted(const QModelIndex &parent, int start, int end);
- virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
virtual void wheelEvent(QWheelEvent *);
virtual QSize sizeHint() const;
virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
virtual void contextMenuEvent(QContextMenuEvent *event);
virtual void wheelEvent(QWheelEvent *);
virtual QSize sizeHint() const;
virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
virtual void contextMenuEvent(QContextMenuEvent *event);
+#if QT_VERSION < 0x050000
+ virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+#else
+ virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
+#endif
+
private slots:
void joinChannel(const QModelIndex &index);
void toggleHeader(bool checked);
private slots:
void joinChannel(const QModelIndex &index);
void toggleHeader(bool checked);
@@
-137,6
+142,8
@@
public :
BufferViewConfig *config() const;
inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }
inline bool isActive() const { return _active; }
BufferViewConfig *config() const;
inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }
inline bool isActive() const { return _active; }
+ void setWidget(QWidget *newWidget);
+ QWidget *widget() const { return _childWidget; }
public slots:
void setActive(bool active = true);
public slots:
void setActive(bool active = true);
@@
-146,7
+153,9
@@
private slots:
void updateTitle();
private:
void updateTitle();
private:
-
+ QWidget *_childWidget;
+ QWidget *_widget;
+ QLineEdit *_filterEdit;
bool _active;
QString _title;
};
bool _active;
QString _title;
};