#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"
#include <KToolBar>
// Qt toolkit headers.
+#include <QFileDialog>
#include <QInputDialog>
+#include <QNetworkCookie>
+#include <QMenuBar>
+#include <QShortcut>
#include <QStatusBar>
+// Construct the class.
BrowserWindow::BrowserWindow() : KXmlGuiWindow()
{
- // Instantiate the main view pointer.
- browserViewPointer = new BrowserView(this);
+ // Initialize the variables.
+ javaScriptEnabled = false;
+ localStorageEnabled = false;
- // Set the main view as the central widget.
- setCentralWidget(browserViewPointer);
+ // Instantiate the privacy tab widget pointer.
+ tabWidgetPointer = new TabWidget(this);
+
+ // Set the privacy tab widget as the central widget.
+ setCentralWidget(tabWidgetPointer);
// Get a handle for the action collection.
KActionCollection *actionCollectionPointer = this->actionCollection();
// Add the standard actions.
- QAction *backActionPointer = KStandardAction::back(this, SLOT(back()), actionCollectionPointer);
- QAction *forwardActionPointer = KStandardAction::forward(this, SLOT(forward()), actionCollectionPointer);
- KStandardAction::home(this, SLOT(home()), actionCollectionPointer);
KStandardAction::openNew(this, SLOT(fileNew()), actionCollectionPointer);
+ KStandardAction::print(tabWidgetPointer, SLOT(print()), actionCollectionPointer);
+ KStandardAction::printPreview(tabWidgetPointer, SLOT(printPreview()), actionCollectionPointer);
KStandardAction::quit(qApp, SLOT(closeAllWindows()), actionCollectionPointer);
- KStandardAction::preferences(this, SLOT(settingsConfigure()), actionCollectionPointer);
KStandardAction::redisplay(this, SLOT(refresh()), actionCollectionPointer);
+ fullScreenActionPointer = KStandardAction::fullScreen(this, SLOT(toggleFullScreen()), this, actionCollectionPointer);
+ QAction *backActionPointer = KStandardAction::back(this, SLOT(back()), actionCollectionPointer);
+ QAction *forwardActionPointer = KStandardAction::forward(this, SLOT(forward()), actionCollectionPointer);
+ KStandardAction::home(this, SLOT(home()), actionCollectionPointer);
+ KStandardAction::preferences(this, SLOT(showSettingsDialog()), actionCollectionPointer);
// Add the custom actions.
userAgentPrivacyBrowserActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_privacy_browser"));
+ userAgentWebEngineDefaultActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_webengine_default"));
userAgentFirefoxLinuxActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_firefox_linux"));
userAgentChromiumLinuxActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_chromium_linux"));
userAgentFirefoxWindowsActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_firefox_windows"));
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"));
+ domStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("dom_storage"));
// Create the action groups
QActionGroup *userAgentActionGroupPointer = new QActionGroup(this);
// Add the actions to the groups.
userAgentActionGroupPointer->addAction(userAgentPrivacyBrowserActionPointer);
+ userAgentActionGroupPointer->addAction(userAgentWebEngineDefaultActionPointer);
userAgentActionGroupPointer->addAction(userAgentFirefoxLinuxActionPointer);
userAgentActionGroupPointer->addAction(userAgentChromiumLinuxActionPointer);
userAgentActionGroupPointer->addAction(userAgentFirefoxWindowsActionPointer);
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);
userAgentChromiumLinuxActionPointer->setCheckable(true);
userAgentFirefoxWindowsActionPointer->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);
userAgentChromiumLinuxActionPointer->setText(UserAgentHelper::CHROMIUM_LINUX_TRANSLATED);
userAgentFirefoxWindowsActionPointer->setText(UserAgentHelper::FIREFOX_WINDOWS_TRANSLATED);
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", 0));
+ javaScriptActionPointer->setText(i18nc("JavaScript action", "JavaScript"));
+ 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"));
+ userAgentWebEngineDefaultActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("user-group-properties")));
userAgentFirefoxLinuxActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("firefox-esr")));
userAgentChromiumLinuxActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("chromium")));
userAgentFirefoxWindowsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("firefox-esr")));
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")));
+ domStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("code-class")));
// Update the on-the-fly menus.
- connect(browserViewPointer, SIGNAL(updateUserAgentActions(QString)), this, SLOT(updateUserAgentActions(QString)));
- connect(browserViewPointer, SIGNAL(updateZoomFactorAction(double)), this, SLOT(updateZoomFactorAction(double)));
- connect(browserViewPointer, SIGNAL(updateSearchEngineActions(QString)), this, SLOT(updateSearchEngineActions(QString)));
+ connect(tabWidgetPointer, SIGNAL(updateUserAgentActions(QString, bool)), this, SLOT(updateUserAgentActions(QString, bool)));
+ connect(tabWidgetPointer, SIGNAL(updateZoomFactorAction(double)), this, SLOT(updateZoomFactorAction(double)));
+ connect(tabWidgetPointer, 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(searchEngineActionGroupPointer, SIGNAL(triggered(QAction*)), browserViewPointer, SLOT(applyOnTheFlySearchEngine(QAction*)));
+ connect(userAgentActionGroupPointer, SIGNAL(triggered(QAction*)), tabWidgetPointer, SLOT(applyOnTheFlyUserAgent(QAction*)));
+ connect(searchEngineActionGroupPointer, SIGNAL(triggered(QAction*)), tabWidgetPointer, SLOT(applyOnTheFlySearchEngine(QAction*)));
+
+ // Process cookie changes.
+ connect(tabWidgetPointer, SIGNAL(updateCookiesAction(int)), this, SLOT(updateCookiesAction(int)));
// Display dialogs.
connect(zoomFactorActionPointer, SIGNAL(triggered()), this, SLOT(getZoomFactorFromUser()));
+ connect(cookiesActionPointer, SIGNAL(triggered()), this, SLOT(showCookiesDialog()));
+ connect(domainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(showDomainSettingsDialog()));
// 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(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(tabWidgetPointer, SIGNAL(updateBackAction(bool)), backActionPointer, SLOT(setEnabled(bool)));
+ connect(tabWidgetPointer, SIGNAL(updateForwardAction(bool)), forwardActionPointer, SLOT(setEnabled(bool)));
+ connect(tabWidgetPointer, SIGNAL(updateJavaScriptAction(bool)), this, SLOT(updateJavaScriptAction(bool)));
+ connect(tabWidgetPointer, SIGNAL(updateLocalStorageAction(bool)), this, SLOT(updateLocalStorageAction(bool)));
+ connect(tabWidgetPointer, SIGNAL(updateDomStorageAction(bool)), this, SLOT(updateDomStorageAction(bool)));
// Setup the GUI based on the browser_ui.rc file.
setupGUI(StandardWindowOption::Default, ("browser_ui.rc"));
- // Get a handle for the URL toolbar.
- KToolBar *urlToolBarPointer = toolBar(QStringLiteral("url_toolbar"));
+ // 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 handles for the toolbars.
+ navigationToolBarPointer = toolBar(QStringLiteral("navigation_toolbar"));
+ urlToolBarPointer = toolBar(QStringLiteral("url_toolbar"));
// Create a URL line edit.
urlLineEditPointer = new KLineEdit();
connect(urlLineEditPointer, SIGNAL(returnKeyPressed(const QString)), this, SLOT(loadUrlFromLineEdit(const QString)));
// Update the URL line edit on page loads.
- connect(browserViewPointer, SIGNAL(updateUrlLineEdit(QUrl)), this, SLOT(updateUrlLineEdit(QUrl)));
+ connect(tabWidgetPointer, SIGNAL(updateUrlLineEdit(QUrl)), this, SLOT(updateUrlLineEdit(QUrl)));
// Get a handle for the status bar.
QStatusBar *statusBarPointer = statusBar();
statusBarPointer->addPermanentWidget(progressBarPointer);
// Update the status bar with the URL when a link is hovered.
- connect(browserViewPointer, SIGNAL(linkHovered(QString)), statusBarPointer, SLOT(showMessage(QString)));
+ connect(tabWidgetPointer, SIGNAL(linkHovered(QString)), statusBarPointer, SLOT(showMessage(QString)));
// Update the progress bar.
- connect(browserViewPointer, SIGNAL(showProgressBar(const int)), this, SLOT(showProgressBar(const int)));
- connect(browserViewPointer, SIGNAL(hideProgressBar()), progressBarPointer, SLOT(hide()));
+ connect(tabWidgetPointer, SIGNAL(showProgressBar(const int)), this, SLOT(showProgressBar(const int)));
+ connect(tabWidgetPointer, SIGNAL(hideProgressBar()), progressBarPointer, SLOT(hide()));
+
+ // Update the URL line edit focus.
+ connect(tabWidgetPointer, SIGNAL(clearUrlLineEditFocus()), this, SLOT(clearUrlLineEditFocus()));
// Get the URL line edit palettes.
noDomainSettingsPalette = urlLineEditPointer->palette();
domainSettingsPalette.setColor(QPalette::Base, QColor("#C8E6C9"));
// Update the applied palette.
- connect(browserViewPointer, SIGNAL(updateDomainSettingsIndicator(bool, QString)), this, SLOT(updateDomainSettingsIndicator(bool, QString)));
+ connect(tabWidgetPointer, SIGNAL(updateDomainSettingsIndicator(const bool)), this, SLOT(updateDomainSettingsIndicator(const bool)));
+
+ // Process full screen requests.
+ connect(tabWidgetPointer, SIGNAL(fullScreenRequested(bool)), this, SLOT(fullScreenRequested(bool)));
+
+ // Create keyboard shortcuts.
+ QShortcut *ctrlTShortcutPointer = new QShortcut(QKeySequence(i18nc("The open new tab shortcut.", "Ctrl+t")), this);
+ QShortcut *f11ShortcutPointer = new QShortcut(QKeySequence(i18nc("The toggle full screen shortcut.", "F11")), this);
+ QShortcut *escapeShortcutPointer = new QShortcut(QKeySequence::Cancel, this);
+
+ // Connect the keyboard shortcuts to the actions.
+ connect(ctrlTShortcutPointer, SIGNAL(activated()), tabWidgetPointer, SLOT(addTab()));
+ connect(f11ShortcutPointer, SIGNAL(activated()), fullScreenActionPointer, SLOT(trigger()));
+ connect(escapeShortcutPointer, SIGNAL(activated()), this, SLOT(escape()));
// Load the initial website.
- browserViewPointer->loadInitialWebsite();
+ tabWidgetPointer->loadInitialWebsite();
}
void BrowserWindow::addOrEditDomainSettings() const
// Create the domain settings dialog pointer.
DomainSettingsDialog *domainSettingsDialogPointer;
+ // Get the current domain settings name.
+ QString ¤tDomainSettingsName = tabWidgetPointer->getDomainSettingsName();
+
// Run the commands according to the current domain settings status.
- if (currentDomainSettingsDomain == "") // Domain settings are not currently applied.
+ if (currentDomainSettingsName == QStringLiteral("")) // Domain settings are not currently applied.
{
// Instruct the domain settings dialog to add a new domain.
domainSettingsDialogPointer = new DomainSettingsDialog(DomainSettingsDialog::ADD_DOMAIN, currentUrl.host());
else // Domain settings are currently applied.
{
// Instruct the domain settings dialog to edit the current domain.
- domainSettingsDialogPointer = new DomainSettingsDialog(DomainSettingsDialog::EDIT_DOMAIN, currentDomainSettingsDomain);
+ domainSettingsDialogPointer = new DomainSettingsDialog(DomainSettingsDialog::EDIT_DOMAIN, currentDomainSettingsName);
}
// Set the dialog window title.
domainSettingsDialogPointer->show();
// Reload the tabs when domain settings are updated.
- connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), browserViewPointer, SLOT(applyDomainSettingsAndReload()));
+ connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), tabWidgetPointer, SLOT(applyDomainSettingsAndReload()));
}
void BrowserWindow::back() const
urlLineEditPointer->clearFocus();
// Go back.
- browserViewPointer->back();
+ tabWidgetPointer->back();
+}
+
+void BrowserWindow::clearUrlLineEditFocus() const
+{
+ // Remove the focus from the URL line edit.
+ urlLineEditPointer->clearFocus();
+}
+
+void BrowserWindow::escape() const
+{
+ // Exit full screen browsing if it is enabled.
+ if (fullScreenActionPointer->isChecked())
+ fullScreenActionPointer->trigger();
}
void BrowserWindow::fileNew() const
urlLineEditPointer->clearFocus();
// Go forward.
- browserViewPointer->forward();
+ tabWidgetPointer->forward();
+}
+
+void BrowserWindow::fullScreenRequested(const bool toggleOn)
+{
+ // Toggle full screen mode.
+ if (toggleOn) // Turn full screen mode on.
+ {
+ // Set the window to be full screen.
+ fullScreenActionPointer->setFullScreen(window(), true);
+
+ // Hide all the bars.
+ menuBar()->setVisible(false);
+ navigationToolBarPointer->setVisible(false);
+ urlToolBarPointer->setVisible(false);
+ tabWidgetPointer->setTabBarVisible(false);
+ statusBar()->setVisible(false);
+ }
+ else // Turn full screen mode off.
+ {
+ // Set the window to not be full screen.
+ fullScreenActionPointer->setFullScreen(window(), false);
+
+ // Show all the bars.
+ menuBar()->setVisible(true);
+ navigationToolBarPointer->setVisible(true);
+ urlToolBarPointer->setVisible(true);
+ tabWidgetPointer->setTabBarVisible(true);
+ statusBar()->setVisible(true);
+ }
}
void BrowserWindow::getZoomFactorFromUser()
currentZoomFactor = newZoomFactor;
// Set the new zoom factor.
- browserViewPointer->applyOnTheFlyZoomFactor(newZoomFactor);
+ tabWidgetPointer->applyOnTheFlyZoomFactor(newZoomFactor);
// Update the on-the-fly action text.
updateZoomFactorAction(newZoomFactor);
urlLineEditPointer->clearFocus();
// Go home.
- browserViewPointer->home();
+ tabWidgetPointer->home();
}
void BrowserWindow::loadUrlFromLineEdit(const QString &url) const
urlLineEditPointer->clearFocus();
// Load the URL.
- browserViewPointer->loadUrlFromLineEdit(url);
+ tabWidgetPointer->loadUrlFromLineEdit(url);
}
-void BrowserWindow::openDomainSettings() const
+void BrowserWindow::refresh() const
{
// Remove the focus from the URL line edit.
urlLineEditPointer->clearFocus();
- // Instantiate the domain settings dialog.
- DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog();
+ // Refresh the web page.
+ tabWidgetPointer->refresh();
+}
- // Set the dialog window title.
- domainSettingsDialogPointer->setWindowTitle(i18nc("The domain settings dialog title", "Domain Settings"));
+void BrowserWindow::showCookiesDialog()
+{
+ // Remove the focus from the URL line edit.
+ urlLineEditPointer->clearFocus();
- // Set the modality.
- domainSettingsDialogPointer->setWindowModality(Qt::WindowModality::WindowModal);;
+ // Instantiate the cookie settings dialog.
+ CookiesDialog *cookiesDialogPointer = new CookiesDialog(tabWidgetPointer->getCookieList());
// Show the dialog.
- domainSettingsDialogPointer->show();
+ cookiesDialogPointer->show();
- // Reload the tabs when domain settings are updated.
- connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), browserViewPointer, SLOT(applyDomainSettingsAndReload()));
+ // Connect the dialog signals.
+ connect(cookiesDialogPointer, SIGNAL(addCookie(QNetworkCookie)), tabWidgetPointer, SLOT(addCookieToStore(QNetworkCookie)));
+ connect(cookiesDialogPointer, SIGNAL(deleteAllCookies()), tabWidgetPointer, SLOT(deleteAllCookies()));
+ connect(cookiesDialogPointer, SIGNAL(deleteCookie(QNetworkCookie)), tabWidgetPointer, SLOT(deleteCookieFromStore(QNetworkCookie)));
}
-void BrowserWindow::refresh() const
+void BrowserWindow::showDownloadLocationBrowseDialog() const
+{
+ // Get the current download location.
+ QString currentDownloadLocation = downloadLocationComboBoxPointer->currentText();
+
+ // Resolve the system download directory if specified.
+ if (currentDownloadLocation == QStringLiteral("System Download Directory"))
+ currentDownloadLocation = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
+
+ // Get the new download location.
+ QString newDownloadLocation = QFileDialog::getExistingDirectory(configDialogPointer, i18nc("Select download location dialog caption", "Select Download Location"), currentDownloadLocation);
+
+ // Populate the download location combo box according to the new download location.
+ if (newDownloadLocation == QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)) // The default download location was selected.
+ {
+ // Populate the download location with the default text.
+ downloadLocationComboBoxPointer->setCurrentText("System Download Directory");
+ }
+ else if (newDownloadLocation != QStringLiteral("")) // A different directory was selected.
+ {
+ // Populate the download location.
+ downloadLocationComboBoxPointer->setCurrentText(newDownloadLocation);
+ }
+}
+
+void BrowserWindow::showDomainSettingsDialog() const
{
// Remove the focus from the URL line edit.
urlLineEditPointer->clearFocus();
- // Refresh the web page.
- browserViewPointer->refresh();
+ // Instantiate the domain settings dialog.
+ DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog();
+
+ // Show the dialog.
+ domainSettingsDialogPointer->show();
+
+ // Reload the tabs when domain settings are updated.
+ connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), tabWidgetPointer, SLOT(applyDomainSettingsAndReload()));
}
void BrowserWindow::showProgressBar(const int &progress) const
progressBarPointer->show();
}
+void BrowserWindow::showSettingsDialog()
+{
+ // Create the settings widgets.
+ QWidget *privacySettingsWidgetPointer = new QWidget;
+ QWidget *generalSettingsWidgetPointer = new QWidget;
+
+ // Instantiate the settings UI.
+ Ui::PrivacySettings privacySettingsUi;
+ Ui::GeneralSettings generalSettingsUi;
+
+ // Setup the UI to display the settings widgets.
+ privacySettingsUi.setupUi(privacySettingsWidgetPointer);
+ generalSettingsUi.setupUi(generalSettingsWidgetPointer);
+
+ // Get handles for the widgets.
+ QComboBox *userAgentComboBoxPointer = privacySettingsUi.kcfg_userAgent;
+ userAgentLabelPointer = privacySettingsUi.userAgentLabel;
+ QComboBox *searchEngineComboBoxPointer = generalSettingsUi.kcfg_searchEngine;
+ searchEngineLabelPointer = generalSettingsUi.searchEngineLabel;
+ downloadLocationComboBoxPointer = generalSettingsUi.kcfg_downloadLocation;
+ QPushButton *browseButtonPointer = generalSettingsUi.browseButton;
+
+ // Populate the combo box labels.
+ updateUserAgentLabel(userAgentComboBoxPointer->currentText());
+ updateSearchEngineLabel(searchEngineComboBoxPointer->currentText());
+
+ // Update the labels when the combo boxes change.
+ connect(userAgentComboBoxPointer, SIGNAL(currentTextChanged(const QString)), this, SLOT(updateUserAgentLabel(const QString)));
+ connect(searchEngineComboBoxPointer, SIGNAL(currentTextChanged(const QString)), this, SLOT(updateSearchEngineLabel(const QString)));
+
+ // Connect the download location directory browse button.
+ connect(browseButtonPointer, SIGNAL(clicked()), this, SLOT(showDownloadLocationBrowseDialog()));
+
+ // Instantiate a settings config dialog from the settings.kcfg file.
+ configDialogPointer = new KConfigDialog(this, QStringLiteral("settings"), Settings::self());
+
+ // Add the settings widgets as config dialog pages.
+ configDialogPointer->addPage(privacySettingsWidgetPointer, i18nc("@title:tab", "Privacy"), QStringLiteral("privacy-browser"));
+ configDialogPointer->addPage(generalSettingsWidgetPointer, i18nc("@title:tab", "General"), QStringLiteral("breeze-settings"));
+
+ // Prevent interaction with the parent window while the dialog is open.
+ configDialogPointer->setWindowModality(Qt::WindowModal);
+
+ // Make it so.
+ configDialogPointer->show();
+
+ // TODO. KConfigDialog does not respect expanding size policies. <https://redmine.stoutner.com/issues/823>
+ //configDialogPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ //privacySettingsWidgetPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ //generalSettingsWidgetPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ //configDialogPointer->adjustSize();
+
+ // Expand the config dialog.
+ configDialogPointer->resize(1000, 500);
+
+ // Apply the settings when they are updated.
+ connect(configDialogPointer, SIGNAL(settingsChanged(QString)), tabWidgetPointer, SLOT(applyApplicationSettings()));
+ connect(configDialogPointer, SIGNAL(settingsChanged(QString)), tabWidgetPointer, SLOT(applyDomainSettingsAndReload()));
+}
+
QSize BrowserWindow::sizeHint() const
{
// Return the default window size.
return QSize(1500, 1200);
}
-void BrowserWindow::settingsConfigure()
+void BrowserWindow::toggleDomStorage() const
{
- // Check to make sure the dialog box isn't already displayed.
- if (KConfigDialog::exists(QStringLiteral("settings")))
- {
- // Show the existing config dialog if it is hidden.
- configDialogPointer->show();
-
- // Raise the existing config dialog if it is below other windows.
- configDialogPointer->raise();
-
- // Restore the existing config dialog if it has been minimized.
- if (configDialogPointer->isMinimized()) {
- configDialogPointer->showNormal();
- }
-
- // Activate the existing config dialog, which brings its virtual desktop into focus.
- configDialogPointer->activateWindow();
- }
- else
- {
- // Create the settings widgets.
- QWidget *privacySettingsWidgetPointer = new QWidget;
- QWidget *generalSettingsWidgetPointer = new QWidget;
+ // Remove the focus from the URL line edit.
+ urlLineEditPointer->clearFocus();
- // Instantiate the settings UI.
- Ui::PrivacySettings privacySettingsUi;
- Ui::GeneralSettings generalSettingsUi;
+ // Toggle DOM storage.
+ tabWidgetPointer->toggleDomStorage();
+}
- // Setup the UI to display the settings widgets.
- privacySettingsUi.setupUi(privacySettingsWidgetPointer);
- generalSettingsUi.setupUi(generalSettingsWidgetPointer);
+void BrowserWindow::toggleJavaScript() const
+{
+ // Remove the focus from the URL line edit.
+ urlLineEditPointer->clearFocus();
- // Get handles for the widgets.
- QComboBox *userAgentComboBoxPointer = privacySettingsUi.kcfg_userAgent;
- userAgentLabelPointer = privacySettingsUi.userAgentLabel;
- QComboBox *searchEngineComboBoxPointer = generalSettingsUi.kcfg_searchEngine;
- searchEngineLabelPointer = generalSettingsUi.searchEngineLabel;
+ // Toggle JavaScript.
+ tabWidgetPointer->toggleJavaScript();
+}
- // Populate the combo box labels.
- updateUserAgentLabel(userAgentComboBoxPointer->currentText());
- updateSearchEngineLabel(searchEngineComboBoxPointer->currentText());
+void BrowserWindow::toggleLocalStorage() const
+{
+ // Remove the focus from the URL line edit.
+ urlLineEditPointer->clearFocus();
- // Update the labels when the combo boxes change.
- connect(userAgentComboBoxPointer, SIGNAL(currentTextChanged(const QString)), this, SLOT(updateUserAgentLabel(const QString)));
- connect(searchEngineComboBoxPointer, SIGNAL(currentTextChanged(const QString)), this, SLOT(updateSearchEngineLabel(const QString)));
+ // Toggle local storage.
+ tabWidgetPointer->toggleLocalStorage();
+}
- // Instantiate a settings config dialog from the settings.kcfg file.
- configDialogPointer = new KConfigDialog(this, QStringLiteral("settings"), Settings::self());
+void BrowserWindow::toggleFullScreen()
+{
+ // Toggle the full screen status.
+ if (fullScreenActionPointer->isChecked()) // Enable full screen browsing mode.
+ {
+ // Enable full screen mode.
+ fullScreenActionPointer->setFullScreen(window(), true);
+
+ // Hide the menu bar if specified.
+ if (Settings::fullScreenHideMenuBar())
+ menuBar()->setVisible(false);
+
+ // Hide the toolbars if specified.
+ if (Settings::fullScreenHideToolBars())
+ {
+ navigationToolBarPointer->setVisible(false);
+ urlToolBarPointer->setVisible(false);
+ }
- // Add the settings widgets as config dialog pages.
- configDialogPointer->addPage(privacySettingsWidgetPointer, i18nc("@title:tab", "Privacy"), QStringLiteral("privacy-browser"));
- configDialogPointer->addPage(generalSettingsWidgetPointer, i18nc("@title:tab", "General"), QStringLiteral("breeze-settings"));
+ // Hide the tab bar if specified.
+ if (Settings::fullScreenHideTabBar())
+ tabWidgetPointer->setTabBarVisible(false);
- // Delete the config dialog when it is closed.
- configDialogPointer->setAttribute(Qt::WA_DeleteOnClose);
+ // Hide the status bar if specified.
+ if (Settings::fullScreenHideStatusBar())
+ statusBar()->setVisible(false);
+ }
+ else // Disable full screen browsing mode.
+ {
+ // Disable full screen mode.
+ fullScreenActionPointer->setFullScreen(window(), false);
- // Make it so.
- configDialogPointer->show();
+ // Show the menu bar.
+ menuBar()->setVisible(true);
- // TODO. KConfigDialog does not respect expanding size policies. <https://redmine.stoutner.com/issues/823>
- //configDialogPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- //privacySettingsWidgetPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- //generalSettingsWidgetPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- //configDialogPointer->adjustSize();
+ // Show the toolbars.
+ navigationToolBarPointer->setVisible(true);
+ urlToolBarPointer->setVisible(true);
- // Expand the config dialog.
- configDialogPointer->resize(1000, 500);
+ // Show the tab bar.
+ tabWidgetPointer->setTabBarVisible(true);
- // Apply the settings when they are updated.
- connect(configDialogPointer, SIGNAL(settingsChanged(QString)), browserViewPointer, SLOT(applyApplicationSettings()));
- connect(configDialogPointer, SIGNAL(settingsChanged(QString)), browserViewPointer, SLOT(applyDomainSettingsAndReload()));
+ // Show the status bar.
+ statusBar()->setVisible(true);
}
}
-void BrowserWindow::toggleJavaScript() const
+void BrowserWindow::updateCookiesAction(const int numberOfCookies) const
{
- // Remove the focus from the URL line edit.
- urlLineEditPointer->clearFocus();
-
- // Toggle JavaScript.
- browserViewPointer->toggleJavaScript();
+ // Update the action text.
+ cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", numberOfCookies));
}
-void BrowserWindow::toggleLocalStorage() const
+void BrowserWindow::updateDomStorageAction(const bool &isEnabled) const
{
- // Remove the focus from the URL line edit.
- urlLineEditPointer->clearFocus();
-
- // Toggle JavaScript.
- browserViewPointer->toggleLocalStorage();
+ // Set the action checked status.
+ domStorageActionPointer->setChecked(isEnabled);
}
-void BrowserWindow::updateDomainSettingsIndicator(const bool &status, const QString &domainSettingsDomain)
+void BrowserWindow::updateDomainSettingsIndicator(const bool status)
{
// Set the domain palette according to the status.
- if (status) urlLineEditPointer->setPalette(domainSettingsPalette);
- else urlLineEditPointer->setPalette(noDomainSettingsPalette);
-
- // Store the domain.
- currentDomainSettingsDomain = domainSettingsDomain;
+ if (status)
+ urlLineEditPointer->setPalette(domainSettingsPalette);
+ else
+ urlLineEditPointer->setPalette(noDomainSettingsPalette);
}
-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
+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 == 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 == TabWidget::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
{
// Update the URL line edit if it does not have focus.
if (!urlLineEditPointer->hasFocus())
{
+ // Get the new URL string.
+ QString newUrlString = newUrl.toString();
+
// Update the URL line edit.
- urlLineEditPointer->setText(newUrl.toString());
+ urlLineEditPointer->setText(newUrlString);
+
+ // Set the focus if the new URL is blank.
+ if (newUrlString == QStringLiteral(""))
+ urlLineEditPointer->setFocus();
}
// Store the current URL.