X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=cf3c3fa3e75202e3b96dca1cd4af2f7d3697ecad;hp=7121c210818e7665a8a49b49280fa66e5cdec851;hb=da2b5b2e4e2b0ea1847a0a5f0cb4a3752fc655c9;hpb=70706ff642683d03ff091cab25d984ec7d9612de

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index 7121c210..cf3c3fa3 100644
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC 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        *
@@ -27,66 +27,43 @@
 #include "chatline.h"
 #include "qtui.h"
 
-ChatLine::ChatLine(Message msg) : QGraphicsItem(), AbstractUiMsg() {
-  _styledTimestamp = QtUi::style()->styleString(msg.formattedTimestamp());
-  _styledSender = QtUi::style()->styleString(msg.formattedSender());
-  _styledText = QtUi::style()->styleString(msg.formattedText());
-  _msgId = msg.msgId();
-  _timestamp = msg.timestamp();
-
-  _tsColWidth = _senderColWidth = _textColWidth = 0;
-  QTextOption option;
-  option.setWrapMode(QTextOption::NoWrap);
-  _tsItem = new ChatItem(this);
-  _tsItem->setTextOption(option);
-  _tsItem->setText(_styledTimestamp);
-
-  option.setAlignment(Qt::AlignRight);
-  _senderItem = new ChatItem(this);
-  _senderItem->setTextOption(option);
-  _senderItem->setText(_styledSender);
-
-  option.setAlignment(Qt::AlignLeft);
-  option.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
-  _textItem = new ChatItem(this);
-  _textItem->setTextOption(option);
-  _textItem->setText(_styledText);
+ChatLine::ChatLine(const QModelIndex &index, QGraphicsItem *parent) : QGraphicsItem(parent) {
+  _timestampItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatLineModel::TimestampColumn)), this);
+  _senderItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatLineModel::SenderColumn)), this);
+  _contentsItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatLineModel::ContentsColumn)), this);
 
+  _timestampItem->setPos(0,0);
+  _width = _height = 0;
 }
 
 ChatLine::~ChatLine() {
-  
+  delete _timestampItem;
+  delete _senderItem;
+  delete _contentsItem;
 }
 
-QString ChatLine::sender() const {
-  return QString();
-}
-
-QString ChatLine::text() const {
-  return QString();
-}
-
-MsgId ChatLine::msgId() const {
-  return 0;
+QRectF ChatLine::boundingRect () const {
+  //return childrenBoundingRect();
+  return QRectF(0, 0, _width, _height);
 }
 
-BufferInfo ChatLine::bufferInfo() const {
-  Q_ASSERT(false); // do we actually need this function???
-  return BufferInfo();
-}
+int ChatLine::setColumnWidths(int ts, int sender, int contents) {
+  _timestampItem->setWidth(ts);
+  _senderItem->setWidth(sender);
+  _height = _contentsItem->setWidth(contents);
 
-QDateTime ChatLine::timestamp() const {
-  return QDateTime();
-}
+  _senderItem->setPos(ts, 0);
+  _contentsItem->setPos(ts + sender, 0);
 
-QRectF ChatLine::boundingRect () const {
-  return childrenBoundingRect();
+  _width = ts + sender + contents;
+  return _height;
 }
 
 void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
 
 }
 
+/*
 void ChatLine::setColumnWidths(int tsColWidth, int senderColWidth, int textColWidth) {
   if(tsColWidth >= 0) {
     _tsColWidth = tsColWidth;
@@ -116,5 +93,6 @@ bool ChatLine::sceneEvent ( QEvent * event ) {
   event->ignore();
   return false;
 }
+*/