Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/QtUI/QtWebKitChatView.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI/QtWebKitChatView.cpp')
-rw-r--r--Swift/QtUI/QtWebKitChatView.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index d6dc6f5..b7f96f6 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -436,22 +436,26 @@ void QtWebKitChatView::setFileTransferStatus(QString id, const ChatWindow::FileT
436 SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id) << std::endl; 436 SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id) << std::endl;
437 return; 437 return;
438 } 438 }
439 439
440 QString newInnerHTML = ""; 440 QString newInnerHTML = "";
441 if (state == ChatWindow::WaitingForAccept) { 441 if (state == ChatWindow::Initialisation) {
442 newInnerHTML = tr("Waiting for other side to accept the transfer.") + "<br/>" + 442 newInnerHTML = tr("Preparing to send.") + "<br/>" +
443 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id); 443 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id);
444 } 444 }
445 if (state == ChatWindow::Negotiating) { 445 else if (state == ChatWindow::WaitingForAccept) {
446 newInnerHTML = tr("Waiting for other side to accept the transfer.") + "<br/>" +
447 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id);
448 }
449 else if (state == ChatWindow::Negotiating) {
446 // replace with text "Negotiaging" + Cancel button 450 // replace with text "Negotiaging" + Cancel button
447 newInnerHTML = tr("Negotiating...") + "<br/>" + 451 newInnerHTML = tr("Negotiating...") + "<br/>" +
448 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id); 452 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id);
449 } 453 }
450 else if (state == ChatWindow::Transferring) { 454 else if (state == ChatWindow::Transferring) {
451 // progress bar + Cancel Button 455 // progress bar + Cancel Button
452 newInnerHTML = "<div style=\"position: relative; width: 90%; height: 20px; border: 2px solid grey; -webkit-border-radius: 10px;\">" 456 newInnerHTML = "<div style=\"position: relative; width: 90%; height: 20px; border: 2px solid grey; -webkit-border-radius: 10px;\">"
453 "<div class=\"progressbar\" style=\"width: 0%; height: 100%; background: #AAA; -webkit-border-radius: 6px;\">" 457 "<div class=\"progressbar\" style=\"width: 0%; height: 100%; background: #AAA; -webkit-border-radius: 6px;\">"
454 "<div class=\"progressbar-value\" style=\"position: absolute; top: 0px; left: 0px; width: 100%; text-align: center; padding-top: 2px;\">" 458 "<div class=\"progressbar-value\" style=\"position: absolute; top: 0px; left: 0px; width: 100%; text-align: center; padding-top: 2px;\">"
455 "0%" 459 "0%"
456 "</div>" 460 "</div>"
457 "</div>" 461 "</div>"