X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.cpp;h=ef264a5db5476d3ae05074bbfdb23bd9ca5b8f1d;hp=a29b5037c83af5ae69dcfd9f146228fc96f0e251;hb=2facce32fb6d97b52a7dc148044cae4b36a65d4c;hpb=2e5db0d355267f5823610100947970af12ca6342 diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index a29b503..ef264a5 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/CookiesDialog.h" #include "dialogs/DomainSettingsDialog.h" #include "helpers/SearchEngineHelper.h" #include "helpers/UserAgentHelper.h" @@ -32,10 +33,17 @@ // Qt toolkit headers. #include +#include #include +// Construct the class. BrowserWindow::BrowserWindow() : KXmlGuiWindow() { + // Initialize the variables. + cookieListPointer = new std::list; + cookiesEnabled = false; + javaScriptEnabled = false; + // Instantiate the main view pointer. browserViewPointer = new BrowserView(this); @@ -72,9 +80,11 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() searchEngineBingActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_bing")); searchEngineYahooActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_yahoo")); searchEngineCustomActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_custom")); + QAction *domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings")); + cookiesActionPointer = actionCollectionPointer->addAction(QStringLiteral("cookies")); javaScriptActionPointer = actionCollectionPointer->addAction(QStringLiteral("javascript")); - localStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("local_storage")); - domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings")); + onTheFlyCookiesActionPointer = actionCollectionPointer->addAction(QStringLiteral("on-the-fly_cookies")); + domStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("dom_storage")); // Create the action groups QActionGroup *userAgentActionGroupPointer = new QActionGroup(this); @@ -116,7 +126,10 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() searchEngineYahooActionPointer->setCheckable(true); searchEngineCustomActionPointer->setCheckable(true); - // Set the non-mutable action text. + // Get the number of cookies. + int numberOfCookies = cookieListPointer->size(); + + // Set the action text. userAgentPrivacyBrowserActionPointer->setText(UserAgentHelper::PRIVACY_BROWSER_TRANSLATED); userAgentWebEngineDefaultActionPointer->setText(UserAgentHelper::WEB_ENGINE_DEFAULT_TRANSLATED); userAgentFirefoxLinuxActionPointer->setText(UserAgentHelper::FIREFOX_LINUX_TRANSLATED); @@ -131,9 +144,11 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() searchEngineGoogleActionPointer->setText(i18nc("Search engine", "Google")); searchEngineBingActionPointer->setText(i18nc("Search engine", "Bing")); searchEngineYahooActionPointer->setText(i18nc("Search engine", "Yahoo")); - javaScriptActionPointer->setText(i18nc("JavaScript button", "JavaScript")); - localStorageActionPointer->setText(i18nc("Local Storage Button", "Local Storage")); - domainSettingsActionPointer->setText(i18nc("Domain Settings button", "Domain Settings")); + domainSettingsActionPointer->setText(i18nc("Domain Settings action", "Domain Settings")); + cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", numberOfCookies)); + javaScriptActionPointer->setText(i18nc("JavaScript action", "JavaScript")); + onTheFlyCookiesActionPointer->setText(i18nc("The On-The-Fly Cookies action, which also display the number of cookies", "Cookies - %1", numberOfCookies)); + domStorageActionPointer->setText(i18nc("DOM Storage action", "DOM Storage")); // Set the action icons. userAgentPrivacyBrowserActionPointer->setIcon(QIcon(":/icons/privacy-mode")); @@ -154,6 +169,8 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() searchEngineCustomActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search"))); zoomFactorActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("zoom"))); domainSettingsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("settings-configure"))); + cookiesActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("preferences-web-browser-cookies"))); + onTheFlyCookiesActionPointer->setIcon(QIcon(":/icons/cookies-off")); // Update the on-the-fly menus. connect(browserViewPointer, SIGNAL(updateUserAgentActions(QString)), this, SLOT(updateUserAgentActions(QString))); @@ -166,17 +183,20 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() // Display dialogs. connect(zoomFactorActionPointer, SIGNAL(triggered()), this, SLOT(getZoomFactorFromUser())); + connect(cookiesActionPointer, SIGNAL(triggered()), this, SLOT(openCookiesDialog())); + connect(domainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(openDomainSettings())); // Connect the URL toolbar actions. connect(javaScriptActionPointer, SIGNAL(triggered()), this, SLOT(toggleJavaScript())); - connect(localStorageActionPointer, SIGNAL(triggered()), this, SLOT(toggleLocalStorage())); - connect(domainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(openDomainSettings())); + connect(onTheFlyCookiesActionPointer, SIGNAL(triggered()), this, SLOT(toggleCookies())); + connect(domStorageActionPointer, SIGNAL(triggered()), this, SLOT(toggleDomStorage())); // 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))); - connect(browserViewPointer, SIGNAL(updateLocalStorageAction(bool)), this, SLOT(updateLocalStorageAction(bool))); + connect(browserViewPointer, SIGNAL(updateCookiesAction(bool)), this, SLOT(updateCookiesAction(bool))); + connect(browserViewPointer, SIGNAL(updateDomStorageAction(bool)), this, SLOT(updateDomStorageAction(bool))); // Setup the GUI based on the browser_ui.rc file. setupGUI(StandardWindowOption::Default, ("browser_ui.rc")); @@ -218,6 +238,9 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() connect(browserViewPointer, SIGNAL(showProgressBar(const int)), this, SLOT(showProgressBar(const int))); connect(browserViewPointer, SIGNAL(hideProgressBar()), progressBarPointer, SLOT(hide())); + // Clear the URL line edit focus when requested. + connect(browserViewPointer, SIGNAL(clearUrlLineEditFocus()), this, SLOT(clearUrlLineEditFocus())); + // Get the URL line edit palettes. noDomainSettingsPalette = urlLineEditPointer->palette(); domainSettingsPalette = urlLineEditPointer->palette(); @@ -228,10 +251,29 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() // Update the applied palette. connect(browserViewPointer, SIGNAL(updateDomainSettingsIndicator(bool, QString)), this, SLOT(updateDomainSettingsIndicator(bool, QString))); + // Process cookie changes. + connect(browserViewPointer, SIGNAL(addCookie(QNetworkCookie)), this, SLOT(addCookieToList(QNetworkCookie))); + connect(browserViewPointer, SIGNAL(removeCookie(QNetworkCookie)), this, SLOT(removeCookieFromList(QNetworkCookie))); + // Load the initial website. browserViewPointer->loadInitialWebsite(); } +void BrowserWindow::addCookieToList(const QNetworkCookie &newCookie) const +{ + qDebug() << "Add cookie: " << newCookie.toRawForm(); + + // Add the new cookie to the list. + cookieListPointer->push_front(newCookie); + + // Get the number of cookies. + int numberOfCookies = cookieListPointer->size(); + + // Update the action text. + cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", numberOfCookies)); + onTheFlyCookiesActionPointer->setText(i18nc("The On-The-Fly Cookies action, which also display the number of cookies", "Cookies - %1", numberOfCookies)); +} + void BrowserWindow::addOrEditDomainSettings() const { // Remove the focus from the URL line edit. @@ -274,6 +316,12 @@ void BrowserWindow::back() const browserViewPointer->back(); } +void BrowserWindow::clearUrlLineEditFocus() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); +} + void BrowserWindow::fileNew() const { // Display a new instance of Privacy Browser. @@ -331,6 +379,23 @@ void BrowserWindow::loadUrlFromLineEdit(const QString &url) const browserViewPointer->loadUrlFromLineEdit(url); } +void BrowserWindow::openCookiesDialog() +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Instantiate the cookie settings dialog. + CookiesDialog *cookiesDialogPointer = new CookiesDialog(cookieListPointer); + + // Show the dialog. + cookiesDialogPointer->show(); + + // Connect the dialog signals. + connect(cookiesDialogPointer, SIGNAL(addCookie(QNetworkCookie)), browserViewPointer, SLOT(addCookieToStore(QNetworkCookie))); + connect(cookiesDialogPointer, SIGNAL(deleteAllCookies()), browserViewPointer, SLOT(deleteAllCookies())); + connect(cookiesDialogPointer, SIGNAL(deleteCookie(QNetworkCookie)), browserViewPointer, SLOT(deleteCookieFromStore(QNetworkCookie))); +} + void BrowserWindow::openDomainSettings() const { // Remove the focus from the URL line edit. @@ -339,12 +404,6 @@ void BrowserWindow::openDomainSettings() const // Instantiate the domain settings dialog. 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(); @@ -361,6 +420,21 @@ void BrowserWindow::refresh() const browserViewPointer->refresh(); } +void BrowserWindow::removeCookieFromList(const QNetworkCookie &cookie) const +{ + qDebug() << "Remove cookie: " << cookie.toRawForm(); + + // Remove the cookie from the list. + cookieListPointer->remove(cookie); + + // Get the number of cookies. + int numberOfCookies = cookieListPointer->size(); + + // Update the action text. + cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", numberOfCookies)); + onTheFlyCookiesActionPointer->setText(i18nc("The On-The-Fly Cookies action, which also display the number of cookies", "Cookies - %1", numberOfCookies)); +} + void BrowserWindow::showProgressBar(const int &progress) const { // Set the progress bar value. @@ -451,6 +525,15 @@ void BrowserWindow::settingsConfigure() } } +void BrowserWindow::toggleCookies() const +{ + // Remove the focus from teh URL line edit. + urlLineEditPointer->clearFocus(); + + // Toggle cookies. + browserViewPointer->toggleCookies(); +} + void BrowserWindow::toggleJavaScript() const { // Remove the focus from the URL line edit. @@ -460,37 +543,64 @@ void BrowserWindow::toggleJavaScript() const browserViewPointer->toggleJavaScript(); } -void BrowserWindow::toggleLocalStorage() const +void BrowserWindow::toggleDomStorage() const { // Remove the focus from the URL line edit. urlLineEditPointer->clearFocus(); - // Toggle JavaScript. - browserViewPointer->toggleLocalStorage(); + // Toggle DOM storage. + browserViewPointer->toggleDomStorage(); +} + +void BrowserWindow::updateCookiesAction(const bool &isEnabled) +{ + // Update the cookies status. + cookiesEnabled = isEnabled; + + // Update the icon. + if (cookiesEnabled) + onTheFlyCookiesActionPointer->setIcon(QIcon(":/icons/cookies-on")); + else + onTheFlyCookiesActionPointer->setIcon(QIcon(":/icons/cookies-off")); + + // Update the status of the DOM storage action. + domStorageActionPointer->setEnabled(cookiesEnabled & javaScriptEnabled); } void BrowserWindow::updateDomainSettingsIndicator(const bool &status, const QString &domainSettingsDomain) { // Set the domain palette according to the status. - if (status) urlLineEditPointer->setPalette(domainSettingsPalette); - else urlLineEditPointer->setPalette(noDomainSettingsPalette); + if (status) + urlLineEditPointer->setPalette(domainSettingsPalette); + else + urlLineEditPointer->setPalette(noDomainSettingsPalette); // Store the domain. currentDomainSettingsDomain = domainSettingsDomain; } -void BrowserWindow::updateJavaScriptAction(const bool &isEnabled) const +void BrowserWindow::updateJavaScriptAction(const bool &isEnabled) { + // Update the JavaScript status. + javaScriptEnabled = isEnabled; + // Set the icon according to the status. - if (isEnabled) javaScriptActionPointer->setIcon(QIcon(":/icons/javascript-warning")); - else javaScriptActionPointer->setIcon(QIcon(":/icons/privacy-mode")); + if (javaScriptEnabled) + javaScriptActionPointer->setIcon(QIcon(":/icons/javascript-warning")); + else + javaScriptActionPointer->setIcon(QIcon(":/icons/privacy-mode")); + + // Update the status of the DOM storage action. + domStorageActionPointer->setEnabled(javaScriptEnabled & cookiesEnabled); } -void BrowserWindow::updateLocalStorageAction(const bool &isEnabled) const +void BrowserWindow::updateDomStorageAction(const bool &isEnabled) const { // Set the icon according to the status. - if (isEnabled) localStorageActionPointer->setIcon(QIcon::fromTheme("disk-quota-low")); - else localStorageActionPointer->setIcon(QIcon::fromTheme("disk-quota")); + if (isEnabled) + domStorageActionPointer->setIcon(QIcon::fromTheme("disk-quota-low")); + else + domStorageActionPointer->setIcon(QIcon::fromTheme("disk-quota")); } void BrowserWindow::updateSearchEngineActions(const QString &searchEngine) const