#include "Settings.h"
#include "ui_SettingsPrivacy.h"
#include "ui_SettingsGeneral.h"
+#include "databases/CookiesDatabase.h"
#include "dialogs/CookiesDialog.h"
#include "dialogs/DomainSettingsDialog.h"
#include "helpers/SearchEngineHelper.h"
#include <QNetworkCookie>
#include <QStatusBar>
+// Construct the class.
BrowserWindow::BrowserWindow() : KXmlGuiWindow()
{
+ // Initialize the variables.
+ cookieListPointer = new std::list<QNetworkCookie>;
+ javaScriptEnabled = false;
+ localStorageEnabled = false;
+
// Instantiate the main view pointer.
browserViewPointer = new BrowserView(this);
searchEngineYahooActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_yahoo"));
searchEngineCustomActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_custom"));
QAction *domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings"));
- QAction *cookiesActionPointer = actionCollectionPointer->addAction(QStringLiteral("cookies"));
+ cookiesActionPointer = actionCollectionPointer->addAction(QStringLiteral("cookies"));
javaScriptActionPointer = actionCollectionPointer->addAction(QStringLiteral("javascript"));
localStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("local_storage"));
+ domStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("dom_storage"));
// Create the action groups
QActionGroup *userAgentActionGroupPointer = new QActionGroup(this);
searchEngineActionGroupPointer->addAction(searchEngineCustomActionPointer);
// Set some actions to be checkable.
+ javaScriptActionPointer->setCheckable(true);
+ localStorageActionPointer->setCheckable(true);
+ domStorageActionPointer->setCheckable(true);
userAgentPrivacyBrowserActionPointer->setCheckable(true);
userAgentWebEngineDefaultActionPointer->setCheckable(true);
userAgentFirefoxLinuxActionPointer->setCheckable(true);
searchEngineYahooActionPointer->setCheckable(true);
searchEngineCustomActionPointer->setCheckable(true);
- // Set the non-mutable action text.
+ // Set the action text.
userAgentPrivacyBrowserActionPointer->setText(UserAgentHelper::PRIVACY_BROWSER_TRANSLATED);
userAgentWebEngineDefaultActionPointer->setText(UserAgentHelper::WEB_ENGINE_DEFAULT_TRANSLATED);
userAgentFirefoxLinuxActionPointer->setText(UserAgentHelper::FIREFOX_LINUX_TRANSLATED);
searchEngineBingActionPointer->setText(i18nc("Search engine", "Bing"));
searchEngineYahooActionPointer->setText(i18nc("Search engine", "Yahoo"));
domainSettingsActionPointer->setText(i18nc("Domain Settings action", "Domain Settings"));
- cookiesActionPointer->setText(i18nc("Cookies action", "Cookies"));
+ cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", cookieListPointer->size()));
javaScriptActionPointer->setText(i18nc("JavaScript action", "JavaScript"));
- localStorageActionPointer->setText(i18nc("Local Storage action", "Local Storage"));
+ localStorageActionPointer->setText(i18nc("The Local Storage action", "Local Storage"));
+ domStorageActionPointer->setText(i18nc("DOM Storage action", "DOM Storage"));
// Set the action icons.
userAgentPrivacyBrowserActionPointer->setIcon(QIcon(":/icons/privacy-mode"));
zoomFactorActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("zoom")));
domainSettingsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("settings-configure")));
cookiesActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("preferences-web-browser-cookies")));
+ domStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("view-web-browser-dom-tree")));
// Update the on-the-fly menus.
connect(browserViewPointer, SIGNAL(updateUserAgentActions(QString)), this, SLOT(updateUserAgentActions(QString)));
// Connect the URL toolbar actions.
connect(javaScriptActionPointer, SIGNAL(triggered()), this, SLOT(toggleJavaScript()));
connect(localStorageActionPointer, SIGNAL(triggered()), this, SLOT(toggleLocalStorage()));
+ 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(updateDomStorageAction(bool)), this, SLOT(updateDomStorageAction(bool)));
// Setup the GUI based on the browser_ui.rc file.
setupGUI(StandardWindowOption::Default, ("browser_ui.rc"));
// Update the applied palette.
connect(browserViewPointer, SIGNAL(updateDomainSettingsIndicator(bool, QString)), this, SLOT(updateDomainSettingsIndicator(bool, QString)));
- // Initialize the cookie list.
- cookieListPointer = new std::forward_list<QNetworkCookie>;
-
// Process cookie changes.
connect(browserViewPointer, SIGNAL(addCookie(QNetworkCookie)), this, SLOT(addCookieToList(QNetworkCookie)));
connect(browserViewPointer, SIGNAL(removeCookie(QNetworkCookie)), this, SLOT(removeCookieFromList(QNetworkCookie)));
void BrowserWindow::addCookieToList(const QNetworkCookie &newCookie) const
{
qDebug() << "Add cookie: " << newCookie.toRawForm();
+
// Add the new cookie to the list.
cookieListPointer->push_front(newCookie);
+
+ // Update the action text.
+ cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", cookieListPointer->size()));
+
+ // Update the cookie if it is durable and has new data.
+ if (CookiesDatabase::isUpdate(newCookie))
+ CookiesDatabase::updateCookie(newCookie);
}
void BrowserWindow::addOrEditDomainSettings() const
// Remove the cookie from the list.
cookieListPointer->remove(cookie);
+
+ // Update the action text.
+ cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", cookieListPointer->size()));
}
void BrowserWindow::showProgressBar(const int &progress) const
}
}
+void BrowserWindow::toggleLocalStorage() const
+{
+ // Remove the focus from teh URL line edit.
+ urlLineEditPointer->clearFocus();
+
+ // Toggle local storage.
+ browserViewPointer->toggleLocalStorage();
+}
+
void BrowserWindow::toggleJavaScript() const
{
// Remove the focus from the URL line edit.
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::updateDomStorageAction(const bool &isEnabled) const
+{
+ // Set the action checked status.
+ domStorageActionPointer->setChecked(isEnabled);
}
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(QStringLiteral(":/icons/javascript-warning")));
+ else
+ javaScriptActionPointer->setIcon(QIcon(QStringLiteral(":/icons/privacy-mode")));
+
+ // Set the action checked status.
+ javaScriptActionPointer->setChecked(javaScriptEnabled);
+
+ // Update the status of the DOM storage action.
+ domStorageActionPointer->setEnabled(javaScriptEnabled & localStorageEnabled);
}
-void BrowserWindow::updateLocalStorageAction(const bool &isEnabled) const
+void BrowserWindow::updateLocalStorageAction(const bool &isEnabled)
{
- // Set the icon according to the status.
- if (isEnabled) localStorageActionPointer->setIcon(QIcon::fromTheme("disk-quota-low"));
- else localStorageActionPointer->setIcon(QIcon::fromTheme("disk-quota"));
+ // Update the local storage status.
+ localStorageEnabled = isEnabled;
+
+ // Update the icon.
+ if (localStorageEnabled)
+ localStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("disk-quota-high")));
+ else
+ localStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("disk-quota")));
+
+ // Set the action checked status.
+ localStorageActionPointer->setChecked(localStorageEnabled);
+
+ // Update the status of the DOM storage action.
+ domStorageActionPointer->setEnabled(localStorageEnabled & javaScriptEnabled);
}
void BrowserWindow::updateSearchEngineActions(const QString &searchEngine) const