X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2FMainView.cpp;h=3893f2b96c683b445d5c1eb92e49f475060e554b;hp=9ddf1fb4524177e07627da213c047bb9d7b6354e;hb=12fd6b5fe4593faaec5da7ec77438c81b2d5fb5d;hpb=68167c0aba46c4bd4c859b176824873ffd14a3e7 diff --git a/src/MainView.cpp b/src/MainView.cpp index 9ddf1fb..3893f2b 100644 --- a/src/MainView.cpp +++ b/src/MainView.cpp @@ -23,10 +23,12 @@ #include "MouseEventFilter.h" #include "Settings.h" #include "ui_MainView.h" +#include "UrlRequestInterceptor.h" #include "helpers/SearchEngineHelper.h" #include "helpers/UserAgentHelper.h" // Qt framework headers. +#include #include MainView::MainView(QWidget *parent) : QWidget(parent) @@ -76,52 +78,48 @@ MainView::MainView(QWidget *parent) : QWidget(parent) // Listen for hovered link URLs. connect(webEnginePagePointer, SIGNAL(linkHovered(const QString)), this, SLOT(pageLinkHovered(const QString))); + // Instantiate the URL request interceptor. + UrlRequestInterceptor *urlRequestInterceptorPointer = new UrlRequestInterceptor(); + + // Set the URL request interceptor. + webEngineProfilePointer->setUrlRequestInterceptor(urlRequestInterceptorPointer); + + // Reapply the domain settings when the host changes. + connect(urlRequestInterceptorPointer, SIGNAL(applyDomainSettings()), this, SLOT(applyDomainSettingsWithoutReloading())); + // Disable the cache. webEngineProfilePointer->setHttpCacheType(QWebEngineProfile::NoCache); // Don't allow JavaScript to open windows. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false); - // Set the zoom factor. - webEngineViewPointer->setZoomFactor(Settings::zoomFactor()); - - // Apply the application settings. - applyApplicationSettings(); - - // Apply the domain settings. `false` does not reload the website. - applyDomainSettings(false); - // Set the focus on the WebEngine view. webEngineViewPointer->setFocus(); - - // Get the arguments. - QStringList argumentsStringList = qApp->arguments(); - - // Check to see if the arguments lists contains a URL. - if (argumentsStringList.size() > 1) - { - // Load the URL from the arguments list. - webEngineViewPointer->setUrl(QUrl::fromUserInput(argumentsStringList.at(1))); - } - else - { - // Load the homepage. - goHome(); - } } -void MainView::applyApplicationSettings() const +void MainView::applyApplicationSettings() { - // TODO. + // Set the search engine URL. + searchEngineUrl = SearchEngineHelper::getSearchUrl(Settings::searchEngine()); + + // Emit the search engine updated signal, which causes the on-the-fly menu to be updated. + emit searchEngineUpdated(Settings::searchEngine()); } // 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 MainView::applyDomainSettingsAndReload() const { - // Apply the domain setings. `true` reloads the website. + // Apply the domain settings. `true` reloads the website. applyDomainSettings(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 MainView::applyDomainSettingsWithoutReloading() const +{ + // Apply the domain settings `false` does not reload the website. + applyDomainSettings(false); +} + void MainView::applyDomainSettings(bool reloadWebsite) const { // Set the JavaScript status. @@ -140,6 +138,13 @@ void MainView::applyDomainSettings(bool reloadWebsite) const // Apply the user agent. webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgent(Settings::userAgent())); + // Set the zoom factor. + webEngineViewPointer->setZoomFactor(Settings::zoomFactor()); + + // Emit the on-the-fly menu update signals. + emit userAgentUpdated(Settings::userAgent()); + emit zoomFactorUpdated(Settings::zoomFactor()); + // Reload the website if requested. if (reloadWebsite) { @@ -147,12 +152,66 @@ void MainView::applyDomainSettings(bool reloadWebsite) const } } +void MainView::applyOnTheFlySearchEngine(QAction *searchEngineActionPointer) +{ + // Store the search engine name. + QString searchEngineName = searchEngineActionPointer->text(); + + // Strip out any `&` characters. + searchEngineName.remove('&'); + + // Store the search engine string. + searchEngineUrl = SearchEngineHelper::getSearchUrl(searchEngineName); +} + +void MainView::applyOnTheFlyUserAgent(QAction *userAgentActionPointer) const +{ + // Get the user agent name. + QString userAgentName = userAgentActionPointer->text(); + + // Strip out any `&` characters. + userAgentName.remove('&'); + + // Apply the user agent. + webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgent(userAgentName)); + + // Reload the website. + webEngineViewPointer->reload(); +} + +void MainView::applyOnTheFlyZoomFactor(const double &zoomFactor) const +{ + // Set the zoom factor. + webEngineViewPointer->setZoomFactor(zoomFactor); +} + void MainView::goHome() const { // Load the homepage. webEngineViewPointer->setUrl(QUrl::fromUserInput(Settings::homepage())); } +void MainView::loadInitialWebsite() +{ + // Apply the application settings. + applyApplicationSettings(); + + // Get the arguments. + QStringList argumentsStringList = qApp->arguments(); + + // Check to see if the arguments lists contains a URL. + if (argumentsStringList.size() > 1) + { + // Load the URL from the arguments list. + webEngineViewPointer->setUrl(QUrl::fromUserInput(argumentsStringList.at(1))); + } + else + { + // Load the homepage. + goHome(); + } +} + void MainView::loadUrlFromTextBox(QString urlFromUser) const { // Remove the focus from the URL line edit. @@ -174,7 +233,7 @@ void MainView::loadUrlFromTextBox(QString urlFromUser) const else // The text is likely a search. { // Load the search. - webEngineViewPointer->setUrl(QUrl::fromUserInput(SearchEngineHelper::getSearchUrl(Settings::searchEngine()) + urlFromUser)); + webEngineViewPointer->setUrl(QUrl::fromUserInput(searchEngineUrl + urlFromUser)); } }