Improve initialization order.

[PrivacyBrowserPC.git] / src / MainView.cpp

diff --git a/src/MainView.cpp b/src/MainView.cpp
index 99c9355053652253527d727961ba751041dbb898..3893f2b96c683b445d5c1eb92e49f475060e554b 100644 (file)
--- a/src/MainView.cpp
+++ b/src/MainView.cpp
@@ -93,26 +93,8 @@ MainView::MainView(QWidget *parent) : QWidget(parent)
     // Don't allow JavaScript to open windows.
     webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false);
 
-    // Apply the application settings.
-    applyApplicationSettings();
-
     // 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()
@@ -156,12 +138,13 @@ void MainView::applyDomainSettings(bool reloadWebsite) const
     // Apply the user agent.
     webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgent(Settings::userAgent()));
 
-    // Emit the user agent updated signal, which causes the on-the-fly menu to be updated.
-    emit userAgentUpdated(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)
     {
@@ -196,12 +179,39 @@ void MainView::applyOnTheFlyUserAgent(QAction *userAgentActionPointer) const
     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.