Improve initialization order.

[PrivacyBrowserPC.git] / src / MainView.cpp

diff --git a/src/MainView.cpp b/src/MainView.cpp
index 3bef1040a88bb160939b685cd2fbf10635f69844..3893f2b96c683b445d5c1eb92e49f475060e554b 100644 (file)
--- a/src/MainView.cpp
+++ b/src/MainView.cpp
@@ -28,6 +28,7 @@
 #include "helpers/UserAgentHelper.h"
 
 // Qt framework headers.
+#include <QAction>
 #include <QWebEngineProfile>
 
 MainView::MainView(QWidget *parent) : QWidget(parent)
@@ -92,37 +93,17 @@ MainView::MainView(QWidget *parent) : QWidget(parent)
     // 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();
-
-    // Get the arguments.
-    QStringList argumentsStringList = qApp->arguments();
-
-    // Check to see if the arguments lists contains a URL.
-    if (argumentsStringList.size() > 1)
-    {
-        // Load the URL from the arguments list.
-        webEngineViewPointer->setUrl(QUrl::fromUserInput(argumentsStringList.at(1)));
-    }
-    else
-    {
-        // Load the homepage.
-        goHome();
-    }
 }
 
-void MainView::applyApplicationSettings() const
+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());
 }
 
 // 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.
@@ -157,6 +138,13 @@ void MainView::applyDomainSettings(bool reloadWebsite) const
     // Apply the user agent.
     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)
     {
@@ -164,12 +152,66 @@ void MainView::applyDomainSettings(bool reloadWebsite) const
     }
 }
 
+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.
     webEngineViewPointer->setUrl(QUrl::fromUserInput(Settings::homepage()));
 }
 
+void MainView::loadInitialWebsite()
+{
+    // Apply the application settings.
+    applyApplicationSettings();
+
+    // Get the arguments.
+    QStringList argumentsStringList = qApp->arguments();
+
+    // Check to see if the arguments lists contains a URL.
+    if (argumentsStringList.size() > 1)
+    {
+        // Load the URL from the arguments list.
+        webEngineViewPointer->setUrl(QUrl::fromUserInput(argumentsStringList.at(1)));
+    }
+    else
+    {
+        // Load the homepage.
+        goHome();
+    }
+}
+
 void MainView::loadUrlFromTextBox(QString urlFromUser) const
 {
     // Remove the focus from the URL line edit.
@@ -191,7 +233,7 @@ void MainView::loadUrlFromTextBox(QString urlFromUser) const
     else  // The text is likely a search.
     {
         // Load the search.
-        webEngineViewPointer->setUrl(QUrl::fromUserInput(SearchEngineHelper::getSearchUrl(Settings::searchEngine()) + urlFromUser));
+        webEngineViewPointer->setUrl(QUrl::fromUserInput(searchEngineUrl + urlFromUser));
     }
 }