Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-07-21 21:28:21 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-08-11 09:47:22 (GMT) |
| commit | 009e552f76e17570f2c09789949d3804a153d696 (patch) | |
| tree | 8d7e95abda5e97836f59d4266273c8b11a56f217 | |
| parent | 360d7d6e0b184fea1d22ba0cc755db6f2e57e889 (diff) | |
| download | swift-009e552f76e17570f2c09789949d3804a153d696.zip swift-009e552f76e17570f2c09789949d3804a153d696.tar.bz2 | |
Remove extra space in file transfer file size text
Test-Information:
Verified the change is visible in the UI.
Change-Id: I31ebb28b3930c45e791ffea2ba8eb08364fcbd9b
| -rw-r--r-- | Swift/QtUI/QtWebKitChatView.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp index 0c82e73..8327473 100644 --- a/Swift/QtUI/QtWebKitChatView.cpp +++ b/Swift/QtUI/QtWebKitChatView.cpp | |||
| @@ -666,21 +666,21 @@ std::string QtWebKitChatView::addFileTransfer(const std::string& senderName, boo | |||
| 666 | QString htmlString; | 666 | QString htmlString; |
| 667 | QString formattedFileSize = P2QSTRING(formatSize(sizeInBytes)); | 667 | QString formattedFileSize = P2QSTRING(formatSize(sizeInBytes)); |
| 668 | if (senderIsSelf) { | 668 | if (senderIsSelf) { |
| 669 | // outgoing | 669 | // outgoing |
| 670 | filePaths_[ft_id] = P2QSTRING(filename); | 670 | filePaths_[ft_id] = P2QSTRING(filename); |
| 671 | actionText = tr("Send file"); | 671 | actionText = tr("Send file: %1 (%2)").arg(P2QSTRING(filename)).arg(formattedFileSize); |
| 672 | htmlString = actionText + ": " + P2QSTRING(filename) + " ( " + formattedFileSize + ") <br/>" + | 672 | htmlString = actionText + " <br/>" + |
| 673 | "<div id='" + ft_id + "'>" + | 673 | "<div id='" + ft_id + "'>" + |
| 674 | buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, ft_id) + | 674 | buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, ft_id) + |
| 675 | buildChatWindowButton(tr("Set Description"), ButtonFileTransferSetDescription, ft_id) + | 675 | buildChatWindowButton(tr("Set Description"), ButtonFileTransferSetDescription, ft_id) + |
| 676 | buildChatWindowButton(tr("Send"), ButtonFileTransferSendRequest, ft_id) + | 676 | buildChatWindowButton(tr("Send"), ButtonFileTransferSendRequest, ft_id) + |
| 677 | "</div>"; | 677 | "</div>"; |
| 678 | } else { | 678 | } else { |
| 679 | // incoming | 679 | // incoming |
| 680 | actionText = tr("Receiving file"); | 680 | actionText = tr("Receiving file: %1 (%2)").arg(P2QSTRING(filename)).arg(formattedFileSize); |
| 681 | htmlString = actionText + ": " + P2QSTRING(filename) + " ( " + formattedFileSize + ") <br/>" + | 681 | htmlString = actionText + " <br/>" + |
| 682 | "<div id='" + ft_id + "'>" + | 682 | "<div id='" + ft_id + "'>" + |
| 683 | buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, ft_id) + | 683 | buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, ft_id) + |
| 684 | buildChatWindowButton(tr("Accept"), ButtonFileTransferAcceptRequest, ft_id, P2QSTRING(filename)) + | 684 | buildChatWindowButton(tr("Accept"), ButtonFileTransferAcceptRequest, ft_id, P2QSTRING(filename)) + |
| 685 | "</div>"; | 685 | "</div>"; |
| 686 | } | 686 | } |