X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=src%2Fviews%2FBrowserView.cpp;h=319f9e51b7624ef49776445be3d1c776025dc550;hb=fb7b0588f2e95260578076aceb22a5644e81f8b6;hp=07c11301b1619f5eef790eafb42654eb20929c56;hpb=5daa7af456c7daa05b1a055932b5156ed1f88b00;p=PrivacyBrowserPC.git

diff --git a/src/views/BrowserView.cpp b/src/views/BrowserView.cpp
index 07c1130..319f9e5 100644
--- a/src/views/BrowserView.cpp
+++ b/src/views/BrowserView.cpp
@@ -23,7 +23,6 @@
 #include "Settings.h"
 #include "ui_BrowserView.h"
 #include "UrlRequestInterceptor.h"
-#include "dialogs/DomainSettingsDialog.h"
 #include "helpers/DomainsDatabaseHelper.h"
 #include "helpers/SearchEngineHelper.h"
 #include "helpers/UserAgentHelper.h"
@@ -42,13 +41,6 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent)
     browserViewUi.setupUi(this);
 
     // Get handles for the views.
-    backButtonPointer = browserViewUi.backButton;
-    forwardButtonPointer = browserViewUi.forwardButton;
-    QPushButton *refreshButtonPointer = browserViewUi.refreshButton;
-    QPushButton *homeButtonPointer = browserViewUi.homeButton;
-    urlLineEditPointer = browserViewUi.urlLineEdit;
-    javaScriptButtonPointer = browserViewUi.javaScript;
-    QPushButton *domainSettingsButtonPointer = browserViewUi.domainSettingsButton;
     webEngineViewPointer = browserViewUi.webEngineView;
 
     // Get handles for the aspects of the WebEngine.
@@ -57,30 +49,12 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent)
     webEngineProfilePointer = webEnginePagePointer->profile();
     webEngineSettingsPointer = webEngineViewPointer->settings();
 
-    // Update the webengine view from the URL line edit.  TODO.  Remove.
-    connect(urlLineEditPointer, SIGNAL(returnKeyPressed(const QString)), this, SLOT(loadUrlFromLineEdit(const QString)));
-
     // 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()));
 
-    // Setup the URL bar buttons.  TODO.  Remove.
-    connect(backButtonPointer, SIGNAL(clicked()), webEngineViewPointer, SLOT(back()));
-    connect(forwardButtonPointer, SIGNAL(clicked()), webEngineViewPointer, SLOT(forward()));
-    connect(refreshButtonPointer, SIGNAL(clicked()), webEngineViewPointer, SLOT(reload()));
-    connect(homeButtonPointer, SIGNAL(clicked()), this, SLOT(home()));
-    connect(javaScriptButtonPointer, SIGNAL(clicked()), this, SLOT(toggleJavaScript()));
-    connect(domainSettingsButtonPointer, SIGNAL(clicked()), this, SLOT(openDomainSettings()));
-
-    // Get the URL line edit palettes.  TODO.  Remove.
-    noDomainSettingsPalette = urlLineEditPointer->palette();
-    domainSettingsPalette = urlLineEditPointer->palette();
-
-    // Modify the domain settings palette.  TODO.  Remove.
-    domainSettingsPalette.setColor(QPalette::Base, QColor("#C8E6C9"));
-
-    // Instantiate the mouse event pointer.
+    // Instantiate the mouse event filter pointer.
     MouseEventFilter *mouseEventFilterPointer = new MouseEventFilter(webEngineViewPointer);
 
     // Install the mouse event filter.
@@ -177,7 +151,6 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
         webEngineViewPointer->setZoomFactor(Settings::zoomFactor());
 
         // Apply the domain settings palette to the URL line edit.
-        urlLineEditPointer->setPalette(domainSettingsPalette);  // TODO.  Remove.
         emit updateDomainSettingsIndicator(true);
     }
     else  // The hostname does not have domain settings.
