X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtopia%2Fchatwidget.cpp;h=e60083b1bc0c132553fc3c57b8aea26ea97c8941;hp=b492fd331c040e5b1b83ad87f5d52233f82c7fb5;hb=9b63f3ec74f5e2b94e223f0e9b6dc3292787375f;hpb=c0ca17fde48836a5d2e7ea9ceaaabcdd7225d9b8

diff --git a/src/qtopia/chatwidget.cpp b/src/qtopia/chatwidget.cpp
index b492fd33..e60083b1 100644
--- a/src/qtopia/chatwidget.cpp
+++ b/src/qtopia/chatwidget.cpp
@@ -23,7 +23,8 @@
 #include "chatwidget.h"
 
 ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent) {
-
+  setStyleSheet("background-color: rgba(255, 255, 255, 60%)");
+  setTextInteractionFlags(Qt::TextBrowserInteraction);
 }
 
 void ChatWidget::setContents(QList<ChatLine *> lines) {
@@ -33,19 +34,25 @@ void ChatWidget::setContents(QList<ChatLine *> lines) {
 }
 
 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);
 }
 
 void ChatWidget::appendChatLine(ChatLine *line) {
-  append(line->text()); qDebug() << "appending";
+  QTextCursor cursor = textCursor();
+  moveCursor(QTextCursor::End);
+  if(!document()->isEmpty()) insertPlainText("\n");
+  insertStyledText(line->styledSender());
+  insertPlainText(" ");
+  insertStyledText(line->styledText());
+  setTextCursor(cursor);
 }
 
 void ChatWidget::appendChatLines(QList<ChatLine *> list) {
@@ -57,21 +64,32 @@ void ChatWidget::appendChatLines(QList<ChatLine *> list) {
 void ChatWidget::prependChatLine(ChatLine *line) {
   QTextCursor cursor = textCursor();
   moveCursor(QTextCursor::Start);
-  insertHtml(line->text());
+  bool flg = document()->isEmpty();
+  insertStyledText(line->styledSender());
+  insertPlainText(" ");
+  insertStyledText(line->styledText());
+  if(!flg) insertPlainText("\n");
   setTextCursor(cursor);
-  QTextCharFormat fmt;
-  fmt.setForeground(QBrush("#eeff33"));
-  QFont font("Courier", 8);
-  font.setFixedPitch(true); qDebug() << font.family();
-  fmt.setFont(font);
-  //fmt.setBackground(QBrush("#112233"));
-  QTextCursor crsor(document());
-  crsor.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
-  crsor.select(QTextCursor::Document);
-  crsor.setCharFormat(fmt);
 }
 
 void ChatWidget::prependChatLines(QList<ChatLine *> list) {
+  foreach(ChatLine *line, list) {
+    prependChatLine(line);
+  }
+}
 
+void ChatWidget::insertChatLine(ChatLine *line) {
+  if(!document()->isEmpty()) insertPlainText("\n");
+  insertStyledText(line->styledSender());
+  insertPlainText(" ");
+  insertStyledText(line->styledText());
+}
 
+void ChatWidget::insertStyledText(const QtopiaUiStyle::StyledText &stext) {
+  QTextCursor cursor = textCursor();
+  foreach(QTextLayout::FormatRange format, stext.formats) {
+    cursor.setCharFormat(format.format);
+    setTextCursor(cursor);
+    insertPlainText(stext.text.mid(format.start, format.length));
+  }
 }