X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.cpp;h=13e3c51ebbaa93ca054569b257bf7e0bba3deac7;hb=03d1e9e85a1fc8c7f561d0c7d9492ef1bee292db;hp=214b0af6888b16801986eef1189bd1363b93ffa3;hpb=bc134c3e83b97b4b82733feaa39e0bd99bb0fcc3;p=PrivacyBrowserPC.git diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index 214b0af..13e3c51 100644 --- a/src/windows/BrowserWindow.cpp +++ b/src/windows/BrowserWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2022-2023 Soren Stoutner . + * Copyright 2022-2024 Soren Stoutner . * * This file is part of Privacy Browser PC . * @@ -24,6 +24,7 @@ #include "ui_SettingsPrivacy.h" #include "ui_SettingsSpellCheck.h" #include "databases/BookmarksDatabase.h" +#include "databases/DomainsDatabase.h" #include "dialogs/AddBookmarkDialog.h" #include "dialogs/AddFolderDialog.h" #include "dialogs/BookmarksDialog.h" @@ -77,7 +78,7 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) KStandardAction::quit(qApp, SLOT(closeAllWindows()), actionCollectionPointer); zoomInActionPointer = KStandardAction::zoomIn(this, SLOT(incrementZoom()), actionCollectionPointer); zoomOutActionPointer = KStandardAction::zoomOut(this, SLOT(decrementZoom()), actionCollectionPointer); - KStandardAction::redisplay(this, SLOT(refresh()), actionCollectionPointer); + refreshActionPointer = KStandardAction::redisplay(this, SLOT(refresh()), actionCollectionPointer); fullScreenActionPointer = KStandardAction::fullScreen(this, SLOT(toggleFullScreen()), this, actionCollectionPointer); QAction *backActionPointer = KStandardAction::back(this, SLOT(back()), actionCollectionPointer); QAction *forwardActionPointer = KStandardAction::forward(this, SLOT(forward()), actionCollectionPointer); @@ -94,8 +95,10 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) QAction *saveArchiveActionPointer = actionCollectionPointer->addAction(QLatin1String("save_archive")); zoomDefaultActionPointer = actionCollectionPointer->addAction(QLatin1String("zoom_default")); QAction *reloadAndBypassCacheActionPointer = actionCollectionPointer->addAction(QLatin1String("reload_and_bypass_cache")); + stopActionPointer = actionCollectionPointer->addAction(QLatin1String("stop")); viewSourceActionPointer = actionCollectionPointer->addAction(QLatin1String("view_source")); viewSourceInNewTabActionPointer = actionCollectionPointer->addAction(QLatin1String("view_source_in_new_tab")); + developerToolsActionPointer = actionCollectionPointer->addAction(QLatin1String("developer_tools")); javaScriptActionPointer = actionCollectionPointer->addAction(QLatin1String("javascript")); localStorageActionPointer = actionCollectionPointer->addAction(QLatin1String("local_storage")); domStorageActionPointer = actionCollectionPointer->addAction(QLatin1String("dom_storage")); @@ -150,6 +153,7 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) domStorageActionPointer->setCheckable(true); findCaseSensitiveActionPointer->setCheckable(true); viewSourceActionPointer->setCheckable(true); + developerToolsActionPointer->setCheckable(true); userAgentPrivacyBrowserActionPointer->setCheckable(true); userAgentWebEngineDefaultActionPointer->setCheckable(true); userAgentFirefoxLinuxActionPointer->setCheckable(true); @@ -177,8 +181,10 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) saveArchiveActionPointer->setText(i18nc("Save archive action", "Save Archive")); zoomDefaultActionPointer->setText(i18nc("Zoom default action", "Zoom Default")); reloadAndBypassCacheActionPointer->setText(i18nc("Reload and bypass cache action", "Reload and Bypass Cache")); + stopActionPointer->setText(i18nc("Stop action", "Stop")); viewSourceActionPointer->setText(i18nc("View source action", "View Source")); viewSourceInNewTabActionPointer->setText(i18nc("View source in new tab action", "View Source in New Tab")); + developerToolsActionPointer->setText(i18nc("Developer tools action", "Developer Tools")); javaScriptActionPointer->setText(i18nc("JavaScript action", "JavaScript")); localStorageActionPointer->setText(i18nc("The Local Storage action", "Local Storage")); domStorageActionPointer->setText(i18nc("DOM Storage action", "DOM Storage")); @@ -209,11 +215,14 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) saveArchiveActionPointer->setIcon(QIcon::fromTheme(QLatin1String("document-save"))); zoomDefaultActionPointer->setIcon(QIcon::fromTheme(QLatin1String("zoom-fit-best"))); reloadAndBypassCacheActionPointer->setIcon(QIcon::fromTheme(QLatin1String("view-refresh"))); + stopActionPointer->setIcon(QIcon::fromTheme(QLatin1String("process-stop"))); viewSourceActionPointer->setIcon(QIcon::fromTheme(QLatin1String("view-choose"), QIcon::fromTheme(QLatin1String("accessories-text-editor")))); viewSourceInNewTabActionPointer->setIcon(QIcon::fromTheme(QLatin1String("view-choose"), QIcon::fromTheme(QLatin1String("accessories-text-editor")))); + developerToolsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("add-subtitle"), QIcon::fromTheme("system-run"))); domStorageActionPointer->setIcon(QIcon::fromTheme(QLatin1String("code-class"), QIcon(QLatin1String("/usr/share/icons/gnome/32x32/actions/gtk-unindent-ltr.png")))); - userAgentPrivacyBrowserActionPointer->setIcon(QIcon(":/icons/privacy-mode.svg")); - userAgentWebEngineDefaultActionPointer->setIcon(QIcon::fromTheme(QLatin1String("qtlogo"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))))); + userAgentPrivacyBrowserActionPointer->setIcon(QIcon(QLatin1String(":/icons/privacy-mode.svg"))); + userAgentWebEngineDefaultActionPointer->setIcon(QIcon::fromTheme(QLatin1String("qtlogo"), QIcon::fromTheme(QLatin1String("user-group-properties"), + QIcon::fromTheme(QLatin1String("contact-new"))))); userAgentFirefoxLinuxActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))))); userAgentChromiumLinuxActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))))); @@ -244,8 +253,10 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) QKeySequence ctrlAKeySequence = QKeySequence(i18nc("The save archive key sequence.", "Ctrl+A")); QKeySequence ctrl0KeySequence = QKeySequence(i18nc("The zoom default key sequence.", "Ctrl+0")); QKeySequence ctrlF5KeySequence = QKeySequence(i18nc("The reload and bypass cache key sequence.", "Ctrl+F5")); + QKeySequence ctrlShiftXKeySequence = QKeySequence(i18nc("The stop key sequence.", "Ctrl+Shift+X")); QKeySequence ctrlUKeySequence = QKeySequence(i18nc("The view source key sequence.", "Ctrl+U")); QKeySequence ctrlShiftUKeySequence = QKeySequence(i18nc("The view source in new tab key sequence.", "Ctrl+Shift+U")); + QKeySequence f12KeySequence = QKeySequence(i18nc("The developer tools key sequence.", "F12")); QKeySequence ctrlShiftPKeySequence = QKeySequence(i18nc("The print preview key sequence.", "Ctrl+Shift+P")); QKeySequence ctrlJKeySequence = QKeySequence(i18nc("The JavaScript key sequence.", "Ctrl+J")); QKeySequence ctrlLKeySequence = QKeySequence(i18nc("The local storage key sequence.", "Ctrl+L")); @@ -279,8 +290,10 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) actionCollectionPointer->setDefaultShortcut(saveArchiveActionPointer, ctrlAKeySequence); actionCollectionPointer->setDefaultShortcut(zoomDefaultActionPointer, ctrl0KeySequence); actionCollectionPointer->setDefaultShortcut(reloadAndBypassCacheActionPointer, ctrlF5KeySequence); + actionCollectionPointer->setDefaultShortcut(stopActionPointer, ctrlShiftXKeySequence); actionCollectionPointer->setDefaultShortcut(viewSourceActionPointer, ctrlUKeySequence); actionCollectionPointer->setDefaultShortcut(viewSourceInNewTabActionPointer, ctrlShiftUKeySequence); + actionCollectionPointer->setDefaultShortcut(developerToolsActionPointer, f12KeySequence); actionCollectionPointer->setDefaultShortcut(printPreviewActionPointer, ctrlShiftPKeySequence); actionCollectionPointer->setDefaultShortcut(javaScriptActionPointer, ctrlJKeySequence); actionCollectionPointer->setDefaultShortcut(localStorageActionPointer, ctrlLKeySequence); @@ -314,8 +327,10 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) connect(saveArchiveActionPointer, SIGNAL(triggered()), tabWidgetPointer, SLOT(saveArchive())); connect(zoomDefaultActionPointer, SIGNAL(triggered()), this, SLOT(zoomDefault())); connect(reloadAndBypassCacheActionPointer, SIGNAL(triggered()), this, SLOT(reloadAndBypassCache())); + connect(stopActionPointer, SIGNAL(triggered()), tabWidgetPointer, SLOT(stop())); connect(viewSourceActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSource())); connect(viewSourceInNewTabActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSourceInNewTab())); + connect(developerToolsActionPointer, SIGNAL(triggered()), this, SLOT(toggleDeveloperTools())); connect(zoomFactorActionPointer, SIGNAL(triggered()), this, SLOT(getZoomFactorFromUser())); connect(viewBookmarksToolBarActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewBookmarksToolBar())); connect(cookiesActionPointer, SIGNAL(triggered()), this, SLOT(showCookiesDialog())); @@ -341,7 +356,8 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) connect(localStorageActionPointer, SIGNAL(triggered()), this, SLOT(toggleLocalStorage())); connect(domStorageActionPointer, SIGNAL(triggered()), this, SLOT(toggleDomStorage())); - // Update the URL toolbar actions. + // Update the actions from the tab widget. + connect(tabWidgetPointer, SIGNAL(updateDeveloperToolsAction(bool)), developerToolsActionPointer, SLOT(setChecked(bool))); connect(tabWidgetPointer, SIGNAL(updateBackAction(bool)), backActionPointer, SLOT(setEnabled(bool))); connect(tabWidgetPointer, SIGNAL(updateForwardAction(bool)), forwardActionPointer, SLOT(setEnabled(bool))); connect(tabWidgetPointer, SIGNAL(updateJavaScriptAction(bool)), this, SLOT(updateJavaScriptAction(bool))); @@ -493,7 +509,7 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) // Update the progress bar. connect(tabWidgetPointer, SIGNAL(showProgressBar(const int)), this, SLOT(showProgressBar(const int))); - connect(tabWidgetPointer, SIGNAL(hideProgressBar()), progressBarPointer, SLOT(hide())); + connect(tabWidgetPointer, SIGNAL(hideProgressBar()), this, SLOT(hideProgressBar())); // Update the URL line edit focus. connect(tabWidgetPointer, SIGNAL(clearUrlLineEditFocus()), this, SLOT(clearUrlLineEditFocus())); @@ -610,9 +626,9 @@ void BrowserWindow::addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double // Get all the folder URLs. QList *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); } ); @@ -623,9 +639,9 @@ void BrowserWindow::addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double // Get all the folder URLs. QList *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); } ); @@ -641,9 +657,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(); @@ -758,24 +774,47 @@ void BrowserWindow::addOrEditDomainSettings() const // Remove the focus from the URL line edit. urlLineEditPointer->clearFocus(); - // Create the domain settings dialog pointer. - DomainSettingsDialog *domainSettingsDialogPointer; - // Get the current domain settings name. QString ¤tDomainSettingsName = tabWidgetPointer->getDomainSettingsName(); // Run the commands according to the current domain settings status. if (currentDomainSettingsName == QStringLiteral("")) // Domain settings are not currently applied. { - // Instruct the domain settings dialog to add a new domain. - domainSettingsDialogPointer = new DomainSettingsDialog(DomainSettingsDialog::ADD_DOMAIN, currentUrl.host()); - } - else // Domain settings are currently applied. - { - // Instruct the domain settings dialog to edit the current domain. - domainSettingsDialogPointer = new DomainSettingsDialog(DomainSettingsDialog::EDIT_DOMAIN, currentDomainSettingsName); + // Get the current settings status. + int javaScriptInt = calculateSettingsInt(javaScriptEnabled, Settings::javaScriptEnabled()); + int localStorageInt = calculateSettingsInt(localStorageActionPointer->isChecked(), Settings::localStorageEnabled()); + int domStorageInt = calculateSettingsInt(domStorageActionPointer->isChecked(), Settings::domStorageEnabled()); + + // Get the current user agent string. + QString currentUserAgentString = tabWidgetPointer->getCurrentUserAgent(); + + // Get the current user agent database string. + QString currentUserAgentDatabaseString = UserAgentHelper::getDatabaseUserAgentNameFromUserAgent(currentUserAgentString); + + // Initialize the user agent database string. + QString userAgentDatabaseString = UserAgentHelper::SYSTEM_DEFAULT_DATABASE; + + // Replace the user agent database string if the current user agent is not the default. + if (currentUserAgentDatabaseString != Settings::userAgent()) + userAgentDatabaseString = currentUserAgentDatabaseString; + + // Initialize the zoom factor variables. + int zoomFactorInt = DomainsDatabase::SYSTEM_DEFAULT; + + // Use a custom zoom factor if currently applied. Doubles cannot be reliably compared using `==`, so a mathematical workaround is used. + if (abs(currentZoomFactorDouble - defaultZoomFactorDouble ) > 0.01) + zoomFactorInt = DomainsDatabase::CUSTOM; + + // Add the domain. + DomainsDatabase::addDomain(currentUrl.host(), javaScriptInt, localStorageInt, domStorageInt, userAgentDatabaseString, zoomFactorInt, currentZoomFactorDouble); + + // Apply the domain settings. + tabWidgetPointer->applyDomainSettingsAndReload(); } + // Create the domain settings dialog pointer. + DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog(DomainSettingsDialog::EDIT_DOMAIN, currentDomainSettingsName); + // Reload the tabs when domain settings are updated. connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), tabWidgetPointer, SLOT(applyDomainSettingsAndReload())); @@ -792,6 +831,17 @@ void BrowserWindow::back() const tabWidgetPointer->back(); } +int BrowserWindow::calculateSettingsInt(const bool settingCurrentlyEnabled, const bool settingEnabledByDefault) const +{ + // Return the int that matches the current state. + if (settingCurrentlyEnabled == settingEnabledByDefault) // The current system default is used. + return DomainsDatabase::SYSTEM_DEFAULT; + else if (settingCurrentlyEnabled) // The setting is enabled, which is different from the system default. + return DomainsDatabase::ENABLED; + else // The setting is disabled, which is different from the system default. + return DomainsDatabase::DISABLED; +} + void BrowserWindow::clearUrlLineEditFocus() const { // Remove the focus from the URL line edit. @@ -801,17 +851,17 @@ void BrowserWindow::clearUrlLineEditFocus() const void BrowserWindow::decrementZoom() { // Update the current zoom factor. - currentZoomFactor = currentZoomFactor - 0.25; + currentZoomFactorDouble = currentZoomFactorDouble - 0.25; // Check to make sure the zoom factor is in the valid range (0.25 to 5.00). - if (currentZoomFactor < 0.25) - currentZoomFactor = 0.25; + if (currentZoomFactorDouble < 0.25) + currentZoomFactorDouble = 0.25; // Set the new zoom factor. - tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactor); + tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactorDouble); // Update the on-the-fly action text. - updateZoomActions(currentZoomFactor); + updateZoomActions(currentZoomFactorDouble); } void BrowserWindow::editBookmarks() const @@ -936,18 +986,18 @@ void BrowserWindow::getZoomFactorFromUser() bool okClicked; // Display a dialog to get the new zoom factor from the user. Format the double to display two decimals and have a 0.25 step. - double newZoomFactor = QInputDialog::getDouble(this, i18nc("The on-the-fly zoom factor dialog title", "On-The-Fly Zoom Factor"), + double newZoomFactorDouble = QInputDialog::getDouble(this, i18nc("The on-the-fly zoom factor dialog title", "On-The-Fly Zoom Factor"), i18nc("The instruction text of the on-the-fly zoom factor dialog", "Enter a zoom factor between 0.25 and 5.00"), - currentZoomFactor, .025, 5.00, 2, &okClicked, Qt::WindowFlags(), 0.25); + currentZoomFactorDouble, .025, 5.00, 2, &okClicked, Qt::WindowFlags(), 0.25); // Update the zoom factor if the user clicked OK. if (okClicked) { // Set the new zoom factor. - tabWidgetPointer->applyOnTheFlyZoomFactor(newZoomFactor); + tabWidgetPointer->applyOnTheFlyZoomFactor(newZoomFactorDouble); // Update the on-the-fly action text. - updateZoomActions(newZoomFactor); + updateZoomActions(newZoomFactorDouble); } } @@ -971,20 +1021,34 @@ void BrowserWindow::home() const tabWidgetPointer->home(); } +void BrowserWindow::hideProgressBar() const +{ + // Hide the progress bar. + progressBarPointer->hide(); + + // Disable and hide the stop action. + stopActionPointer->setEnabled(false); + stopActionPointer->setVisible(false); + + // Enable and show the refresh action. + refreshActionPointer->setEnabled(true); + refreshActionPointer->setVisible(true); +} + void BrowserWindow::incrementZoom() { // Update the current zoom factor. - currentZoomFactor = currentZoomFactor + 0.25; + currentZoomFactorDouble = currentZoomFactorDouble + 0.25; // Check to make sure the zoom factor is in the valid range (0.25 to 5.00). - if (currentZoomFactor > 5.0) - currentZoomFactor = 5.0; + if (currentZoomFactorDouble > 5.0) + currentZoomFactorDouble = 5.0; // Set the new zoom factor. - tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactor); + tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactorDouble); // Update the on-the-fly action text. - updateZoomActions(currentZoomFactor); + updateZoomActions(currentZoomFactorDouble); } void BrowserWindow::loadUrlFromLineEdit(const QString &url) const @@ -1026,8 +1090,6 @@ void BrowserWindow::populateBookmarksInAllWindows() const void BrowserWindow::populateBookmarksInThisWindow() { - qDebug() << "Populating bookmarks."; - // Remove all the final bookmark folder menu actions. for (QPair *finalBookmarkFolderMenuActionPair : finalBookmarkFolderMenuActionList) { @@ -1295,8 +1357,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); } ); @@ -1306,8 +1368,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); } ); @@ -1419,28 +1481,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); } } @@ -1483,6 +1546,14 @@ void BrowserWindow::showProgressBar(const int &progress) const // Show the progress bar. progressBarPointer->show(); + + // Disable and hide the refresh action. + refreshActionPointer->setEnabled(false); + refreshActionPointer->setVisible(false); + + // Enable and show the stop action. + stopActionPointer->setEnabled(true); + stopActionPointer->setVisible(true); } void BrowserWindow::showSettingsDialog() @@ -1507,7 +1578,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; @@ -1519,8 +1590,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")); @@ -1693,6 +1764,12 @@ void BrowserWindow::toggleBookmark() populateBookmarksInAllWindows(); } +void BrowserWindow::toggleDeveloperTools() const +{ + // Toggle the developer tools. + tabWidgetPointer->toggleDeveloperTools(developerToolsActionPointer->isChecked()); +} + void BrowserWindow::toggleDomStorage() const { // Remove the focus from the URL line edit. @@ -1782,8 +1859,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 @@ -1801,10 +1878,10 @@ void BrowserWindow::updateCookiesAction(const int numberOfCookies) const cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", numberOfCookies)); } -void BrowserWindow::updateDefaultZoomFactor(const double newDefaultZoomFactor) +void BrowserWindow::updateDefaultZoomFactor(const double newDefaultZoomFactorDouble) { // Store the new default zoom factor. - defaultZoomFactor = newDefaultZoomFactor; + defaultZoomFactorDouble = newDefaultZoomFactorDouble; } void BrowserWindow::updateDomStorageAction(const bool &isEnabled) const @@ -2202,35 +2279,35 @@ void BrowserWindow::updateWindowTitle(const QString &title) setWindowTitle(title); } -void BrowserWindow::updateZoomActions(const double &zoomFactor) +void BrowserWindow::updateZoomActions(const double zoomFactorDouble) { // Set the current zoom factor. - currentZoomFactor = zoomFactor; + currentZoomFactorDouble = zoomFactorDouble; // Set the status of the default zoom action. - zoomDefaultActionPointer->setEnabled(currentZoomFactor != defaultZoomFactor); + zoomDefaultActionPointer->setEnabled(currentZoomFactorDouble != defaultZoomFactorDouble); // Set the status of the zoom in action and button. - zoomInActionPointer->setEnabled(currentZoomFactor <= 4.99); - zoomPlusButtonPointer->setEnabled(currentZoomFactor <= 4.99); + zoomInActionPointer->setEnabled(currentZoomFactorDouble <= 4.99); + zoomPlusButtonPointer->setEnabled(currentZoomFactorDouble <= 4.99); // Set the status of the zoom out action and button. - zoomMinusButtonPointer->setEnabled(currentZoomFactor > 0.25); - zoomOutActionPointer->setEnabled(currentZoomFactor > 0.25); + zoomMinusButtonPointer->setEnabled(currentZoomFactorDouble > 0.25); + zoomOutActionPointer->setEnabled(currentZoomFactorDouble > 0.25); // Update the zoom factor action text, formatting the double with 2 decimal places. `0` specifies no extra field width. `'0'` sets the format to not use scientific notation. - zoomFactorActionPointer->setText(ki18nc("The zoom factor action", "Zoom Factor - %1").subs(zoomFactor, 0, '0', 2).toString()); + zoomFactorActionPointer->setText(ki18nc("The zoom factor action", "Zoom Factor - %1").subs(zoomFactorDouble, 0, '0', 2).toString()); // Update the status bar zoom factor label. - currentZoomButtonPointer->setText(ki18nc("The status bar zoom, which is just the formatted zoom factor", "%1").subs(zoomFactor, 0, '0', 2).toString()); + currentZoomButtonPointer->setText(ki18nc("The status bar zoom, which is just the formatted zoom factor", "%1").subs(zoomFactorDouble, 0, '0', 2).toString()); } void BrowserWindow::zoomDefault() { // Set the new zoom factor. - tabWidgetPointer->applyOnTheFlyZoomFactor(defaultZoomFactor); + tabWidgetPointer->applyOnTheFlyZoomFactor(defaultZoomFactorDouble); // Update the on-the-fly action text. - updateZoomActions(defaultZoomFactor); + updateZoomActions(defaultZoomFactorDouble); }