Swiftdiff options
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtWebKitChatView.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp index b7f96f6..57706d4 100644 --- a/Swift/QtUI/QtWebKitChatView.cpp +++ b/Swift/QtUI/QtWebKitChatView.cpp | |||
| @@ -687,11 +687,11 @@ std::string QtWebKitChatView::addFileTransfer(const std::string& senderName, boo | |||
| 687 | 687 | ||
| 688 | bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasFileTransfer, senderName, senderIsSelf); | 688 | bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasFileTransfer, senderName, senderIsSelf); |
| 689 | 689 | ||
| 690 | QString qAvatarPath = "qrc:/icons/avatar.png"; | 690 | QString qAvatarPath = "qrc:/icons/avatar.png"; |
| 691 | std::string id = "ftmessage" + boost::lexical_cast<std::string>(idCounter_++); | 691 | std::string id = "ftmessage" + boost::lexical_cast<std::string>(idCounter_++); |
| 692 | addMessageBottom(boost::make_shared<MessageSnippet>(htmlString, QtUtilities::htmlEscape(P2QSTRING(senderName)), B2QDATE(boost::posix_time::second_clock::local_time()), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id), ChatSnippet::getDirection(actionText))); | 692 | addMessageBottom(boost::make_shared<MessageSnippet>(htmlString, QtUtilities::htmlEscape(P2QSTRING(senderName)), B2QDATE(boost::posix_time::second_clock::universal_time()), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id), ChatSnippet::getDirection(actionText))); |
| 693 | 693 | ||
| 694 | previousMessageWasSelf_ = senderIsSelf; | 694 | previousMessageWasSelf_ = senderIsSelf; |
| 695 | previousSenderName_ = P2QSTRING(senderName); | 695 | previousSenderName_ = P2QSTRING(senderName); |
| 696 | previousMessageKind_ = PreviousMessageWasFileTransfer; | 696 | previousMessageKind_ = PreviousMessageWasFileTransfer; |
| 697 | return Q2PSTRING(ft_id); | 697 | return Q2PSTRING(ft_id); |
| @@ -721,11 +721,11 @@ std::string QtWebKitChatView::addWhiteboardRequest(const QString& contact, bool | |||
| 721 | buildChatWindowButton(tr("Accept"), ButtonWhiteboardSessionAcceptRequest, wb_id) + | 721 | buildChatWindowButton(tr("Accept"), ButtonWhiteboardSessionAcceptRequest, wb_id) + |
| 722 | "</div>"; | 722 | "</div>"; |
| 723 | } | 723 | } |
| 724 | QString qAvatarPath = "qrc:/icons/avatar.png"; | 724 | QString qAvatarPath = "qrc:/icons/avatar.png"; |
| 725 | std::string id = "wbmessage" + boost::lexical_cast<std::string>(idCounter_++); | 725 | std::string id = "wbmessage" + boost::lexical_cast<std::string>(idCounter_++); |
| 726 | addMessageBottom(boost::make_shared<MessageSnippet>(htmlString, QtUtilities::htmlEscape(contact), B2QDATE(boost::posix_time::second_clock::local_time()), qAvatarPath, false, false, theme_, P2QSTRING(id), ChatSnippet::getDirection(actionText))); | 726 | addMessageBottom(boost::make_shared<MessageSnippet>(htmlString, QtUtilities::htmlEscape(contact), B2QDATE(boost::posix_time::second_clock::universal_time()), qAvatarPath, false, false, theme_, P2QSTRING(id), ChatSnippet::getDirection(actionText))); |
| 727 | previousMessageWasSelf_ = false; | 727 | previousMessageWasSelf_ = false; |
| 728 | previousSenderName_ = contact; | 728 | previousSenderName_ = contact; |
| 729 | return Q2PSTRING(wb_id); | 729 | return Q2PSTRING(wb_id); |
| 730 | } | 730 | } |
| 731 | 731 | ||
| @@ -924,11 +924,11 @@ void QtWebKitChatView::addMUCInvitation(const std::string& senderName, const JID | |||
| 924 | 924 | ||
| 925 | bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasMUCInvite, senderName, false); | 925 | bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasMUCInvite, senderName, false); |
| 926 | 926 | ||
| 927 | QString qAvatarPath = "qrc:/icons/avatar.png"; | 927 | QString qAvatarPath = "qrc:/icons/avatar.png"; |
| 928 | 928 | ||
| 929 | addMessageBottom(boost::make_shared<MessageSnippet>(htmlString, QtUtilities::htmlEscape(P2QSTRING(senderName)), B2QDATE(boost::posix_time::second_clock::local_time()), qAvatarPath, false, appendToPrevious, theme_, id, ChatSnippet::getDirection(message))); | 929 | addMessageBottom(boost::make_shared<MessageSnippet>(htmlString, QtUtilities::htmlEscape(P2QSTRING(senderName)), B2QDATE(boost::posix_time::second_clock::universal_time()), qAvatarPath, false, appendToPrevious, theme_, id, ChatSnippet::getDirection(message))); |
| 930 | previousMessageWasSelf_ = false; | 930 | previousMessageWasSelf_ = false; |
| 931 | previousSenderName_ = P2QSTRING(senderName); | 931 | previousSenderName_ = P2QSTRING(senderName); |
| 932 | previousMessageKind_ = PreviousMessageWasMUCInvite; | 932 | previousMessageKind_ = PreviousMessageWasMUCInvite; |
| 933 | } | 933 | } |
| 934 | 934 | ||