X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fviews%2FBrowserView.cpp;h=319f9e51b7624ef49776445be3d1c776025dc550;hp=aa9ffffa18132bb0d6d18d5802758a1a0310183b;hb=f199b82941d34514783e4a4b85905d12999701d6;hpb=16118809a11aa423f453a03c47f5263e9dd8b662 diff --git a/src/views/BrowserView.cpp b/src/views/BrowserView.cpp index aa9ffff..319f9e5 100644 --- a/src/views/BrowserView.cpp +++ b/src/views/BrowserView.cpp @@ -23,7 +23,6 @@ #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" @@ -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. - 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())); - - // Get the URL line edit palettes. - noDomainSettingsPalette = urlLineEditPointer->palette(); - domainSettingsPalette = urlLineEditPointer->palette(); - - // Modify the domain settings palette. - domainSettingsPalette.setColor(QPalette::Base, Qt::green); - - // Instantiate the mouse event pointer. + // Instantiate the mouse event filter pointer. MouseEventFilter *mouseEventFilterPointer = new MouseEventFilter(webEngineViewPointer); // Install the mouse event filter. @@ -139,8 +113,6 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload // Check if the hostname has domain settings. if (domainQuery.isValid()) // The hostname has domain settings. { - - // Get the domain record. QSqlRecord domainRecord = domainQuery.record(); @@ -172,42 +144,33 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload } } - // Apply the user agent. - webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgent(Settings::userAgent())); + // 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. - urlLineEditPointer->setPalette(domainSettingsPalette); + emit updateDomainSettingsIndicator(true); } else // The hostname does not have domain settings. { // 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()); // Apply the no domain settings palette to the URL line edit. - urlLineEditPointer->setPalette(noDomainSettingsPalette); - } - - // Update the JavaScript button. - if (webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)) - { - javaScriptButtonPointer->setIcon(QIcon(":/icons/javascript-warning")); - } - else - { - javaScriptButtonPointer->setIcon(QIcon(":/icons/privacy-mode")); + 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. @@ -238,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(); @@ -250,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() @@ -268,78 +243,56 @@ 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)); + webEngineViewPointer->load(QUrl::fromUserInput(searchEngineUrl + url)); } } -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")); - - // Resize the dialog window. - domainSettingsDialogPointer->resize(1500, 1000); - - // Set the modality. - domainSettingsDialogPointer->setWindowModality(Qt::WindowModality::WindowModal);; - - // Show the dialog. - domainSettingsDialogPointer->show(); -} - void BrowserView::pageLinkHovered(const QString &linkUrl) const { // Emit a signal so that the browser window can update the status bar. 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(); @@ -347,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());