4 files changed, 95 insertions, 16 deletions
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;
 };
 
 }