X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2FMainView.cpp;h=5acb4470ec3a56a5b4223c895d56b9116da034b8;hp=cf84eccf063142977d66cd48d259b9fd91e2632f;hb=d37c965b5cc545db8845756ff2e059fd20a54869;hpb=05800bafb963a10f291d2a9604dc90cd7ac37c7b

diff --git a/src/MainView.cpp b/src/MainView.cpp
index cf84ecc..5acb447 100644
--- a/src/MainView.cpp
+++ b/src/MainView.cpp
@@ -23,6 +23,7 @@
 #include "MouseEventFilter.h"
 #include "Settings.h"
 #include "ui_MainView.h"
+#include "UserAgentHelper.h"
 
 // Qt framework headers.
 #include <QWebEngineProfile>
@@ -38,6 +39,7 @@ 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;
@@ -50,7 +52,7 @@ MainView::MainView(QWidget *parent) : QWidget(parent)
     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()));
@@ -60,6 +62,7 @@ MainView::MainView(QWidget *parent) : QWidget(parent)
     // 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()));
 
@@ -75,9 +78,6 @@ MainView::MainView(QWidget *parent) : QWidget(parent)
     // 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);
 
@@ -109,18 +109,19 @@ MainView::MainView(QWidget *parent) : QWidget(parent)
     }
 }
 
-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());
@@ -136,7 +137,7 @@ void MainView::applyDomainSettings(bool reloadWebsite)
     }
 
     // Apply the user agent.
-    webEngineProfilePointer->setHttpUserAgent(userAgentHelperPointer->getUserAgent(Settings::userAgent()));
+    webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgent(Settings::userAgent()));
 
     // Reload the website if requested.
     if (reloadWebsite)
@@ -145,28 +146,35 @@ void MainView::applyDomainSettings(bool 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));
@@ -185,7 +193,7 @@ void MainView::toggleJavaScript()
     webEngineViewPointer->reload();
 }
 
-void MainView::updateInterface()
+void MainView::updateInterface() const
 {
     // Update the URL line edit if it does not have focus.
     if (!urlLineEditPointer->hasFocus())