X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fviews%2FBrowserView.cpp;h=319f9e51b7624ef49776445be3d1c776025dc550;hp=44c170a72e46e77e5429157cca01f908b058c160;hb=f199b82941d34514783e4a4b85905d12999701d6;hpb=0a7bcc3ab2d2a1015f29293fc9c527c1448a86cf diff --git a/src/views/BrowserView.cpp b/src/views/BrowserView.cpp index 44c170a..319f9e5 100644 --- a/src/views/BrowserView.cpp +++ b/src/views/BrowserView.cpp @@ -23,10 +23,10 @@ #include "Settings.h" #include "ui_BrowserView.h" #include "UrlRequestInterceptor.h" +#include "helpers/DomainsDatabaseHelper.h" #include "helpers/SearchEngineHelper.h" #include "helpers/UserAgentHelper.h" #include "windows/BrowserWindow.h" -#include "windows/DomainSettingsWindow.h" // Qt framework headers. #include @@ -41,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. @@ -56,23 +49,12 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent) webEngineProfilePointer = webEnginePagePointer->profile(); webEngineSettingsPointer = webEngineViewPointer->settings(); - // Update the webengine view from the URL line edit. - connect(urlLineEditPointer, SIGNAL(returnKeyPressed(const QString)), this, SLOT(loadUrlFromTextBox(const QString))); - - // Update the URL line edit form the webengine view. + // 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. - 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(goHome())); - connect(javaScriptButtonPointer, SIGNAL(clicked()), this, SLOT(toggleJavaScript())); - connect(domainSettingsButtonPointer, SIGNAL(clicked()), this, SLOT(openDomainSettings())); - - // Instantiate the mouse event pointer. + // Instantiate the mouse event filter pointer. MouseEventFilter *mouseEventFilterPointer = new MouseEventFilter(webEngineViewPointer); // Install the mouse event filter. @@ -88,7 +70,7 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent) webEngineProfilePointer->setUrlRequestInterceptor(urlRequestInterceptorPointer); // Reapply the domain settings when the host changes. - connect(urlRequestInterceptorPointer, SIGNAL(applyDomainSettings()), this, SLOT(applyDomainSettingsWithoutReloading())); + connect(urlRequestInterceptorPointer, SIGNAL(applyDomainSettings(QString)), this, SLOT(applyDomainSettingsWithoutReloading(QString))); // Disable the cache. webEngineProfilePointer->setHttpCacheType(QWebEngineProfile::NoCache); @@ -113,39 +95,82 @@ void BrowserView::applyApplicationSettings() void BrowserView::applyDomainSettingsAndReload() const { // Apply the domain settings. `true` reloads the website. - applyDomainSettings(true); + 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 +void BrowserView::applyDomainSettingsWithoutReloading(const QString &hostname) const { // Apply the domain settings `false` does not reload the website. - applyDomainSettings(false); + applyDomainSettings(hostname, false); } -void BrowserView::applyDomainSettings(bool reloadWebsite) const +void BrowserView::applyDomainSettings(const QString &hostname, const bool reloadWebsite) const { - // Set the JavaScript status. - webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScript()); + // Get the record for the hostname. + QSqlQuery domainQuery = DomainsDatabaseHelper::getDomainQuery(hostname); - // Update the JavaScript button. - if (Settings::javaScript()) + // Check if the hostname has domain settings. + if (domainQuery.isValid()) // The hostname has domain settings. { - javaScriptButtonPointer->setIcon(QIcon(":/icons/javascript-warning")); + // Get the domain record. + QSqlRecord domainRecord = domainQuery.record(); + + // Set the JavaScript status. + switch (domainRecord.field(DomainsDatabaseHelper::JAVASCRIPT).value().toInt()) + { + case (DomainsDatabaseHelper::SYSTEM_DEFAULT): + { + // Set the default JavaScript status. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScript()); + + break; + } + + case (DomainsDatabaseHelper::DISABLED): + { + // Disable JavaScript. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, false); + + break; + } + + case (DomainsDatabaseHelper::ENABLED): + { + // Enable JavaScript. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, true); + + break; + } + } + + // Set the user agent. + webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getResultingDomainSettingsUserAgent(domainRecord.field(DomainsDatabaseHelper::USER_AGENT).value().toString())); + + // Set the zoom factor. + webEngineViewPointer->setZoomFactor(Settings::zoomFactor()); + + // Apply the domain settings palette to the URL line edit. + emit updateDomainSettingsIndicator(true); } - else + else // The hostname does not have domain settings. { - javaScriptButtonPointer->setIcon(QIcon(":/icons/privacy-mode")); - } + // Set the JavaScript status. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScript()); - // Apply the user agent. - webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgent(Settings::userAgent())); + // Set the user agent. + webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent())); - // Set the zoom factor. - webEngineViewPointer->setZoomFactor(Settings::zoomFactor()); + // Set the zoom factor. + webEngineViewPointer->setZoomFactor(Settings::zoomFactor()); + + // Apply the no domain settings palette to the URL line edit. + emit updateDomainSettingsIndicator(false); + } // Emit the on-the-fly menu update signals. - emit userAgentUpdated(Settings::userAgent()); + emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)); + emit userAgentUpdated(webEngineProfilePointer->httpUserAgent()); emit zoomFactorUpdated(Settings::zoomFactor()); // Reload the website if requested. @@ -176,7 +201,7 @@ void BrowserView::applyOnTheFlyUserAgent(QAction *userAgentActionPointer) const userAgentName.remove('&'); // Apply the user agent. - webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgent(userAgentName)); + webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromTranslatedName(userAgentName)); // Reload the website. webEngineViewPointer->reload(); @@ -188,10 +213,22 @@ void BrowserView::applyOnTheFlyZoomFactor(const double &zoomFactor) const webEngineViewPointer->setZoomFactor(zoomFactor); } -void BrowserView::goHome() const +void BrowserView::back() const +{ + // Go back. + webEngineViewPointer->back(); +} + +void BrowserView::forward() const +{ + // Go forward. + webEngineViewPointer->forward(); +} + +void BrowserView::home() const { // Load the homepage. - webEngineViewPointer->setUrl(QUrl::fromUserInput(Settings::homepage())); + webEngineViewPointer->load(QUrl::fromUserInput(Settings::homepage())); } void BrowserView::loadInitialWebsite() @@ -206,80 +243,34 @@ void BrowserView::loadInitialWebsite() if (argumentsStringList.size() > 1) { // Load the URL from the arguments list. - webEngineViewPointer->setUrl(QUrl::fromUserInput(argumentsStringList.at(1))); + webEngineViewPointer->load(QUrl::fromUserInput(argumentsStringList.at(1))); } else { // Load the homepage. - goHome(); + home(); } } -void BrowserView::loadUrlFromTextBox(QString urlFromUser) const +void BrowserView::loadUrlFromLineEdit(QString url) const { - // Remove the focus from the URL line edit. - urlLineEditPointer->clearFocus(); - // Decide if the text is more likely to be a URL or a search. - if (urlFromUser.contains(".")) // The text is likely a URL. + if (url.contains(".")) // The text is likely a URL. { // Check if the URL does not start with a valid protocol. - if (!urlFromUser.startsWith("http") && !urlFromUser.startsWith("file://")) + if (!url.startsWith("http") && !url.startsWith("file://")) { // Add `https://` to the beginning of the URL. - urlFromUser = "https://" + urlFromUser; + url = "https://" + url; } // Load the URL. - webEngineViewPointer->setUrl(QUrl::fromUserInput(urlFromUser)); + webEngineViewPointer->load(QUrl::fromUserInput(url)); } else // The text is likely a search. { // Load the search. - webEngineViewPointer->setUrl(QUrl::fromUserInput(searchEngineUrl + urlFromUser)); - } -} - -void BrowserView::openDomainSettings() const -{ - // Get a list of the top level widgets. - const QWidgetList topLevelWidgets = QApplication::topLevelWidgets(); - - // Initialize a domain settings window exists boolean. - bool domainSettingsWindowExists = false; - - // Iterate through the top level widgets. - for (QWidget *widgetPointer : topLevelWidgets) - { - // Check for an existing domain settings window. - if (widgetPointer->objectName() == QStringLiteral("domain_settings")) - { - // Show the existing domain settings window if it is hidden. - widgetPointer->show(); - - // Raise the existing domain settings window if it is below other windows. - widgetPointer->raise(); - - // Restore the existing domain settings window if it has been minimized. - if (widgetPointer->isMinimized()) { - widgetPointer->showNormal(); - } - - // Activate the existing domain settings window, which brings its virtual desktop into focus. - widgetPointer->activateWindow(); - - // Update the domain settings window exists boolean. - domainSettingsWindowExists = true; - } - } - - if (!domainSettingsWindowExists) - { - // Instantiate the domain settings window. - DomainSettingsWindow *domainSettingsWindowPointer = new DomainSettingsWindow(); - - // Show the window. - domainSettingsWindowPointer->show(); + webEngineViewPointer->load(QUrl::fromUserInput(searchEngineUrl + url)); } } @@ -289,20 +280,19 @@ void BrowserView::pageLinkHovered(const QString &linkUrl) const emit linkHovered(linkUrl); } +void BrowserView::refresh() const +{ + // Reload the website. + webEngineViewPointer->reload(); +} + 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(); @@ -310,16 +300,12 @@ void BrowserView::toggleJavaScript() const void BrowserView::updateInterface() const { - // Update the URL line edit if it does not have focus. - 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()); - forwardButtonPointer->setEnabled(webEngineHistoryPointer->canGoForward()); + emit updateBackAction(webEngineHistoryPointer->canGoBack()); + 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());