X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.cpp;h=77bb43b021f112e656da12f42dc731bc9815bcf8;hp=5a84d40c97df93be9cf436b198e3431f3177299a;hb=fb7b0588f2e95260578076aceb22a5644e81f8b6;hpb=5daa7af456c7daa05b1a055932b5156ed1f88b00

diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp
index 5a84d40..77bb43b 100644
--- 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"
 
@@ -45,9 +46,13 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow()
     KActionCollection *actionCollectionPointer = this->actionCollection();
 
     // Add the standard actions.
+    QAction *backActionPointer = KStandardAction::back(this, SLOT(back()), actionCollectionPointer);
+    QAction *forwardActionPointer = KStandardAction::forward(this, SLOT(forward()), actionCollectionPointer);
+    KStandardAction::home(this, SLOT(home()), actionCollectionPointer);
     KStandardAction::openNew(this, SLOT(fileNew()), actionCollectionPointer);
     KStandardAction::quit(qApp, SLOT(closeAllWindows()), actionCollectionPointer);
     KStandardAction::preferences(this, SLOT(settingsConfigure()), actionCollectionPointer);
+    KStandardAction::redisplay(this, SLOT(refresh()), actionCollectionPointer);
 
     // Add the custom actions.
     userAgentPrivacyBrowserActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_privacy_browser"));
@@ -66,10 +71,8 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow()
     searchEngineBingActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_bing"));
     searchEngineYahooActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_yahoo"));
     searchEngineCustomActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_custom"));
-    backActionPointer = actionCollectionPointer->addAction(QStringLiteral("back"));
-    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);
@@ -123,16 +126,12 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow()
     searchEngineGoogleActionPointer->setText(i18nc("Search engine", "Google"));
     searchEngineBingActionPointer->setText(i18nc("Search engine", "Bing"));
     searchEngineYahooActionPointer->setText(i18nc("Search engine", "Yahoo"));
-    backActionPointer->setText(i18nc("Back button", "Back"));
-    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")));
+    //refreshActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
+    domainSettingsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("network-server-symbolic")));
 
     // Update the on-the-fly menus.
     connect(browserViewPointer, SIGNAL(userAgentUpdated(QString)), this, SLOT(updateOnTheFlyUserAgent(QString)));
@@ -147,14 +146,13 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow()
     connect(zoomFactorActionPointer, SIGNAL(triggered()), this, SLOT(getZoomFactorFromUser()));
 
     // Connect the URL toolbar actions.
-    connect(backActionPointer, SIGNAL(triggered()), this, SLOT(back()));
-    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 +163,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 +260,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 +290,21 @@ void BrowserWindow::refresh() const
     browserViewPointer->refresh();
 }
 
+void BrowserWindow::toggleJavaScript() const
+{
+    // Remove the focus from the URL line edit.
+    urlLineEditPointer->clearFocus();
+
+    // Toggle JavaScript.
+    browserViewPointer->toggleJavaScript();
+}
+
+QSize BrowserWindow::sizeHint() const
+{
+    // Return the default window size.
+    return QSize(1500, 1200);
+}
+
 void BrowserWindow::settingsConfigure()
 {
     // Check to make sure the dialog box isn't already displayed.
@@ -344,13 +380,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.