From f42c82503ff414452d9927d82d0a419f61a82fd5 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sat, 5 Mar 2016 10:03:57 +0100
Subject: [PATCH] Fixed #165.

---
 resources/text/CHANGELOG            |  4 ++++
 src/gui/dialogs/formsettings.cpp    |  3 +++
 src/gui/dialogs/formsettings.ui     | 13 ++++++++++---
 src/miscellaneous/settings.cpp      |  3 +++
 src/miscellaneous/settings.h        |  3 +++
 src/network-web/downloadmanager.cpp |  3 ++-
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 157e311cf..0619b939f 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -7,6 +7,10 @@ PLEASE, FILL THIS SURVEY.
 http://goo.gl/forms/GcvPYgS2a8
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+Added:
+
+▪ Opening of download manager when new file download starts is now optional. (issue #165)
+
 Fixed:
 
 ▪ Fixed little problem with feed list hiding. (bug #163)
diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp
index 14a4069f7..eb307c550 100755
--- a/src/gui/dialogs/formsettings.cpp
+++ b/src/gui/dialogs/formsettings.cpp
@@ -176,6 +176,8 @@ void FormSettings::selectNewNotificationColor() {
 }
 
 void FormSettings::loadDownloads() {
+  m_ui->m_checkOpenManagerWhenDownloadStarts->setChecked(m_settings->value(GROUP(Downloads),
+                                                                           SETTING(Downloads::ShowDownloadsWhenNewDownloadStarts)).toBool());
   m_ui->m_txtDownloadsTargetDirectory->setText(QDir::toNativeSeparators(m_settings->value(GROUP(Downloads),
                                                                                           SETTING(Downloads::TargetDirectory)).toString()));
   m_ui->m_rbDownloadsAskEachFile->setChecked(m_settings->value(GROUP(Downloads),
@@ -183,6 +185,7 @@ void FormSettings::loadDownloads() {
 }
 
 void FormSettings::saveDownloads() {
+  m_settings->setValue(GROUP(Downloads), Downloads::ShowDownloadsWhenNewDownloadStarts, m_ui->m_checkOpenManagerWhenDownloadStarts->isChecked());
   m_settings->setValue(GROUP(Downloads), Downloads::TargetDirectory, m_ui->m_txtDownloadsTargetDirectory->text());
   m_settings->setValue(GROUP(Downloads), Downloads::AlwaysPromptForFilename, m_ui->m_rbDownloadsAskEachFile->isChecked());
   qApp->downloadManager()->setDownloadDirectory(m_ui->m_txtDownloadsTargetDirectory->text());
diff --git a/src/gui/dialogs/formsettings.ui b/src/gui/dialogs/formsettings.ui
index 87258c123..bd7a5ef0e 100755
--- a/src/gui/dialogs/formsettings.ui
+++ b/src/gui/dialogs/formsettings.ui
@@ -88,7 +88,7 @@
    <item row="0" column="1">
     <widget class="QStackedWidget" name="m_stackedSettings">
      <property name="currentIndex">
-      <number>6</number>
+      <number>7</number>
      </property>
      <widget class="QWidget" name="m_pageGeneral">
       <layout class="QFormLayout" name="formLayout_5">
@@ -495,8 +495,8 @@ Authors of this application are NOT responsible for lost data.</string>
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>167</width>
-                <height>219</height>
+                <width>208</width>
+                <height>238</height>
                </rect>
               </property>
               <layout class="QFormLayout" name="formLayout">
@@ -1588,6 +1588,13 @@ Authors of this application are NOT responsible for lost data.</string>
          </layout>
         </widget>
        </item>
+       <item row="0" column="1">
+        <widget class="QCheckBox" name="m_checkOpenManagerWhenDownloadStarts">
+         <property name="text">
+          <string>Open download manager when new download is started</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index c039843c2..d4ed9401c 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -186,6 +186,9 @@ DVALUE(int) Downloads::RemovePolicyDef   = DownloadManager::Never;
 DKEY Downloads::TargetExplicitDirectory                  = "target_explicit_directory";
 DVALUE(QString) Downloads::TargetExplicitDirectoryDef    = IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::DesktopLocation);
 
+DKEY Downloads::ShowDownloadsWhenNewDownloadStarts = "show_downloads_on_new_download_start";
+DVALUE(bool) Downloads::ShowDownloadsWhenNewDownloadStartsDef = true;
+
 DKEY Downloads::ItemUrl                 = "download_%1_url";
 DKEY Downloads::ItemLocation            = "download_%1_location";
 DKEY Downloads::ItemDone                = "download_%1_done";
diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h
index 9ba13b009..13dae2374 100755
--- a/src/miscellaneous/settings.h
+++ b/src/miscellaneous/settings.h
@@ -207,6 +207,9 @@ namespace Downloads {
   KEY TargetExplicitDirectory;
   VALUE(QString) TargetExplicitDirectoryDef;
 
+  KEY ShowDownloadsWhenNewDownloadStarts;
+  VALUE(bool) ShowDownloadsWhenNewDownloadStartsDef;
+
   KEY ItemUrl;
   KEY ItemLocation;
   KEY ItemDone;
diff --git a/src/network-web/downloadmanager.cpp b/src/network-web/downloadmanager.cpp
index 0f353aaa4..0c1356772 100755
--- a/src/network-web/downloadmanager.cpp
+++ b/src/network-web/downloadmanager.cpp
@@ -525,7 +525,8 @@ void DownloadManager::handleUnsupportedContent(QNetworkReply *reply) {
   DownloadItem *item = new DownloadItem(reply, this);
   addItem(item);
 
-  if (!item->m_canceledFileSelect) {
+  if (!item->m_canceledFileSelect && qApp->settings()->value(GROUP(Downloads),
+                                                             SETTING(Downloads::ShowDownloadsWhenNewDownloadStarts)).toBool()) {
     qApp->mainForm()->tabWidget()->showDownloadManager();
   }
 }