#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"
{
// Initialize the variables.
cookieListPointer = new std::list<QNetworkCookie>;
- cookiesEnabled = false;
javaScriptEnabled = false;
+ localStorageEnabled = false;
// Instantiate the main view pointer.
browserViewPointer = new BrowserView(this);
QAction *domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings"));
cookiesActionPointer = actionCollectionPointer->addAction(QStringLiteral("cookies"));
javaScriptActionPointer = actionCollectionPointer->addAction(QStringLiteral("javascript"));
- onTheFlyCookiesActionPointer = actionCollectionPointer->addAction(QStringLiteral("on-the-fly_cookies"));
+ localStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("local_storage"));
domStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("dom_storage"));
// Create the action groups
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);
- // 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);
searchEngineBingActionPointer->setText(i18nc("Search engine", "Bing"));
searchEngineYahooActionPointer->setText(i18nc("Search engine", "Yahoo"));
domainSettingsActionPointer->setText(i18nc("Domain Settings action", "Domain Settings"));
- cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", numberOfCookies));
+ cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", cookieListPointer->size()));
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));
+ localStorageActionPointer->setText(i18nc("The Local Storage action", "Local Storage"));
domStorageActionPointer->setText(i18nc("DOM Storage action", "DOM Storage"));
// Set the action icons.
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"));
+ 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(onTheFlyCookiesActionPointer, SIGNAL(triggered()), this, SLOT(toggleCookies()));
+ 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(updateCookiesAction(bool)), this, SLOT(updateCookiesAction(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.
// 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));
+ 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);
- // 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));
+ 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::toggleCookies() const
+void BrowserWindow::toggleLocalStorage() const
{
// Remove the focus from teh URL line edit.
urlLineEditPointer->clearFocus();
- // Toggle cookies.
- browserViewPointer->toggleCookies();
+ // Toggle local storage.
+ browserViewPointer->toggleLocalStorage();
}
void BrowserWindow::toggleJavaScript() const
browserViewPointer->toggleDomStorage();
}
-void BrowserWindow::updateCookiesAction(const bool &isEnabled)
+void BrowserWindow::updateDomStorageAction(const bool &isEnabled) const
{
- // 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);
+ // Set the action checked status.
+ domStorageActionPointer->setChecked(isEnabled);
}
void BrowserWindow::updateDomainSettingsIndicator(const bool &status, const QString &domainSettingsDomain)
// Set the icon according to the status.
if (javaScriptEnabled)
- javaScriptActionPointer->setIcon(QIcon(":/icons/javascript-warning"));
+ javaScriptActionPointer->setIcon(QIcon(QStringLiteral(":/icons/javascript-warning")));
else
- javaScriptActionPointer->setIcon(QIcon(":/icons/privacy-mode"));
+ 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 & cookiesEnabled);
+ domStorageActionPointer->setEnabled(javaScriptEnabled & localStorageEnabled);
}
-void BrowserWindow::updateDomStorageAction(const bool &isEnabled) const
+void BrowserWindow::updateLocalStorageAction(const bool &isEnabled)
{
- // Set the icon according to the status.
- if (isEnabled)
- domStorageActionPointer->setIcon(QIcon::fromTheme("disk-quota-low"));
+ // Update the local storage status.
+ localStorageEnabled = isEnabled;
+
+ // Update the icon.
+ if (localStorageEnabled)
+ localStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("disk-quota-high")));
else
- domStorageActionPointer->setIcon(QIcon::fromTheme("disk-quota"));
+ 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