X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.cpp;h=44614194b78b1e75621316ed4afc52ff5d541781;hp=3d6eb61880f8954792a9f024db2a4a19cd84f5f4;hb=cca335d6b9751fbf0e87daa5f122a1b8770488c8;hpb=fe9f5cdee9e6e16eac1858f7f661516c24f71fa5 diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index 3d6eb61..4461419 100644 --- a/src/windows/BrowserWindow.cpp +++ b/src/windows/BrowserWindow.cpp @@ -22,11 +22,13 @@ #include "Settings.h" #include "ui_SettingsPrivacy.h" #include "ui_SettingsGeneral.h" +#include "dialogs/DomainSettingsDialog.h" #include "helpers/SearchEngineHelper.h" #include "helpers/UserAgentHelper.h" // KDE Frameworks headers. #include +#include // Qt toolkit headers. #include @@ -44,9 +46,13 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() 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::quit(qApp, SLOT(closeAllWindows()), actionCollectionPointer); KStandardAction::preferences(this, SLOT(settingsConfigure()), actionCollectionPointer); + KStandardAction::redisplay(this, SLOT(refresh()), actionCollectionPointer); // Add the custom actions. userAgentPrivacyBrowserActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_privacy_browser")); @@ -65,6 +71,9 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() searchEngineBingActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_bing")); searchEngineYahooActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_yahoo")); searchEngineCustomActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_custom")); + javaScriptActionPointer = actionCollectionPointer->addAction(QStringLiteral("javascript")); + localStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("local_storage")); + domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings")); // Create the action groups QActionGroup *userAgentActionGroupPointer = new QActionGroup(this); @@ -112,17 +121,39 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() userAgentChromeWindowsActionPointer->setText(UserAgentHelper::CHROME_WINDOWS_TRANSLATED); userAgentEdgeWindowsActionPointer->setText(UserAgentHelper::EDGE_WINDOWS_TRANSLATED); userAgentSafariMacosActionPointer->setText(UserAgentHelper::SAFARI_MACOS_TRANSLATED); - searchEngineMojeekActionPointer->setText(i18nc("@action", "Mojeek")); - searchEngineMonoclesActionPointer->setText(i18nc("@action", "Monocles")); - searchEngineMetagerActionPointer->setText(i18nc("@action", "MetaGer")); - searchEngineGoogleActionPointer->setText(i18nc("@action", "Google")); - searchEngineBingActionPointer->setText(i18nc("@action", "Bing")); - searchEngineYahooActionPointer->setText(i18nc("@action", "Yahoo")); + searchEngineMojeekActionPointer->setText(i18nc("Search engine", "Mojeek")); + searchEngineMonoclesActionPointer->setText(i18nc("Search engine", "Monocles")); + searchEngineMetagerActionPointer->setText(i18nc("Search engine", "MetaGer")); + 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")); + + // Set the action icons. + userAgentPrivacyBrowserActionPointer->setIcon(QIcon(":/icons/privacy-mode")); + userAgentFirefoxLinuxActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("firefox-esr"))); + userAgentChromiumLinuxActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("chromium"))); + userAgentFirefoxWindowsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("firefox-esr"))); + userAgentChromeWindowsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("chromium"))); + userAgentEdgeWindowsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("user-group-properties"))); + userAgentSafariMacosActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("user-group-properties"))); + userAgentCustomActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("user-group-properties"))); + searchEngineMojeekActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search"))); + searchEngineMonoclesActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search"))); + searchEngineMetagerActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search"))); + searchEngineGoogleActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("im-google"))); + searchEngineBingActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search"))); + searchEngineYahooActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("im-yahoo"))); + searchEngineCustomActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search"))); + zoomFactorActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("zoom"))); + domainSettingsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("settings-configure"))); // Update the on-the-fly menus. - connect(browserViewPointer, SIGNAL(userAgentUpdated(QString)), this, SLOT(updateOnTheFlyUserAgent(QString))); - connect(browserViewPointer, SIGNAL(zoomFactorUpdated(double)), this, SLOT(updateOnTheFlyZoomFactor(double))); - connect(browserViewPointer, SIGNAL(searchEngineUpdated(QString)), this, SLOT(updateOnTheFlySearchEngine(QString))); + 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))); // Apply the on-the-fly settings when selected. connect(userAgentActionGroupPointer, SIGNAL(triggered(QAction*)), browserViewPointer, SLOT(applyOnTheFlyUserAgent(QAction*))); @@ -131,22 +162,128 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() // Display dialogs. connect(zoomFactorActionPointer, SIGNAL(triggered()), this, SLOT(getZoomFactorFromUser())); - // Update the status bar with the URL when a link is hovered. - connect(browserViewPointer, SIGNAL(linkHovered(QString)), this, SLOT(updateStatusBar(QString))); + // 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())); + + // 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))); // Setup the GUI based on the browser_ui.rc file. setupGUI(StandardWindowOption::Default, ("browser_ui.rc")); - // Load the initial webstie. + // Get a handle for the URL toolbar. + KToolBar *urlToolBarPointer = toolBar(QStringLiteral("url_toolbar")); + + // Create a URL line edit. + urlLineEditPointer = new KLineEdit(); + + // Add an edit or add domain settings action to the URL line edit. + QAction *addOrEditDomainSettingsActionPointer = urlLineEditPointer->addAction(QIcon::fromTheme("settings-configure"), QLineEdit::TrailingPosition); + + // Add or edit the current domain settings. + connect(addOrEditDomainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(addOrEditDomainSettings())); + + // Populate the URL toolbar. + urlToolBarPointer->insertWidget(javaScriptActionPointer, urlLineEditPointer); + + // Load a new URL from the URL line edit. + 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))); + + // Get a handle for the status bar. + QStatusBar *statusBarPointer = statusBar(); + + // Create a progress bar. + progressBarPointer = new QProgressBar(); + + // Add the progress bar to to the status bar. + statusBarPointer->addPermanentWidget(progressBarPointer); + + // Update the status bar with the URL when a link is hovered. + connect(browserViewPointer, 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())); + + // Get the URL line edit palettes. + noDomainSettingsPalette = urlLineEditPointer->palette(); + domainSettingsPalette = urlLineEditPointer->palette(); + + // Modify the domain settings palette. + domainSettingsPalette.setColor(QPalette::Base, QColor("#C8E6C9")); + + // Update the applied palette. + connect(browserViewPointer, SIGNAL(updateDomainSettingsIndicator(bool, QString)), this, SLOT(updateDomainSettingsIndicator(bool, QString))); + + // Load the initial website. browserViewPointer->loadInitialWebsite(); } +void BrowserWindow::addOrEditDomainSettings() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Create the domain settings dialog pointer. + DomainSettingsDialog *domainSettingsDialogPointer; + + // Run the commands according to the current domain settings status. + if (currentDomainSettingsDomain == "") // 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); + } + + // Set the dialog window title. + domainSettingsDialogPointer->setWindowTitle(i18nc("The domain settings dialog title", "Domain Settings")); + + // Set the modality. + domainSettingsDialogPointer->setWindowModality(Qt::WindowModality::WindowModal);; + + // Show the dialog. + domainSettingsDialogPointer->show(); + + // Reload the tabs when domain settings are updated. + connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), browserViewPointer, SLOT(applyDomainSettingsAndReload())); +} + +void BrowserWindow::back() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Go back. + browserViewPointer->back(); +} + void BrowserWindow::fileNew() const { // Display a new instance of Privacy Browser. (new BrowserWindow)->show(); } +void BrowserWindow::forward() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Go forward. + browserViewPointer->forward(); +} + void BrowserWindow::getZoomFactorFromUser() { // Create an OK flag. @@ -167,10 +304,73 @@ void BrowserWindow::getZoomFactorFromUser() browserViewPointer->applyOnTheFlyZoomFactor(newZoomFactor); // Update the on-the-fly action text. - updateOnTheFlyZoomFactor(newZoomFactor); + updateZoomFactorAction(newZoomFactor); } } +void BrowserWindow::home() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Go home. + browserViewPointer->home(); +} + +void BrowserWindow::loadUrlFromLineEdit(const QString &url) const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Load the URL. + browserViewPointer->loadUrlFromLineEdit(url); +} + +void BrowserWindow::openDomainSettings() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Instantiate the domain settings dialog. + DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog(); + + // Set the dialog window title. + domainSettingsDialogPointer->setWindowTitle(i18nc("The domain settings dialog title", "Domain Settings")); + + // Set the modality. + domainSettingsDialogPointer->setWindowModality(Qt::WindowModality::WindowModal);; + + // Show the dialog. + domainSettingsDialogPointer->show(); + + // Reload the tabs when domain settings are updated. + connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), browserViewPointer, SLOT(applyDomainSettingsAndReload())); +} + +void BrowserWindow::refresh() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Refresh the web page. + browserViewPointer->refresh(); +} + +void BrowserWindow::showProgressBar(const int &progress) const +{ + // Set the progress bar value. + progressBarPointer->setValue(progress); + + // Show the progress bar. + progressBarPointer->show(); +} + +QSize BrowserWindow::sizeHint() const +{ + // Return the default window size. + return QSize(1500, 1200); +} + void BrowserWindow::settingsConfigure() { // Check to make sure the dialog box isn't already displayed. @@ -231,11 +431,11 @@ void BrowserWindow::settingsConfigure() // Make it so. configDialogPointer->show(); - // TODO. KConfigDialog does not respect expanding size policies. - configDialogPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - privacySettingsWidgetPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - generalSettingsWidgetPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - configDialogPointer->adjustSize(); + // TODO. KConfigDialog does not respect expanding size policies. + //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); @@ -246,7 +446,49 @@ void BrowserWindow::settingsConfigure() } } -void BrowserWindow::updateOnTheFlySearchEngine(const QString &searchEngine) const +void BrowserWindow::toggleJavaScript() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Toggle JavaScript. + browserViewPointer->toggleJavaScript(); +} + +void BrowserWindow::toggleLocalStorage() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Toggle JavaScript. + browserViewPointer->toggleLocalStorage(); +} + +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); + + // Store the domain. + currentDomainSettingsDomain = domainSettingsDomain; +} + +void BrowserWindow::updateJavaScriptAction(const bool &isEnabled) const +{ + // Set the icon according to the status. + if (isEnabled) javaScriptActionPointer->setIcon(QIcon(":/icons/javascript-warning")); + else javaScriptActionPointer->setIcon(QIcon(":/icons/privacy-mode")); +} + +void BrowserWindow::updateLocalStorageAction(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")); +} + +void BrowserWindow::updateSearchEngineActions(const QString &searchEngine) const { // Initialize the custom search engine flag. bool customSearchEngine = false; @@ -284,7 +526,6 @@ void BrowserWindow::updateOnTheFlySearchEngine(const QString &searchEngine) cons customSearchEngine = true; } - // Format the custom search engine. if (customSearchEngine) { @@ -304,7 +545,7 @@ void BrowserWindow::updateOnTheFlySearchEngine(const QString &searchEngine) cons } } -void BrowserWindow::updateOnTheFlyUserAgent(const QString &userAgent) const +void BrowserWindow::updateUserAgentActions(const QString &userAgent) const { // Initialize the custom user agent flag. bool customUserAgent = false; @@ -346,10 +587,10 @@ void BrowserWindow::updateOnTheFlyUserAgent(const QString &userAgent) const } } -void BrowserWindow::updateOnTheFlyZoomFactor(const double &zoomFactor) +void BrowserWindow::updateZoomFactorAction(const double &zoomFactor) { // Set the current zoom factor. - currentZoomFactor = Settings::zoomFactor(); + currentZoomFactor = zoomFactor; // Update the zoom factor action text, formatting the double with 2 decimal places. zoomFactorActionPointer->setText(ki18nc("@action", "Zoom Factor - %1").subs(zoomFactor, 0, '0', 2).toString()); @@ -361,10 +602,17 @@ void BrowserWindow::updateSearchEngineLabel(const QString &searchEngineString) c searchEngineLabelPointer->setText(SearchEngineHelper::getSearchUrl(searchEngineString)); } -void BrowserWindow::updateStatusBar(const QString &statusBarMessage) const +void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl) { - // Display the status bar message. - statusBar()->showMessage(statusBarMessage); + // Update the URL line edit if it does not have focus. + if (!urlLineEditPointer->hasFocus()) + { + // Update the URL line edit. + urlLineEditPointer->setText(newUrl.toString()); + } + + // Store the current URL. + currentUrl = newUrl; } void BrowserWindow::updateUserAgentLabel(const QString &userAgentDatabaseName) const