From ed00df1501e2da74b0287999d4d1c7185005e3f6 Mon Sep 17 00:00:00 2001 From: Mateusz Piekos Date: Tue, 7 Aug 2012 20:04:42 +0200 Subject: Changed texts informing about whiteboard session states 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") + "
" + 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(idCounter_++))); QString htmlString; if (senderIsSelf) { - htmlString = "
" + tr("Sent session request") + "
"+ + htmlString = "
" + tr("Starting whiteboard chat") + "
"+ buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) + "
"; } else { - htmlString = "
" + Qt::escape(contact_) + tr(" would like to start whiteboard session") + ":
" + + htmlString = "
" + Qt::escape(contact_) + tr(" would like to start whiteboard chat") + ":
" + buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) + buildChatWindowButton(tr("Accept"), ButtonWhiteboardSessionAcceptRequest, wb_id) + "
"; -- cgit v0.10.2-6-g49f6