Added option to delete all cookies on exiting (#2173)

src/lib/app/mainapplication.cpp

@@ -732,12 +732,19 @@ void MainApplication::saveSettings()
     bool deleteHtml5Storage = settings.value("deleteHTML5StorageOnClose", false).toBool();
     settings.endGroup();
 
+    settings.beginGroup("Cookie-Settings");
+    bool deleteCookies = settings.value("deleteCookiesOnClose", false).toBool();
+    settings.endGroup();
+
     if (deleteHistory) {
         m_history->clearHistory();
     }
     if (deleteHtml5Storage) {
         ClearPrivateData::clearLocalStorage();
     }
+    if (deleteCookies) {
+        m_cookieJar->deleteAllCookies();
+    }
 
     m_searchEnginesManager->saveSettings();
     m_plugins->shutdown();

src/lib/cookies/cookiemanager.cpp

@@ -70,6 +70,7 @@ CookieManager::CookieManager()
     ui->saveCookies->setChecked(settings.value("allowCookies", true).toBool());
     ui->filter3rdParty->setChecked(settings.value("filterThirdPartyCookies", false).toBool());
     ui->filterTracking->setChecked(settings.value("filterTrackingCookie", false).toBool());
+    ui->deleteCookiesOnClose->setChecked(settings.value("deleteCookiesOnClose", false).toBool());
     ui->whiteList->addItems(settings.value("whitelist", QStringList()).toStringList());
     ui->blackList->addItems(settings.value("blacklist", QStringList()).toStringList());
     settings.endGroup();
@@ -328,6 +329,7 @@ void CookieManager::closeEvent(QCloseEvent* e)
     settings.setValue("allowCookies", ui->saveCookies->isChecked());
     settings.setValue("filterThirdPartyCookies", ui->filter3rdParty->isChecked());
     settings.setValue("filterTrackingCookie", ui->filterTracking->isChecked());
+    settings.setValue("deleteCookiesOnClose", ui->deleteCookiesOnClose->isChecked());
     settings.setValue("whitelist", whitelist);
     settings.setValue("blacklist", blacklist);
     settings.endGroup();

src/lib/cookies/cookiemanager.ui

@@ -426,6 +426,13 @@
          </property>
         </widget>
        </item>
+       <item row="5" column="1" colspan="2">
+        <widget class="QCheckBox" name="deleteCookiesOnClose">
+         <property name="text">
+          <string>Delete cookies on close</string>
+         </property>
+        </widget>
+       </item>
        <item row="6" column="3">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
@@ -439,7 +446,7 @@
          </property>
         </spacer>
        </item>
-       <item row="5" column="1" colspan="3">
+       <item row="7" column="1" colspan="3">
         <widget class="QLabel" name="label_19">
          <property name="text">
           <string>&lt;b&gt;Warning:&lt;/b&gt; Filter 3rd party and tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first!</string>
@@ -449,7 +456,7 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="3">
+       <item row="9" column="3">
         <widget class="QDialogButtonBox" name="close3">
          <property name="standardButtons">
           <set>QDialogButtonBox::Close</set>