@@ -192,21 +165,11 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
         webEngineViewPointer->setZoomFactor(Settings::zoomFactor());
 
         // Apply the no domain settings palette to the URL line edit.
-        urlLineEditPointer->setPalette(noDomainSettingsPalette);  // TODO.  Remove.
         emit updateDomainSettingsIndicator(false);
     }
 
-    // Update the JavaScript button.
-    if (webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled))
-    {
-        javaScriptButtonPointer->setIcon(QIcon(":/icons/javascript-warning"));
-    }
-    else
-    {
-        javaScriptButtonPointer->setIcon(QIcon(":/icons/privacy-mode"));
-    }
-
     // Emit the on-the-fly menu update signals.
+    emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled));
     emit userAgentUpdated(webEngineProfilePointer->httpUserAgent());
     emit zoomFactorUpdated(Settings::zoomFactor());
 
@@ -291,9 +254,6 @@ void BrowserView::loadInitialWebsite()
 
 void BrowserView::loadUrlFromLineEdit(QString url) const
 {
-    // Remove the focus from the URL line edit.  TODO.  Remove.
-    urlLineEditPointer->clearFocus();
-
     // Decide if the text is more likely to be a URL or a search.
     if (url.contains("."))  // The text is likely a URL.
     {
@@ -314,24 +274,6 @@ void BrowserView::loadUrlFromLineEdit(QString url) const
     }
 }
 
-void BrowserView::openDomainSettings() const
-{
-    // Instantiate the domain settings window.
-    DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog();
-
-    // Set the dialog window title.
-    domainSettingsDialogPointer->setWindowTitle(i18nc("The domain settings dialog title", "Domain Settings"));
-
-    // Set the modality.
-    domainSettingsDialogPointer->setWindowModality(Qt::WindowModality::WindowModal);;
-
-    // Show the dialog.
-    domainSettingsDialogPointer->show();
-
-    // Reload the tabs when domain settings are updated.
-    connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), this, SLOT(applyDomainSettingsAndReload()));
-}
-
 void BrowserView::pageLinkHovered(const QString &linkUrl) const
 {
     // Emit a signal so that the browser window can update the status bar.
@@ -349,15 +291,8 @@ void BrowserView::toggleJavaScript() const
     // Toggle JavaScript.
     webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, !webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled));
 
-    // Update the JavaScript button.
-    if (webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled))
-    {
-        javaScriptButtonPointer->setIcon(QIcon(":/icons/javascript-warning"));
-    }
-    else
-    {
-        javaScriptButtonPointer->setIcon(QIcon(":/icons/privacy-mode"));
-    }
+    // Update the JavaScript icon.
+    emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled));
 
     // Reload the website.
     webEngineViewPointer->reload();
@@ -365,20 +300,11 @@ void BrowserView::toggleJavaScript() const
 
 void BrowserView::updateInterface() const
 {
-    // Update the URL line edit if it does not have focus.  TODO.  Remove block.
-    if (!urlLineEditPointer->hasFocus())
-    {
-        // Update the URL line edit.
-        urlLineEditPointer->setText(webEngineViewPointer->url().toString());
-    }
-
     // Update the URL line edit.
     emit updateUrlLineEdit(webEngineViewPointer->url().toString());
 
     // Update the status of the forward and back buttons.
-    backButtonPointer->setEnabled(webEngineHistoryPointer->canGoBack());  // TODO Remove.
     emit updateBackAction(webEngineHistoryPointer->canGoBack());
-    forwardButtonPointer->setEnabled(webEngineHistoryPointer->canGoForward());  // TODO Remove.
     emit updateForwardAction(webEngineHistoryPointer->canGoForward());
 
     // Reapply the zoom factor.  This is a bug in QWebEngineView that resets the zoom with every load.  Hopefully it will be fixed in Qt6.  <https://bugreports.qt.io/browse/QTBUG-51992>