Add option to auto update the download directory. https://redmine.stoutner.com/issue...

[PrivacyBrowserPC.git] / src / windows / BrowserWindow.cpp

diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp
index 99fc2fac5f92d8f9a3d628d678443426ac822e26..1513d1af30e7eb31ccd3435ff22a1524cd6a8867 100644 (file)
--- a/src/windows/BrowserWindow.cpp
+++ b/src/windows/BrowserWindow.cpp
@@ -625,9 +625,9 @@ void BrowserWindow::addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double
             // Get all the folder URLs.
             QList<QString> *folderUrlsListPointer = BookmarksDatabase::getAllFolderUrls(folderId);
 
-            // Open the URLs in new tabs.  `true` removes the URL line edit focus, `false` does not load a background tab.
+            // Open the URLs in new tabs.  `true` removes the URL line edit focus, `true` opens the new tabs in an adjacent tab.  `false` does not load a background tab.
             for (QString url : *folderUrlsListPointer)
-                tabWidgetPointer->addTab(true, false, url);
+                tabWidgetPointer->addTab(true, true, false, url);
         }
     );
 
@@ -638,9 +638,9 @@ void BrowserWindow::addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double
             // Get all the folder URLs.
             QList<QString> *folderUrlsListPointer = BookmarksDatabase::getAllFolderUrls(folderId);
 
-            // Open the URLs in new tabs.  `true` removes the URL line edit focus, `true` loads a background tab.
+            // Open the URLs in new tabs.  `true` removes the URL line edit focus, `true` opens the new tabs in an adjacent tab.  `true` loads a background tab.
             for (QString url : *folderUrlsListPointer)
-                tabWidgetPointer->addTab(true, true, url);
+                tabWidgetPointer->addTab(true, true, true, url);
         }
     );
 
@@ -656,9 +656,9 @@ void BrowserWindow::addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double
             // Get a count of the folder URLs.
             const int folderUrls = folderUrlsListPointer->count();
 
-            // Load all the other URLs.  `true` removes the URL line edit focus, `true` loads a background tab.
+            // Load all the other URLs.  `true` removes the URL line edit focus, `false` does not load the new tabs in adjacent tabs.  `true` loads a background tab.
             for (int i = 1; i < folderUrls; ++i)
-                browserWindowPointer->tabWidgetPointer->addTab(true, true, folderUrlsListPointer->value(i));
+                browserWindowPointer->tabWidgetPointer->addTab(true, false, true, folderUrlsListPointer->value(i));
 
             // Show the new browser window.
             browserWindowPointer->show();
@@ -1322,8 +1322,8 @@ void BrowserWindow::showBookmarkContextMenu(const QPoint &point)
                     // Get the bookmark.
                     BookmarkStruct *bookmarkStructPointer = BookmarksDatabase::getBookmark(databaseId);
 
-                    // Open the bookmark in a new tab.  `true` removes the URL line edit focus, `false` does not load a background tab.
-                    tabWidgetPointer->addTab(true, false, bookmarkStructPointer->url);
+                    // Open the bookmark in a new tab.  `true` removes the URL line edit focus, `true` opens the new tab in an adjacent tab.  `false` does not load a background tab.
+                    tabWidgetPointer->addTab(true, true, false, bookmarkStructPointer->url);
                 }
             );
 
@@ -1333,8 +1333,8 @@ void BrowserWindow::showBookmarkContextMenu(const QPoint &point)
                     // Get the bookmark.
                     BookmarkStruct *bookmarkStructPointer = BookmarksDatabase::getBookmark(databaseId);
 
-                    // Open the bookmark in a new tab.  `true` removes the URL line edit focus, `true` loads a background tab.
-                    tabWidgetPointer->addTab(true, true, bookmarkStructPointer->url);
+                    // Open the bookmark in a new tab.  `true` removes the URL line edit focus, `true` opens the new tab in an adjacent tab.  `true` loads a background tab.
+                    tabWidgetPointer->addTab(true, true, true, bookmarkStructPointer->url);
                 }
             );
 
@@ -1446,28 +1446,29 @@ void BrowserWindow::showCookiesDialog()
     connect(cookiesDialogPointer, SIGNAL(deleteCookie(QNetworkCookie)), tabWidgetPointer, SLOT(deleteCookieFromStore(QNetworkCookie)));
 }
 
