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

diff --git a/src/qtopia/chatwidget.cpp b/src/qtopia/chatwidget.cpp
index 6c3ffe20..8c81f448 100644
--- a/src/qtopia/chatwidget.cpp
+++ b/src/qtopia/chatwidget.cpp
@@ -23,7 +23,7 @@
 #include "chatwidget.h"
 
 ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent) {
-
+  setStyleSheet("background-color: rgba(255, 255, 255, 60%)");
 }
 
 void ChatWidget::setContents(QList<ChatLine *> lines) {
@@ -45,7 +45,10 @@ void ChatWidget::appendMsg(AbstractUiMsg *msg) {
 }
 
 void ChatWidget::appendChatLine(ChatLine *line) {
-  append(line->text()); qDebug() << "appending";
+  QTextCursor cursor = textCursor();
+  moveCursor(QTextCursor::End);
+  insertChatLine(line);
+  setTextCursor(cursor);
 }
 
 void ChatWidget::appendChatLines(QList<ChatLine *> list) {
@@ -55,24 +58,30 @@ void ChatWidget::appendChatLines(QList<ChatLine *> list) {
 }
 
 void ChatWidget::prependChatLine(ChatLine *line) {
-  qDebug() << "prepending"; return;
   QTextCursor cursor = textCursor();
   moveCursor(QTextCursor::Start);
-  insertHtml(line->text());
+  insertChatLine(line);
   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) {
+  insertStyledText(line->styledSender());
+  insertPlainText(" ");
+  insertStyledText(line->styledText());
+  insertPlainText("\n");
+}
 
+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));
+  }
 }