#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>
// 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()));
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);
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
// 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