Changeset View
Changeset View
Standalone View
Standalone View
src/viewer/ircview.cpp
Show All 14 Lines | |||||
15 | */ | 15 | */ | ||
16 | 16 | | |||
17 | #include "ircview.h" | 17 | #include "ircview.h" | ||
18 | #include "channel.h" | 18 | #include "channel.h" | ||
19 | #include "dcc/chatcontainer.h" | 19 | #include "dcc/chatcontainer.h" | ||
20 | #include "application.h" | 20 | #include "application.h" | ||
21 | #include "highlight.h" | 21 | #include "highlight.h" | ||
22 | #include "sound.h" | 22 | #include "sound.h" | ||
23 | #include "emoticons.h" | | |||
24 | #include "notificationhandler.h" | 23 | #include "notificationhandler.h" | ||
25 | 24 | | |||
26 | #include <QDrag> | 25 | #include <QDrag> | ||
27 | #include <QScrollBar> | 26 | #include <QScrollBar> | ||
28 | #include <QTextBlock> | 27 | #include <QTextBlock> | ||
29 | #include <QPainter> | 28 | #include <QPainter> | ||
30 | #include <QTextDocumentFragment> | 29 | #include <QTextDocumentFragment> | ||
31 | #include <QMimeData> | 30 | #include <QMimeData> | ||
▲ Show 20 Lines • Show All 1177 Lines • ▼ Show 20 Line(s) | 1074 | { | |||
1209 | } | 1208 | } | ||
1210 | else if (doHighlight && (whoSent == ownNick) && Preferences::self()->highlightOwnLines()) | 1209 | else if (doHighlight && (whoSent == ownNick) && Preferences::self()->highlightOwnLines()) | ||
1211 | { | 1210 | { | ||
1212 | // highlight own lines | 1211 | // highlight own lines | ||
1213 | filteredLine = QLatin1String("<font color=\"") + Preferences::self()->highlightOwnLinesColor().name() + | 1212 | filteredLine = QLatin1String("<font color=\"") + Preferences::self()->highlightOwnLinesColor().name() + | ||
1214 | QLatin1String("\">") + filteredLine + QLatin1String("</font>"); | 1213 | QLatin1String("\">") + filteredLine + QLatin1String("</font>"); | ||
1215 | } | 1214 | } | ||
1216 | 1215 | | |||
1217 | filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine); | | |||
1218 | | ||||
1219 | return filteredLine; | 1216 | return filteredLine; | ||
1220 | } | 1217 | } | ||
1221 | 1218 | | |||
1222 | QString IRCView::ircTextToHtml(const QString& text, bool parseURL, const QString& defaultColor, | 1219 | QString IRCView::ircTextToHtml(const QString& text, bool parseURL, const QString& defaultColor, | ||
1223 | const QString& whoSent, bool closeAllTags, QChar::Direction* direction) | 1220 | const QString& whoSent, bool closeAllTags, QChar::Direction* direction) | ||
1224 | { | 1221 | { | ||
1225 | TextHtmlData data; | 1222 | TextHtmlData data; | ||
1226 | data.defaultColor = defaultColor; | 1223 | data.defaultColor = defaultColor; | ||
▲ Show 20 Lines • Show All 1215 Lines • Show Last 20 Lines |