Swiftdiff options
| author | Mateusz Piekos <mateuszpiekos@gmail.com> | 2012-08-07 18:04:42 (GMT) |
|---|---|---|
| committer | Mateusz Piekos <mateuszpiekos@gmail.com> | 2012-08-07 18:04:42 (GMT) |
| commit | ed00df1501e2da74b0287999d4d1c7185005e3f6 (patch) | |
| tree | 3a2f28d1c39fa4c1cd1df686539113553e71e514 | |
| parent | a7a2f6124fd733926a0effe486cffee03bf9fde0 (diff) | |
| download | swift-contrib-ed00df1501e2da74b0287999d4d1c7185005e3f6.zip swift-contrib-ed00df1501e2da74b0287999d4d1c7185005e3f6.tar.bz2 | |
Changed texts informing about whiteboard session states
| -rw-r--r-- | Swift/QtUI/QtChatView.cpp | 4 | ||||
| -rw-r--r-- | Swift/QtUI/QtChatWindow.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp index 375a1ad..2f9a6e7 100644 --- a/Swift/QtUI/QtChatView.cpp +++ b/Swift/QtUI/QtChatView.cpp @@ -368,9 +368,9 @@ void QtChatView::setWhiteboardSessionStatus(QString id, const ChatWindow::Whiteb newInnerHTML = tr("Started whiteboard chat") + "<br/>" + QtChatWindow::buildChatWindowButton(tr("Show whiteboard"), QtChatWindow::ButtonWhiteboardShowWindow, id); } else if (state == ChatWindow::WhiteboardCanceled) { - newInnerHTML = tr("Whiteboard session has been canceled"); + newInnerHTML = tr("Whiteboard chat has been canceled"); } else if (state == ChatWindow::WhiteboardRejected) { - newInnerHTML = tr("Whiteboard session request has been rejected"); + newInnerHTML = tr("Whiteboard chat request has been rejected"); } divElement.setInnerXml(newInnerHTML); } diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp index 027962d..bf06abd 100644 --- a/Swift/QtUI/QtChatWindow.cpp +++ b/Swift/QtUI/QtChatWindow.cpp @@ -600,11 +600,11 @@ std::string QtChatWindow::addWhiteboardRequest(bool senderIsSelf) { QString wb_id = QString("wb%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++))); QString htmlString; if (senderIsSelf) { - htmlString = "<div id='" + wb_id + "'>" + tr("Sent session request") + "<br />"+ + htmlString = "<div id='" + wb_id + "'>" + tr("Starting whiteboard chat") + "<br />"+ buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) + "</div>"; } else { - htmlString = "<div id='" + wb_id + "'>" + Qt::escape(contact_) + tr(" would like to start whiteboard session") + ": <br/>" + + htmlString = "<div id='" + wb_id + "'>" + Qt::escape(contact_) + tr(" would like to start whiteboard chat") + ": <br/>" + buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) + buildChatWindowButton(tr("Accept"), ButtonWhiteboardSessionAcceptRequest, wb_id) + "</div>"; |