projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve flood control a bit
[quassel.git]
/
src
/
uisupport
/
bufferviewfilter.h
diff --git
a/src/uisupport/bufferviewfilter.h
b/src/uisupport/bufferviewfilter.h
index
06503fd
..
ba3778a
100644
(file)
--- a/
src/uisupport/bufferviewfilter.h
+++ b/
src/uisupport/bufferviewfilter.h
@@
-22,7
+22,6
@@
#define BUFFERVIEWFILTER_H_
#include <QAction>
#define BUFFERVIEWFILTER_H_
#include <QAction>
-#include <QColor>
#include <QDropEvent>
#include <QFlags>
#include <QPixmap>
#include <QDropEvent>
#include <QFlags>
#include <QPixmap>
@@
-59,7
+58,7
@@
public:
QVariant data(const QModelIndex &index, int role) const;
QVariant icon(const QModelIndex &index) const;
QVariant data(const QModelIndex &index, int role) const;
QVariant icon(const QModelIndex &index) const;
- QVariant foreground(const QModelIndex &index) const;
+
//
QVariant foreground(const QModelIndex &index) const;
QVariant checkedState(const QModelIndex &index) const;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
QVariant checkedState(const QModelIndex &index) const;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
@@
-97,12
+96,8
@@
private:
QPointer<BufferViewConfig> _config;
Qt::SortOrder _sortOrder;
QPointer<BufferViewConfig> _config;
Qt::SortOrder _sortOrder;
- QColor _FgColorInactiveActivity;
- QColor _FgColorNoActivity;
- QColor _FgColorHighlightActivity;
- QColor _FgColorNewMessageActivity;
- QColor _FgColorOtherActivity;
-
+ QPixmap _channelJoinedIcon;
+ QPixmap _channelPartedIcon;
QPixmap _userOfflineIcon;
QPixmap _userAwayIcon;
QPixmap _userOnlineIcon;
QPixmap _userOfflineIcon;
QPixmap _userAwayIcon;
QPixmap _userOnlineIcon;
@@
-114,11
+109,10
@@
private:
QSet<BufferId> _toTempRemove;
QSet<BufferId> _toRemove;
QSet<BufferId> _toTempRemove;
QSet<BufferId> _toRemove;
- void loadColors();
-
bool filterAcceptBuffer(const QModelIndex &) const;
bool filterAcceptNetwork(const QModelIndex &) const;
bool filterAcceptBuffer(const QModelIndex &) const;
bool filterAcceptNetwork(const QModelIndex &) const;
- void addBuffer(const BufferId &) const;
+ void addBuffer(const BufferId &bufferId) const;
+ void addBuffers(const QList<BufferId> &bufferIds) const;
static bool bufferIdLessThan(const BufferId &, const BufferId &);
};
Q_DECLARE_OPERATORS_FOR_FLAGS(BufferViewFilter::Modes)
static bool bufferIdLessThan(const BufferId &, const BufferId &);
};
Q_DECLARE_OPERATORS_FOR_FLAGS(BufferViewFilter::Modes)