projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved BufferView and BufferViewFilter to uisupport, since I intend
[quassel.git]
/
src
/
qtopia
/
chatwidget.cpp
diff --git
a/src/qtopia/chatwidget.cpp
b/src/qtopia/chatwidget.cpp
index
8c81f44
..
6a5ba02
100644
(file)
--- a/
src/qtopia/chatwidget.cpp
+++ b/
src/qtopia/chatwidget.cpp
@@
-47,7
+47,10
@@
void ChatWidget::appendMsg(AbstractUiMsg *msg) {
void ChatWidget::appendChatLine(ChatLine *line) {
QTextCursor cursor = textCursor();
moveCursor(QTextCursor::End);
void ChatWidget::appendChatLine(ChatLine *line) {
QTextCursor cursor = textCursor();
moveCursor(QTextCursor::End);
- insertChatLine(line);
+ if(!document()->isEmpty()) insertPlainText("\n");
+ insertStyledText(line->styledSender());
+ insertPlainText(" ");
+ insertStyledText(line->styledText());
setTextCursor(cursor);
}
setTextCursor(cursor);
}
@@
-60,7
+63,11
@@
void ChatWidget::appendChatLines(QList<ChatLine *> list) {
void ChatWidget::prependChatLine(ChatLine *line) {
QTextCursor cursor = textCursor();
moveCursor(QTextCursor::Start);
void ChatWidget::prependChatLine(ChatLine *line) {
QTextCursor cursor = textCursor();
moveCursor(QTextCursor::Start);
- insertChatLine(line);
+ bool flg = document()->isEmpty();
+ insertStyledText(line->styledSender());
+ insertPlainText(" ");
+ insertStyledText(line->styledText());
+ if(!flg) insertPlainText("\n");
setTextCursor(cursor);
}
setTextCursor(cursor);
}
@@
-71,10
+78,10
@@
void ChatWidget::prependChatLines(QList<ChatLine *> list) {
}
void ChatWidget::insertChatLine(ChatLine *line) {
}
void ChatWidget::insertChatLine(ChatLine *line) {
+ if(!document()->isEmpty()) insertPlainText("\n");
insertStyledText(line->styledSender());
insertPlainText(" ");
insertStyledText(line->styledText());
insertStyledText(line->styledSender());
insertPlainText(" ");
insertStyledText(line->styledText());
- insertPlainText("\n");
}
void ChatWidget::insertStyledText(const QtopiaUiStyle::StyledText &stext) {
}
void ChatWidget::insertStyledText(const QtopiaUiStyle::StyledText &stext) {