/***************************************************************************
- * 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 *
***************************************************************************/
#include "chatline-old.h"
+#include "client.h"
+#include "network.h"
#include "qtui.h"
-//!\brief Construct a ChatLine object from a message.
+//! Construct a ChatLine object from a message.
/**
* \param m The message to be layouted and rendered
- * \param net The network name
- * \param buf The buffer name
*/
ChatLine::ChatLine(Message m) {
hght = 0;
//bufferName = m.buffer.buffer();
msg = m;
selectionMode = None;
+ isHighlight = false;
formatMsg(msg);
}
}
void ChatLine::formatMsg(Message msg) {
+ isHighlight = msg.flags() & Message::Highlight;
QTextOption tsOption, senderOption, textOption;
styledTimeStamp = QtUi::style()->styleString(msg.formattedTimestamp());
styledSender = QtUi::style()->styleString(msg.formattedSender());
// This function is almost obsolete, since with the new style engine, we already get a list of formats...
// We don't know yet if we keep this implementation of ChatLine, so I won't bother making this actually nice.
-// Also, the additional format is ignored for now, which means that you won't see a selection...
-// FIXME TODO
-QList<ChatLine::FormatRange> ChatLine::calcFormatRanges(const UiStyle::StyledText &fs, QTextLayout::FormatRange additional) {
+QList<ChatLine::FormatRange> ChatLine::calcFormatRanges(UiStyle::StyledText fs, QTextLayout::FormatRange additional) {
QList<FormatRange> ranges;
+ if(additional.length > 0) {
+ for(int i = 0; i < fs.formats.count(); i++) {
+ int oldend = fs.formats[i].start + fs.formats[i].length - 1;
+ int addend = additional.start + additional.length - 1;
+ if(oldend < additional.start) continue;
+ fs.formats[i].length = additional.start - fs.formats[i].start;
+ QTextLayout::FormatRange addfmtrng = fs.formats[i];
+ addfmtrng.format.merge(additional.format);
+ addfmtrng.start = additional.start;
+ addfmtrng.length = qMin(oldend, addend) - additional.start + 1;
+ fs.formats.insert(++i, addfmtrng);
+ if(addend == oldend) break;
+ if(addend < oldend) {
+ QTextLayout::FormatRange restfmtrng = fs.formats[i-1];
+ restfmtrng.start = addend + 1;
+ restfmtrng.length = oldend - addend;
+ fs.formats.insert(++i, restfmtrng);
+ break;
+ }
+ }
+ }
foreach(QTextLayout::FormatRange f, fs.formats) {
+ if(f.length <= 0) continue;
FormatRange range;
range.start = f.start;
range.length = f.length;
range.height = metrics.lineSpacing();
ranges.append(range);
}
- /*
- QList<QTextLayout::FormatRange> formats = fs.formats;
- formats.append(additional);
- int cur = -1;
- FormatRange range, lastrange;
- for(int i = 0; i < fs.text.length(); i++) {
- QTextCharFormat format;
- foreach(QTextLayout::FormatRange f, formats) {
- if(i >= f.start && i < f.start + f.length) format.merge(f.format);
- }
- if(cur < 0) {
- range.start = 0; range.length = 1; range.format= format;
- cur = 0;
- } else {
- if(format == range.format) range.length++;
- else {
- QFontMetrics metrics(range.format.font());
- range.height = metrics.lineSpacing();
- ranges.append(range);
- range.start = i; range.length = 1; range.format = format;
- cur++;
- }
- }
- }
- if(cur >= 0) {
- QFontMetrics metrics(range.format.font());
- range.height = metrics.lineSpacing();
- ranges.append(range);
- }
- */
return ranges;
}
textSel.format.setBackground(pal.brush(QPalette::Highlight));
textSel.start = selectionStart;
textSel.length = selectionEnd - selectionStart;
- //textFormat.append(textSel);
textFormat = calcFormatRanges(styledText, textSel);
- foreach(FormatRange fr, textFormat);
break;
case Full:
tsSel.format.setForeground(pal.brush(QPalette::HighlightedText));
}
}
-uint ChatLine::msgId() const {
- return msg.buffer().uid();
+MsgId ChatLine::msgId() const {
+ return msg.msgId();
}
BufferInfo ChatLine::bufferInfo() const {
- return msg.buffer();
+ return msg.bufferInfo();
}
QDateTime ChatLine::timestamp() const {
p->setPen(Qt::NoPen);
p->setBrush(pal.brush(QPalette::Highlight));
p->drawRect(QRectF(pos, QSizeF(tsWidth + QtUi::style()->sepTsSender() + senderWidth + QtUi::style()->sepSenderText() + textWidth, height())));
- } else if(selectionMode == Partial) {
+ } else {
+ if(isHighlight) {
+ p->setPen(Qt::NoPen);
+ p->setBrush(pal.brush(QPalette::AlternateBase));
+ p->drawRect(QRectF(pos, QSizeF(tsWidth + QtUi::style()->sepTsSender() + senderWidth + QtUi::style()->sepSenderText() + textWidth, height())));
+ }
+ if(selectionMode == Partial) {
+ }
} /*
p->setClipRect(QRectF(pos, QSizeF(tsWidth, height())));
tsLayout.draw(p, pos, tsFormat);
}
QPointF tpos = pos + QPointF(tsWidth + QtUi::style()->sepTsSender() + senderWidth + QtUi::style()->sepSenderText(), 0);
qreal h = 0; int l = 0;
+ if(lineLayouts.count() == 0) return; // how can this happen?
rect = QRectF(tpos + QPointF(0, h), QSizeF(textWidth, lineLayouts[l].height));
int offset = 0;
foreach(FormatRange fr, textFormat) {