X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.cpp;h=77bb43b021f112e656da12f42dc731bc9815bcf8;hp=1ab6cfc613bb0292a6a837c3093b6d4a74678410;hb=fb7b0588f2e95260578076aceb22a5644e81f8b6;hpb=16118809a11aa423f453a03c47f5263e9dd8b662 diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index 1ab6cfc..77bb43b 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,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")); + javaScriptActionPointer = actionCollectionPointer->addAction(QStringLiteral("javascript")); + domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings")); // Create the action groups QActionGroup *userAgentActionGroupPointer = new QActionGroup(this); @@ -105,19 +113,25 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() searchEngineCustomActionPointer->setCheckable(true); // Set the non-mutable action text. - userAgentPrivacyBrowserActionPointer->setText(i18nc("@action", "Privacy Browser")); - userAgentFirefoxLinuxActionPointer->setText(i18nc("@action", "Firefox Linux")); - userAgentChromiumLinuxActionPointer->setText(i18nc("@action", "Chromium Linux")); - userAgentFirefoxWindowsActionPointer->setText(i18nc("@action", "Firefox Windows")); - userAgentChromeWindowsActionPointer->setText(i18nc("@action", "Chrome Windows")); - userAgentEdgeWindowsActionPointer->setText(i18nc("@action", "Edge Windows")); - userAgentSafariMacosActionPointer->setText(i18nc("@action", "Safari macOS")); - 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")); + userAgentPrivacyBrowserActionPointer->setText(UserAgentHelper::PRIVACY_BROWSER_TRANSLATED); + userAgentFirefoxLinuxActionPointer->setText(UserAgentHelper::FIREFOX_LINUX_TRANSLATED); + userAgentChromiumLinuxActionPointer->setText(UserAgentHelper::CHROMIUM_LINUX_TRANSLATED); + userAgentFirefoxWindowsActionPointer->setText(UserAgentHelper::FIREFOX_WINDOWS_TRANSLATED); + userAgentChromeWindowsActionPointer->setText(UserAgentHelper::CHROME_WINDOWS_TRANSLATED); + userAgentEdgeWindowsActionPointer->setText(UserAgentHelper::EDGE_WINDOWS_TRANSLATED); + userAgentSafariMacosActionPointer->setText(UserAgentHelper::SAFARI_MACOS_TRANSLATED); + 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")); + domainSettingsActionPointer->setText(i18nc("Domain Settings button", "Domain Settings")); + + // Set the action icons. + //refreshActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh"))); + domainSettingsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("network-server-symbolic"))); // Update the on-the-fly menus. connect(browserViewPointer, SIGNAL(userAgentUpdated(QString)), this, SLOT(updateOnTheFlyUserAgent(QString))); @@ -131,22 +145,79 @@ 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(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))); // 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(); + + // Populate the URL toolbar. + urlToolBarPointer->addWidget(urlLineEditPointer); + urlToolBarPointer->addAction(javaScriptActionPointer); + urlToolBarPointer->addAction(domainSettingsActionPointer); + + // 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))); + + // Get a handle for the status bar. + QStatusBar *statusBarPointer = statusBar(); + + // Update the status bar with the URL when a link is hovered. + connect(browserViewPointer, SIGNAL(linkHovered(QString)), statusBarPointer, SLOT(showMessage(QString))); + + // 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)), this, SLOT(updateDomainSettingsIndicator(bool))); + + // Load the initial website. browserViewPointer->loadInitialWebsite(); } +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. @@ -171,6 +242,69 @@ void BrowserWindow::getZoomFactorFromUser() } } +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 window. + 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::toggleJavaScript() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Toggle JavaScript. + browserViewPointer->toggleJavaScript(); +} + +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,6 +365,12 @@ 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(); + // Expand the config dialog. configDialogPointer->resize(1000, 500); @@ -240,6 +380,20 @@ void BrowserWindow::settingsConfigure() } } +void BrowserWindow::updateDomainSettingsIndicator(const bool &status) const +{ + // Set the domain palette according to the status. + if (status) urlLineEditPointer->setPalette(domainSettingsPalette); + else urlLineEditPointer->setPalette(noDomainSettingsPalette); +} + +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::updateOnTheFlySearchEngine(const QString &searchEngine) const { // Initialize the custom search engine flag. @@ -278,7 +432,6 @@ void BrowserWindow::updateOnTheFlySearchEngine(const QString &searchEngine) cons customSearchEngine = true; } - // Format the custom search engine. if (customSearchEngine) { @@ -304,34 +457,13 @@ void BrowserWindow::updateOnTheFlyUserAgent(const QString &userAgent) const bool customUserAgent = false; // Check the indicated on-the-fly user agent. - if (userAgent == "Privacy Browser") // Privacy Browser. - { - userAgentPrivacyBrowserActionPointer->setChecked(true); - } - else if (userAgent == "Firefox Linux") // Firefox Linux. - { - userAgentFirefoxLinuxActionPointer->setChecked(true); - } - else if (userAgent == "Chromium Linux") // Chromium Linux. - { - userAgentChromiumLinuxActionPointer->setChecked(true); - } - else if (userAgent == "Firefox Windows") // Firefox Windows. - { - userAgentFirefoxWindowsActionPointer->setChecked(true); - } - else if (userAgent == "Chrome Windows") // Chrome Windows. - { - userAgentChromeWindowsActionPointer->setChecked(true); - } - else if (userAgent == "Edge Windows") // Edge Windows. - { - userAgentEdgeWindowsActionPointer->setChecked(true); - } - else if (userAgent == "Safari macOS") // Safari macOS. - { - userAgentSafariMacosActionPointer->setChecked(true); - } + 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. else // Custom user agent. { // Check the user agent. @@ -376,14 +508,18 @@ void BrowserWindow::updateSearchEngineLabel(const QString &searchEngineString) c searchEngineLabelPointer->setText(SearchEngineHelper::getSearchUrl(searchEngineString)); } -void BrowserWindow::updateStatusBar(const QString &statusBarMessage) const +void BrowserWindow::updateUrlLineEdit(const QString &newUrl) const { - // 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); + } } -void BrowserWindow::updateUserAgentLabel(const QString &userAgentName) const +void BrowserWindow::updateUserAgentLabel(const QString &userAgentDatabaseName) const { // Update the user agent label. - userAgentLabelPointer->setText(UserAgentHelper::getUserAgent(userAgentName)); + userAgentLabelPointer->setText(UserAgentHelper::getUserAgentFromDatabaseName(userAgentDatabaseName)); }