-void BrowserWindow::showDownloadLocationBrowseDialog() const
+void BrowserWindow::showDownloadDirectoryBrowseDialog() const
 {
-    // Get the current download location.
-    QString currentDownloadLocation = downloadLocationComboBoxPointer->currentText();
+    // Get the current download directory.
+    QString currentDownloadDirectory = downloadDirectoryComboBoxPointer->currentText();
 
     // Resolve the system download directory if specified.
-    if (currentDownloadLocation == QStringLiteral("System Download Directory"))
-        currentDownloadLocation = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
+    if (currentDownloadDirectory == QStringLiteral("System Download Directory"))
+        currentDownloadDirectory = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
 
-    // Get the new download location.
-    QString newDownloadLocation = QFileDialog::getExistingDirectory(configDialogPointer, i18nc("Select download location dialog caption", "Select Download Location"), currentDownloadLocation);
+    // Get the new download directory.
+    QString newDownloadDirectory = QFileDialog::getExistingDirectory(configDialogPointer, i18nc("Select download directory dialog caption", "Select Download Directory"),
+                                                                     currentDownloadDirectory);
 
-    // Populate the download location combo box according to the new download location.
-    if (newDownloadLocation == QStandardPaths::writableLocation(QStandardPaths::DownloadLocation))  // The default download location was selected.
+    // Populate the download directory combo box according to the new download location.
+    if (newDownloadDirectory == QStandardPaths::writableLocation(QStandardPaths::DownloadLocation))  // The default download location was selected.
     {
         // Populate the download location with the default text.
-        downloadLocationComboBoxPointer->setCurrentText("System Download Directory");
+        downloadDirectoryComboBoxPointer->setCurrentText("System Download Directory");
     }
-    else if (newDownloadLocation != QStringLiteral(""))  // A different directory was selected.
+    else if (newDownloadDirectory != QStringLiteral(""))  // A different directory was selected.
     {
         // Populate the download location.
-        downloadLocationComboBoxPointer->setCurrentText(newDownloadLocation);
+        downloadDirectoryComboBoxPointer->setCurrentText(newDownloadDirectory);
     }
 }
 
@@ -1542,7 +1543,7 @@ void BrowserWindow::showSettingsDialog()
     userAgentLabelPointer = privacySettingsUi.userAgentLabel;
     QComboBox *searchEngineComboBoxPointer = generalSettingsUi.kcfg_searchEngine;
     searchEngineLabelPointer = generalSettingsUi.searchEngineLabel;
-    downloadLocationComboBoxPointer = generalSettingsUi.kcfg_downloadLocation;
+    downloadDirectoryComboBoxPointer = generalSettingsUi.kcfg_downloadDirectory;
     QPushButton *browseButtonPointer = generalSettingsUi.browseButton;
     QListWidget *spellCheckListWidgetPointer = spellCheckSettingsUi.spellCheckListWidget;
 
@@ -1554,8 +1555,8 @@ void BrowserWindow::showSettingsDialog()
     connect(userAgentComboBoxPointer, SIGNAL(currentTextChanged(const QString)), this, SLOT(updateUserAgentLabel(const QString)));
     connect(searchEngineComboBoxPointer, SIGNAL(currentTextChanged(const QString)), this, SLOT(updateSearchEngineLabel(const QString)));
 
-    // Connect the download location directory browse button.
-    connect(browseButtonPointer, SIGNAL(clicked()), this, SLOT(showDownloadLocationBrowseDialog()));
+    // Connect the download directory directory browse button.
+    connect(browseButtonPointer, SIGNAL(clicked()), this, SLOT(showDownloadDirectoryBrowseDialog()));
 
     // Create a dictionaries QDir from the `QTWEBENGINE_DICTIONARIES_PATH` environment variable.
     QDir dictionariesDir = QDir(qEnvironmentVariable("QTWEBENGINE_DICTIONARIES_PATH"));
@@ -1823,8 +1824,8 @@ void BrowserWindow::toggleViewSourceInNewTab() const
         url = url.prepend(QLatin1String("view-source:"));
     }
 
-    // Add the new tab.  `true` removes the URL line edit focus, `false` does not open a background tab.
-    tabWidgetPointer->addTab(true, false, url);
+    // Add the new tab.  `true` removes the URL line edit focus, `true` opens the new tab in an adjacent tab.  `false` does not open a background tab.
+    tabWidgetPointer->addTab(true, true, false, url);
 }
 
 void BrowserWindow::updateBookmarkedAction() const