#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"
// Qt toolkit headers.
#include <QInputDialog>
#include <QNetworkCookie>
+#include <QMenuBar>
#include <QStatusBar>
// Construct the class.
{
// 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(browserViewPointer, SIGNAL(updateUserAgentActions(QString, bool)), this, SLOT(updateUserAgentActions(QString, bool)));
connect(browserViewPointer, SIGNAL(updateZoomFactorAction(double)), this, SLOT(updateZoomFactorAction(double)));
- connect(browserViewPointer, SIGNAL(updateSearchEngineActions(QString)), this, SLOT(updateSearchEngineActions(QString)));
+ connect(browserViewPointer, SIGNAL(updateSearchEngineActions(QString, bool)), this, SLOT(updateSearchEngineActions(QString, bool)));
// Apply the on-the-fly settings when selected.
connect(userAgentActionGroupPointer, SIGNAL(triggered(QAction*)), browserViewPointer, SLOT(applyOnTheFlyUserAgent(QAction*)));
// 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.
setupGUI(StandardWindowOption::Default, ("browser_ui.rc"));
+ // Get lists of the actions' associated widgets.
+ QList<QWidget*> userAgentAssociatedWidgetsPointerList = userAgentPrivacyBrowserActionPointer->associatedWidgets();
+ QList<QWidget*> searchEngineAssociatedWidgetsPointerList = searchEngineMojeekActionPointer->associatedWidgets();
+
+ // Get the menu widget pointers. It is the second entry, after the main window.
+ QWidget *userAgentMenuWidgetPointer = userAgentAssociatedWidgetsPointerList[1];
+ QWidget *searchEngineMenuWidgetPointer = searchEngineAssociatedWidgetsPointerList[1];
+
+ // Get the menu pointers.
+ QMenu *userAgentMenuPointer = qobject_cast<QMenu*>(userAgentMenuWidgetPointer);
+ QMenu *searchEngineMenuPointer = qobject_cast<QMenu*>(searchEngineMenuWidgetPointer);
+
+ // Get the menu actions.
+ userAgentMenuActionPointer = userAgentMenuPointer->menuAction();
+ searchEngineMenuActionPointer = searchEngineMenuPointer->menuAction();
+
// Get a handle for the URL toolbar.
KToolBar *urlToolBarPointer = toolBar(QStringLiteral("url_toolbar"));
// 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
+void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const bool &updateCustomSearchEngineStatus)
{
// Initialize the custom search engine flag.
bool customSearchEngine = false;
if (searchEngine == "Mojeek") // Mojeek.
{
+ // Check the Mojeek user agent action.
searchEngineMojeekActionPointer->setChecked(true);
+
+ // Update the search engine menu action text.
+ searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Mojeek"));
}
else if (searchEngine == "Monocles") // Monocles.
{
+ // Check the Monocles user agent action.
searchEngineMonoclesActionPointer->setChecked(true);
+
+ // Update the search engine menu action text.
+ searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Monocles"));
}
else if (searchEngine == "MetaGer") // MetaGer.
{
+ // Check the MetaGer user agent action.
searchEngineMetagerActionPointer->setChecked(true);
+
+ // Update the search engine menu action text.
+ searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - MetaGer"));
}
else if (searchEngine == "Google") // Google.
{
+ // Check the Google user agent action.
searchEngineGoogleActionPointer->setChecked(true);
+
+ // Update the search engine menu action text.
+ searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Google"));
}
else if (searchEngine == "Bing") // Bing.
{
+ // Check the Bing user agent action.
searchEngineBingActionPointer->setChecked(true);
+
+ // Update the search engine menu action text.
+ searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Bing"));
}
else if (searchEngine == "Yahoo") // Yahoo.
{
+ // Check the Yahoo user agent action.
searchEngineYahooActionPointer->setChecked(true);
+
+ // Update the search engine menu action text.
+ searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Yahoo"));
}
else // Custom search engine.
{
// Check the user agent.
searchEngineCustomActionPointer->setChecked(true);
+ // Update the search engine menu action text.
+ searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Custom"));
+
+ // Set the custom search engine text.
+ searchEngineCustomActionPointer->setText(searchEngine);
+
// Set the custom search engine flag.
customSearchEngine = true;
}
+ // Update the custom search engine enabled boolean.
+ if (updateCustomSearchEngineStatus)
+ customSearchEngineEnabled = customSearchEngine;
+
// Format the custom search engine.
- if (customSearchEngine)
+ if (customSearchEngineEnabled)
{
// Enable the custom search engine.
searchEngineCustomActionPointer->setEnabled(true);
-
- // Set the custom search engine text.
- searchEngineCustomActionPointer->setText(searchEngine);
}
else
{
}
}
-void BrowserWindow::updateUserAgentActions(const QString &userAgent) const
+void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool &updateCustomUserAgentStatus)
{
// Initialize the custom user agent flag.
bool customUserAgent = false;
// Check the indicated on-the-fly user agent.
- if (userAgent == UserAgentHelper::PRIVACY_BROWSER_USER_AGENT) userAgentPrivacyBrowserActionPointer->setChecked(true); // Privacy Browser.
- else if (userAgent == BrowserView::webEngineDefaultUserAgent) userAgentWebEngineDefaultActionPointer->setChecked(true); // WebEngine default.
- else if (userAgent == UserAgentHelper::FIREFOX_LINUX_USER_AGENT) userAgentFirefoxLinuxActionPointer->setChecked(true); // Firefox Linux.
- else if (userAgent == UserAgentHelper::CHROMIUM_LINUX_USER_AGENT) userAgentChromiumLinuxActionPointer->setChecked(true); // Chromium Linux.
- else if (userAgent == UserAgentHelper::FIREFOX_WINDOWS_USER_AGENT) userAgentFirefoxWindowsActionPointer->setChecked(true); // Firefox Windows.
- else if (userAgent == UserAgentHelper::CHROME_WINDOWS_USER_AGENT) userAgentChromeWindowsActionPointer->setChecked(true); // Chrome Windows.
- else if (userAgent == UserAgentHelper::EDGE_WINDOWS_USER_AGENT) userAgentEdgeWindowsActionPointer->setChecked(true); // Edge Windows.
- else if (userAgent == UserAgentHelper::SAFARI_MACOS_USER_AGENT) userAgentSafariMacosActionPointer->setChecked(true); // Safara macOS.
+ if (userAgent == UserAgentHelper::PRIVACY_BROWSER_USER_AGENT) // Privacy Browser.
+ {
+ // Check the Privacy Browser user agent action.
+ userAgentPrivacyBrowserActionPointer->setChecked(true);
+
+ // Update the user agent menu action text.
+ userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Privacy Browser"));
+ }
+ else if (userAgent == BrowserView::webEngineDefaultUserAgent) // WebEngine default.
+ {
+ // check the WebEngine default user agent action.
+ userAgentWebEngineDefaultActionPointer->setChecked(true);
+
+ // Update the user agent menu action text.
+ userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - WebEngine default"));
+ }
+ else if (userAgent == UserAgentHelper::FIREFOX_LINUX_USER_AGENT) // Firefox on Linux.
+ {
+ // Check the Firefox on Linux user agent action.
+ userAgentFirefoxLinuxActionPointer->setChecked(true);
+
+ // Update the user agent menu action text.
+ userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Firefox on Linux"));
+ }
+ else if (userAgent == UserAgentHelper::CHROMIUM_LINUX_USER_AGENT) // Chromium on Linux.
+ {
+ // Check the Chromium on Linux user agent action.
+ userAgentChromiumLinuxActionPointer->setChecked(true);
+
+ // Update the user agent menu action text.
+ userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Chromium on Linux"));
+ }
+ else if (userAgent == UserAgentHelper::FIREFOX_WINDOWS_USER_AGENT) // Firefox on Windows.
+ {
+ // Check the Firefox on Windows user agent action.
+ userAgentFirefoxWindowsActionPointer->setChecked(true);
+
+ // Update the user agent menu action text.
+ userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Firefox on Windows"));
+ }
+ else if (userAgent == UserAgentHelper::CHROME_WINDOWS_USER_AGENT) // Chrome on Windows.
+ {
+ // Check the Chrome on Windows user agent action.
+ userAgentChromeWindowsActionPointer->setChecked(true);
+
+ // Update the user agent menu action text.
+ userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Chrome on Windows"));
+ }
+ else if (userAgent == UserAgentHelper::EDGE_WINDOWS_USER_AGENT) // Edge on Windows.
+ {
+ // Check the Edge on Windows user agent action.
+ userAgentEdgeWindowsActionPointer->setChecked(true);
+
+ // Update the user agent menu action text.
+ userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Edge on Windows"));
+ }
+ else if (userAgent == UserAgentHelper::SAFARI_MACOS_USER_AGENT) // Safari on macOS.
+ {
+ // Check the Safari on macOS user agent action.
+ userAgentSafariMacosActionPointer->setChecked(true);
+
+ // Update the user agent menu action text.
+ userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Safari on macOS"));
+ }
else // Custom user agent.
{
// Check the user agent.
userAgentCustomActionPointer->setChecked(true);
+ // Update the user agent menu action text.
+ userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Custom"));
+
+ // Set the custom user agent text.
+ userAgentCustomActionPointer->setText(userAgent);
+
// Set the custom user agent flag.
customUserAgent = true;
}
+ // Update the custom user agent enabled boolean.
+ if (updateCustomUserAgentStatus)
+ customUserAgentEnabled = customUserAgent;
+
// Format the custom user agent.
- if (customUserAgent)
+ if (customUserAgentEnabled)
{
// Enable the custom user agent.
userAgentCustomActionPointer->setEnabled(true);
-
- // Set the custom user agent text.
- userAgentCustomActionPointer->setText(userAgent);
}
else
{
projects / PrivacyBrowserPC.git / blobdiff