Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/QtUI/QtPlainChatView.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI/QtPlainChatView.cpp')
-rw-r--r--Swift/QtUI/QtPlainChatView.cpp23
1 files changed, 15 insertions, 8 deletions
diff --git a/Swift/QtUI/QtPlainChatView.cpp b/Swift/QtUI/QtPlainChatView.cpp
index 031a41d..eabf35f 100644
--- a/Swift/QtUI/QtPlainChatView.cpp
+++ b/Swift/QtUI/QtPlainChatView.cpp
@@ -4,26 +4,26 @@
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
6 6
7#include <Swift/QtUI/QtPlainChatView.h> 7#include <Swift/QtUI/QtPlainChatView.h>
8 8
9#include <QTextEdit>
10#include <QScrollBar>
11#include <QVBoxLayout>
12#include <QPushButton>
13#include <QLabel>
14#include <QDialog> 9#include <QDialog>
15#include <QProgressBar>
16#include <QFileDialog> 10#include <QFileDialog>
17#include <QInputDialog> 11#include <QInputDialog>
12#include <QLabel>
18#include <QMenu> 13#include <QMenu>
14#include <QProgressBar>
15#include <QPushButton>
16#include <QScrollBar>
17#include <QTextEdit>
18#include <QVBoxLayout>
19 19
20#include <Swiften/Base/foreach.h>
21#include <Swiften/Base/FileSize.h> 20#include <Swiften/Base/FileSize.h>
21#include <Swiften/Base/foreach.h>
22 22
23#include <Swift/Controllers/UIEvents/UIEventStream.h>
24#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h> 23#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
24#include <Swift/Controllers/UIEvents/UIEventStream.h>
25 25
26#include <Swift/QtUI/ChatSnippet.h> 26#include <Swift/QtUI/ChatSnippet.h>
27#include <Swift/QtUI/QtSwiftUtil.h> 27#include <Swift/QtUI/QtSwiftUtil.h>
28#include <Swift/QtUI/QtUtilities.h> 28#include <Swift/QtUI/QtUtilities.h>
29 29
@@ -358,10 +358,17 @@ QtPlainChatView::FileTransfer::FileTransfer(QtPlainChatView* parent, bool sender
358 } 358 }
359 359
360 std::string status = msg; 360 std::string status = msg;
361 361
362 switch (state) { 362 switch (state) {
363 case ChatWindow::Initialisation: {
364 status = "Preparing to send <i>"+ filename + "</i>...";
365 FileTransfer::Action* cancel = new FileTransfer::Action("Cancel", ftId);
366 parent->connect(cancel, SIGNAL(clicked()), SLOT(fileTransferReject()));
367 layout_->addWidget(cancel);
368 break;
369 }
363 case ChatWindow::WaitingForAccept: { 370 case ChatWindow::WaitingForAccept: {
364 status = "Waiting for user to accept <i>" + filename + "</i>..."; 371 status = "Waiting for user to accept <i>" + filename + "</i>...";
365 FileTransfer::Action* cancel = new FileTransfer::Action("Cancel", ftId); 372 FileTransfer::Action* cancel = new FileTransfer::Action("Cancel", ftId);
366 parent->connect(cancel, SIGNAL(clicked()), SLOT(fileTransferReject())); 373 parent->connect(cancel, SIGNAL(clicked()), SLOT(fileTransferReject()));
367 layout_->addWidget(cancel); 374 layout_->addWidget(cancel);