X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtopia%2Fchatwidget.cpp;h=b6950c645b263ba6b9caad5234489d08cd488a63;hp=8c81f4485785f4513b1593e59015ec1a6525ba02;hb=e561e02a8d2f1f009559d17c7b1c66cb6f4e2a5a;hpb=fbc4df88ae0bb5e4d9394922395ce2ba29d9108e

diff --git a/src/qtopia/chatwidget.cpp b/src/qtopia/chatwidget.cpp
index 8c81f448..b6950c64 100644
--- a/src/qtopia/chatwidget.cpp
+++ b/src/qtopia/chatwidget.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development 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        *
@@ -22,24 +22,27 @@
 #include <QtGui>
 #include "chatwidget.h"
 
-ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent) {
+ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent), AbstractChatView() {
   setStyleSheet("background-color: rgba(255, 255, 255, 60%)");
+  setTextInteractionFlags(Qt::TextBrowserInteraction);
 }
 
-void ChatWidget::setContents(QList<ChatLine *> lines) {
+void ChatWidget::setContents(const QList<AbstractUiMsg *> &lines) {
   clear();
-  appendChatLines(lines);
+  QList<ChatLine *> list;
+  foreach(AbstractUiMsg *msg, lines) list << static_cast<ChatLine*>(msg);
+  appendChatLines(list);
 
 }
 
 void ChatWidget::prependMsg(AbstractUiMsg *msg) {
-  ChatLine *line = dynamic_cast<ChatLine*>(msg);
+  ChatLine *line = static_cast<ChatLine*>(msg);
   Q_ASSERT(line);
   prependChatLine(line);
 }
 
 void ChatWidget::appendMsg(AbstractUiMsg *msg) {
-  ChatLine *line = dynamic_cast<ChatLine*>(msg);
+  ChatLine *line = static_cast<ChatLine*>(msg);
   Q_ASSERT(line);
   appendChatLine(line);
 }
@@ -47,7 +50,10 @@ void ChatWidget::appendMsg(AbstractUiMsg *msg) {
 void ChatWidget::appendChatLine(ChatLine *line) {
   QTextCursor cursor = textCursor();
   moveCursor(QTextCursor::End);
-  insertChatLine(line);
+  if(!document()->isEmpty()) insertPlainText("\n");
+  insertStyledText(line->styledSender());
+  insertPlainText(" ");
+  insertStyledText(line->styledContents());
   setTextCursor(cursor);
 }
 
@@ -60,7 +66,11 @@ void ChatWidget::appendChatLines(QList<ChatLine *> list) {
 void ChatWidget::prependChatLine(ChatLine *line) {
   QTextCursor cursor = textCursor();
   moveCursor(QTextCursor::Start);
-  insertChatLine(line);
+  bool flg = document()->isEmpty();
+  insertStyledText(line->styledSender());
+  insertPlainText(" ");
+  insertStyledText(line->styledContents());
+  if(!flg) insertPlainText("\n");
   setTextCursor(cursor);
 }
 
@@ -71,17 +81,17 @@ void ChatWidget::prependChatLines(QList<ChatLine *> list) {
 }
 
 void ChatWidget::insertChatLine(ChatLine *line) {
+  if(!document()->isEmpty()) insertPlainText("\n");
   insertStyledText(line->styledSender());
   insertPlainText(" ");
-  insertStyledText(line->styledText());
-  insertPlainText("\n");
+  insertStyledText(line->styledContents());
 }
 
 void ChatWidget::insertStyledText(const QtopiaUiStyle::StyledText &stext) {
   QTextCursor cursor = textCursor();
-  foreach(QTextLayout::FormatRange format, stext.formats) {
+  foreach(QTextLayout::FormatRange format, stext.formatList) {
     cursor.setCharFormat(format.format);
     setTextCursor(cursor);
-    insertPlainText(stext.text.mid(format.start, format.length));
+    insertPlainText(stext.plainText.mid(format.start, format.length));
   }
 }