X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FMainView.cpp;fp=src%2FMainView.cpp;h=9ddf1fb4524177e07627da213c047bb9d7b6354e;hb=68167c0aba46c4bd4c859b176824873ffd14a3e7;hp=5acb4470ec3a56a5b4223c895d56b9116da034b8;hpb=d37c965b5cc545db8845756ff2e059fd20a54869;p=PrivacyBrowserPC.git

diff --git a/src/MainView.cpp b/src/MainView.cpp
index 5acb447..9ddf1fb 100644
--- a/src/MainView.cpp
+++ b/src/MainView.cpp
@@ -23,7 +23,8 @@
 #include "MouseEventFilter.h"
 #include "Settings.h"
 #include "ui_MainView.h"
-#include "UserAgentHelper.h"
+#include "helpers/SearchEngineHelper.h"
+#include "helpers/UserAgentHelper.h"
 
 // Qt framework headers.
 #include <QWebEngineProfile>
@@ -56,8 +57,8 @@ MainView::MainView(QWidget *parent) : QWidget(parent)
 
     // 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()));
@@ -73,7 +74,7 @@ MainView::MainView(QWidget *parent) : QWidget(parent)
     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)));
 
     // Disable the cache.
     webEngineProfilePointer->setHttpCacheType(QWebEngineProfile::NoCache);
@@ -149,7 +150,7 @@ void MainView::applyDomainSettings(bool reloadWebsite) const
 void MainView::goHome() const
 {
     // Load the homepage.
-    webEngineViewPointer->setUrl(QUrl::fromUserInput(Settings::homepage().toString()));
+    webEngineViewPointer->setUrl(QUrl::fromUserInput(Settings::homepage()));
 }
 
 void MainView::loadUrlFromTextBox(QString urlFromUser) const
@@ -157,15 +158,24 @@ void MainView::loadUrlFromTextBox(QString urlFromUser) const
     // Remove the focus from the URL line edit.
     urlLineEditPointer->clearFocus();
 
-    // Check if the URL does not start with a valid protocol.
-    if (!urlFromUser.startsWith("http") && !urlFromUser.startsWith("file://"))
+    // Decide if the text is more likely to be a URL or a search.
+    if (urlFromUser.contains("."))  // The text is likely a URL.
     {
-        // Add `https://` to the beginning of the URL.
-        urlFromUser = "https://" + urlFromUser;
+        // 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(SearchEngineHelper::getSearchUrl(Settings::searchEngine()) + urlFromUser));
     }
-
-    // Load the URL.
-    webEngineViewPointer->setUrl(QUrl::fromUserInput(urlFromUser));
 }
 
 void MainView::pageLinkHovered(const QString &linkUrl) const