X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=8eca675692e2d4f4f36c6ddf9c8c279fc89c5d72;hp=4e83369e5b178c8b907bdee984a7205e16a922a6;hb=a72e2b4a90ce18c58b54e111161691ba008dc47d;hpb=0abe45a62eb5d9c8e1d8c0e783d77e07e705235b

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 4e83369e..8eca6756 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-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -25,6 +25,7 @@
 #include <QMenu>
 #include <QDockWidget>
 #include <QModelIndex>
+#include <QStyledItemDelegate>
 #include <QTreeView>
 #include <QPointer>
 
@@ -40,6 +41,11 @@ class BufferView : public QTreeView {
   Q_OBJECT
 
 public:
+  enum Direction {
+    Forward = 1,
+    Backward = -1
+  };
+
   BufferView(QWidget *parent = 0);
   void init();
 
@@ -57,6 +63,8 @@ public slots:
   void setRootIndexForNetworkId(const NetworkId &networkId);
   void removeSelectedBuffers(bool permanently = false);
   void menuActionTriggered(QAction *);
+  void nextBuffer();
+  void previousBuffer();
 
 signals:
   void removeBuffer(const QModelIndex &);
@@ -76,44 +84,66 @@ 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();
+  void on_layoutChanged();
+
+  void changeBuffer(Direction direction);
 
 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);
+};
 
 // ==============================
 //  BufferView Dock
 // ==============================
 class BufferViewDock : public QDockWidget {
   Q_OBJECT
+  Q_PROPERTY(bool active READ isActive WRITE setActive STORED true)
 
 public:
   BufferViewDock(BufferViewConfig *config, QWidget *parent);
 
+  int bufferViewId() const;
+  BufferViewConfig *config() const;
   inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }
+  inline bool isActive() const { return _active; }
 
 public slots:
+  void setActive(bool active = true);
+
+private slots:
   void bufferViewRenamed(const QString &newName);
+  void updateTitle();
+
+private:
+
+  bool _active;
+  QString _title;
 };
 
 #endif