From ebfe001a7fe2cffcda50ac5dfed52dc3a258f471 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 1 Dec 2013 16:36:21 +0100 Subject: [PATCH] + allow to close download dialog --- src/Gui/DownloadManager.cpp | 11 ++++++++++- src/Gui/DownloadManager.h | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Gui/DownloadManager.cpp b/src/Gui/DownloadManager.cpp index 8846863ec304..27931652f03e 100644 --- a/src/Gui/DownloadManager.cpp +++ b/src/Gui/DownloadManager.cpp @@ -76,7 +76,10 @@ DownloadManager::DownloadManager(QWidget *parent) Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance(); QDockWidget* dw = pDockMgr->addDockWindow(QT_TR_NOOP("Download Manager"), this, Qt::BottomDockWidgetArea); - dw->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable); + dw->setFeatures(QDockWidget::DockWidgetMovable| + QDockWidget::DockWidgetFloatable| + QDockWidget::DockWidgetClosable); + dw->setAttribute(Qt::WA_DeleteOnClose); dw->show(); } @@ -87,6 +90,12 @@ DownloadManager::~DownloadManager() if (m_iconProvider) delete m_iconProvider; delete ui; + self = 0; +} + +void DownloadManager::closeEvent(QCloseEvent* e) +{ + QDialog::closeEvent(e); } int DownloadManager::activeDownloads() const diff --git a/src/Gui/DownloadManager.h b/src/Gui/DownloadManager.h index 48d847eef1cd..818e95f528a1 100644 --- a/src/Gui/DownloadManager.h +++ b/src/Gui/DownloadManager.h @@ -64,6 +64,7 @@ class GuiExport DownloadManager : public QDialog RemovePolicy removePolicy() const; void setRemovePolicy(RemovePolicy policy); + void closeEvent(QCloseEvent* e); public Q_SLOTS: void download(const QNetworkRequest &request, bool requestFileName = false);