X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.h;h=724be7dcec78fb3177cd99902aad923e4d770ec3;hp=fca296fa2d76db3e29cc6dd1b06bc5d469d649f3;hb=94be5fb31afd8f3befa8cb2cf1b3c2e5ef3cdba5;hpb=d298e7275374e2da41b0ed9ef1080464a77c8cf1

diff --git a/src/qtui/chatline.h b/src/qtui/chatline.h
index fca296fa..724be7dc 100644
--- a/src/qtui/chatline.h
+++ b/src/qtui/chatline.h
@@ -18,84 +18,43 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _CHATLINE_H_
-#define _CHATLINE_H_
+#ifndef CHATLINE_H_
+#define CHATLINE_H_
 
 #include <QGraphicsItem>
 
-#include "message.h"
-#include "quasselui.h"
-#include "uistyle.h"
+#include "chatlinemodel.h"
+#include "chatitem.h"
 
-class ChatItem;
-class ChatLineData;
-
-/* Concept Ideas
-* Probably makes sense to have ChatLineData be the AbstractUiMsg instead, if it turns out that creating ChatLineData
-is the expensive part... In that case, we could have a QHash<MsgId, ChatLineData*> in the Client, and ChatLine just
-gets a data pointer. This would allow us to share most data between AbstractUiMsgs, and ChatLines themselves could
-be pretty cheap - that'd be a clean solution for having a monitor buffer, highlight buffer etcpp.
-
-* ItemLayoutData
-
-*/
-
-class ChatLine : public QGraphicsItem, public AbstractUiMsg {
+class ChatLine : public QGraphicsItem {
 
   public:
-    ChatLine(Message);
-    virtual ~ChatLine();
-    virtual QString sender() const;
-    virtual QString text() const;
-    virtual MsgId msgId() const;
-    virtual BufferInfo bufferInfo() const;
-    virtual QDateTime timestamp() const;
+  ChatLine(int row, QAbstractItemModel *model, QGraphicsItem *parent = 0);
 
     virtual QRectF boundingRect () const;
-    virtual void paint (QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
-    void layout();
-
-    void setColumnWidths(int tsColWidth, int senderColWidth, int textColWidth);
-
-    void myMousePressEvent ( QGraphicsSceneMouseEvent * event ) { qDebug() << "press"; mousePressEvent(event); }
-
-  protected:
-    bool sceneEvent ( QEvent * event );
 
-  private:
-    UiStyle::StyledText _styledTimestamp, _styledText, _styledSender;
-
-    QDateTime _timestamp;
-    MsgId _msgId;
-
-    ChatItem *_tsItem, *_senderItem, *_textItem;
-    int _tsColWidth, _senderColWidth, _textColWidth;
-};
-
-//! This contains the data of a ChatLine, i.e. mainly the styled message contents.
-/** By separating ChatLine and ChatLineData, ChatLine itself is very small and we can reuse the
- *  same contents in several ChatLine objects without duplicating data.
- */
-class ChatLineData {
+  inline int row() { return _row; }
+  inline void setRow(int row) { _row = row; }
+    inline qreal width() const { return _width; }
+    inline qreal height() const { return _height; }
+    ChatItem &item(ChatLineModel::ColumnType);
 
-  public:
-    ChatLineData(const Message &msg);
+    virtual void paint (QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
-    inline UiStyle::StyledText styledSender() const { return _styledSender; }
-    inline UiStyle::StyledText styledTimestamp() const { return _styledTimestamp; }
-    inline UiStyle::StyledText styledText() const { return _styledText; }
+    // returns height
+    qreal setGeometry(qreal width, qreal firstColPos, qreal secondColPos);
+    void setSelected(bool selected, ChatLineModel::ColumnType minColumn = ChatLineModel::ContentsColumn);
+    void setHighlighted(bool highlighted);
 
-    inline QString sender() const { return _styledSender.text; }
-    inline QString text() const { return _styledText.text; }
-    inline QDateTime timestamp() const { return _timestamp; }
-    inline MsgId msgId() const { return _msgId; }
+  protected:
 
   private:
-    UiStyle::StyledText _styledSender, _styledText, _styledTimestamp;
-    QDateTime _timestamp;
-    MsgId _msgId;
+  int _row;
+    ChatItem _timestampItem, _senderItem, _contentsItem;
+    qreal _width, _height;
 
+    enum { Selected = 0x40, Highlighted = 0x80 };
+    quint8 _selection;  // save space, so we put both the col and the flags into one byte
 };
 
-
 #endif