X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fviews%2FBrowserView.cpp;h=2e29ea0caf9fd515690e9205f498cdd621659c20;hp=d190dbec3bcdc4ab4525bf48b19e9a93d32a20c7;hb=2e5db0d355267f5823610100947970af12ca6342;hpb=bbc06827f4301381ee3882000abbba147607aa35 diff --git a/src/views/BrowserView.cpp b/src/views/BrowserView.cpp index d190dbe..2e29ea0 100644 --- a/src/views/BrowserView.cpp +++ b/src/views/BrowserView.cpp @@ -32,6 +32,9 @@ #include #include +// Initialize the public static variables. +QString BrowserView::webEngineDefaultUserAgent = QStringLiteral(""); + BrowserView::BrowserView(QWidget *parent) : QWidget(parent) { // Instantiate the browser view UI. @@ -43,16 +46,29 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent) // Get handles for the views. webEngineViewPointer = browserViewUi.webEngineView; + // Create an off-the-record profile (the default when no profile name is specified). + webEngineProfilePointer = new QWebEngineProfile(QStringLiteral("")); + + // Create a WebEngine page. + QWebEnginePage *webEnginePagePointer = new QWebEnginePage(webEngineProfilePointer); + + // Set the WebEngine page. + webEngineViewPointer->setPage(webEnginePagePointer); + // Get handles for the aspects of the WebEngine. - QWebEnginePage *webEnginePagePointer = webEngineViewPointer->page(); webEngineHistoryPointer = webEnginePagePointer->history(); - webEngineProfilePointer = webEnginePagePointer->profile(); webEngineSettingsPointer = webEngineViewPointer->settings(); - // 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())); + // Store a copy of the WebEngine default user agent. + webEngineDefaultUserAgent = webEngineProfilePointer->httpUserAgent(); + + // Update the URL line edit when the URL changes. + connect(webEngineViewPointer, SIGNAL(urlChanged(const QUrl)), this, SLOT(updateUrl(const QUrl))); + + // Update the progress bar. + connect(webEngineViewPointer, SIGNAL(loadStarted()), this, SLOT(loadStarted())); + connect(webEngineViewPointer, SIGNAL(loadProgress(const int)), this, SLOT(loadProgress(const int))); + connect(webEngineViewPointer, SIGNAL(loadFinished(const bool)), this, SLOT(loadFinished())); // Instantiate the mouse event filter pointer. MouseEventFilter *mouseEventFilterPointer = new MouseEventFilter(webEngineViewPointer); @@ -72,9 +88,6 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent) // Reapply the domain settings when the host changes. connect(urlRequestInterceptorPointer, SIGNAL(applyDomainSettings(QString)), this, SLOT(applyDomainSettingsWithoutReloading(QString))); - // Disable the cache. - webEngineProfilePointer->setHttpCacheType(QWebEngineProfile::NoCache); - // Don't allow JavaScript to open windows. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false); @@ -99,8 +112,8 @@ void BrowserView::applyApplicationSettings() // 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()); + // Emit the update search engine actions signal. + emit updateSearchEngineActions(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. @@ -159,6 +172,34 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload } } + // Set local storage. + switch (domainRecord.field(DomainsDatabaseHelper::LOCAL_STORAGE).value().toInt()) + { + case (DomainsDatabaseHelper::SYSTEM_DEFAULT): + { + // Set the default local storage status. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::localStorage()); + + break; + } + + case (DomainsDatabaseHelper::DISABLED): + { + // Disable local storage. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, false); + + break; + } + + case (DomainsDatabaseHelper::ENABLED): + { + // Enable local storage. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, true); + + break; + } + } + // Set the user agent. webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getResultingDomainSettingsUserAgent(domainRecord.field(DomainsDatabaseHelper::USER_AGENT).value().toString())); @@ -178,13 +219,16 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload webEngineViewPointer->setZoomFactor(currentZoomFactor); // Apply the domain settings palette to the URL line edit. - emit updateDomainSettingsIndicator(true); + emit updateDomainSettingsIndicator(true, domainRecord.field(DomainsDatabaseHelper::DOMAIN_NAME).value().toString()); } else // The hostname does not have domain settings. { // Set the JavaScript status. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScript()); + // Set local storage. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::localStorage()); + // Set the user agent. webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent())); @@ -195,13 +239,14 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload webEngineViewPointer->setZoomFactor(Settings::zoomFactor()); // Apply the no domain settings palette to the URL line edit. - emit updateDomainSettingsIndicator(false); + emit updateDomainSettingsIndicator(false, QStringLiteral("")); } - // Emit the on-the-fly menu update signals. + // Emit the update actions signals. emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)); - emit userAgentUpdated(webEngineProfilePointer->httpUserAgent()); - emit zoomFactorUpdated(Settings::zoomFactor()); + emit updateLocalStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); + emit updateUserAgentActions(webEngineProfilePointer->httpUserAgent()); + emit updateZoomFactorAction(webEngineViewPointer->zoomFactor()); // Reload the website if requested. if (reloadWebsite) @@ -265,6 +310,12 @@ void BrowserView::home() const webEngineViewPointer->load(QUrl::fromUserInput(Settings::homepage())); } +void BrowserView::loadFinished() const +{ + // Hide the progress bar. + emit hideProgressBar(); +} + void BrowserView::loadInitialWebsite() { // Apply the application settings. @@ -286,6 +337,18 @@ void BrowserView::loadInitialWebsite() } } +void BrowserView::loadProgress(const int &progress) const +{ + // Show the progress bar. + emit showProgressBar(progress); +} + +void BrowserView::loadStarted() const +{ + // Show the progress bar. + emit showProgressBar(0); +} + void BrowserView::loadUrlFromLineEdit(QString url) const { // Decide if the text is more likely to be a URL or a search. @@ -337,10 +400,22 @@ void BrowserView::toggleJavaScript() const webEngineViewPointer->reload(); } -void BrowserView::updateInterface() const +void BrowserView::toggleLocalStorage() const +{ + // Toggle local storage. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, !webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); + + // Update the local storage icon. + emit updateLocalStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); + + // Reload the website. + webEngineViewPointer->reload(); +} + +void BrowserView::updateUrl(const QUrl &url) const { // Update the URL line edit. - emit updateUrlLineEdit(webEngineViewPointer->url().toString()); + emit updateUrlLineEdit(url); // Update the status of the forward and back buttons. emit updateBackAction(webEngineHistoryPointer->canGoBack());