summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-04-24 16:29:01 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-04-24 16:29:01 (GMT)
commit8d200bd989b2893d2eaa03ea9f7fa7863f313547 (patch)
tree36e5be5c077a0269d0e525fb4b5030055032bb62 /Swift
parentcbe63e090b0f9151734dd166ab41902cdbdf5ac0 (diff)
downloadswift-contrib-8d200bd989b2893d2eaa03ea9f7fa7863f313547.zip
swift-contrib-8d200bd989b2893d2eaa03ea9f7fa7863f313547.tar.bz2
Use the right HTML for linebreaks
Resolves: #1102
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/QtChatWindow.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index b7ac05f..42fe0f5 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -538,7 +538,7 @@ std::string QtChatWindow::addFileTransfer(const std::string& senderName, bool se
QString formattedFileSize = P2QSTRING(formatSize(sizeInBytes));
if (senderIsSelf) {
// outgoing
- htmlString = tr("Send file") + ": " + P2QSTRING(filename) + " ( " + formattedFileSize + ") </br>" +
+ htmlString = tr("Send file") + ": " + P2QSTRING(filename) + " ( " + formattedFileSize + ") <br/>" +
"<div id='" + ft_id + "'>" +
buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, ft_id) +
buildChatWindowButton(tr("Set Description"), ButtonFileTransferSetDescription, ft_id) +
@@ -546,7 +546,7 @@ std::string QtChatWindow::addFileTransfer(const std::string& senderName, bool se
"</div>";
} else {
// incoming
- htmlString = "Receiving file: " + P2QSTRING(filename) + " ( " + formattedFileSize + ") </br>" +
+ htmlString = "Receiving file: " + P2QSTRING(filename) + " ( " + formattedFileSize + ") <br/>" +
"<div id='" + ft_id + "'>" +
buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, ft_id) +
buildChatWindowButton(tr("Accept"), ButtonFileTransferAcceptRequest, ft_id, P2QSTRING(filename)) +
@@ -858,12 +858,12 @@ void QtChatWindow::addMUCInvitation(const std::string& senderName, const JID& ji
onAllMessagesRead();
}
- QString htmlString = QObject::tr("You've been invited to enter the %1 room.").arg(P2QSTRING(jid.toString())) + " </br>";
+ QString htmlString = QObject::tr("You've been invited to enter the %1 room.").arg(P2QSTRING(jid.toString())) + " <br/>";
if (!reason.empty()) {
- htmlString += QObject::tr("Reason: %1").arg(P2QSTRING(reason)) + "</br>";
+ htmlString += QObject::tr("Reason: %1").arg(P2QSTRING(reason)) + "<br/>";
}
if (!direct) {
- htmlString += QObject::tr("This person may not have really sent this invitation!") + "</br>";
+ htmlString += QObject::tr("This person may not have really sent this invitation!") + "<br/>";
}
QString id = QString(ButtonMUCInvite + "%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++)));