From f4036f6f56e8a0d13f3f1630002281331260d45a Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sat, 25 Nov 2017 14:01:01 +0200 Subject: Use span tags to prevent html escaping --- src/TimelineItem.cc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/TimelineItem.cc b/src/TimelineItem.cc index 263eb70d..03d375c3 100644 --- a/src/TimelineItem.cc +++ b/src/TimelineItem.cc @@ -341,15 +341,12 @@ TimelineItem::generateBody(const QString &userid, const QString &body) sender = userid.split(":")[0].split("@")[1]; } - QString userContent("%1"); - QString bodyContent("%1"); - QFont usernameFont = font_; usernameFont.setBold(true); userName_ = new QLabel(this); userName_->setFont(usernameFont); - userName_->setText(userContent.arg(sender)); + userName_->setText(sender); if (body.isEmpty()) return; @@ -357,7 +354,7 @@ TimelineItem::generateBody(const QString &userid, const QString &body) body_ = new QLabel(this); body_->setFont(font_); body_->setWordWrap(true); - body_->setText(bodyContent.arg(replaceEmoji(body))); + body_->setText(QString(" %1 ").arg(replaceEmoji(body))); body_->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextBrowserInteraction); body_->setOpenExternalLinks(true); body_->setMargin(0); @@ -366,8 +363,6 @@ TimelineItem::generateBody(const QString &userid, const QString &body) void TimelineItem::generateTimestamp(const QDateTime &time) { - QString msg("%1"); - QFont timestampFont; timestampFont.setPixelSize(conf::timeline::fonts::timestamp); @@ -376,7 +371,7 @@ TimelineItem::generateTimestamp(const QDateTime &time) timestamp_ = new QLabel(this); timestamp_->setFont(timestampFont); - timestamp_->setText(msg.arg(time.toString("HH:mm"))); + timestamp_->setText(time.toString("HH:mm")); timestamp_->setContentsMargins(0, topMargin, 0, 0); timestamp_->setStyleSheet( QString("font-size: %1px;").arg(conf::timeline::fonts::timestamp)); -- cgit v1.2.3