Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-06-22 09:06:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-07-10 11:46:50 (GMT) |
| commit | ed7a1fbf61d7879fd33896f36effd2f154753438 (patch) | |
| tree | 4904bf7298a7b25ece1e56c6d29aace1a60e9020 /Swift/QtUI/QtWebKitChatView.cpp | |
| parent | 84dcfb6263b46b62504706d69198675690f759be (diff) | |
| download | swift-ed7a1fbf61d7879fd33896f36effd2f154753438.zip swift-ed7a1fbf61d7879fd33896f36effd2f154753438.tar.bz2 | |
Show collecting of file transfer candidates in UI
Show the user the collection of possible file transfer candidates
after pressing the 'Start' button for a file transfer. Previously the
buttons remained in the UI giving no feedback to the user at all. If
no UPnP/NAT-PMP device is present, it this stage can take a couple
seconds to timeout and move on to the next stage.
Furthermore this commit adds documentation for the different states
in the ChatWindow::FileTransferState enum.
Test-Information:
Tested this in a network environment with no UPnP/NAT-PMP device
between two Swift instances.
Change-Id: I76ec6e641a2acd683938fe2d8f542d023a244145
Diffstat (limited to 'Swift/QtUI/QtWebKitChatView.cpp')
| -rw-r--r-- | Swift/QtUI/QtWebKitChatView.cpp | 14 |
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 | |||
| @@ -438,18 +438,22 @@ void QtWebKitChatView::setFileTransferStatus(QString id, const ChatWindow::FileT | |||
| 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%" |