------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=119699
ogoffart kde org changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|UNCONFIRMED |RESOLVED
Resolution| |FIXED
------- Additional Comments From ogoffart kde org 2006-03-31 20:25 -------
SVN commit 525062 by ogoffart:
Make rich text override working
BUG: 119699
M +4 -3 kopete/chatwindow/chatmessagepart.cpp
M +11 -1 libkopete/kopetemessage.cpp
--- branches/kopete/0.12/kopete/kopete/chatwindow/chatmessagepart.cpp
#525061:525062
@ -395,14 +395,15 @
void ChatMessagePart::appendMessage( Kopete::Message &message, bool restoring )
{
+ message.setBgOverride( d->bgOverride );
+ message.setFgOverride( d->fgOverride );
+ message.setRtfOverride( d->rtfOverride );
+
// parse emoticons and URL now.
// Do not reparse emoticons on restoring, because it cause very
intensive CPU usage on long chats.
if( !restoring )
message.setBody( message.parsedBody() ,
Kopete::Message::ParsedHTML );
- message.setBgOverride( d->bgOverride );
- message.setFgOverride( d->fgOverride );
- message.setRtfOverride( d->rtfOverride );
#ifdef STYLE_TIMETEST
QTime beforeMessage = QTime::currentTime();
#endif
--- branches/kopete/0.12/kopete/libkopete/kopetemessage.cpp #525061:525062
@ -223,6 +223,10 @
theBody.remove( QString::fromLatin1("\n") );
}
+ /* else if( f == ParsedHTML )
+ {
+ kdWarning( 14000 ) << k_funcinfo << "using ParsedHTML which is
internal ! message: " << body << kdBacktrace() << endl;
+ }*/
d->body=theBody;
d->format = f;
@ -286,11 +290,17 @
QString Message::escapedBody() const
{
QString escapedBody=d->body;
+// kdDebug(14000) << k_funcinfo << escapedBody << " " << d->rtfOverride <<
endl;
if( d->format & PlainText )
{
escapedBody=escape( escapedBody );
}
+ else if( d->format & RichText && d->rtfOverride)
+ {
+ //remove the rich text
+ escapedBody = escape (unescape( escapedBody ) );
+ }
return escapedBody;
}
@ -305,7 +315,7 @
}
else
{
- return
Kopete::Emoticons::parseEmoticons(parseLinks(escapedBody(), d->format));
+ return
Kopete::Emoticons::parseEmoticons(parseLinks(escapedBody(), RichText));
}
}
_______________________________________________
kopete-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kopete-devel
