Reimplement the URL bar as standard toolbars.

[PrivacyBrowserPC.git] / src / windows / BrowserWindow.cpp

diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp
index 5a84d40c97df93be9cf436b198e3431f3177299a..d83dd69b5e515b12a2baf6fa9cd3e8689ac93d7a 100644 (file)
--- a/src/windows/BrowserWindow.cpp
+++ b/src/windows/BrowserWindow.cpp
@@ -22,6 +22,7 @@
 #include "Settings.h"
 #include "ui_SettingsPrivacy.h"
 #include "ui_SettingsGeneral.h"
+#include "dialogs/DomainSettingsDialog.h"
 #include "helpers/SearchEngineHelper.h"
 #include "helpers/UserAgentHelper.h"
 
@@ -70,6 +71,8 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow()
     forwardActionPointer = actionCollectionPointer->addAction(QStringLiteral("forward"));
     refreshActionPointer = actionCollectionPointer->addAction(QStringLiteral("refresh"));
     homeActionPointer = actionCollectionPointer->addAction(QStringLiteral("home"));
+    javaScriptActionPointer = actionCollectionPointer->addAction(QStringLiteral("javascript"));
+    domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings"));
 
     // Create the action groups
     QActionGroup *userAgentActionGroupPointer = new QActionGroup(this);
@@ -127,12 +130,15 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow()
     forwardActionPointer->setText(i18nc("Forward button", "Forward"));
     refreshActionPointer->setText(i18nc("Refresh button", "Refresh"));
     homeActionPointer->setText(i18nc("Home button", "Home"));
+    javaScriptActionPointer->setText(i18nc("JavaScript button", "JavaScript"));
+    domainSettingsActionPointer->setText(i18nc("Domain Settings button", "Domain Settings"));
 
     // Set the action icons.
     backActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("arrow-left")));
     forwardActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right")));
     refreshActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
     homeActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("home")));
+    domainSettingsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("network-server-symbolic")));
 
     // Update the on-the-fly menus.
     connect(browserViewPointer, SIGNAL(userAgentUpdated(QString)), this, SLOT(updateOnTheFlyUserAgent(QString)));
@@ -151,10 +157,13 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow()
     connect(forwardActionPointer, SIGNAL(triggered()), this, SLOT(forward()));
     connect(refreshActionPointer, SIGNAL(triggered()), this, SLOT(refresh()));
     connect(homeActionPointer, SIGNAL(triggered()), this, SLOT(home()));
+    connect(javaScriptActionPointer, SIGNAL(triggered()), this, SLOT(toggleJavaScript()));
+    connect(domainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(openDomainSettings()));
 
     // Update the URL toolbar actions.
     connect(browserViewPointer, SIGNAL(updateBackAction(bool)), backActionPointer, SLOT(setEnabled(bool)));
     connect(browserViewPointer, SIGNAL(updateForwardAction(bool)), forwardActionPointer, SLOT(setEnabled(bool)));
+    connect(browserViewPointer, SIGNAL(updateJavaScriptAction(bool)), this, SLOT(updateJavaScriptAction(bool)));
 
     // Setup the GUI based on the browser_ui.rc file.
     setupGUI(StandardWindowOption::Default, ("browser_ui.rc"));
@@ -165,8 +174,10 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow()
     // Create a URL line edit.
     urlLineEditPointer = new KLineEdit();
 
-    // Add the URL line edit to the URL toolbar.
+    // Populate the URL toolbar.
     urlToolBarPointer->addWidget(urlLineEditPointer);
+    urlToolBarPointer->addAction(javaScriptActionPointer);
+    urlToolBarPointer->addAction(domainSettingsActionPointer);
 
     // Load a new URL from the URL line edit.
     connect(urlLineEditPointer, SIGNAL(returnKeyPressed(const QString)), this, SLOT(loadUrlFromLineEdit(const QString)));
@@ -260,6 +271,27 @@ void BrowserWindow::loadUrlFromLineEdit(const QString &url) const
     browserViewPointer->loadUrlFromLineEdit(url);
 }
 
+void BrowserWindow::openDomainSettings() const
+{
+    // Remove the focus from the URL line edit.
+    urlLineEditPointer->clearFocus();
+
+    // 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()), browserViewPointer, SLOT(applyDomainSettingsAndReload()));
+}
+
 void BrowserWindow::refresh() const
 {
     // Remove the focus from the URL line edit.
@@ -269,6 +301,15 @@ void BrowserWindow::refresh() const
     browserViewPointer->refresh();
 }
 
+void BrowserWindow::toggleJavaScript() const
+{
+    // Remove the focus from the URL line edit.
+    urlLineEditPointer->clearFocus();
+
+    // Toggle JavaScript.
+    browserViewPointer->toggleJavaScript();
+}
+
 void BrowserWindow::settingsConfigure()
 {
     // Check to make sure the dialog box isn't already displayed.
@@ -344,13 +385,20 @@ void BrowserWindow::settingsConfigure()
     }
 }
 
-void BrowserWindow::updateDomainSettingsIndicator(const bool status) const
+void BrowserWindow::updateDomainSettingsIndicator(const bool &status) const
 {
     // Set the domain palette according to the status.
     if (status) urlLineEditPointer->setPalette(domainSettingsPalette);
     else urlLineEditPointer->setPalette(noDomainSettingsPalette);
 }
 
+void BrowserWindow::updateJavaScriptAction(const bool &isEnabled) const
+{
+    // Set the icon according to the status.
+    if (isEnabled) javaScriptActionPointer->setIcon(QIcon(":/icons/javascript-warning"));
+    else javaScriptActionPointer->setIcon(QIcon(":/icons/privacy-mode"));
+}
+
 void BrowserWindow::updateOnTheFlySearchEngine(const QString &searchEngine) const
 {
     // Initialize the custom search engine flag.