#include "MouseEventFilter.h"
#include "Settings.h"
#include "ui_BrowserView.h"
-#include "UrlRequestInterceptor.h"
#include "helpers/DomainsDatabaseHelper.h"
#include "helpers/SearchEngineHelper.h"
#include "helpers/UserAgentHelper.h"
+#include "interceptors/UrlRequestInterceptor.h"
#include "windows/BrowserWindow.h"
// Qt framework headers.
webEngineProfilePointer = webEnginePagePointer->profile();
webEngineSettingsPointer = webEngineViewPointer->settings();
- // Update the URL line edit from the webengine view.
- connect(webEngineViewPointer, SIGNAL(loadStarted()), this, SLOT(updateInterface()));
- connect(webEngineViewPointer, SIGNAL(loadProgress(const int)), this, SLOT(updateInterface()));
- connect(webEngineViewPointer, SIGNAL(loadFinished(const bool)), this, SLOT(updateInterface()));
+ // Update the URL line edit when the URL changes.
+ connect(webEngineViewPointer, SIGNAL(urlChanged(const QUrl)), this, SLOT(updateUrl(const QUrl)));
+
+ // Update the progress bar.
+ connect(webEngineViewPointer, SIGNAL(loadStarted()), this, SLOT(loadStarted()));
+ connect(webEngineViewPointer, SIGNAL(loadProgress(const int)), this, SLOT(loadProgress(const int)));
+ connect(webEngineViewPointer, SIGNAL(loadFinished(const bool)), this, SLOT(loadFinished()));
// Instantiate the mouse event filter pointer.
MouseEventFilter *mouseEventFilterPointer = new MouseEventFilter(webEngineViewPointer);
// 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());
+ // Emit the update search engine actions signal.
+ emit updateSearchEngineActions(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.
// Set the user agent.
webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getResultingDomainSettingsUserAgent(domainRecord.field(DomainsDatabaseHelper::USER_AGENT).value().toString()));
- // Check if a custom zoom factor is set. This can be removed once <https://redmine.stoutner.com/issues/799> has been resolved.
+ // Check if a custom zoom factor is set.
if (domainRecord.field(DomainsDatabaseHelper::ZOOM_FACTOR).value().toInt())
{
// Store the current zoom factor.
currentZoomFactor = Settings::zoomFactor();
}
- // Set the zoom factor.
+ // Set the zoom factor. The use of `currentZoomFactor` can be removed once <https://redmine.stoutner.com/issues/799> has been resolved.
webEngineViewPointer->setZoomFactor(currentZoomFactor);
// Apply the domain settings palette to the URL line edit.
// Set the user agent.
webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent()));
- // Store the current zoom factor.
+ // Store the current zoom factor. This can be removed once <https://redmine.stoutner.com/issues/799> has been resolved.
currentZoomFactor = Settings::zoomFactor();
// Set the zoom factor.
- webEngineViewPointer->setZoomFactor(currentZoomFactor);
+ webEngineViewPointer->setZoomFactor(Settings::zoomFactor());
// Apply the no domain settings palette to the URL line edit.
emit updateDomainSettingsIndicator(false);
}
- // Emit the on-the-fly menu update signals.
+ // Emit the update actions signals.
emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled));
- emit userAgentUpdated(webEngineProfilePointer->httpUserAgent());
- emit zoomFactorUpdated(Settings::zoomFactor());
+ emit updateUserAgentActions(webEngineProfilePointer->httpUserAgent());
+ emit updateZoomFactorAction(webEngineViewPointer->zoomFactor());
// Reload the website if requested.
if (reloadWebsite)
webEngineViewPointer->reload();
}
-void BrowserView::applyOnTheFlyZoomFactor(const double &zoomFactor) const
+// This can be const once <https://redmine.stoutner.com/issues/799> has been resolved.
+void BrowserView::applyOnTheFlyZoomFactor(const double &zoomFactor)
{
+ // Update the current zoom factor. This can be removed once <https://redmine.stoutner.com/issues/799> has been resolved.
+ currentZoomFactor = zoomFactor;
+
// Set the zoom factor.
webEngineViewPointer->setZoomFactor(zoomFactor);
}
webEngineViewPointer->load(QUrl::fromUserInput(Settings::homepage()));
}
+void BrowserView::loadFinished() const
+{
+ // Hide the progress bar.
+ emit hideProgressBar();
+}
+
void BrowserView::loadInitialWebsite()
{
// Apply the application settings.
}
}
+void BrowserView::loadProgress(const int &progress) const
+{
+ // Show the progress bar.
+ emit showProgressBar(progress);
+}
+
+void BrowserView::loadStarted() const
+{
+ // Show the progress bar.
+ emit showProgressBar(0);
+}
+
void BrowserView::loadUrlFromLineEdit(QString url) const
{
// Decide if the text is more likely to be a URL or a search.
webEngineViewPointer->reload();
}
-void BrowserView::updateInterface() const
+void BrowserView::updateUrl(const QUrl &url) const
{
// Update the URL line edit.
- emit updateUrlLineEdit(webEngineViewPointer->url().toString());
+ emit updateUrlLineEdit(url.toString());
// Update the status of the forward and back buttons.
emit updateBackAction(webEngineHistoryPointer->canGoBack());