X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.cpp;h=5960393f1da4b4fb535b4383463ce4ff46f08a3c;hp=4edb35ac4613bdfd771cc876aaa0c574d63fa2f1;hb=06a69a2d38bf73c0c5219f94c345b19142bb1646;hpb=823acbeb2cc27030857f249ab7157d8562e7b7fe diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index 4edb35a..5960393 100644 --- a/src/windows/BrowserWindow.cpp +++ b/src/windows/BrowserWindow.cpp @@ -22,7 +22,6 @@ #include "Settings.h" #include "ui_SettingsPrivacy.h" #include "ui_SettingsGeneral.h" -#include "databases/CookiesDatabase.h" #include "dialogs/CookiesDialog.h" #include "dialogs/DomainSettingsDialog.h" #include "helpers/SearchEngineHelper.h" @@ -30,39 +29,48 @@ // KDE Frameworks headers. #include +#include #include // Qt toolkit headers. +#include #include #include #include +#include #include +#include // Construct the class. -BrowserWindow::BrowserWindow() : KXmlGuiWindow() +BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() { // Initialize the variables. - cookieListPointer = new std::list; javaScriptEnabled = false; localStorageEnabled = false; - // Instantiate the main view pointer. - browserViewPointer = new BrowserView(this); + // Instantiate the privacy tab widget pointer. + tabWidgetPointer = new TabWidget(this); - // Set the main view as the central widget. - setCentralWidget(browserViewPointer); + // 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); + KStandardAction::find(this, SLOT(focusFindLineEdit()), actionCollectionPointer); + QAction *findNextActionPointer = KStandardAction::findNext(this, SLOT(findNext()), actionCollectionPointer); + KStandardAction::findPrev(this, SLOT(findPrevious()), actionCollectionPointer); // Add the custom actions. userAgentPrivacyBrowserActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_privacy_browser")); @@ -87,6 +95,7 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() javaScriptActionPointer = actionCollectionPointer->addAction(QStringLiteral("javascript")); localStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("local_storage")); domStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("dom_storage")); + findCaseSensitiveActionPointer = actionCollectionPointer->addAction(QStringLiteral("find_case_sensitive")); // Create the action groups QActionGroup *userAgentActionGroupPointer = new QActionGroup(this); @@ -114,6 +123,7 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() javaScriptActionPointer->setCheckable(true); localStorageActionPointer->setCheckable(true); domStorageActionPointer->setCheckable(true); + findCaseSensitiveActionPointer->setCheckable(true); userAgentPrivacyBrowserActionPointer->setCheckable(true); userAgentWebEngineDefaultActionPointer->setCheckable(true); userAgentFirefoxLinuxActionPointer->setCheckable(true); @@ -131,15 +141,18 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() searchEngineYahooActionPointer->setCheckable(true); searchEngineCustomActionPointer->setCheckable(true); + // Instantiate the user agent helper. + UserAgentHelper *userAgentHelperPointer = new UserAgentHelper(); + // 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); - userAgentChromeWindowsActionPointer->setText(UserAgentHelper::CHROME_WINDOWS_TRANSLATED); - userAgentEdgeWindowsActionPointer->setText(UserAgentHelper::EDGE_WINDOWS_TRANSLATED); - userAgentSafariMacosActionPointer->setText(UserAgentHelper::SAFARI_MACOS_TRANSLATED); + userAgentPrivacyBrowserActionPointer->setText(userAgentHelperPointer->PRIVACY_BROWSER_TRANSLATED); + userAgentWebEngineDefaultActionPointer->setText(userAgentHelperPointer->WEB_ENGINE_DEFAULT_TRANSLATED); + userAgentFirefoxLinuxActionPointer->setText(userAgentHelperPointer->FIREFOX_LINUX_TRANSLATED); + userAgentChromiumLinuxActionPointer->setText(userAgentHelperPointer->CHROMIUM_LINUX_TRANSLATED); + userAgentFirefoxWindowsActionPointer->setText(userAgentHelperPointer->FIREFOX_WINDOWS_TRANSLATED); + userAgentChromeWindowsActionPointer->setText(userAgentHelperPointer->CHROME_WINDOWS_TRANSLATED); + userAgentEdgeWindowsActionPointer->setText(userAgentHelperPointer->EDGE_WINDOWS_TRANSLATED); + userAgentSafariMacosActionPointer->setText(userAgentHelperPointer->SAFARI_MACOS_TRANSLATED); searchEngineMojeekActionPointer->setText(i18nc("Search engine", "Mojeek")); searchEngineMonoclesActionPointer->setText(i18nc("Search engine", "Monocles")); searchEngineMetagerActionPointer->setText(i18nc("Search engine", "MetaGer")); @@ -147,10 +160,11 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() searchEngineBingActionPointer->setText(i18nc("Search engine", "Bing")); searchEngineYahooActionPointer->setText(i18nc("Search engine", "Yahoo")); domainSettingsActionPointer->setText(i18nc("Domain Settings action", "Domain Settings")); - cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", cookieListPointer->size())); + 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")); + findCaseSensitiveActionPointer->setText(i18nc("Find Case Sensitive action", "Find Case Sensitive")); // Set the action icons. userAgentPrivacyBrowserActionPointer->setIcon(QIcon(":/icons/privacy-mode")); @@ -172,21 +186,25 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() 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("view-web-browser-dom-tree"))); + domStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("code-class"))); + findCaseSensitiveActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("format-text-lowercase"))); // Update the on-the-fly menus. - connect(browserViewPointer, SIGNAL(updateUserAgentActions(QString, bool)), this, SLOT(updateUserAgentActions(QString, bool))); - connect(browserViewPointer, SIGNAL(updateZoomFactorAction(double)), this, SLOT(updateZoomFactorAction(double))); - connect(browserViewPointer, SIGNAL(updateSearchEngineActions(QString, bool)), this, SLOT(updateSearchEngineActions(QString, bool))); + 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(openCookiesDialog())); - connect(domainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(openDomainSettings())); + 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())); @@ -194,14 +212,17 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() 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(browserViewPointer, SIGNAL(updateDomStorageAction(bool)), this, SLOT(updateDomStorageAction(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))); + + // Connect the find text actions. + connect(findCaseSensitiveActionPointer, SIGNAL(triggered()), this, SLOT(toggleFindCaseSensitive())); - // Setup the GUI based on the browser_ui.rc file. - setupGUI(StandardWindowOption::Default, ("browser_ui.rc")); + // Setup the GUI based on the browser_window_ui.rc file. + setupGUI(StandardWindowOption::Default, ("browserwindowui.rc")); // Get lists of the actions' associated widgets. QList userAgentAssociatedWidgetsPointerList = userAgentPrivacyBrowserActionPointer->associatedWidgets(); @@ -219,11 +240,37 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() userAgentMenuActionPointer = userAgentMenuPointer->menuAction(); searchEngineMenuActionPointer = searchEngineMenuPointer->menuAction(); - // Get a handle for the URL toolbar. - KToolBar *urlToolBarPointer = toolBar(QStringLiteral("url_toolbar")); + // Get handles for the toolbars. + navigationToolBarPointer = toolBar(QStringLiteral("navigation_toolbar")); + urlToolBarPointer = toolBar(QStringLiteral("url_toolbar")); - // Create a URL line edit. + // Create the line edits. urlLineEditPointer = new KLineEdit(); + findTextLineEditPointer = new KLineEdit(); + + // Get the line edit size policies. + QSizePolicy urlLineEditSizePolicy = urlLineEditPointer->sizePolicy(); + QSizePolicy findTextLineEditSizePolicy = findTextLineEditPointer->sizePolicy(); + + // Set the URL line edit horizontal stretch to be five times the find text line edit stretch. + urlLineEditSizePolicy.setHorizontalStretch(5); + findTextLineEditSizePolicy.setHorizontalStretch(1); + + // Set the policies. + urlLineEditPointer->setSizePolicy(urlLineEditSizePolicy); + findTextLineEditPointer->setSizePolicy(findTextLineEditSizePolicy); + + // Set the widths. + urlLineEditPointer->setMinimumWidth(350); + findTextLineEditPointer->setMinimumWidth(200); + findTextLineEditPointer->setMaximumWidth(350); + + // Set the placehold text. + urlLineEditPointer->setPlaceholderText(i18nc("The URL line edit placeholder text", "URL or Search Terms")); + findTextLineEditPointer->setPlaceholderText(i18nc("The find line edit placeholder text", "Find Text")); + + // Show the clear button on the find line edit. + findTextLineEditPointer->setClearButtonEnabled(true); // Add an edit or add domain settings action to the URL line edit. QAction *addOrEditDomainSettingsActionPointer = urlLineEditPointer->addAction(QIcon::fromTheme("settings-configure"), QLineEdit::TrailingPosition); @@ -231,14 +278,37 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() // Add or edit the current domain settings. connect(addOrEditDomainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(addOrEditDomainSettings())); - // Populate the URL toolbar. + // Create a find text label pointer. + findTextLabelPointer = new QLabel(); + + // Set the default label text. + findTextLabelPointer->setText(QStringLiteral(" ") + i18nc("Default find results.", "0/0") + QStringLiteral(" ")); + + // Insert the widgets into the toolbars. urlToolBarPointer->insertWidget(javaScriptActionPointer, urlLineEditPointer); + urlToolBarPointer->insertWidget(findNextActionPointer, findTextLineEditPointer); + urlToolBarPointer->insertWidget(findNextActionPointer, findTextLabelPointer); // Load a new URL from the URL line edit. connect(urlLineEditPointer, SIGNAL(returnKeyPressed(const QString)), this, SLOT(loadUrlFromLineEdit(const QString))); + // Find text as it is typed. + connect(findTextLineEditPointer, SIGNAL(textEdited(const QString &)), tabWidgetPointer, SLOT(findText(const QString &))); + + // Find next if the enter key is pressed. + connect(findTextLineEditPointer, SIGNAL(returnKeyPressed(const QString &)), tabWidgetPointer, SLOT(findText(const QString &))); + + // Update find text when switching tabs. + connect(tabWidgetPointer, SIGNAL(updateFindText(const QString &, const bool)), this, SLOT(updateFindText(const QString &, const bool))); + + // Update the find text results. + connect(tabWidgetPointer, SIGNAL(updateFindTextResults(const QWebEngineFindTextResult &)), this, SLOT(updateFindTextResults(const QWebEngineFindTextResult &))); + // 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))); + + // Update the window title. + connect(tabWidgetPointer, SIGNAL(updateWindowTitle(const QString)), this, SLOT(updateWindowTitle(const QString))); // Get a handle for the status bar. QStatusBar *statusBarPointer = statusBar(); @@ -250,46 +320,51 @@ BrowserWindow::BrowserWindow() : KXmlGuiWindow() 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())); - // Clear the URL line edit focus when requested. - connect(browserViewPointer, SIGNAL(clearUrlLineEditFocus()), this, SLOT(clearUrlLineEditFocus())); + // Update the URL line edit focus. + connect(tabWidgetPointer, SIGNAL(clearUrlLineEditFocus()), this, SLOT(clearUrlLineEditFocus())); // Get the URL line edit palettes. - noDomainSettingsPalette = urlLineEditPointer->palette(); - domainSettingsPalette = urlLineEditPointer->palette(); + normalBackgroundPalette = urlLineEditPointer->palette(); + negativeBackgroundPalette = normalBackgroundPalette; + positiveBackgroundPalette = normalBackgroundPalette; - // Modify the domain settings palette. - domainSettingsPalette.setColor(QPalette::Base, QColor("#C8E6C9")); + // Modify the palettes. + KColorScheme::adjustBackground(negativeBackgroundPalette, KColorScheme::NegativeBackground); + KColorScheme::adjustBackground(positiveBackgroundPalette, KColorScheme::PositiveBackground); // Update the applied palette. - connect(browserViewPointer, SIGNAL(updateDomainSettingsIndicator(bool, QString)), this, SLOT(updateDomainSettingsIndicator(bool, QString))); - - // Process cookie changes. - connect(browserViewPointer, SIGNAL(addCookie(QNetworkCookie)), this, SLOT(addCookieToList(QNetworkCookie))); - connect(browserViewPointer, SIGNAL(removeCookie(QNetworkCookie)), this, SLOT(removeCookieFromList(QNetworkCookie))); - - // Load the initial website. - browserViewPointer->loadInitialWebsite(); -} - -void BrowserWindow::addCookieToList(const QNetworkCookie &newCookie) const -{ - qDebug() << "Add cookie: " << newCookie.toRawForm(); - - // Add the new cookie to the list. - cookieListPointer->push_front(newCookie); - - // Update the action text. - cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", cookieListPointer->size())); - - // Update the cookie if it is durable and has new data. - if (CookiesDatabase::isUpdate(newCookie)) - CookiesDatabase::updateCookie(newCookie); + 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())); + + // Populate the UI. + // This must be done here, because otherwise, if a URL is loaded, like a local file, that does not trigger a call to TabWidget::applyDomainSettings, the UI will not be fully populated. + updateJavaScriptAction(Settings::javaScriptEnabled()); + updateLocalStorageAction(Settings::localStorageEnabled()); + updateDomStorageAction(Settings::domStorageEnabled()); + updateUserAgentActions(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent()), true); + updateZoomFactorAction(Settings::zoomFactor()); + + // Load the initial website if this is the first window. + if (firstWindow) + tabWidgetPointer->loadInitialWebsite(); } void BrowserWindow::addOrEditDomainSettings() const @@ -300,8 +375,11 @@ 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()); @@ -309,7 +387,7 @@ void BrowserWindow::addOrEditDomainSettings() const 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. @@ -322,7 +400,7 @@ void BrowserWindow::addOrEditDomainSettings() const 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 @@ -331,7 +409,7 @@ void BrowserWindow::back() const urlLineEditPointer->clearFocus(); // Go back. - browserViewPointer->back(); + tabWidgetPointer->back(); } void BrowserWindow::clearUrlLineEditFocus() const @@ -340,19 +418,95 @@ void BrowserWindow::clearUrlLineEditFocus() const urlLineEditPointer->clearFocus(); } +void BrowserWindow::escape() const +{ + // Process the excape according to the status of the browser. + if (fullScreenActionPointer->isChecked()) // Full screen browsing is enabled. + { + // Exit full screen browsing. + fullScreenActionPointer->trigger(); + } + else if (!findTextLineEditPointer->text().isEmpty()) // Find text is activated. + { + // Clear the text in the line edit. + findTextLineEditPointer->clear(); + + // Clear the search in the WebEngine. + tabWidgetPointer->findText(QStringLiteral("")); + } +} + void BrowserWindow::fileNew() const { // Display a new instance of Privacy Browser. (new BrowserWindow)->show(); } +void BrowserWindow::findNext() const +{ + // Get the find string. + const QString findString = findTextLineEditPointer->text(); + + // Search for the text if it is not empty. + if (!findString.isEmpty()) + tabWidgetPointer->findText(findString); +} + +void BrowserWindow::findPrevious() const +{ + // Get the find string. + const QString findString = findTextLineEditPointer->text(); + + // Search for the text if it is not empty. + if (!findString.isEmpty()) + tabWidgetPointer->findPrevious(findString); +} + +void BrowserWindow::focusFindLineEdit() const +{ + // Set the focus on the find line edit. + findTextLineEditPointer->setFocus(); + + // Select all the text in the find line edit. + findTextLineEditPointer->selectAll(); +} + void BrowserWindow::forward() const { // Remove the focus from the URL line edit. 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() @@ -372,7 +526,7 @@ 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); @@ -385,7 +539,7 @@ void BrowserWindow::home() const urlLineEditPointer->clearFocus(); // Go home. - browserViewPointer->home(); + tabWidgetPointer->home(); } void BrowserWindow::loadUrlFromLineEdit(const QString &url) const @@ -394,59 +548,73 @@ void BrowserWindow::loadUrlFromLineEdit(const QString &url) const urlLineEditPointer->clearFocus(); // Load the URL. - browserViewPointer->loadUrlFromLineEdit(url); + tabWidgetPointer->loadUrlFromLineEdit(url); +} + +void BrowserWindow::refresh() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Refresh the web page. + tabWidgetPointer->refresh(); } -void BrowserWindow::openCookiesDialog() +void BrowserWindow::showCookiesDialog() { // Remove the focus from the URL line edit. urlLineEditPointer->clearFocus(); // Instantiate the cookie settings dialog. - CookiesDialog *cookiesDialogPointer = new CookiesDialog(cookieListPointer); + CookiesDialog *cookiesDialogPointer = new CookiesDialog(tabWidgetPointer->getCookieList()); // Show the dialog. cookiesDialogPointer->show(); // Connect the dialog signals. - connect(cookiesDialogPointer, SIGNAL(addCookie(QNetworkCookie)), browserViewPointer, SLOT(addCookieToStore(QNetworkCookie))); - connect(cookiesDialogPointer, SIGNAL(deleteAllCookies()), browserViewPointer, SLOT(deleteAllCookies())); - connect(cookiesDialogPointer, SIGNAL(deleteCookie(QNetworkCookie)), browserViewPointer, SLOT(deleteCookieFromStore(QNetworkCookie))); + 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::openDomainSettings() const +void BrowserWindow::showDownloadLocationBrowseDialog() const { - // Remove the focus from the URL line edit. - urlLineEditPointer->clearFocus(); + // Get the current download location. + QString currentDownloadLocation = downloadLocationComboBoxPointer->currentText(); - // Instantiate the domain settings dialog. - DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog(); + // Resolve the system download directory if specified. + if (currentDownloadLocation == QStringLiteral("System Download Directory")) + currentDownloadLocation = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); - // Show the dialog. - domainSettingsDialogPointer->show(); + // Get the new download location. + QString newDownloadLocation = QFileDialog::getExistingDirectory(configDialogPointer, i18nc("Select download location dialog caption", "Select Download Location"), currentDownloadLocation); - // Reload the tabs when domain settings are updated. - connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), browserViewPointer, SLOT(applyDomainSettingsAndReload())); + // 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::refresh() const +void BrowserWindow::showDomainSettingsDialog() const { // Remove the focus from the URL line edit. urlLineEditPointer->clearFocus(); - // Refresh the web page. - browserViewPointer->refresh(); -} - -void BrowserWindow::removeCookieFromList(const QNetworkCookie &cookie) const -{ - qDebug() << "Remove cookie: " << cookie.toRawForm(); + // Instantiate the domain settings dialog. + DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog(); - // Remove the cookie from the list. - cookieListPointer->remove(cookie); + // Show the dialog. + domainSettingsDialogPointer->show(); - // Update the action text. - cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", cookieListPointer->size())); + // Reload the tabs when domain settings are updated. + connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), tabWidgetPointer, SLOT(applyDomainSettingsAndReload())); } void BrowserWindow::showProgressBar(const int &progress) const @@ -458,94 +626,88 @@ 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. + //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; - - // 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; - - // 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))); - - // 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")); - - // Delete the config dialog when it is closed. - configDialogPointer->setAttribute(Qt::WA_DeleteOnClose); - - // 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); + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); - // Apply the settings when they are updated. - connect(configDialogPointer, SIGNAL(settingsChanged(QString)), browserViewPointer, SLOT(applyApplicationSettings())); - connect(configDialogPointer, SIGNAL(settingsChanged(QString)), browserViewPointer, SLOT(applyDomainSettingsAndReload())); - } + // Toggle DOM storage. + tabWidgetPointer->toggleDomStorage(); } -void BrowserWindow::toggleLocalStorage() const +void BrowserWindow::toggleFindCaseSensitive() const { - // Remove the focus from teh URL line edit. - urlLineEditPointer->clearFocus(); + // Get the current find string. + const QString findString = findTextLineEditPointer->text(); - // Toggle local storage. - browserViewPointer->toggleLocalStorage(); + // Toggle find case sensitive. + tabWidgetPointer->toggleFindCaseSensitive(findString); } void BrowserWindow::toggleJavaScript() const @@ -554,16 +716,69 @@ void BrowserWindow::toggleJavaScript() const urlLineEditPointer->clearFocus(); // Toggle JavaScript. - browserViewPointer->toggleJavaScript(); + tabWidgetPointer->toggleJavaScript(); } -void BrowserWindow::toggleDomStorage() const +void BrowserWindow::toggleLocalStorage() const { // Remove the focus from the URL line edit. urlLineEditPointer->clearFocus(); - // Toggle DOM storage. - browserViewPointer->toggleDomStorage(); + // Toggle local storage. + tabWidgetPointer->toggleLocalStorage(); +} + +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); + } + + // Hide the tab bar if specified. + if (Settings::fullScreenHideTabBar()) + tabWidgetPointer->setTabBarVisible(false); + + // 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); + + // Show the menu bar. + menuBar()->setVisible(true); + + // Show the toolbars. + navigationToolBarPointer->setVisible(true); + urlToolBarPointer->setVisible(true); + + // Show the tab bar. + tabWidgetPointer->setTabBarVisible(true); + + // Show the status bar. + statusBar()->setVisible(true); + } +} + +void BrowserWindow::updateCookiesAction(const int numberOfCookies) const +{ + // Update the action text. + cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", numberOfCookies)); } void BrowserWindow::updateDomStorageAction(const bool &isEnabled) const @@ -572,16 +787,36 @@ void BrowserWindow::updateDomStorageAction(const bool &isEnabled) const 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); + urlLineEditPointer->setPalette(positiveBackgroundPalette); else - urlLineEditPointer->setPalette(noDomainSettingsPalette); + urlLineEditPointer->setPalette(normalBackgroundPalette); +} + +void BrowserWindow::updateFindText(const QString &text, const bool findCaseSensitive) const +{ + // Set the text. + findTextLineEditPointer->setText(text); - // Store the domain. - currentDomainSettingsDomain = domainSettingsDomain; + // Set the find case sensitive action checked status. + findCaseSensitiveActionPointer->setChecked(findCaseSensitive); +} + +void BrowserWindow::updateFindTextResults(const QWebEngineFindTextResult &findTextResult) const +{ + // Update the find text label. + findTextLabelPointer->setText(QStringLiteral(" %1/%2 ").arg(findTextResult.activeMatch()).arg(findTextResult.numberOfMatches())); + + // Set the background color according to the find status. + if (findTextLineEditPointer->text().isEmpty()) + findTextLineEditPointer->setPalette(normalBackgroundPalette); + else if (findTextResult.numberOfMatches() == 0) + findTextLineEditPointer->setPalette(negativeBackgroundPalette); + else + findTextLineEditPointer->setPalette(positiveBackgroundPalette); } void BrowserWindow::updateJavaScriptAction(const bool &isEnabled) @@ -722,7 +957,7 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool // Update the user agent menu action text. userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Privacy Browser")); } - else if (userAgent == BrowserView::webEngineDefaultUserAgent) // WebEngine default. + else if (userAgent == TabWidget::webEngineDefaultUserAgent) // WebEngine default. { // check the WebEngine default user agent action. userAgentWebEngineDefaultActionPointer->setChecked(true); @@ -794,6 +1029,7 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool } // Update the custom user agent enabled boolean. + // This is not done when the current user agent is a custom one but it is temporarially being changed via on-the-fly settings so that the user can switch back to the custom user agent. if (updateCustomUserAgentStatus) customUserAgentEnabled = customUserAgent; @@ -834,8 +1070,15 @@ void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl) // 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. @@ -847,3 +1090,9 @@ void BrowserWindow::updateUserAgentLabel(const QString &userAgentDatabaseName) c // Update the user agent label. userAgentLabelPointer->setText(UserAgentHelper::getUserAgentFromDatabaseName(userAgentDatabaseName)); } + +void BrowserWindow::updateWindowTitle(const QString &title) +{ + // Update the window title. + setWindowTitle(title); +}