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/Controllers/FileTransfer | |
| 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/Controllers/FileTransfer')
| -rw-r--r-- | Swift/Controllers/FileTransfer/FileTransferController.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp index 076d3c0..f7ce8e6 100644 --- a/Swift/Controllers/FileTransfer/FileTransferController.cpp +++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp | |||
| @@ -146,10 +146,11 @@ void FileTransferController::handleFileTransferStateChange(FileTransfer::State s | |||
| 146 | return; | 146 | return; |
| 147 | case FileTransfer::State::WaitingForAccept: | 147 | case FileTransfer::State::WaitingForAccept: |
| 148 | chatWindow->setFileTransferStatus(uiID, ChatWindow::WaitingForAccept); | 148 | chatWindow->setFileTransferStatus(uiID, ChatWindow::WaitingForAccept); |
| 149 | return; | 149 | return; |
| 150 | case FileTransfer::State::WaitingForStart: | 150 | case FileTransfer::State::WaitingForStart: |
| 151 | chatWindow->setFileTransferStatus(uiID, ChatWindow::Initialisation); | ||
| 151 | return; | 152 | return; |
| 152 | } | 153 | } |
| 153 | assert(false); | 154 | assert(false); |
| 154 | } | 155 | } |
| 155 | 156 | ||