X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.h;h=b805c6668e133152f2247cfacb4872f3e5656316;hp=251643f59fe25b644d2ceffd3ad92a5db15a53c1;hb=e2aa07398950ba83b47d1772eb8fb23bc8fdd931;hpb=9fd4619e9aca7d53d7c5df156a0b25956a1bf682

diff --git a/src/qtui/bufferwidget.h b/src/qtui/bufferwidget.h
index 251643f5..b805c666 100644
--- a/src/qtui/bufferwidget.h
+++ b/src/qtui/bufferwidget.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -23,90 +23,52 @@
 
 #include "ui_bufferwidget.h"
 
-#include "global.h"
+#include "chatview.h"
+#include "types.h"
 
-class Buffer;
-struct BufferState;
+class ChatView;
 class ChatWidget;
 class LayoutThread;
 
-//!\brief Displays the contents of a Buffer.
-/** A BufferWidget usually includes a topic line, a nicklist, the chat itself, and an input line.
- * For server buffers or queries, there is of course no nicklist.
- * The contents of the chat is rendered by a ChatWidget.
- */
+//! Displays the contents of a Buffer.
+/**
+*/
 class BufferWidget : public QWidget {
   Q_OBJECT
 
-  public:
-    BufferWidget(QWidget *parent = 0);
-    ~BufferWidget();
-    void init();
-
-    QSize sizeHint() const;
-
-  signals:
-    void userInput(QString msg);
-    void aboutToClose();
-  
-    //void layoutMessages(LayoutTask);
-    void nickListUpdated(QStringList l);
-      
-  protected:
-
-  public slots:
-    void setBuffer(Buffer *);
-    void saveState();
-    //void prependMessages(Buffer *, QList<Message>);  // for backlog processing
-
-  protected:
-    void resizeEvent ( QResizeEvent * event );
-
-  private slots:
-    void enterPressed();
-    void itemExpansionChanged(QTreeWidgetItem *);
-    void updateTitle();
-
-    //void displayMsg(Message);
-    void updateNickList(BufferState *state, QVariantMap nicks);
-    void updateNickList(QVariantMap nicks);
-    void setOwnNick(QString ownNick);
-    void setTopic(QString topic);
-    void setActive(bool act = true);
-
-    //void messagesLayouted(LayoutTask);
-
-
-  private:
-    Ui::BufferWidget ui;
-    Buffer *curBuf;
-    QHash<Buffer *, BufferState *> states;
-    bool active;
-
-    ChatWidget *chatWidget;
-    QSplitter *splitter;
-    QTreeWidget *nickTree;
-
-    QString networkName;
-    QString bufferName;
-
-    //LayoutThread *layoutThread;
-    //QHash<Buffer *, QList<ChatLine*> > chatLineCache;
-    //QHash<Buffer *, QList<Message> > msgCache;
-};
+  Q_PROPERTY(BufferId currentBuffer READ currentBuffer WRITE setCurrentBuffer);
+  Q_PROPERTY(NetworkId currentNetwork READ currentNetwork WRITE setCurrentNetwork);
+
+public:
+  BufferWidget(QWidget *parent = 0);
+  virtual ~BufferWidget();
+  void init();
+
+  QSize sizeHint() const;
+
+signals:
+  void userInput(QString msg);
+  void aboutToClose();
+
+public slots:
+  BufferId currentBuffer() const;
+  void setCurrentBuffer(BufferId bufferId);
 
-struct BufferState {
-  ChatWidget *chatWidget;
-  QTreeWidget *nickTree;
-  QSplitter *splitter;
-  QWidget *page;
-  Buffer *buffer;
-  QByteArray splitterState;
-  QString topic, ownNick;
-  QString inputLine;
-  int currentLine;
-  int lineOffset;
-  bool opsExpanded, voicedExpanded, usersExpanded;
+  NetworkId currentNetwork() const;
+  void setCurrentNetwork(NetworkId networkId);
+
+  void saveState();
+
+private slots:
+  void enterPressed();
+  void removeBuffer(BufferId bufferId);
+
+private:
+  Ui::BufferWidget ui;
+  QHash<BufferId, ChatWidget *> _chatWidgets;
+  BufferId _currentBuffer;
+  NetworkId _currentNetwork;
 };
 
+
 #endif