X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline-old.cpp;h=2c9cb0d3c1628df01ed4a5441b1dcf2d0c9a0b16;hp=999285607cf6f8181bf0b30dab105c241b457ca6;hb=87828aeae2510b29619aa79a3bd76885e2c1ebd4;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016 diff --git a/src/qtui/chatline-old.cpp b/src/qtui/chatline-old.cpp index 99928560..2c9cb0d3 100644 --- a/src/qtui/chatline-old.cpp +++ b/src/qtui/chatline-old.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC 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 * @@ -19,28 +19,30 @@ ***************************************************************************/ #include "chatline-old.h" +#include "client.h" +#include "network.h" #include "qtui.h" -//!\brief Construct a ChatLine object from a message. +//! Construct a ChatLineOld 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) { +ChatLineOld::ChatLineOld(Message m) { hght = 0; //networkName = m.buffer.network(); //bufferName = m.buffer.buffer(); msg = m; selectionMode = None; + isHighlight = false; formatMsg(msg); } -ChatLine::~ChatLine() { +ChatLineOld::~ChatLineOld() { } -void ChatLine::formatMsg(Message msg) { +void ChatLineOld::formatMsg(Message msg) { + isHighlight = msg.flags() & Message::Highlight; QTextOption tsOption, senderOption, textOption; styledTimeStamp = QtUi::style()->styleString(msg.formattedTimestamp()); styledSender = QtUi::style()->styleString(msg.formattedSender()); @@ -49,13 +51,33 @@ void ChatLine::formatMsg(Message msg) { } // 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::calcFormatRanges(const UiStyle::StyledText &fs, QTextLayout::FormatRange additional) { +// We don't know yet if we keep this implementation of ChatLineOld, so I won't bother making this actually nice. +QList ChatLineOld::calcFormatRanges(UiStyle::StyledText fs, QTextLayout::FormatRange additional) { QList 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; @@ -64,40 +86,10 @@ QList ChatLine::calcFormatRanges(const UiStyle::StyledTex range.height = metrics.lineSpacing(); ranges.append(range); } - /* - QList 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; } -void ChatLine::setSelection(SelectionMode mode, int start, int end) { +void ChatLineOld::setSelection(SelectionMode mode, int start, int end) { selectionMode = mode; //tsFormat.clear(); senderFormat.clear(); textFormat.clear(); QPalette pal = QApplication::palette(); @@ -114,9 +106,7 @@ void ChatLine::setSelection(SelectionMode mode, int start, int end) { 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)); @@ -135,32 +125,32 @@ void ChatLine::setSelection(SelectionMode mode, int start, int end) { } } -uint ChatLine::msgId() const { - return msg.buffer().uid(); +MsgId ChatLineOld::msgId() const { + return msg.msgId(); } -BufferInfo ChatLine::bufferInfo() const { - return msg.buffer(); +BufferInfo ChatLineOld::bufferInfo() const { + return msg.bufferInfo(); } -QDateTime ChatLine::timestamp() const { +QDateTime ChatLineOld::timestamp() const { return msg.timestamp(); } -QString ChatLine::sender() const { +QString ChatLineOld::sender() const { return styledSender.text; } -QString ChatLine::text() const { +QString ChatLineOld::text() const { return styledText.text; } -bool ChatLine::isUrl(int c) const { +bool ChatLineOld::isUrl(int c) const { if(c < 0 || c >= charUrlIdx.count()) return false;; return charUrlIdx[c] >= 0; } -QUrl ChatLine::getUrl(int c) const { +QUrl ChatLineOld::getUrl(int c) const { if(c < 0 || c >= charUrlIdx.count()) return QUrl(); int i = charUrlIdx[c]; if(i >= 0) return styledText.urls[i].url; @@ -169,10 +159,10 @@ QUrl ChatLine::getUrl(int c) const { //!\brief Return the cursor position for the given coordinate pos. /** - * \param pos The position relative to the ChatLine + * \param pos The position relative to the ChatLineOld * \return The cursor position, [or -3 for invalid,] or -2 for timestamp, or -1 for sender */ -int ChatLine::posToCursor(QPointF pos) { +int ChatLineOld::posToCursor(QPointF pos) { if(pos.x() < tsWidth + (int)QtUi::style()->sepTsSender()/2) return -2; qreal textStart = tsWidth + QtUi::style()->sepTsSender() + senderWidth + QtUi::style()->sepSenderText(); if(pos.x() < textStart) return -1; @@ -190,7 +180,7 @@ int ChatLine::posToCursor(QPointF pos) { return 0; } -void ChatLine::precomputeLine() { +void ChatLineOld::precomputeLine() { tsFormat = calcFormatRanges(styledTimeStamp); senderFormat = calcFormatRanges(styledSender); textFormat = calcFormatRanges(styledText); @@ -243,7 +233,7 @@ void ChatLine::precomputeLine() { if(wr.start >= 0) words.append(wr); } -qreal ChatLine::layout(qreal tsw, qreal senderw, qreal textw) { +qreal ChatLineOld::layout(qreal tsw, qreal senderw, qreal textw) { tsWidth = tsw; senderWidth = senderw; textWidth = textw; if(textw <= 0) return minHeight; lineLayouts.clear(); LineLayout line; @@ -308,16 +298,23 @@ qreal ChatLine::layout(qreal tsw, qreal senderw, qreal textw) { return hght; } -//!\brief Draw ChatLine on the given QPainter at the given position. -void ChatLine::draw(QPainter *p, const QPointF &pos) { +//!\brief Draw ChatLineOld on the given QPainter at the given position. +void ChatLineOld::draw(QPainter *p, const QPointF &pos) { QPalette pal = QApplication::palette(); if(selectionMode == Full) { 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(QColor("lightcoral") /*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); @@ -347,6 +344,7 @@ void ChatLine::draw(QPainter *p, const QPointF &pos) { } 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) {