X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=24e4a5d104a94e435682381d00f14545c13de75c;hp=6e4982a4edb7bf75c354364c24b6e0eeec8180a6;hb=62192fb6cd9cc211b5b9fe844c9b4c2f98f923cc;hpb=65c657b9339661b5ba31f132c914873f4a9093ae

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index 6e4982a4..24e4a5d1 100644
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -23,24 +23,29 @@
 #include <QtGui>
 
 #include "bufferinfo.h"
+#include "buffersyncer.h"
+#include "client.h"
 #include "chatitem.h"
 #include "chatline.h"
+#include "columnhandleitem.h"
+#include "messagemodel.h"
+#include "networkmodel.h"
 #include "qtui.h"
+#include "qtuisettings.h"
 
-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;
-  _selection = 0;
-}
-
-ChatLine::~ChatLine() {
-  delete _timestampItem;
-  delete _senderItem;
-  delete _contentsItem;
+ChatLine::ChatLine(int row, QAbstractItemModel *model, QGraphicsItem *parent)
+  : QGraphicsItem(parent),
+    _row(row), // needs to be set before the items
+    _timestampItem(model, this),
+    _senderItem(model, this),
+    _contentsItem(model, this),
+    _width(0),
+    _height(0),
+    _selection(0)
+{
+  Q_ASSERT(model);
+  QModelIndex index = model->index(row, ChatLineModel::ContentsColumn);
+  setHighlighted(model->data(index, MessageModel::FlagsRole).toInt() & Message::Highlight);
 }
 
 QRectF ChatLine::boundingRect () const {
@@ -48,26 +53,31 @@ QRectF ChatLine::boundingRect () const {
   return QRectF(0, 0, _width, _height);
 }
 
-ChatItem *ChatLine::item(ChatLineModel::ColumnType column) const {
+ChatItem &ChatLine::item(ChatLineModel::ColumnType column) {
   switch(column) {
-    case ChatLineModel::TimestampColumn: return _timestampItem;
-    case ChatLineModel::SenderColumn: return _senderItem;
-    case ChatLineModel::ContentsColumn: return _contentsItem;
-    default: return 0;
+    case ChatLineModel::TimestampColumn:
+      return _timestampItem;
+    case ChatLineModel::SenderColumn:
+      return _senderItem;
+    case ChatLineModel::ContentsColumn:
+      return _contentsItem;
+  default:
+    return *(ChatItem *)0; // provoke an error
   }
 }
 
-qreal ChatLine::setGeometry(qreal width, qreal firstHandlePos, qreal secondHandlePos) {
-  if(width != _width) prepareGeometryChange();
-  qreal firstsep = QtUi::style()->firstColumnSeparator()/2;
-  qreal secondsep = QtUi::style()->secondColumnSeparator()/2;
+qreal ChatLine::setGeometry(qreal width) {
+  if(width != _width)
+    prepareGeometryChange();
 
-  _timestampItem->setWidth(firstHandlePos - firstsep);
-  _senderItem->setWidth(secondHandlePos - firstHandlePos - (firstsep+secondsep));
-  _height = _contentsItem->setWidth(width - secondHandlePos - secondsep);
+  ColumnHandleItem *firstColumnHandle = chatScene()->firstColumnHandle();
+  ColumnHandleItem *secondColumnHandle = chatScene()->secondColumnHandle();
+  _height = _contentsItem.setGeometry(width - secondColumnHandle->sceneRight());
+  _timestampItem.setGeometry(firstColumnHandle->sceneLeft(), _height);
+  _senderItem.setGeometry(secondColumnHandle->sceneLeft() - firstColumnHandle->sceneRight(), _height);
 
-  _senderItem->setPos(firstHandlePos + firstsep, 0);
-  _contentsItem->setPos(secondHandlePos + secondsep, 0);
+  _senderItem.setPos(firstColumnHandle->sceneRight(), 0);
+  _contentsItem.setPos(secondColumnHandle->sceneRight(), 0);
 
   _width = width;
   return _height;
@@ -75,15 +85,24 @@ qreal ChatLine::setGeometry(qreal width, qreal firstHandlePos, qreal secondHandl
 
 void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) {
   if(selected) {
-    _selection = (_selection & 0x80) | 0x40 | minColumn;
-    for(int i = 0; i < minColumn; i++) item((ChatLineModel::ColumnType)i)->clearSelection();
-    for(int i = minColumn; i <= ChatLineModel::ContentsColumn; i++) item((ChatLineModel::ColumnType)i)->setFullSelection();
-  }
-  else {
-    _selection &= 0x80;
-    for(int i = 0; i <= ChatLineModel::ContentsColumn; i++) item((ChatLineModel::ColumnType)i)->clearSelection();
+    quint8 sel = (_selection & 0x80) | 0x40 | minColumn;
+    if(sel != _selection) {
+      _selection = sel;
+      for(int i = 0; i < minColumn; i++)
+	item((ChatLineModel::ColumnType)i).clearSelection();
+      for(int i = minColumn; i <= ChatLineModel::ContentsColumn; i++)
+	item((ChatLineModel::ColumnType)i).setFullSelection();
+      update();
+    }
+  } else {
+    quint8 sel = _selection & 0x80;
+    if(sel != _selection) {
+      _selection = sel;
+      for(int i = 0; i <= ChatLineModel::ContentsColumn; i++)
+	item((ChatLineModel::ColumnType)i).clearSelection();
+      update();
+    }
   }
-  update();
 }
 
 void ChatLine::setHighlighted(bool highlighted) {
@@ -93,12 +112,33 @@ void ChatLine::setHighlighted(bool highlighted) {
 }
 
 void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
+  Q_UNUSED(option);
+  Q_UNUSED(widget);
   if(_selection & Highlighted) {
     painter->fillRect(boundingRect(), QBrush(QtUi::style()->highlightColor()));
   }
   if(_selection & Selected) {
-    qreal left = item((ChatLineModel::ColumnType)(_selection & 0x3f))->x();
+    qreal left = item((ChatLineModel::ColumnType)(_selection & 0x3f)).x();
     QRectF selectRect(left, 0, width() - left, height());
     painter->fillRect(selectRect, QApplication::palette().brush(QPalette::Highlight));
   }
+
+  // new line marker
+  const QAbstractItemModel *model_ = model();
+  if(model_ && row() > 0) {
+    QModelIndex prevRowIdx = model_->index(row() - 1, 0);
+    MsgId msgId = model_->data(prevRowIdx, MessageModel::MsgIdRole).value<MsgId>();
+    Message::Flags flags = (Message::Flags)model_->data(model_->index(row(), 0), MessageModel::FlagsRole).toInt();
+    // don't show the marker if we wrote that new line
+    if(!(flags & Message::Self)) {
+      BufferId bufferId = model_->data(prevRowIdx, MessageModel::BufferIdRole).value<BufferId>();
+      if(msgId == Client::networkModel()->lastSeenMsgId(bufferId) && chatScene()->isSingleBufferScene()) {
+	QtUiStyleSettings s("Colors");
+	QLinearGradient gradient(0, 0, 0, height());
+	gradient.setColorAt(0, s.value("newMsgMarkerFG", QColor(Qt::red)).value<QColor>());
+	gradient.setColorAt(0.1, Qt::transparent);
+	painter->fillRect(boundingRect(), gradient);
+      }
+    }
+  }
 }