X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.cpp;h=3ddba02c9e3809475a6d7393354b5cbc5eae33fb;hp=d83dd69b5e515b12a2baf6fa9cd3e8689ac93d7a;hb=34816101e23ae2b489d64d540534125cf2c2e925;hpb=f199b82941d34514783e4a4b85905d12999701d6 diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index d83dd69..3ddba02 100644 --- a/src/windows/BrowserWindow.cpp +++ b/src/windows/BrowserWindow.cpp @@ -46,12 +46,17 @@ 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")); + 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")); @@ -67,11 +72,8 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() searchEngineBingActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_bing")); searchEngineYahooActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_yahoo")); searchEngineCustomActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_custom")); - backActionPointer = actionCollectionPointer->addAction(QStringLiteral("back")); - forwardActionPointer = actionCollectionPointer->addAction(QStringLiteral("forward")); - refreshActionPointer = actionCollectionPointer->addAction(QStringLiteral("refresh")); - homeActionPointer = actionCollectionPointer->addAction(QStringLiteral("home")); javaScriptActionPointer = actionCollectionPointer->addAction(QStringLiteral("javascript")); + localStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("local_storage")); domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings")); // Create the action groups @@ -80,6 +82,7 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() // Add the actions to the groups. userAgentActionGroupPointer->addAction(userAgentPrivacyBrowserActionPointer); + userAgentActionGroupPointer->addAction(userAgentWebEngineDefaultActionPointer); userAgentActionGroupPointer->addAction(userAgentFirefoxLinuxActionPointer); userAgentActionGroupPointer->addAction(userAgentChromiumLinuxActionPointer); userAgentActionGroupPointer->addAction(userAgentFirefoxWindowsActionPointer); @@ -97,6 +100,7 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() // Set some actions to be checkable. userAgentPrivacyBrowserActionPointer->setCheckable(true); + userAgentWebEngineDefaultActionPointer->setCheckable(true); userAgentFirefoxLinuxActionPointer->setCheckable(true); userAgentChromiumLinuxActionPointer->setCheckable(true); userAgentFirefoxWindowsActionPointer->setCheckable(true); @@ -114,6 +118,7 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() // Set the non-mutable 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); @@ -126,24 +131,34 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() searchEngineGoogleActionPointer->setText(i18nc("Search engine", "Google")); searchEngineBingActionPointer->setText(i18nc("Search engine", "Bing")); searchEngineYahooActionPointer->setText(i18nc("Search engine", "Yahoo")); - backActionPointer->setText(i18nc("Back button", "Back")); - forwardActionPointer->setText(i18nc("Forward button", "Forward")); - refreshActionPointer->setText(i18nc("Refresh button", "Refresh")); - homeActionPointer->setText(i18nc("Home button", "Home")); 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. - backActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("arrow-left"))); - forwardActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right"))); - refreshActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh"))); - homeActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("home"))); - domainSettingsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("network-server-symbolic"))); + 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"))); + 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*))); @@ -153,17 +168,15 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() connect(zoomFactorActionPointer, SIGNAL(triggered()), this, SLOT(getZoomFactorFromUser())); // Connect the URL toolbar actions. - connect(backActionPointer, SIGNAL(triggered()), this, SLOT(back())); - connect(forwardActionPointer, SIGNAL(triggered()), this, SLOT(forward())); - connect(refreshActionPointer, SIGNAL(triggered()), this, SLOT(refresh())); - connect(homeActionPointer, SIGNAL(triggered()), this, SLOT(home())); 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")); @@ -174,23 +187,40 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() // 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->addWidget(urlLineEditPointer); - urlToolBarPointer->addAction(javaScriptActionPointer); - urlToolBarPointer->addAction(domainSettingsActionPointer); + 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(QString)), this, SLOT(updateUrlLineEdit(QString))); + 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())); + + // Clear the URL line edit focus when requested. + connect(browserViewPointer, SIGNAL(clearUrlLineEditFocus()), this, SLOT(clearUrlLineEditFocus())); + // Get the URL line edit palettes. noDomainSettingsPalette = urlLineEditPointer->palette(); domainSettingsPalette = urlLineEditPointer->palette(); @@ -199,12 +229,45 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() domainSettingsPalette.setColor(QPalette::Base, QColor("#C8E6C9")); // Update the applied palette. - connect(browserViewPointer, SIGNAL(updateDomainSettingsIndicator(bool)), this, SLOT(updateDomainSettingsIndicator(bool))); + 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. @@ -214,6 +277,12 @@ void BrowserWindow::back() const browserViewPointer->back(); } +void BrowserWindow::clearUrlLineEditFocus() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); +} + void BrowserWindow::fileNew() const { // Display a new instance of Privacy Browser. @@ -249,7 +318,7 @@ void BrowserWindow::getZoomFactorFromUser() browserViewPointer->applyOnTheFlyZoomFactor(newZoomFactor); // Update the on-the-fly action text. - updateOnTheFlyZoomFactor(newZoomFactor); + updateZoomFactorAction(newZoomFactor); } } @@ -276,7 +345,7 @@ void BrowserWindow::openDomainSettings() const // Remove the focus from the URL line edit. urlLineEditPointer->clearFocus(); - // Instantiate the domain settings window. + // Instantiate the domain settings dialog. DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog(); // Set the dialog window title. @@ -301,13 +370,19 @@ void BrowserWindow::refresh() const browserViewPointer->refresh(); } -void BrowserWindow::toggleJavaScript() const +void BrowserWindow::showProgressBar(const int &progress) const { - // Remove the focus from the URL line edit. - urlLineEditPointer->clearFocus(); + // Set the progress bar value. + progressBarPointer->setValue(progress); - // Toggle JavaScript. - browserViewPointer->toggleJavaScript(); + // Show the progress bar. + progressBarPointer->show(); +} + +QSize BrowserWindow::sizeHint() const +{ + // Return the default window size. + return QSize(1500, 1200); } void BrowserWindow::settingsConfigure() @@ -385,11 +460,32 @@ void BrowserWindow::settingsConfigure() } } -void BrowserWindow::updateDomainSettingsIndicator(const bool &status) 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 @@ -399,7 +495,14 @@ void BrowserWindow::updateJavaScriptAction(const bool &isEnabled) const else javaScriptActionPointer->setIcon(QIcon(":/icons/privacy-mode")); } -void BrowserWindow::updateOnTheFlySearchEngine(const QString &searchEngine) const +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; @@ -456,13 +559,14 @@ 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; // 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. @@ -498,10 +602,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()); @@ -513,14 +617,17 @@ void BrowserWindow::updateSearchEngineLabel(const QString &searchEngineString) c searchEngineLabelPointer->setText(SearchEngineHelper::getSearchUrl(searchEngineString)); } -void BrowserWindow::updateUrlLineEdit(const QString &newUrl) const +void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl) { // Update the URL line edit if it does not have focus. if (!urlLineEditPointer->hasFocus()) { // Update the URL line edit. - urlLineEditPointer->setText(newUrl); + urlLineEditPointer->setText(newUrl.toString()); } + + // Store the current URL. + currentUrl = newUrl; } void BrowserWindow::updateUserAgentLabel(const QString &userAgentDatabaseName) const