#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 <QAction>
#include <QWebEngineProfile>
MainView::MainView(QWidget *parent) : QWidget(parent)
// Get handles for the views.
backButtonPointer = mainViewUi.backButton;
forwardButtonPointer = mainViewUi.forwardButton;
+ QPushButton *refreshButtonPointer = mainViewUi.refreshButton;
QPushButton *homeButtonPointer = mainViewUi.homeButton;
urlLineEditPointer = mainViewUi.urlLineEdit;
javaScriptButtonPointer = mainViewUi.javaScript;
webEngineSettingsPointer = webEngineViewPointer->settings();
// Update the webengine view from the URL line edit.
- connect(urlLineEditPointer, SIGNAL(returnKeyPressed(const QString)), this, SLOT(loadUrl(const QString)));
+ connect(urlLineEditPointer, SIGNAL(returnKeyPressed(const QString)), this, SLOT(loadUrlFromTextBox(const QString)));
// Update the URL line edit form the webengine view.
connect(webEngineViewPointer, SIGNAL(loadStarted()), this, SLOT(updateInterface()));
- connect(webEngineViewPointer, SIGNAL(loadProgress(int)), this, SLOT(updateInterface()));
- connect(webEngineViewPointer, SIGNAL(loadFinished(bool)), 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()));
qApp->installEventFilter(mouseEventFilterPointer);
// Listen for hovered link URLs.
- connect(webEnginePagePointer, SIGNAL(linkHovered(QString)), this, SLOT(pageLinkHovered(QString)));
+ 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);
- // Instantiate the user agent helper.
- userAgentHelperPointer = new UserAgentHelper();
-
// 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();
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());
}
-void MainView::applyDomainSettingsAndReload()
+// 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);
}
-void MainView::applyDomainSettings(bool reloadWebsite)
+// 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.
webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScript());
}
// Apply the user agent.
- webEngineProfilePointer->setHttpUserAgent(userAgentHelperPointer->getUserAgent(Settings::userAgent()));
+ 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)
}
}
-void MainView::goHome()
+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. TODO. Consider sanitizing the homepage input and adding things like protocols if they are missing.
- webEngineViewPointer->setUrl(Settings::homepage());
+ // Load the homepage.
+ webEngineViewPointer->setUrl(QUrl::fromUserInput(Settings::homepage()));
}
-void MainView::loadUrl(const QString &urlFromUser)
+void MainView::loadUrlFromTextBox(QString urlFromUser) const
{
// Remove the focus from the URL line edit.
urlLineEditPointer->clearFocus();
- // Load the URL, adding standard protocol sections if needed. TODO. Replace this with logic that prefers HTTPS.
- webEngineViewPointer->setUrl(QUrl::fromUserInput(urlFromUser));
+ // Decide if the text is more likely to be a URL or a search.
+ if (urlFromUser.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://"))
+ {
+ // Add `https://` to the beginning of the URL.
+ urlFromUser = "https://" + urlFromUser;
+ }
+
+ // Load the URL.
+ webEngineViewPointer->setUrl(QUrl::fromUserInput(urlFromUser));
+ }
+ else // The text is likely a search.
+ {
+ // Load the search.
+ webEngineViewPointer->setUrl(QUrl::fromUserInput(searchEngineUrl + urlFromUser));
+ }
}
-void MainView::pageLinkHovered(const QString &linkUrl)
+void MainView::pageLinkHovered(const QString &linkUrl) const
{
// Emit a signal so that the browser window can update the status bar.
emit linkHovered(linkUrl);
}
-void MainView::toggleJavaScript()
+void MainView::toggleJavaScript() const
{
// Toggle JavaScript.
webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, !webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled));
webEngineViewPointer->reload();
}
-void MainView::updateInterface()
+void MainView::updateInterface() const
{
// Update the URL line edit if it does not have focus.
if (!urlLineEditPointer->hasFocus())
projects / PrivacyBrowserPC.git / blobdiff