#include <QNetworkCookie>
#include <QStatusBar>
+// Construct the class.
BrowserWindow::BrowserWindow() : KXmlGuiWindow()
{
+ // Initialize the variables.
+ cookieListPointer = new std::list<QNetworkCookie>;
+ cookiesEnabled = false;
+ javaScriptEnabled = 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"));
+ onTheFlyCookiesActionPointer = actionCollectionPointer->addAction(QStringLiteral("on-the-fly_cookies"));
+ domStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("dom_storage"));
// Create the action groups
QActionGroup *userAgentActionGroupPointer = new QActionGroup(this);
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);
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", numberOfCookies));
javaScriptActionPointer->setText(i18nc("JavaScript action", "JavaScript"));
- localStorageActionPointer->setText(i18nc("Local Storage action", "Local Storage"));
+ 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"));
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)));
// Connect the URL toolbar actions.
connect(javaScriptActionPointer, SIGNAL(triggered()), this, SLOT(toggleJavaScript()));
- connect(localStorageActionPointer, SIGNAL(triggered()), this, SLOT(toggleLocalStorage()));
+ 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"));
// Update the applied palette.
connect(browserViewPointer, SIGNAL(updateDomainSettingsIndicator(bool, QString)), this, SLOT(updateDomainSettingsIndicator(bool, QString)));
- // Initialize the cookie list.
- cookieListPointer = new QList<QNetworkCookie>;
-
- // Add new cookies to the list.
- connect(browserViewPointer, SIGNAL(addCookie(QNetworkCookie)), this, SLOT(addCookie(QNetworkCookie)));
+ // 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::addCookie(const QNetworkCookie &newCookie) const
+void BrowserWindow::addCookieToList(const QNetworkCookie &newCookie) const
{
- // Check to see if the list already contains a cookie with this ID.
- for (QNetworkCookie existingCookie : *cookieListPointer)
- {
- // Remove the old version of the cookie.
- if (existingCookie.hasSameIdentifier(newCookie)) cookieListPointer->removeOne(existingCookie);
- }
+ qDebug() << "Add cookie: " << newCookie.toRawForm();
// Add the new cookie to the list.
- cookieListPointer->append(newCookie);
+ 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
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.
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.
}
}
+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.
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
projects / PrivacyBrowserPC.git / blobdiff