#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"
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.
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 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, QColor("#C8E6C9"));
-
- // Instantiate the mouse event pointer.
+ // Instantiate the mouse event filter pointer.
MouseEventFilter *mouseEventFilterPointer = new MouseEventFilter(webEngineViewPointer);
// Install the mouse event filter.
// 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();
}
}
// 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 <https://redmine.stoutner.com/issues/799> 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 <https://redmine.stoutner.com/issues/799> 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 <https://redmine.stoutner.com/issues/799> 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);
// Set the user agent.
webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getResultingDomainSettingsUserAgent(domainRecord.field(DomainsDatabaseHelper::USER_AGENT).value().toString()));
+ // Check if a custom zoom factor is set. This can be removed once <https://redmine.stoutner.com/issues/799> has been resolved.
+ 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.
- webEngineViewPointer->setZoomFactor(Settings::zoomFactor());
+ webEngineViewPointer->setZoomFactor(currentZoomFactor);
// 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 user agent.
webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent()));
+ // Store the current zoom factor.
+ currentZoomFactor = Settings::zoomFactor();
+
// Set the zoom factor.
- webEngineViewPointer->setZoomFactor(Settings::zoomFactor());
+ webEngineViewPointer->setZoomFactor(currentZoomFactor);
// 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 updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled));
emit userAgentUpdated(webEngineProfilePointer->httpUserAgent());
emit zoomFactorUpdated(Settings::zoomFactor());
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()
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.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 (!urlFromUser.startsWith("http") && !urlFromUser.startsWith("file://"))
+ if (!url.startsWith("http"))
{
// 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"));
-
- // 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.
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();
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. <https://bugreports.qt.io/browse/QTBUG-51992>
- webEngineViewPointer->setZoomFactor(Settings::zoomFactor());
+ // Reapply the zoom factor. This is a bug in QWebEngineView that resets the zoom with every load. <https://redmine.stoutner.com/issues/799>
+ webEngineViewPointer->setZoomFactor(currentZoomFactor);
}
projects / PrivacyBrowserPC.git / blobdiff