X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fviews%2FBrowserView.cpp;h=d190dbec3bcdc4ab4525bf48b19e9a93d32a20c7;hp=07c11301b1619f5eef790eafb42654eb20929c56;hb=bbc06827f4301381ee3882000abbba147607aa35;hpb=5daa7af456c7daa05b1a055932b5156ed1f88b00 diff --git a/src/views/BrowserView.cpp b/src/views/BrowserView.cpp index 07c1130..d190dbe 100644 --- a/src/views/BrowserView.cpp +++ b/src/views/BrowserView.cpp @@ -22,11 +22,10 @@ #include "MouseEventFilter.h" #include "Settings.h" #include "ui_BrowserView.h" -#include "UrlRequestInterceptor.h" -#include "dialogs/DomainSettingsDialog.h" #include "helpers/DomainsDatabaseHelper.h" #include "helpers/SearchEngineHelper.h" #include "helpers/UserAgentHelper.h" +#include "interceptors/UrlRequestInterceptor.h" #include "windows/BrowserWindow.h" // Qt framework headers. @@ -42,13 +41,6 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent) browserViewUi.setupUi(this); // Get handles for the views. - backButtonPointer = browserViewUi.backButton; - forwardButtonPointer = browserViewUi.forwardButton; - QPushButton *refreshButtonPointer = browserViewUi.refreshButton; - QPushButton *homeButtonPointer = browserViewUi.homeButton; - urlLineEditPointer = browserViewUi.urlLineEdit; - javaScriptButtonPointer = browserViewUi.javaScript; - QPushButton *domainSettingsButtonPointer = browserViewUi.domainSettingsButton; webEngineViewPointer = browserViewUi.webEngineView; // Get handles for the aspects of the WebEngine. @@ -57,30 +49,12 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent) webEngineProfilePointer = webEnginePagePointer->profile(); webEngineSettingsPointer = webEngineViewPointer->settings(); - // Update the webengine view from the URL line edit. TODO. Remove. - connect(urlLineEditPointer, SIGNAL(returnKeyPressed(const QString)), this, SLOT(loadUrlFromLineEdit(const QString))); - // Update the URL line edit from the webengine view. connect(webEngineViewPointer, SIGNAL(loadStarted()), this, SLOT(updateInterface())); connect(webEngineViewPointer, SIGNAL(loadProgress(const int)), this, SLOT(updateInterface())); connect(webEngineViewPointer, SIGNAL(loadFinished(const bool)), this, SLOT(updateInterface())); - // Setup the URL bar buttons. TODO. Remove. - connect(backButtonPointer, SIGNAL(clicked()), webEngineViewPointer, SLOT(back())); - connect(forwardButtonPointer, SIGNAL(clicked()), webEngineViewPointer, SLOT(forward())); - connect(refreshButtonPointer, SIGNAL(clicked()), webEngineViewPointer, SLOT(reload())); - connect(homeButtonPointer, SIGNAL(clicked()), this, SLOT(home())); - connect(javaScriptButtonPointer, SIGNAL(clicked()), this, SLOT(toggleJavaScript())); - connect(domainSettingsButtonPointer, SIGNAL(clicked()), this, SLOT(openDomainSettings())); - - // Get the URL line edit palettes. TODO. Remove. - noDomainSettingsPalette = urlLineEditPointer->palette(); - domainSettingsPalette = urlLineEditPointer->palette(); - - // Modify the domain settings palette. TODO. Remove. - domainSettingsPalette.setColor(QPalette::Base, QColor("#C8E6C9")); - - // Instantiate the mouse event pointer. + // Instantiate the mouse event filter pointer. MouseEventFilter *mouseEventFilterPointer = new MouseEventFilter(webEngineViewPointer); // Install the mouse event filter. @@ -104,6 +78,18 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent) // Don't allow JavaScript to open windows. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false); + // Allow keyboard navigation. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::SpatialNavigationEnabled, true); + + // Enable full screen support. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, true); + + // Require user interaction to play media. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::PlaybackRequiresUserGesture, true); + + // Limit WebRTC to public IP addresses. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::WebRTCPublicInterfacesOnly, true); + // Set the focus on the WebEngine view. webEngineViewPointer->setFocus(); } @@ -118,20 +104,23 @@ void BrowserView::applyApplicationSettings() } // This exists as a separate function from `applyDomainSettings()` so it can be listed as a slot and function without the need for a boolean argument. -void BrowserView::applyDomainSettingsAndReload() const +// Once has been resolved this can be `const`. +void BrowserView::applyDomainSettingsAndReload() { // Apply the domain settings. `true` reloads the website. applyDomainSettings(webEngineViewPointer->url().host(), true); } // This exists as a separate function from `applyDomainSettings()` so it can be listed as a slot and function without the need for a boolean argument. -void BrowserView::applyDomainSettingsWithoutReloading(const QString &hostname) const +// Once has been resolved this can be `const`. +void BrowserView::applyDomainSettingsWithoutReloading(const QString &hostname) { // Apply the domain settings `false` does not reload the website. applyDomainSettings(hostname, false); } -void BrowserView::applyDomainSettings(const QString &hostname, const bool reloadWebsite) const +// Once has been resolved this can be `const`. +void BrowserView::applyDomainSettings(const QString &hostname, const bool reloadWebsite) { // Get the record for the hostname. QSqlQuery domainQuery = DomainsDatabaseHelper::getDomainQuery(hostname); @@ -173,11 +162,22 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload // Set the user agent. webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getResultingDomainSettingsUserAgent(domainRecord.field(DomainsDatabaseHelper::USER_AGENT).value().toString())); - // Set the zoom factor. - webEngineViewPointer->setZoomFactor(Settings::zoomFactor()); + // Check if a custom zoom factor is set. + if (domainRecord.field(DomainsDatabaseHelper::ZOOM_FACTOR).value().toInt()) + { + // Store the current zoom factor. + currentZoomFactor = domainRecord.field(DomainsDatabaseHelper::CUSTOM_ZOOM_FACTOR).value().toDouble(); + } + else + { + // Reset the current zoom factor. + currentZoomFactor = Settings::zoomFactor(); + } + + // Set the zoom factor. The use of `currentZoomFactor` can be removed once has been resolved. + webEngineViewPointer->setZoomFactor(currentZoomFactor); // Apply the domain settings palette to the URL line edit. - urlLineEditPointer->setPalette(domainSettingsPalette); // TODO. Remove. emit updateDomainSettingsIndicator(true); } else // The hostname does not have domain settings. @@ -188,25 +188,18 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload // Set the user agent. webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent())); + // Store the current zoom factor. This can be removed once has been resolved. + currentZoomFactor = Settings::zoomFactor(); + // Set the zoom factor. webEngineViewPointer->setZoomFactor(Settings::zoomFactor()); // Apply the no domain settings palette to the URL line edit. - urlLineEditPointer->setPalette(noDomainSettingsPalette); // TODO. Remove. emit updateDomainSettingsIndicator(false); } - // Update the JavaScript button. - if (webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)) - { - javaScriptButtonPointer->setIcon(QIcon(":/icons/javascript-warning")); - } - else - { - javaScriptButtonPointer->setIcon(QIcon(":/icons/privacy-mode")); - } - // Emit the on-the-fly menu update signals. + emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)); emit userAgentUpdated(webEngineProfilePointer->httpUserAgent()); emit zoomFactorUpdated(Settings::zoomFactor()); @@ -244,8 +237,12 @@ void BrowserView::applyOnTheFlyUserAgent(QAction *userAgentActionPointer) const webEngineViewPointer->reload(); } -void BrowserView::applyOnTheFlyZoomFactor(const double &zoomFactor) const +// This can be const once has been resolved. +void BrowserView::applyOnTheFlyZoomFactor(const double &zoomFactor) { + // Update the current zoom factor. This can be removed once has been resolved. + currentZoomFactor = zoomFactor; + // Set the zoom factor. webEngineViewPointer->setZoomFactor(zoomFactor); } @@ -291,14 +288,16 @@ void BrowserView::loadInitialWebsite() void BrowserView::loadUrlFromLineEdit(QString url) const { - // Remove the focus from the URL line edit. TODO. Remove. - urlLineEditPointer->clearFocus(); - // Decide if the text is more likely to be a URL or a search. - if (url.contains(".")) // The text is likely a URL. + if (url.startsWith("file://")) // The text is likely a file URL. + { + // Load the URL. + webEngineViewPointer->load(QUrl::fromUserInput(url)); + } + else if (url.contains(".")) // The text is likely a URL. { // Check if the URL does not start with a valid protocol. - if (!url.startsWith("http") && !url.startsWith("file://")) + if (!url.startsWith("http")) { // Add `https://` to the beginning of the URL. url = "https://" + url; @@ -314,24 +313,6 @@ void BrowserView::loadUrlFromLineEdit(QString url) const } } -void BrowserView::openDomainSettings() const -{ - // Instantiate the domain settings window. - DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog(); - - // Set the dialog window title. - domainSettingsDialogPointer->setWindowTitle(i18nc("The domain settings dialog title", "Domain Settings")); - - // Set the modality. - domainSettingsDialogPointer->setWindowModality(Qt::WindowModality::WindowModal);; - - // Show the dialog. - domainSettingsDialogPointer->show(); - - // Reload the tabs when domain settings are updated. - connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), this, SLOT(applyDomainSettingsAndReload())); -} - void BrowserView::pageLinkHovered(const QString &linkUrl) const { // Emit a signal so that the browser window can update the status bar. @@ -349,15 +330,8 @@ void BrowserView::toggleJavaScript() const // Toggle JavaScript. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, !webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)); - // Update the JavaScript button. - if (webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)) - { - javaScriptButtonPointer->setIcon(QIcon(":/icons/javascript-warning")); - } - else - { - javaScriptButtonPointer->setIcon(QIcon(":/icons/privacy-mode")); - } + // Update the JavaScript icon. + emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)); // Reload the website. webEngineViewPointer->reload(); @@ -365,22 +339,13 @@ void BrowserView::toggleJavaScript() const void BrowserView::updateInterface() const { - // Update the URL line edit if it does not have focus. TODO. Remove block. - if (!urlLineEditPointer->hasFocus()) - { - // Update the URL line edit. - urlLineEditPointer->setText(webEngineViewPointer->url().toString()); - } - // Update the URL line edit. emit updateUrlLineEdit(webEngineViewPointer->url().toString()); // Update the status of the forward and back buttons. - backButtonPointer->setEnabled(webEngineHistoryPointer->canGoBack()); // TODO Remove. emit updateBackAction(webEngineHistoryPointer->canGoBack()); - forwardButtonPointer->setEnabled(webEngineHistoryPointer->canGoForward()); // TODO Remove. emit updateForwardAction(webEngineHistoryPointer->canGoForward()); - // Reapply the zoom factor. This is a bug in QWebEngineView that resets the zoom with every load. Hopefully it will be fixed in Qt6. - webEngineViewPointer->setZoomFactor(Settings::zoomFactor()); + // Reapply the zoom factor. This is a bug in QWebEngineView that resets the zoom with every load. + webEngineViewPointer->setZoomFactor(currentZoomFactor); }