Implement logic behind 'Clear all' button

The 'Clear all' button in the file transfer overview window was only present in the UI, without any logic behind. That's fixed now. Test-Information: Send a file in between two Swift instances. Verified that the button is enabled/disabled at appropriate times and works as expected if pressed. Change-Id: Ib92621cba479683ade8d815ce5ace9768449a499
author: Tobias Markmann <tm@ayena.de> 2015-06-17 20:40:41 (GMT)
committer: Tobias Markmann <tm@ayena.de> 2015-07-10 14:56:43 (GMT)
commit: b54aa689ffc6bec7987c193e28c641d2f0f73236 (patch)
tree: ad9984fc3f9633e21fe0ff5ef8728f6d420ca07f
parent: 7af21fdd59af3b3112cff69996301605859af84c (diff)
download: swift-b54aa689ffc6bec7987c193e28c641d2f0f73236.zip
swift-b54aa689ffc6bec7987c193e28c641d2f0f73236.tar.bz2
9 files changed, 229 insertions, 83 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index f7ce8e6..c21c364 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -118,13 +118,13 @@ void FileTransferController::cancel() {
 		chatWindow->setFileTransferStatus(uiID, ChatWindow::Canceled);
 	}
 }
 
 void FileTransferController::handleFileTransferStateChange(FileTransfer::State state) {
 	currentState = state;
-	onStateChage();
+	onStateChanged();
 	switch(state.type) {
 		case FileTransfer::State::Initial:
 			assert(false);
 			return;
 		case FileTransfer::State::Negotiating:
 			chatWindow->setFileTransferStatus(uiID, ChatWindow::Negotiating);
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.h b/Swift/Controllers/FileTransfer/FileTransferController.h
index 3d6f7d5..490773d 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.h
+++ b/Swift/Controllers/FileTransfer/FileTransferController.h
@@ -1,24 +1,31 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <string>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/cstdint.hpp>
+#include <boost/shared_ptr.hpp>
 
-#include <Swiften/JID/JID.h>
-#include <Swiften/FileTransfer/FileTransfer.h>
-#include <Swiften/FileTransfer/IncomingFileTransfer.h>
 #include <Swiften/FileTransfer/FileReadBytestream.h>
+#include <Swiften/FileTransfer/FileTransfer.h>
 #include <Swiften/FileTransfer/FileWriteBytestream.h>
+#include <Swiften/FileTransfer/IncomingFileTransfer.h>
+#include <Swiften/JID/JID.h>
+
 #include <Swift/Controllers/FileTransfer/FileTransferProgressInfo.h>
 
 namespace Swift {
 
 class FileTransferManager;
 class ChatWindow;
@@ -46,20 +53,20 @@ public:
 	const JID &getOtherParty() const;
 	bool isIncoming() const;
 	FileTransfer::State getState() const;
 	int getProgress() const;
 	boost::uintmax_t getSize() const;
 
-	boost::signal<void ()> onStateChage;
+	boost::signal<void ()> onStateChanged;
 	boost::signal<void ()> onProgressChange;
 
 private:
 	void handleFileTransferStateChange(FileTransfer::State);
 	void handleProgressPercentageChange(int percentage);
 
-private:	
+private:
 	bool sending;
 	JID otherParty;
 	std::string filename;
 	FileTransfer::ref transfer;
 	boost::shared_ptr<FileReadBytestream> fileReadStream;
 	boost::shared_ptr<FileWriteBytestream> fileWriteStream;
diff --git a/Swift/Controllers/FileTransfer/FileTransferOverview.cpp b/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
index 2a8c319..b2afea9 100644
--- a/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
@@ -1,44 +1,92 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #include "FileTransferOverview.h"
 
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
-#include <Swiften/Base/boost_bsignals.h>
 
+#include <Swiften/Base/Log.h>
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Base/foreach.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 
 namespace Swift {
 
 FileTransferOverview::FileTransferOverview(FileTransferManager* ftm) : fileTransferManager(ftm) {
 	fileTransferManager->onIncomingFileTransfer.connect(boost::bind(&FileTransferOverview::handleIncomingFileTransfer, this, _1));
+	onNewFileTransferController.connect(boost::bind(&FileTransferOverview::handleNewFileTransferController, this, _1));
 }
 
 FileTransferOverview::~FileTransferOverview() {
-	
+	onNewFileTransferController.disconnect(boost::bind(&FileTransferOverview::handleNewFileTransferController, this, _1));
+	fileTransferManager->onIncomingFileTransfer.disconnect(boost::bind(&FileTransferOverview::handleIncomingFileTransfer, this, _1));
+	foreach(FileTransferController* controller, fileTransfers) {
+		controller->onStateChanged.disconnect(boost::bind(&FileTransferOverview::handleFileTransferStateChanged, this));
+	}
 }
 	
 void FileTransferOverview::sendFile(const JID& jid, const std::string& filename) {
 	if (boost::filesystem::exists(filename) && boost::filesystem::file_size(filename) > 0) {
 		FileTransferController* controller = new FileTransferController(jid, filename, fileTransferManager);
-		fileTransfers.push_back(controller);
-
 		onNewFileTransferController(controller);
 	}
 }
 
 void FileTransferOverview::handleIncomingFileTransfer(IncomingFileTransfer::ref transfer) {
 	FileTransferController* controller = new FileTransferController(transfer);
-	fileTransfers.push_back(controller);
 	onNewFileTransferController(controller);
 }
 
+void FileTransferOverview::handleNewFileTransferController(FileTransferController* controller) {
+	fileTransfers.push_back(controller);
+	controller->onStateChanged.connect(boost::bind(&FileTransferOverview::handleFileTransferStateChanged, this));
+}
+
+void FileTransferOverview::handleFileTransferStateChanged() {
+	onFileTransferListChanged();
+}
+
 const std::vector<FileTransferController*>& FileTransferOverview::getFileTransfers() const {
 	return fileTransfers;
 }
 
+void FileTransferOverview::clearFinished() {
+	for (std::vector<FileTransferController*>::iterator it = fileTransfers.begin(); it != fileTransfers.end(); ) {
+		if((*it)->getState().type == FileTransfer::State::Finished
+			|| (*it)->getState().type == FileTransfer::State::Failed
+			|| (*it)->getState().type == FileTransfer::State::Canceled) {
+			FileTransferController* controller = *it;
+			it = fileTransfers.erase(it);
+			controller->onStateChanged.disconnect(boost::bind(&FileTransferOverview::handleFileTransferStateChanged, this));
+			delete controller;
+		} else {
+			++it;
+		}
+	}
+	onFileTransferListChanged();
+}
+
+bool FileTransferOverview::isClearable() const {
+	bool isClearable = false;
+	foreach (FileTransferController* controller, fileTransfers) {
+		if(controller->getState().type == FileTransfer::State::Finished
+			|| controller->getState().type == FileTransfer::State::Failed
+			|| controller->getState().type == FileTransfer::State::Canceled) {
+			isClearable = true;
+			break;
+		}
+	}
+	return isClearable;
+}
+
 }
diff --git a/Swift/Controllers/FileTransfer/FileTransferOverview.h b/Swift/Controllers/FileTransfer/FileTransferOverview.h
index 716666a..e3cbf81 100644
--- a/Swift/Controllers/FileTransfer/FileTransferOverview.h
+++ b/Swift/Controllers/FileTransfer/FileTransferOverview.h
@@ -1,37 +1,48 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <vector>
 
-#include "Swift/Controllers/FileTransfer/FileTransferController.h"
-
 #include <Swiften/Base/boost_bsignals.h>
 
+#include <Swift/Controllers/FileTransfer/FileTransferController.h>
+
 namespace Swift {
 
 class ChatsManager;
 class FileTransferManager;
 
 class FileTransferOverview {
 public:
 	FileTransferOverview(FileTransferManager*);
 	~FileTransferOverview();
 	
 	void sendFile(const JID&, const std::string&);
 	const std::vector<FileTransferController*>& getFileTransfers() const;
+	void clearFinished();
+	bool isClearable() const;
 
 	boost::signal<void (FileTransferController*)> onNewFileTransferController;
+	boost::signal<void ()> onFileTransferListChanged;
 
 private:
 	void handleIncomingFileTransfer(IncomingFileTransfer::ref transfer);
+	void handleNewFileTransferController(FileTransferController* controller);
+	void handleFileTransferStateChanged();
 
 private:
 	std::vector<FileTransferController*> fileTransfers;
 	FileTransferManager *fileTransferManager;
 };
 
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index a65a18a..cdaa207 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -10,90 +10,90 @@
 
 #include <boost/bind.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
-#include <Swiften/Base/format.h>
 #include <Swiften/Base/Algorithm.h>
 #include <Swiften/Base/String.h>
-#include <Swiften/StringCodecs/Base64.h>
-#include <Swiften/Network/TimerFactory.h>
-#include <Swiften/Client/Storages.h>
-#include <Swiften/VCards/VCardManager.h>
-#include <Swiften/Client/NickResolver.h>
 #include <Swiften/Base/foreach.h>
+#include <Swiften/Base/format.h>
 #include <Swiften/Client/Client.h>
-#include <Swiften/Presence/PresenceSender.h>
+#include <Swiften/Client/ClientBlockListManager.h>
+#include <Swiften/Client/ClientXMLTracer.h>
+#include <Swiften/Client/NickResolver.h>
+#include <Swiften/Client/StanzaChannel.h>
+#include <Swiften/Client/Storages.h>
+#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/Disco/CapsInfoGenerator.h>
+#include <Swiften/Disco/ClientDiscoManager.h>
+#include <Swiften/Disco/GetDiscoInfoRequest.h>
 #include <Swiften/Elements/ChatState.h>
+#include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Elements/VCardUpdate.h>
-#include <Swiften/Elements/DiscoInfo.h>
-#include <Swiften/Disco/CapsInfoGenerator.h>
-#include <Swiften/Disco/GetDiscoInfoRequest.h>
-#include <Swiften/Disco/ClientDiscoManager.h>
-#include <Swiften/VCards/GetVCardRequest.h>
-#include <Swiften/StringCodecs/Hexify.h>
-#include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
-#include <Swiften/Client/ClientXMLTracer.h>
-#include <Swiften/Client/StanzaChannel.h>
-#include <Swiften/Client/ClientBlockListManager.h>
-#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/Network/NetworkFactories.h>
+#include <Swiften/Network/TimerFactory.h>
+#include <Swiften/Presence/PresenceSender.h>
+#include <Swiften/StringCodecs/Base64.h>
+#include <Swiften/StringCodecs/Hexify.h>
+#include <Swiften/VCards/GetVCardRequest.h>
+#include <Swiften/VCards/VCardManager.h>
 
 #ifdef SWIFTEN_PLATFORM_WIN32
 #include <Swiften/SASL/WindowsAuthentication.h>
 #endif
 
-#include <SwifTools/Dock/Dock.h>
-#include <SwifTools/Notifier/TogglableNotifier.h>
-#include <SwifTools/Idle/IdleDetector.h>
-
-#include <Swift/Controllers/Intl.h>
-#include <Swift/Controllers/UIInterfaces/UIFactory.h>
+#include <Swift/Controllers/AdHocManager.h>
+#include <Swift/Controllers/BlockListController.h>
 #include <Swift/Controllers/BuildVersion.h>
-#include <Swift/Controllers/Chat/UserSearchController.h>
 #include <Swift/Controllers/Chat/ChatsManager.h>
-#include <Swift/Controllers/XMPPEvents/EventController.h>
-#include <Swift/Controllers/EventWindowController.h>
-#include <Swift/Controllers/UIInterfaces/LoginWindow.h>
-#include <Swift/Controllers/UIInterfaces/LoginWindowFactory.h>
-#include <Swift/Controllers/UIInterfaces/MainWindow.h>
 #include <Swift/Controllers/Chat/MUCController.h>
+#include <Swift/Controllers/Chat/UserSearchController.h>
+#include <Swift/Controllers/ContactEditController.h>
+#include <Swift/Controllers/ContactSuggester.h>
+#include <Swift/Controllers/ContactsFromXMPPRoster.h>
+#include <Swift/Controllers/EventNotifier.h>
+#include <Swift/Controllers/EventWindowController.h>
+#include <Swift/Controllers/FileTransfer/FileTransferOverview.h>
+#include <Swift/Controllers/FileTransferListController.h>
+#include <Swift/Controllers/HighlightEditorController.h>
+#include <Swift/Controllers/HighlightManager.h>
+#include <Swift/Controllers/HistoryController.h>
+#include <Swift/Controllers/HistoryViewController.h>
+#include <Swift/Controllers/Intl.h>
+#include <Swift/Controllers/PresenceNotifier.h>
+#include <Swift/Controllers/ProfileController.h>
 #include <Swift/Controllers/Roster/RosterController.h>
+#include <Swift/Controllers/SettingConstants.h>
+#include <Swift/Controllers/Settings/SettingsProvider.h>
+#include <Swift/Controllers/ShowProfileController.h>
 #include <Swift/Controllers/SoundEventController.h>
 #include <Swift/Controllers/SoundPlayer.h>
 #include <Swift/Controllers/StatusTracker.h>
+#include <Swift/Controllers/Storages/CertificateStorageFactory.h>
+#include <Swift/Controllers/Storages/CertificateStorageTrustChecker.h>
+#include <Swift/Controllers/Storages/StoragesFactory.h>
 #include <Swift/Controllers/SystemTray.h>
 #include <Swift/Controllers/SystemTrayController.h>
-#include <Swift/Controllers/XMLConsoleController.h>
-#include <Swift/Controllers/HistoryController.h>
-#include <Swift/Controllers/HistoryViewController.h>
-#include <Swift/Controllers/FileTransferListController.h>
+#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
+#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
-#include <Swift/Controllers/PresenceNotifier.h>
-#include <Swift/Controllers/EventNotifier.h>
-#include <Swift/Controllers/Storages/StoragesFactory.h>
+#include <Swift/Controllers/UIInterfaces/LoginWindow.h>
+#include <Swift/Controllers/UIInterfaces/LoginWindowFactory.h>
+#include <Swift/Controllers/UIInterfaces/MainWindow.h>
+#include <Swift/Controllers/UIInterfaces/UIFactory.h>
 #include <Swift/Controllers/WhiteboardManager.h>
-#include <Swift/Controllers/Settings/SettingsProvider.h>
-#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
-#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
-#include <Swift/Controllers/Storages/CertificateStorageFactory.h>
-#include <Swift/Controllers/Storages/CertificateStorageTrustChecker.h>
-#include <Swift/Controllers/ProfileController.h>
-#include <Swift/Controllers/ShowProfileController.h>
-#include <Swift/Controllers/ContactEditController.h>
+#include <Swift/Controllers/XMLConsoleController.h>
+#include <Swift/Controllers/XMPPEvents/EventController.h>
 #include <Swift/Controllers/XMPPURIController.h>
-#include <Swift/Controllers/AdHocManager.h>
-#include <Swift/Controllers/FileTransfer/FileTransferOverview.h>
-#include <Swift/Controllers/SettingConstants.h>
-#include <Swift/Controllers/HighlightManager.h>
-#include <Swift/Controllers/HighlightEditorController.h>
-#include <Swift/Controllers/BlockListController.h>
-#include <Swift/Controllers/ContactSuggester.h>
-#include <Swift/Controllers/ContactsFromXMPPRoster.h>
+
+#include <SwifTools/Dock/Dock.h>
+#include <SwifTools/Idle/IdleDetector.h>
+#include <SwifTools/Notifier/TogglableNotifier.h>
 
 namespace Swift {
 
 static const std::string CLIENT_NAME = "Swift";
 static const std::string CLIENT_NODE = "http://swift.im";
 
@@ -267,12 +267,13 @@ void MainController::resetClient() {
 #ifdef SWIFT_EXPERIMENTAL_HISTORY
 	delete historyViewController_;
 	historyViewController_ = NULL;
 	delete historyController_;
 	historyController_ = NULL;
 #endif
+	fileTransferListController_->setFileTransferOverview(NULL);
 	delete ftOverview_;
 	ftOverview_ = NULL;
 	delete blockListController_;
 	blockListController_ = NULL;
 	delete rosterController_;
 	rosterController_ = NULL;
diff --git a/Swift/QtUI/QtFileTransferListItemModel.cpp b/Swift/QtUI/QtFileTransferListItemModel.cpp
index b9b9fd1..ef73f4f 100644
--- a/Swift/QtUI/QtFileTransferListItemModel.cpp
+++ b/Swift/QtUI/QtFileTransferListItemModel.cpp
@@ -1,41 +1,70 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
-#include "QtFileTransferListItemModel.h"
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <Swift/QtUI/QtFileTransferListItemModel.h>
 
 #include <boost/bind.hpp>
 #include <boost/cstdint.hpp>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Base/FileSize.h>
+#include <Swiften/Base/boost_bsignals.h>
+
 #include <Swift/Controllers/FileTransfer/FileTransferController.h>
 #include <Swift/Controllers/FileTransfer/FileTransferOverview.h>
-#include "QtSwiftUtil.h"
+
+#include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
 QtFileTransferListItemModel::QtFileTransferListItemModel(QObject *parent) : QAbstractItemModel(parent), fileTransferOverview(0) {
 }
 
+QtFileTransferListItemModel::~QtFileTransferListItemModel() {
+	if (fileTransferOverview) {
+		fileTransferOverview->onNewFileTransferController.disconnect(boost::bind(&QtFileTransferListItemModel::handleNewFileTransferController, this, _1));
+		fileTransferOverview->onFileTransferListChanged.disconnect(boost::bind(&QtFileTransferListItemModel::handleFileTransferListChanged, this));
+	}
+}
+
 void QtFileTransferListItemModel::setFileTransferOverview(FileTransferOverview *overview) {
+	if (fileTransferOverview) {
+		fileTransferOverview->onNewFileTransferController.disconnect(boost::bind(&QtFileTransferListItemModel::handleNewFileTransferController, this, _1));
+		fileTransferOverview->onFileTransferListChanged.disconnect(boost::bind(&QtFileTransferListItemModel::handleFileTransferListChanged, this));
+	}
 	fileTransferOverview = overview;
-	fileTransferOverview->onNewFileTransferController.connect(boost::bind(&QtFileTransferListItemModel::handleNewFileTransferController, this, _1));
+	if (fileTransferOverview) {
+		fileTransferOverview->onNewFileTransferController.connect(boost::bind(&QtFileTransferListItemModel::handleNewFileTransferController, this, _1));
+		fileTransferOverview->onFileTransferListChanged.connect(boost::bind(&QtFileTransferListItemModel::handleFileTransferListChanged, this));
+	}
+	emit layoutAboutToBeChanged();
+	emit layoutChanged();
 }
 
 void QtFileTransferListItemModel::handleNewFileTransferController(FileTransferController* newController) {
 	emit layoutAboutToBeChanged();
 	emit layoutChanged();
 	dataChanged(createIndex(0,0), createIndex(fileTransferOverview->getFileTransfers().size(),4));
-	newController->onStateChage.connect(boost::bind(&QtFileTransferListItemModel::handleStateChange, this, fileTransferOverview->getFileTransfers().size() - 1));
+	newController->onStateChanged.connect(boost::bind(&QtFileTransferListItemModel::handleStateChange, this, fileTransferOverview->getFileTransfers().size() - 1));
 	newController->onProgressChange.connect(boost::bind(&QtFileTransferListItemModel::handleProgressChange, this, fileTransferOverview->getFileTransfers().size() - 1));
 }
 
+void QtFileTransferListItemModel::handleFileTransferListChanged() {
+	emit layoutAboutToBeChanged();
+	emit layoutChanged();
+}
+
 void QtFileTransferListItemModel::handleStateChange(int index) {
 	emit dataChanged(createIndex(index, 2), createIndex(index, 2));
 }
 
 void QtFileTransferListItemModel::handleProgressChange(int index) {
 	emit dataChanged(createIndex(index, 3), createIndex(index, 3));
diff --git a/Swift/QtUI/QtFileTransferListItemModel.h b/Swift/QtUI/QtFileTransferListItemModel.h
index 28f13f8..64cdca4 100644
--- a/Swift/QtUI/QtFileTransferListItemModel.h
+++ b/Swift/QtUI/QtFileTransferListItemModel.h
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <QAbstractItemModel>
 
 namespace Swift {
 
@@ -14,12 +20,13 @@ class FileTransferController;
 class FileTransferOverview;
 
 class QtFileTransferListItemModel : public QAbstractItemModel {
 	Q_OBJECT
 public:
 	explicit QtFileTransferListItemModel(QObject *parent = 0);
+	virtual ~QtFileTransferListItemModel();
 
 	void setFileTransferOverview(FileTransferOverview*);
 
 	QVariant headerData(int section, Qt::Orientation orientation, int role) const;
 	int columnCount(const QModelIndex &parent) const;
 	QVariant data(const QModelIndex &index, int role) const;
@@ -36,12 +43,13 @@ private:
 		OverallSize,
 		NoOfColumns
 	};
 
 private:
 	void handleNewFileTransferController(FileTransferController*);
+	void handleFileTransferListChanged();
 	void handleStateChange(int index);
 	void handleProgressChange(int index);
 
 signals:
 
 public slots:
diff --git a/Swift/QtUI/QtFileTransferListWidget.cpp b/Swift/QtUI/QtFileTransferListWidget.cpp
index fb2b4de..729c95f 100644
--- a/Swift/QtUI/QtFileTransferListWidget.cpp
+++ b/Swift/QtUI/QtFileTransferListWidget.cpp
@@ -1,20 +1,30 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
-#include "QtFileTransferListWidget.h"
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
 
-#include <Swift/QtUI/QtFileTransferListItemModel.h>
+#include <Swift/QtUI/QtFileTransferListWidget.h>
+
+#include <boost/bind.hpp>
 
-#include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QWidget>
 #include <QPushButton>
+#include <QVBoxLayout>
+#include <QWidget>
+
+#include <Swift/Controllers/FileTransfer/FileTransferOverview.h>
+
+#include <Swift/QtUI/QtFileTransferListItemModel.h>
 
 namespace Swift {
 
 QtFileTransferListWidget::QtFileTransferListWidget() : fileTransferOverview(0) {
 	QVBoxLayout* layout = new QVBoxLayout(this);
 	layout->setSpacing(0);
@@ -33,42 +43,62 @@ QtFileTransferListWidget::QtFileTransferListWidget() : fileTransferOverview(0) {
 	bottom->setAutoFillBackground(true);
 
 	QHBoxLayout* buttonLayout = new QHBoxLayout(bottom);
 	buttonLayout->setContentsMargins(10,0,20,0);
 	buttonLayout->setSpacing(0);
 
-	QPushButton* clearFinished = new QPushButton(tr("Clear Finished Transfers"), bottom);
+	clearFinished = new QPushButton(tr("Clear Inactive Transfers"), bottom);
 	clearFinished->setEnabled(false);
-	//connect(clearButton, SIGNAL(clicked()), textEdit, SLOT(clear()));
+	connect(clearFinished, SIGNAL(clicked()), this, SLOT(clearInactiveTransfers()));
 	buttonLayout->addWidget(clearFinished);
 
 	setWindowTitle(tr("File Transfer List"));
 	emit titleUpdated();
 }
 
 QtFileTransferListWidget::~QtFileTransferListWidget() {
+	if (fileTransferOverview) {
+		fileTransferOverview->onFileTransferListChanged.disconnect(boost::bind(&QtFileTransferListWidget::handleFileTransferListChanged, this));
+		fileTransferOverview = NULL;
+	}
 	delete itemModel;
 }
 
 void QtFileTransferListWidget::showEvent(QShowEvent* event) {
 	emit windowOpening();
 	emit titleUpdated(); /* This just needs to be somewhere after construction */
 	QWidget::showEvent(event);
 }
 
+void QtFileTransferListWidget::handleFileTransferListChanged() {
+	clearFinished->setEnabled(fileTransferOverview->isClearable());
+}
+
+void QtFileTransferListWidget::clearInactiveTransfers() {
+	fileTransferOverview->clearFinished();
+}
+
 void QtFileTransferListWidget::show() {
 	QWidget::show();
 	emit windowOpening();
 }
 
 void QtFileTransferListWidget::activate() {
 	emit wantsToActivate();
 }
 
 void QtFileTransferListWidget::setFileTransferOverview(FileTransferOverview *overview) {
-	fileTransferOverview = overview;
+	if (fileTransferOverview) {
+		fileTransferOverview->onFileTransferListChanged.disconnect(boost::bind(&QtFileTransferListWidget::handleFileTransferListChanged, this));
+		fileTransferOverview = NULL;
+	}
+	if (overview) {
+		fileTransferOverview = overview;
+		fileTransferOverview->onFileTransferListChanged.connect(boost::bind(&QtFileTransferListWidget::handleFileTransferListChanged, this));
+		clearFinished->setEnabled(fileTransferOverview->isClearable());
+	}
 	itemModel->setFileTransferOverview(overview);
 }
 
 std::string QtFileTransferListWidget::getID() const {
 	return "QtFileTransferListWidget";
 }
diff --git a/Swift/QtUI/QtFileTransferListWidget.h b/Swift/QtUI/QtFileTransferListWidget.h
index 8adc009..740eb15 100644
--- a/Swift/QtUI/QtFileTransferListWidget.h
+++ b/Swift/QtUI/QtFileTransferListWidget.h
@@ -1,22 +1,29 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
-#pragma once
-
-#include "Swift/Controllers/UIInterfaces/FileTransferListWidget.h"
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
 
-#include "QtTabbable.h"
+#pragma once
 
 #include <QCloseEvent>
+#include <QPushButton>
 #include <QShowEvent>
 #include <QTreeView>
 
+#include <Swift/Controllers/UIInterfaces/FileTransferListWidget.h>
+
+#include <Swift/QtUI/QtTabbable.h>
+
 namespace Swift {
 
 class FileTransferOverview;
 class QtFileTransferListItemModel;
 
 class QtFileTransferListWidget : public QtTabbable, public FileTransferListWidget {
@@ -33,15 +40,20 @@ public:
 
 	virtual std::string getID() const;
 
 private:
 	virtual void closeEvent(QCloseEvent* event);
 	virtual void showEvent(QShowEvent* event);
+	void handleFileTransferListChanged();
+
+private slots:
+	void clearInactiveTransfers();
 
 private:
 	QTreeView* treeView;
 
 	QtFileTransferListItemModel* itemModel;
 	FileTransferOverview* fileTransferOverview;
+	QPushButton* clearFinished;
 };
 
 }
author	Tobias Markmann <tm@ayena.de>	2015-06-17 20:40:41 (GMT)
committer	Tobias Markmann <tm@ayena.de>	2015-07-10 14:56:43 (GMT)
commit	b54aa689ffc6bec7987c193e28c641d2f0f73236 (patch)
tree	ad9984fc3f9633e21fe0ff5ef8728f6d420ca07f
parent	7af21fdd59af3b3112cff69996301605859af84c (diff)
download	swift-b54aa689ffc6bec7987c193e28c641d2f0f73236.zip swift-b54aa689ffc6bec7987c193e28c641d2f0f73236.tar.bz2