X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fviews%2FBrowserView.cpp;h=07c11301b1619f5eef790eafb42654eb20929c56;hp=aa9ffffa18132bb0d6d18d5802758a1a0310183b;hb=5daa7af456c7daa05b1a055932b5156ed1f88b00;hpb=16118809a11aa423f453a03c47f5263e9dd8b662 diff --git a/src/views/BrowserView.cpp b/src/views/BrowserView.cpp index aa9ffff..07c1130 100644 --- a/src/views/BrowserView.cpp +++ b/src/views/BrowserView.cpp @@ -57,28 +57,28 @@ 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 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 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. + // 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(goHome())); + 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. + // Get the URL line edit palettes. TODO. Remove. noDomainSettingsPalette = urlLineEditPointer->palette(); domainSettingsPalette = urlLineEditPointer->palette(); - // Modify the domain settings palette. - domainSettingsPalette.setColor(QPalette::Base, Qt::green); + // Modify the domain settings palette. TODO. Remove. + domainSettingsPalette.setColor(QPalette::Base, QColor("#C8E6C9")); // Instantiate the mouse event pointer. MouseEventFilter *mouseEventFilterPointer = new MouseEventFilter(webEngineViewPointer); @@ -139,8 +139,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,28 +170,30 @@ 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); + urlLineEditPointer->setPalette(domainSettingsPalette); // TODO. Remove. + 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); + urlLineEditPointer->setPalette(noDomainSettingsPalette); // TODO. Remove. + emit updateDomainSettingsIndicator(false); } // Update the JavaScript button. @@ -207,7 +207,7 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload } // Emit the on-the-fly menu update signals. - emit userAgentUpdated(Settings::userAgent()); + emit userAgentUpdated(webEngineProfilePointer->httpUserAgent()); emit zoomFactorUpdated(Settings::zoomFactor()); // Reload the website if requested. @@ -238,7 +238,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 +250,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,37 +280,37 @@ 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. + // 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 (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)); } } @@ -310,14 +322,14 @@ void BrowserView::openDomainSettings() const // 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(); + + // Reload the tabs when domain settings are updated. + connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), this, SLOT(applyDomainSettingsAndReload())); } void BrowserView::pageLinkHovered(const QString &linkUrl) const @@ -326,6 +338,12 @@ 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. @@ -347,16 +365,21 @@ void BrowserView::toggleJavaScript() const void BrowserView::updateInterface() const { - // Update the URL line edit if it does not have focus. + // 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()); - forwardButtonPointer->setEnabled(webEngineHistoryPointer->canGoForward()); + 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());