projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The new 'All Buffers' view is no properly presorted.
[quassel.git]
/
src
/
uisupport
/
bufferviewfilter.h
diff --git
a/src/uisupport/bufferviewfilter.h
b/src/uisupport/bufferviewfilter.h
index
813e554
..
b2f47e3
100644
(file)
--- a/
src/uisupport/bufferviewfilter.h
+++ b/
src/uisupport/bufferviewfilter.h
@@
-21,6
+21,7
@@
#ifndef BUFFERVIEWFILTER_H_
#define BUFFERVIEWFILTER_H_
#ifndef BUFFERVIEWFILTER_H_
#define BUFFERVIEWFILTER_H_
+#include <QAction>
#include <QColor>
#include <QDropEvent>
#include <QFlags>
#include <QColor>
#include <QDropEvent>
#include <QFlags>
@@
-59,12
+60,18
@@
public:
QVariant data(const QModelIndex &index, int role) const;
QVariant icon(const QModelIndex &index) const;
QVariant foreground(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 checkedState(const QModelIndex &index) const;
+
+ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+ bool setCheckedState(const QModelIndex &index, Qt::CheckState state);
void setConfig(BufferViewConfig *config);
inline BufferViewConfig *config() const { return _config; }
virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
void setConfig(BufferViewConfig *config);
inline BufferViewConfig *config() const { return _config; }
virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
+ QList<QAction *> actions(const QModelIndex &index);
+
public slots:
void checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous);
void checkItemForRemoval(const QModelIndex &index) { checkItemsForRemoval(index, index); }
public slots:
void checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous);
void checkItemForRemoval(const QModelIndex &index) { checkItemsForRemoval(index, index); }
@@
-84,6
+91,7
@@
signals:
private slots:
void configInitialized();
void showUserStateIconsChanged();
private slots:
void configInitialized();
void showUserStateIconsChanged();
+ void enableEditMode(bool enable);
private:
QPointer<BufferViewConfig> _config;
private:
QPointer<BufferViewConfig> _config;
@@
-100,14
+108,19
@@
private:
QPixmap _userOnlineIcon;
bool _showUserStateIcons;
QPixmap _userOnlineIcon;
bool _showUserStateIcons;
+ bool _editMode;
+ QAction _enableEditMode;
+ QSet<BufferId> _toAdd;
+ QSet<BufferId> _toTempRemove;
+ QSet<BufferId> _toRemove;
+
void loadColors();
bool filterAcceptBuffer(const QModelIndex &) const;
bool filterAcceptNetwork(const QModelIndex &) const;
void addBuffer(const BufferId &) const;
void loadColors();
bool filterAcceptBuffer(const QModelIndex &) const;
bool filterAcceptNetwork(const QModelIndex &) const;
void addBuffer(const BufferId &) const;
+ static bool bufferIdLessThan(const BufferId &, const BufferId &);
};
Q_DECLARE_OPERATORS_FOR_FLAGS(BufferViewFilter::Modes)
};
Q_DECLARE_OPERATORS_FOR_FLAGS(BufferViewFilter::Modes)
-bool bufferIdLessThan(const BufferId &, const BufferId &);
-
#endif // BUFFERVIEWFILTER_H_
#endif // BUFFERVIEWFILTER_H_