X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=419f33b18eff0cd216a6cbcd8f193c858f497c5c;hp=6bbca4ef88836df8ca32d99029799139777aa2d9;hb=7c9c1b348382b8b77f96a883945c522d32a478d5;hpb=09fea00d02da49748b6a040752759eab16ccd392

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 6bbca4ef..419f33b1 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.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  *
@@ -76,28 +76,50 @@ private slots:
   void joinChannel(const QModelIndex &index);
   void toggleHeader(bool checked);
 
-  void on_collapse(const QModelIndex &index);
-  void on_expand(const QModelIndex &index);
+  void storeExpandedState(const QModelIndex &networkIdx);
+  void setExpandedState(const QModelIndex &networkIdx);
+
   void on_configChanged();
 
 private:
   QPointer<BufferViewConfig> _config;
-  QHash<NetworkId, bool> _expandedState;
 
-  void storeExpandedState(NetworkId networkId, bool expanded);
+  enum ExpandedState {
+    WasExpanded = 0x01,
+    WasActive = 0x02
+  };
+  QHash<NetworkId, short> _expandedState;
+
 };
 
 // ******************************
-//  TristateDelgate
+//  BufferViewDelgate
 // ******************************
 #include <QStyledItemDelegate>
 
-class TristateDelegate : public QStyledItemDelegate {
+class BufferViewDelegate : public QStyledItemDelegate {
   Q_OBJECT
 
 public:
-  TristateDelegate(QObject *parent = 0) : QStyledItemDelegate(parent) {}
+  BufferViewDelegate(QObject *parent = 0);
   bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index);
+
+protected:
+  virtual void customEvent(QEvent *event);
+  virtual void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const;
+
+private slots:
+  void colorsChanged();
+  void loadColors();
+
+private:
+  QColor _FgColorInactiveActivity;
+  QColor _FgColorNoActivity;
+  QColor _FgColorHighlightActivity;
+  QColor _FgColorNewMessageActivity;
+  QColor _FgColorOtherActivity;
+
+  bool _updateColors;
 };
 
 
@@ -109,7 +131,6 @@ class BufferViewDock : public QDockWidget {
 
 public:
   BufferViewDock(BufferViewConfig *config, QWidget *parent);
-  BufferViewDock(QWidget *parent);
 
   inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }