#include "MouseEventFilter.h"
#include "Settings.h"
#include "ui_MainView.h"
+#include "UserAgentHelper.h"
// Qt framework headers.
#include <QWebEngineProfile>
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()));
// 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);
}
}
-void MainView::applyApplicationSettings()
+void MainView::applyApplicationSettings() const
{
// TODO.
}
-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.
applyDomainSettings(true);
}
-void MainView::applyDomainSettings(bool reloadWebsite)
+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()));
// Reload the website if requested.
if (reloadWebsite)
}
}
-void MainView::goHome()
+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().toString()));
}
-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.
+ // 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));
}
-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())