X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fchatscene.cpp;h=d51050f961778a2fff28438ae638e58a01782ccf;hb=9e0b5872dcf290e375c46c016f951c6ea780fcc0;hp=1d00876fee38226364132c3f63d6e398abff3ee1;hpb=8699dd758516d0ded076811e8ea656adc95e69d0;p=quassel.git

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 1d00876f..d51050f9 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -19,21 +19,21 @@
  ***************************************************************************/
 
 #include <QGraphicsSceneMouseEvent>
+#include <QPersistentModelIndex>
 
 #include "buffer.h"
 #include "chatitem.h"
-#include "chatline.h"
+#include "chatlinemodelitem.h"
 #include "chatscene.h"
 #include "quasselui.h"
 
-ChatScene::ChatScene(Buffer *buf, QObject *parent) : QGraphicsScene(parent) {
-  _buffer = buf;
-
-  foreach(AbstractUiMsg *msg, buf->contents()) {
-    appendMsg(msg);
+ChatScene::ChatScene(MessageModel *model, QObject *parent) : QGraphicsScene(parent), _model(model) {
+  connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(rowsInserted(const QModelIndex &, int, int)));
+  for(int i = 0; i < model->rowCount(); i++) {
+    ChatLine *line = new ChatLine(model->index(i, 0));
+    _lines.append(line);
+    addItem(line);
   }
-  connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), this, SLOT(appendMsg(AbstractUiMsg *)));
-  connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), this, SLOT(prependMsg(AbstractUiMsg *)));
 }
 
 ChatScene::~ChatScene() {
@@ -41,24 +41,18 @@ ChatScene::~ChatScene() {
 
 }
 
-void ChatScene::appendMsg(AbstractUiMsg * msg) {
-  ChatLine *line = dynamic_cast<ChatLine*>(msg);
-  Q_ASSERT(line);
-  _lines.append(line);
-  addItem(line);
-  line->setPos(0, _lines.count() * 30);
-  line->setColumnWidths(80, 80, 400);
-}
-
-void ChatScene::prependMsg(AbstractUiMsg * msg) {
-  ChatLine *line = dynamic_cast<ChatLine*>(msg);
-  Q_ASSERT(line); qDebug() << "prepending";
-  _lines.prepend(line);
-  addItem(line);
-  line->setPos(0, _lines.count() * 30);
+void ChatScene::setWidth(int w) {
+  _width = w;
+  int h = 0;
+  foreach(ChatLine *line, _lines) {
+    line->setPos(0, h);
+    h += line->setColumnWidths(60, 80, w - 60 - 80);
+  }
+  setSceneRect(QRectF(0, 0, w, h));
 }
 
 void ChatScene::mousePressEvent ( QGraphicsSceneMouseEvent * mouseEvent ) {
+  /*
   qDebug() << "recv" << mouseEvent->scenePos();
   ChatLine *line = static_cast<ChatLine*>(itemAt(mouseEvent->scenePos()));
   ChatItem *item = static_cast<ChatItem*>(itemAt(mouseEvent->scenePos()));
@@ -66,4 +60,5 @@ void ChatScene::mousePressEvent ( QGraphicsSceneMouseEvent * mouseEvent ) {
   if(line) {
     line->myMousePressEvent(mouseEvent);
   } else  QGraphicsScene::mousePressEvent(mouseEvent);
+  */
 }