X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.h;h=5bacfaf0339b9bf2efb36c0b5029ffd18bfd3487;hp=56fa974a7364c3028e29a9c24ccb45a131292220;hb=eb606f89b0f97cbcb69b87e0ae749a05cd473ff2;hpb=0f206dd896485276cf25025e562c812b8c7fc5da

diff --git a/src/uisupport/bufferviewfilter.h b/src/uisupport/bufferviewfilter.h
index 56fa974a..5bacfaf0 100644
--- a/src/uisupport/bufferviewfilter.h
+++ b/src/uisupport/bufferviewfilter.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,9 +21,10 @@
 #ifndef BUFFERVIEWFILTER_H_
 #define BUFFERVIEWFILTER_H_
 
-#include <QColor>
+#include <QAction>
 #include <QDropEvent>
 #include <QFlags>
+#include <QPixmap>
 #include <QPointer>
 #include <QSet>
 #include <QSortFilterProxyModel>
@@ -36,7 +37,7 @@
  *****************************************/
 class BufferViewFilter : public QSortFilterProxyModel {
   Q_OBJECT
-  
+
 public:
   enum Mode {
     NoActive = 0x01,
@@ -48,26 +49,33 @@ public:
     NoServers = 0x40,
     FullCustom = 0x80
   };
-  Q_DECLARE_FLAGS(Modes, Mode);
+  Q_DECLARE_FLAGS(Modes, Mode)
 
   BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config = 0);
-  
+
   virtual Qt::ItemFlags flags(const QModelIndex &index) const;
   virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
 
   QVariant data(const QModelIndex &index, int role) const;
-  QVariant foreground(const QModelIndex &index) 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);
-									 
+
+  QList<QAction *> actions(const QModelIndex &index);
+
 public slots:
   void checkPreviousCurrentForRemoval(const QModelIndex &current, const QModelIndex &previous);
   void checkItemForRemoval(const QModelIndex &index) { checkItemsForRemoval(index, index); }
   void checkItemsForRemoval(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-  
+
 protected:
   bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
   bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const;
@@ -77,27 +85,35 @@ protected:
 
 signals:
   void _dataChanged(const QModelIndex &source_topLeft, const QModelIndex &source_bottomRight);
+  void configChanged();
 
 private slots:
   void configInitialized();
-    
+  void showUserStateIconsChanged();
+  void enableEditMode(bool enable);
+
 private:
   QPointer<BufferViewConfig> _config;
   Qt::SortOrder _sortOrder;
-  
-  QColor _FgColorInactiveActivity;
-  QColor _FgColorNoActivity;
-  QColor _FgColorHighlightActivity;
-  QColor _FgColorNewMessageActivity;
-  QColor _FgColorOtherActivity;
-  void loadColors();
+
+  QPixmap _channelJoinedIcon;
+  QPixmap _channelPartedIcon;
+  QPixmap _userOfflineIcon;
+  QPixmap _userAwayIcon;
+  QPixmap _userOnlineIcon;
+  bool _showUserStateIcons;
+
+  bool _editMode;
+  QAction _enableEditMode;
+  QSet<BufferId> _toAdd;
+  QSet<BufferId> _toTempRemove;
+  QSet<BufferId> _toRemove;
 
   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)    
-
-bool bufferIdLessThan(const BufferId &, const BufferId &);
+Q_DECLARE_OPERATORS_FOR_FLAGS(BufferViewFilter::Modes)
 
 #endif // BUFFERVIEWFILTER_H_