Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/Controllers
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-06-22 09:06:58 (GMT)
committerTobias Markmann <tm@ayena.de>2015-07-10 11:46:50 (GMT)
commited7a1fbf61d7879fd33896f36effd2f154753438 (patch)
tree4904bf7298a7b25ece1e56c6d29aace1a60e9020 /Swift/Controllers
parent84dcfb6263b46b62504706d69198675690f759be (diff)
downloadswift-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')
-rw-r--r--Swift/Controllers/FileTransfer/FileTransferController.cpp1
-rw-r--r--Swift/Controllers/UIInterfaces/ChatWindow.h10
2 files changed, 10 insertions, 1 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
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index b1e2a11..0fa734c 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -87,11 +87,19 @@ namespace Swift {
87 87
88 enum AckState {Pending, Received, Failed}; 88 enum AckState {Pending, Received, Failed};
89 enum ReceiptState {ReceiptRequested, ReceiptReceived, ReceiptFailed}; 89 enum ReceiptState {ReceiptRequested, ReceiptReceived, ReceiptFailed};
90 enum OccupantAction {Kick, Ban, MakeModerator, MakeParticipant, MakeVisitor, AddContact, ShowProfile}; 90 enum OccupantAction {Kick, Ban, MakeModerator, MakeParticipant, MakeVisitor, AddContact, ShowProfile};
91 enum RoomAction {ChangeSubject, Configure, Affiliations, Destroy, Invite}; 91 enum RoomAction {ChangeSubject, Configure, Affiliations, Destroy, Invite};
92 enum FileTransferState {WaitingForAccept, Negotiating, Transferring, Canceled, Finished, FTFailed}; 92 enum FileTransferState {
93 Initialisation, ///< Collecting information required for sending the request out.
94 WaitingForAccept, ///< The file transfer request was send out.
95 Negotiating, ///< The other party accepted the file transfer request and a suitable transfer method is negotiated.
96 Transferring, ///< The negotiation was successful and the file is currently transferred.
97 Canceled, ///< Someone actively canceled the transfer.
98 Finished, ///< The file was transferred successfully.
99 FTFailed ///< The negotiation, the transfer itself or the verification failed.
100 };
93 enum WhiteboardSessionState {WhiteboardAccepted, WhiteboardTerminated, WhiteboardRejected}; 101 enum WhiteboardSessionState {WhiteboardAccepted, WhiteboardTerminated, WhiteboardRejected};
94 enum BlockingState {BlockingUnsupported, IsBlocked, IsUnblocked}; 102 enum BlockingState {BlockingUnsupported, IsBlocked, IsUnblocked};
95 enum Direction { UnknownDirection, DefaultDirection }; 103 enum Direction { UnknownDirection, DefaultDirection };
96 enum MUCType { StandardMUC, ImpromptuMUC }; 104 enum MUCType { StandardMUC, ImpromptuMUC };
97 enum TimestampBehaviour { KeepTimestamp, UpdateTimestamp }; 105 enum TimestampBehaviour { KeepTimestamp, UpdateTimestamp };