X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.cpp;h=d83dd69b5e515b12a2baf6fa9cd3e8689ac93d7a;hp=3d6eb61880f8954792a9f024db2a4a19cd84f5f4;hb=f199b82941d34514783e4a4b85905d12999701d6;hpb=fe9f5cdee9e6e16eac1858f7f661516c24f71fa5 diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index 3d6eb61..d83dd69 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 @@ -65,6 +67,12 @@ 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")); + domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings")); // Create the action groups QActionGroup *userAgentActionGroupPointer = new QActionGroup(this); @@ -112,12 +120,25 @@ 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")); + 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")); + 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"))); // Update the on-the-fly menus. connect(browserViewPointer, SIGNAL(userAgentUpdated(QString)), this, SLOT(updateOnTheFlyUserAgent(QString))); @@ -131,22 +152,83 @@ 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(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(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 +253,63 @@ 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(); +} + void BrowserWindow::settingsConfigure() { // Check to make sure the dialog box isn't already displayed. @@ -231,11 +370,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,6 +385,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. @@ -284,7 +437,6 @@ void BrowserWindow::updateOnTheFlySearchEngine(const QString &searchEngine) cons customSearchEngine = true; } - // Format the custom search engine. if (customSearchEngine) { @@ -361,10 +513,14 @@ 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 &userAgentDatabaseName) const