X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.cpp;h=6df64f3ee95c558882c20d54f33dd1848712ae3b;hp=716f2e0c58f57dea8d676a00c660ebf697ac58c1;hb=refs%2Fheads%2Fmaster;hpb=aa9a6b20db5e2c808b390b62704f28bd649e283c diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index 716f2e0..fe3b593 100644 --- a/src/windows/BrowserWindow.cpp +++ b/src/windows/BrowserWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright © 2022 Soren Stoutner . + * Copyright 2022-2024 Soren Stoutner . * * This file is part of Privacy Browser PC . * @@ -20,29 +20,44 @@ // Application headers. #include "BrowserWindow.h" #include "Settings.h" -#include "ui_SettingsPrivacy.h" -#include "ui_SettingsGeneral.h" +#include "databases/BookmarksDatabase.h" +#include "databases/DomainsDatabase.h" +#include "dialogs/AddBookmarkDialog.h" +#include "dialogs/AddFolderDialog.h" +#include "dialogs/BookmarksDialog.h" #include "dialogs/CookiesDialog.h" #include "dialogs/DomainSettingsDialog.h" +#include "dialogs/EditBookmarkDialog.h" +#include "dialogs/EditFolderDialog.h" +#include "dialogs/SettingsDialog.h" #include "helpers/SearchEngineHelper.h" #include "helpers/UserAgentHelper.h" +#include "structs/BookmarkStruct.h" // KDE Frameworks headers. #include #include -#include +#include +#include // Qt toolkit headers. -#include +#include +#include +#include +#include +#include +#include #include +#include #include #include +#include #include #include #include // Construct the class. -BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() +BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) : KXmlGuiWindow() { // Initialize the variables. javaScriptEnabled = false; @@ -55,47 +70,60 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() setCentralWidget(tabWidgetPointer); // Get a handle for the action collection. - KActionCollection *actionCollectionPointer = this->actionCollection(); + actionCollectionPointer = this->actionCollection(); // Add the standard actions. - KStandardAction::openNew(this, SLOT(fileNew()), actionCollectionPointer); KStandardAction::print(tabWidgetPointer, SLOT(print()), actionCollectionPointer); - KStandardAction::printPreview(tabWidgetPointer, SLOT(printPreview()), actionCollectionPointer); + QAction *printPreviewActionPointer = KStandardAction::printPreview(tabWidgetPointer, SLOT(printPreview()), actionCollectionPointer); KStandardAction::quit(qApp, SLOT(closeAllWindows()), actionCollectionPointer); - KStandardAction::redisplay(this, SLOT(refresh()), actionCollectionPointer); + zoomInActionPointer = KStandardAction::zoomIn(this, SLOT(incrementZoom()), actionCollectionPointer); + zoomOutActionPointer = KStandardAction::zoomOut(this, SLOT(decrementZoom()), actionCollectionPointer); + refreshActionPointer = 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); + QAction *editBookmarksActionPointer = KStandardAction::editBookmarks(this, SLOT(editBookmarks()), 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); + KStandardAction::find(this, SLOT(showFindTextActions()), actionCollectionPointer); + findNextActionPointer = KStandardAction::findNext(this, SLOT(findNext()), actionCollectionPointer); + findPreviousActionPointer = KStandardAction::findPrev(this, SLOT(findPrevious()), 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")); - userAgentChromeWindowsActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_chrome_windows")); - userAgentEdgeWindowsActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_edge_windows")); - userAgentSafariMacosActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_safari_macos")); - userAgentCustomActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_custom")); - zoomFactorActionPointer = actionCollectionPointer->addAction(QStringLiteral("zoom_factor")); - searchEngineMojeekActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_mojeek")); - searchEngineMonoclesActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_monocles")); - searchEngineMetagerActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_metager")); - searchEngineGoogleActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_google")); - searchEngineBingActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_bing")); - searchEngineYahooActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_yahoo")); - searchEngineCustomActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_custom")); - QAction *domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings")); - cookiesActionPointer = actionCollectionPointer->addAction(QStringLiteral("cookies")); - javaScriptActionPointer = actionCollectionPointer->addAction(QStringLiteral("javascript")); - localStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("local_storage")); - domStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("dom_storage")); - findCaseSensitiveActionPointer = actionCollectionPointer->addAction(QStringLiteral("find_case_sensitive")); + QAction *newTabActionPointer = actionCollectionPointer->addAction(QLatin1String("new_tab")); + QAction *newWindowActionPointer = actionCollectionPointer->addAction(QLatin1String("new_window")); + QAction *saveArchiveActionPointer = actionCollectionPointer->addAction(QLatin1String("save_archive")); + zoomDefaultActionPointer = actionCollectionPointer->addAction(QLatin1String("zoom_default")); + QAction *reloadAndBypassCacheActionPointer = actionCollectionPointer->addAction(QLatin1String("reload_and_bypass_cache")); + stopActionPointer = actionCollectionPointer->addAction(QLatin1String("stop")); + viewSourceActionPointer = actionCollectionPointer->addAction(QLatin1String("view_source")); + viewSourceInNewTabActionPointer = actionCollectionPointer->addAction(QLatin1String("view_source_in_new_tab")); + developerToolsActionPointer = actionCollectionPointer->addAction(QLatin1String("developer_tools")); + javaScriptActionPointer = actionCollectionPointer->addAction(QLatin1String("javascript")); + localStorageActionPointer = actionCollectionPointer->addAction(QLatin1String("local_storage")); + domStorageActionPointer = actionCollectionPointer->addAction(QLatin1String("dom_storage")); + userAgentPrivacyBrowserActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_privacy_browser")); + userAgentWebEngineDefaultActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_webengine_default")); + userAgentFirefoxLinuxActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_firefox_linux")); + userAgentChromiumLinuxActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_chromium_linux")); + userAgentFirefoxWindowsActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_firefox_windows")); + userAgentChromeWindowsActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_chrome_windows")); + userAgentEdgeWindowsActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_edge_windows")); + userAgentSafariMacosActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_safari_macos")); + userAgentCustomActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_custom")); + zoomFactorActionPointer = actionCollectionPointer->addAction(QLatin1String("zoom_factor")); + searchEngineMojeekActionPointer = actionCollectionPointer->addAction(QLatin1String("search_engine_mojeek")); + searchEngineMonoclesActionPointer = actionCollectionPointer->addAction(QLatin1String("search_engine_monocles")); + searchEngineMetagerActionPointer = actionCollectionPointer->addAction(QLatin1String("search_engine_metager")); + searchEngineGoogleActionPointer = actionCollectionPointer->addAction(QLatin1String("search_engine_google")); + searchEngineBingActionPointer = actionCollectionPointer->addAction(QLatin1String("search_engine_bing")); + searchEngineYahooActionPointer = actionCollectionPointer->addAction(QLatin1String("search_engine_yahoo")); + searchEngineCustomActionPointer = actionCollectionPointer->addAction(QLatin1String("search_engine_custom")); + viewBookmarksToolBarActionPointer = actionCollectionPointer->addAction(QLatin1String("view_bookmarks_toolbar")); + QAction *domainSettingsActionPointer = actionCollectionPointer->addAction(QLatin1String("domain_settings")); + cookiesActionPointer = actionCollectionPointer->addAction(QLatin1String("cookies")); + findCaseSensitiveActionPointer = actionCollectionPointer->addAction(QLatin1String("find_case_sensitive")); + hideFindTextActionPointer = actionCollectionPointer->addAction(QLatin1String("hide_find_actions")); // Create the action groups QActionGroup *userAgentActionGroupPointer = new QActionGroup(this); @@ -124,6 +152,8 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() localStorageActionPointer->setCheckable(true); domStorageActionPointer->setCheckable(true); findCaseSensitiveActionPointer->setCheckable(true); + viewSourceActionPointer->setCheckable(true); + developerToolsActionPointer->setCheckable(true); userAgentPrivacyBrowserActionPointer->setCheckable(true); userAgentWebEngineDefaultActionPointer->setCheckable(true); userAgentFirefoxLinuxActionPointer->setCheckable(true); @@ -140,55 +170,175 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() searchEngineBingActionPointer->setCheckable(true); searchEngineYahooActionPointer->setCheckable(true); searchEngineCustomActionPointer->setCheckable(true); + viewBookmarksToolBarActionPointer->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); + newTabActionPointer->setText(i18nc("New tab action", "New Tab")); + newWindowActionPointer->setText(i18nc("New window action", "New Window")); + saveArchiveActionPointer->setText(i18nc("Save archive action", "Save Archive")); + zoomDefaultActionPointer->setText(i18nc("Zoom default action", "Zoom Default")); + reloadAndBypassCacheActionPointer->setText(i18nc("Reload and bypass cache action", "Reload and Bypass Cache")); + stopActionPointer->setText(i18nc("Stop action", "Stop")); + viewSourceActionPointer->setText(i18nc("View source action", "View Source")); + viewSourceInNewTabActionPointer->setText(i18nc("View source in new tab action", "View Source in New Tab")); + developerToolsActionPointer->setText(i18nc("Developer tools action", "Developer Tools")); + javaScriptActionPointer->setText(i18nc("JavaScript action", "JavaScript")); + localStorageActionPointer->setText(i18nc("The Local Storage action", "Local Storage")); + domStorageActionPointer->setText(i18nc("DOM Storage action", "DOM Storage")); + 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")); searchEngineGoogleActionPointer->setText(i18nc("Search engine", "Google")); searchEngineBingActionPointer->setText(i18nc("Search engine", "Bing")); searchEngineYahooActionPointer->setText(i18nc("Search engine", "Yahoo")); + viewBookmarksToolBarActionPointer->setText(i18nc("View bookmarks toolbar", "View Bookmarks Toolbar")); domainSettingsActionPointer->setText(i18nc("Domain Settings action", "Domain Settings")); 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")); - 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"))); - cookiesActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("preferences-web-browser-cookies"))); - domStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("code-class"))); - findCaseSensitiveActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("format-text-lowercase"))); + hideFindTextActionPointer->setText(i18nc("Hide Find Text action (the text should include the language-specific escape keyboard shortcut).", "Hide Find Text (Esc)")); + + // Set the action icons. Gnome doesn't contain some of the icons that KDE has. + // The toolbar icons don't pick up unless the size is explicit, probably because the toolbar ends up being an intermediate size. + newTabActionPointer->setIcon(QIcon::fromTheme(QLatin1String("tab-new"))); + newWindowActionPointer->setIcon(QIcon::fromTheme(QLatin1String("window-new"))); + saveArchiveActionPointer->setIcon(QIcon::fromTheme(QLatin1String("document-save"))); + zoomDefaultActionPointer->setIcon(QIcon::fromTheme(QLatin1String("zoom-fit-best"))); + reloadAndBypassCacheActionPointer->setIcon(QIcon::fromTheme(QLatin1String("view-refresh"))); + stopActionPointer->setIcon(QIcon::fromTheme(QLatin1String("process-stop"))); + viewSourceActionPointer->setIcon(QIcon::fromTheme(QLatin1String("view-choose"), QIcon::fromTheme(QLatin1String("accessories-text-editor")))); + viewSourceInNewTabActionPointer->setIcon(QIcon::fromTheme(QLatin1String("view-choose"), QIcon::fromTheme(QLatin1String("accessories-text-editor")))); + developerToolsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("add-subtitle"), QIcon::fromTheme("system-run"))); + domStorageActionPointer->setIcon(QIcon::fromTheme(QLatin1String("code-class"), QIcon(QLatin1String("/usr/share/icons/gnome/32x32/actions/gtk-unindent-ltr.png")))); + userAgentPrivacyBrowserActionPointer->setIcon(QIcon(QLatin1String(":/icons/privacy-mode.svg"))); + userAgentWebEngineDefaultActionPointer->setIcon(QIcon::fromTheme(QLatin1String("qtlogo"), QIcon::fromTheme(QLatin1String("user-group-properties"), + QIcon::fromTheme(QLatin1String("contact-new"))))); + userAgentFirefoxLinuxActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr"), QIcon::fromTheme(QLatin1String("user-group-properties"), + QIcon::fromTheme(QLatin1String("contact-new"))))); + userAgentChromiumLinuxActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))))); + userAgentFirefoxWindowsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr"), QIcon::fromTheme(QLatin1String("user-group-properties"), + QIcon::fromTheme(QLatin1String("contact-new"))))); + userAgentChromeWindowsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))))); + userAgentEdgeWindowsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))); + userAgentSafariMacosActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))); + userAgentCustomActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))); + searchEngineMojeekActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find"))); + searchEngineMonoclesActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find"))); + searchEngineMetagerActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find"))); + searchEngineGoogleActionPointer->setIcon(QIcon::fromTheme(QLatin1String("im-google"), QIcon::fromTheme(QLatin1String("edit-find")))); + searchEngineBingActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find"))); + searchEngineYahooActionPointer->setIcon(QIcon::fromTheme(QLatin1String("im-yahoo"), QIcon::fromTheme(QLatin1String("edit-find")))); + searchEngineCustomActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find"))); + zoomFactorActionPointer->setIcon(QIcon::fromTheme(QLatin1String("zoom-fit-best"))); + editBookmarksActionPointer->setIcon(QIcon::fromTheme(QLatin1String("bookmark-edit"), QIcon::fromTheme(QLatin1String("bookmark-new")))); + viewBookmarksToolBarActionPointer->setIcon(QIcon::fromTheme(QLatin1String("bookmarks"), QIcon::fromTheme(QLatin1String("bookmark-new")))); + domainSettingsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("settings-configure"), QIcon::fromTheme(QLatin1String("preferences-desktop")))); + cookiesActionPointer->setIcon(QIcon::fromTheme(QLatin1String("preferences-web-browser-cookies"), QIcon::fromTheme(QLatin1String("appointment-new")))); + findCaseSensitiveActionPointer->setIcon(QIcon::fromTheme(QLatin1String("format-text-lowercase"), QIcon::fromTheme(QLatin1String("/usr/share/icons/gnome/32x32/apps/fonts.png")))); + hideFindTextActionPointer->setIcon(QIcon::fromTheme(QLatin1String("window-close-symbolic"))); + + // Create the key sequences. + QKeySequence ctrlTKeySequence = QKeySequence(i18nc("The open new tab key sequence.", "Ctrl+T")); + QKeySequence ctrlNKeySequence = QKeySequence(i18nc("The open new window key sequence.", "Ctrl+N")); + QKeySequence ctrlAKeySequence = QKeySequence(i18nc("The save archive key sequence.", "Ctrl+A")); + QKeySequence ctrl0KeySequence = QKeySequence(i18nc("The zoom default key sequence.", "Ctrl+0")); + QKeySequence ctrlF5KeySequence = QKeySequence(i18nc("The reload and bypass cache key sequence.", "Ctrl+F5")); + QKeySequence ctrlShiftXKeySequence = QKeySequence(i18nc("The stop key sequence.", "Ctrl+Shift+X")); + QKeySequence ctrlUKeySequence = QKeySequence(i18nc("The view source key sequence.", "Ctrl+U")); + QKeySequence ctrlShiftUKeySequence = QKeySequence(i18nc("The view source in new tab key sequence.", "Ctrl+Shift+U")); + QKeySequence f12KeySequence = QKeySequence(i18nc("The developer tools key sequence.", "F12")); + QKeySequence ctrlShiftPKeySequence = QKeySequence(i18nc("The print preview key sequence.", "Ctrl+Shift+P")); + QKeySequence ctrlJKeySequence = QKeySequence(i18nc("The JavaScript key sequence.", "Ctrl+J")); + QKeySequence ctrlLKeySequence = QKeySequence(i18nc("The local storage key sequence.", "Ctrl+L")); + QKeySequence ctrlDKeySequence = QKeySequence(i18nc("The DOM storage key sequence.", "Ctrl+D")); + QKeySequence ctrlSKeySequence = QKeySequence(i18nc("The find case sensitive key sequence.", "Ctrl+S")); + QKeySequence ctrlAltPKeySequence = QKeySequence(i18nc("The Privacy Browser user agent key sequence.", "Ctrl+Alt+P")); + QKeySequence ctrlAltWKeySequence = QKeySequence(i18nc("The WebEngine Default user agent key sequence.", "Ctrl+Alt+W")); + QKeySequence ctrlAltFKeySequence = QKeySequence(i18nc("The Firefox on Linux user agent key sequence.", "Ctrl+Alt+F")); + QKeySequence ctrlAltCKeySequence = QKeySequence(i18nc("The Chromium on Linux user agent key sequence.", "Ctrl+Alt+C")); + QKeySequence ctrlAltShiftFKeySequence = QKeySequence(i18nc("The Firefox on Windows user agent key sequence.", "Ctrl+Alt+Shift+F")); + QKeySequence ctrlAltShiftCKeySequence = QKeySequence(i18nc("The Chrome on Windows user agent key sequence.", "Ctrl+Alt+Shift+C")); + QKeySequence ctrlAltEKeySequence = QKeySequence(i18nc("The Edge on Windows user agent key sequence.", "Ctrl+Alt+E")); + QKeySequence ctrlAltSKeySequence = QKeySequence(i18nc("The Safari on macOS user agent key sequence.", "Ctrl+Alt+S")); + QKeySequence altShiftCKeySequence = QKeySequence(i18nc("The custom user agent key sequence.", "Alt+Shift+C")); + QKeySequence ctrlAltZKeySequence = QKeySequence(i18nc("The zoom factor key sequence.", "Ctrl+Alt+Z")); + QKeySequence ctrlShiftMKeySequence = QKeySequence(i18nc("The Mojeek search engine key sequence.", "Ctrl+Shift+M")); + QKeySequence ctrlShiftOKeySequence = QKeySequence(i18nc("The Monocles search engine key sequence.", "Ctrl+Shift+O")); + QKeySequence ctrlShiftEKeySequence = QKeySequence(i18nc("The MetaGer search engine key sequence.", "Ctrl+Shift+E")); + QKeySequence ctrlShiftGKeySequence = QKeySequence(i18nc("The Google search engine key sequence.", "Ctrl+Shift+G")); + QKeySequence ctrlShiftBKeySequence = QKeySequence(i18nc("The Bing search engine key sequence.", "Ctrl+Shift+B")); + QKeySequence ctrlShiftYKeySequence = QKeySequence(i18nc("The Yahoo search engine key sequence.", "Ctrl+Shift+Y")); + QKeySequence ctrlShiftCKeySequence = QKeySequence(i18nc("The custom search engine key sequence.", "Ctrl+Shift+C")); + QKeySequence ctrlAltShiftBKeySequence = QKeySequence(i18nc("The edit bookmarks key sequence.", "Ctrl+Alt+Shift+B")); + QKeySequence ctrlAltBKeySequence = QKeySequence(i18nc("The view bookmarks toolbar key sequence.", "Ctrl+Alt+B")); + QKeySequence ctrlShiftDKeySequence = QKeySequence(i18nc("The domain settings key sequence.", "Ctrl+Shift+D")); + QKeySequence ctrlSemicolonKeySequence = QKeySequence(i18nc("The cookies dialog key sequence.", "Ctrl+;")); + + // Set the action key sequences. + actionCollectionPointer->setDefaultShortcut(newTabActionPointer, ctrlTKeySequence); + actionCollectionPointer->setDefaultShortcut(newWindowActionPointer, ctrlNKeySequence); + actionCollectionPointer->setDefaultShortcut(saveArchiveActionPointer, ctrlAKeySequence); + actionCollectionPointer->setDefaultShortcut(zoomDefaultActionPointer, ctrl0KeySequence); + actionCollectionPointer->setDefaultShortcut(reloadAndBypassCacheActionPointer, ctrlF5KeySequence); + actionCollectionPointer->setDefaultShortcut(stopActionPointer, ctrlShiftXKeySequence); + actionCollectionPointer->setDefaultShortcut(viewSourceActionPointer, ctrlUKeySequence); + actionCollectionPointer->setDefaultShortcut(viewSourceInNewTabActionPointer, ctrlShiftUKeySequence); + actionCollectionPointer->setDefaultShortcut(developerToolsActionPointer, f12KeySequence); + actionCollectionPointer->setDefaultShortcut(printPreviewActionPointer, ctrlShiftPKeySequence); + actionCollectionPointer->setDefaultShortcut(javaScriptActionPointer, ctrlJKeySequence); + actionCollectionPointer->setDefaultShortcut(localStorageActionPointer, ctrlLKeySequence); + actionCollectionPointer->setDefaultShortcut(domStorageActionPointer, ctrlDKeySequence); + actionCollectionPointer->setDefaultShortcut(findCaseSensitiveActionPointer, ctrlSKeySequence); + actionCollectionPointer->setDefaultShortcut(userAgentPrivacyBrowserActionPointer, ctrlAltPKeySequence); + actionCollectionPointer->setDefaultShortcut(userAgentWebEngineDefaultActionPointer, ctrlAltWKeySequence); + actionCollectionPointer->setDefaultShortcut(userAgentFirefoxLinuxActionPointer, ctrlAltFKeySequence); + actionCollectionPointer->setDefaultShortcut(userAgentChromiumLinuxActionPointer, ctrlAltCKeySequence); + actionCollectionPointer->setDefaultShortcut(userAgentFirefoxWindowsActionPointer, ctrlAltShiftFKeySequence); + actionCollectionPointer->setDefaultShortcut(userAgentChromeWindowsActionPointer, ctrlAltShiftCKeySequence); + actionCollectionPointer->setDefaultShortcut(userAgentEdgeWindowsActionPointer, ctrlAltEKeySequence); + actionCollectionPointer->setDefaultShortcut(userAgentSafariMacosActionPointer, ctrlAltSKeySequence); + actionCollectionPointer->setDefaultShortcut(userAgentCustomActionPointer, altShiftCKeySequence); + actionCollectionPointer->setDefaultShortcut(zoomFactorActionPointer, ctrlAltZKeySequence); + actionCollectionPointer->setDefaultShortcut(searchEngineMojeekActionPointer, ctrlShiftMKeySequence); + actionCollectionPointer->setDefaultShortcut(searchEngineMonoclesActionPointer, ctrlShiftOKeySequence); + actionCollectionPointer->setDefaultShortcut(searchEngineMetagerActionPointer, ctrlShiftEKeySequence); + actionCollectionPointer->setDefaultShortcut(searchEngineGoogleActionPointer, ctrlShiftGKeySequence); + actionCollectionPointer->setDefaultShortcut(searchEngineBingActionPointer, ctrlShiftBKeySequence); + actionCollectionPointer->setDefaultShortcut(searchEngineYahooActionPointer, ctrlShiftYKeySequence); + actionCollectionPointer->setDefaultShortcut(searchEngineCustomActionPointer, ctrlShiftCKeySequence); + actionCollectionPointer->setDefaultShortcut(editBookmarksActionPointer, ctrlAltShiftBKeySequence); + actionCollectionPointer->setDefaultShortcut(viewBookmarksToolBarActionPointer, ctrlAltBKeySequence); + actionCollectionPointer->setDefaultShortcut(domainSettingsActionPointer, ctrlShiftDKeySequence); + actionCollectionPointer->setDefaultShortcut(cookiesActionPointer, ctrlSemicolonKeySequence); + + // Execute the actions. + connect(newTabActionPointer, SIGNAL(triggered()), tabWidgetPointer, SLOT(addTab())); + connect(newWindowActionPointer, SIGNAL(triggered()), this, SLOT(newWindow())); + connect(saveArchiveActionPointer, SIGNAL(triggered()), tabWidgetPointer, SLOT(saveArchive())); + connect(zoomDefaultActionPointer, SIGNAL(triggered()), this, SLOT(zoomDefault())); + connect(reloadAndBypassCacheActionPointer, SIGNAL(triggered()), this, SLOT(reloadAndBypassCache())); + connect(stopActionPointer, SIGNAL(triggered()), tabWidgetPointer, SLOT(stop())); + connect(viewSourceActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSource())); + connect(viewSourceInNewTabActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSourceInNewTab())); + connect(developerToolsActionPointer, SIGNAL(triggered()), this, SLOT(toggleDeveloperTools())); + connect(zoomFactorActionPointer, SIGNAL(triggered()), this, SLOT(getZoomFactorFromUser())); + connect(viewBookmarksToolBarActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewBookmarksToolBar())); + connect(cookiesActionPointer, SIGNAL(triggered()), this, SLOT(showCookiesDialog())); + connect(domainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(showDomainSettingsDialog())); // Update the on-the-fly menus. connect(tabWidgetPointer, SIGNAL(updateUserAgentActions(QString, bool)), this, SLOT(updateUserAgentActions(QString, bool))); - connect(tabWidgetPointer, SIGNAL(updateZoomFactorAction(double)), this, SLOT(updateZoomFactorAction(double))); + connect(tabWidgetPointer, SIGNAL(updateZoomActions(double)), this, SLOT(updateZoomActions(double))); connect(tabWidgetPointer, SIGNAL(updateSearchEngineActions(QString, bool)), this, SLOT(updateSearchEngineActions(QString, bool))); // Apply the on-the-fly settings when selected. @@ -198,17 +348,16 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() // 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(showCookiesDialog())); - connect(domainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(showDomainSettingsDialog())); + // Store the default zoom factor. + connect(tabWidgetPointer, SIGNAL(updateDefaultZoomFactor(double)), this, SLOT(updateDefaultZoomFactor(double))); // Connect the URL toolbar actions. connect(javaScriptActionPointer, SIGNAL(triggered()), this, SLOT(toggleJavaScript())); connect(localStorageActionPointer, SIGNAL(triggered()), this, SLOT(toggleLocalStorage())); connect(domStorageActionPointer, SIGNAL(triggered()), this, SLOT(toggleDomStorage())); - // Update the URL toolbar actions. + // Update the actions from the tab widget. + connect(tabWidgetPointer, SIGNAL(updateDeveloperToolsAction(bool)), developerToolsActionPointer, SLOT(setChecked(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))); @@ -217,9 +366,12 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() // Connect the find text actions. connect(findCaseSensitiveActionPointer, SIGNAL(triggered()), this, SLOT(toggleFindCaseSensitive())); + connect(hideFindTextActionPointer, SIGNAL(triggered()), this, SLOT(hideFindTextActions())); + - // Setup the GUI based on the browser_window_ui.rc file. - setupGUI(StandardWindowOption::Default, ("browser_window_ui.rc")); + + // Setup the GUI based on the browserwindowui.rc file. + setupGUI(StandardWindowOption::Default, ("browserwindowui.rc")); // Get lists of the actions' associated widgets. QList userAgentAssociatedWidgetsPointerList = userAgentPrivacyBrowserActionPointer->associatedWidgets(); @@ -238,11 +390,15 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() searchEngineMenuActionPointer = searchEngineMenuPointer->menuAction(); // Get handles for the toolbars. - navigationToolBarPointer = toolBar(QStringLiteral("navigation_toolbar")); - urlToolBarPointer = toolBar(QStringLiteral("url_toolbar")); + navigationToolBarPointer = toolBar(QLatin1String("navigation_toolbar")); + urlToolBarPointer = toolBar(QLatin1String("url_toolbar")); + bookmarksToolBarPointer = toolBar(QLatin1String("bookmarks_toolbar")); + + // Populate the view bookmarks toolbar checkbox. + connect(bookmarksToolBarPointer, SIGNAL(visibilityChanged(bool)), this, SLOT(updateViewBookmarksToolBarCheckbox(bool))); // Create the line edits. - urlLineEditPointer = new KLineEdit(); + urlLineEditPointer = new UrlLineEdit(); findTextLineEditPointer = new KLineEdit(); // Get the line edit size policies. @@ -262,29 +418,38 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() findTextLineEditPointer->setMinimumWidth(200); findTextLineEditPointer->setMaximumWidth(350); - // Set the placehold text. + // Set the place holder 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); + // Add the actions to the URL line edit. + bookmarkedActionPointer = urlLineEditPointer->addAction(QIcon::fromTheme("non-starred-symbolic"), QLineEdit::LeadingPosition); + QAction *addOrEditDomainSettingsActionPointer = urlLineEditPointer->addAction(QIcon::fromTheme("settings-configure", QIcon::fromTheme(QLatin1String("preferences-desktop"))), + QLineEdit::TrailingPosition); - // Add or edit the current domain settings. + // Set the bookmarked action pointer to be checkable. + bookmarkedActionPointer->setCheckable(true); + + // Connect the URL line edit actions. + connect(bookmarkedActionPointer, SIGNAL(triggered()), this, SLOT(toggleBookmark())); connect(addOrEditDomainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(addOrEditDomainSettings())); // Create a find text label pointer. findTextLabelPointer = new QLabel(); // Set the default label text. - findTextLabelPointer->setText(QStringLiteral(" ") + i18nc("Default find results.", "0/0") + QStringLiteral(" ")); + findTextLabelPointer->setText(QLatin1String(" ") + i18nc("Default find results.", "0/0") + QLatin1String(" ")); // Insert the widgets into the toolbars. urlToolBarPointer->insertWidget(javaScriptActionPointer, urlLineEditPointer); - urlToolBarPointer->insertWidget(findNextActionPointer, findTextLineEditPointer); - urlToolBarPointer->insertWidget(findNextActionPointer, findTextLabelPointer); + findTextLineEditActionPointer = urlToolBarPointer->insertWidget(findNextActionPointer, findTextLineEditPointer); + findTextLabelActionPointer = urlToolBarPointer->insertWidget(findNextActionPointer, findTextLabelPointer); + + // Initially hide the find text actions. + hideFindTextActions(); // Load a new URL from the URL line edit. connect(urlLineEditPointer, SIGNAL(returnKeyPressed(const QString)), this, SLOT(loadUrlFromLineEdit(const QString))); @@ -310,18 +475,41 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() // Get a handle for the status bar. QStatusBar *statusBarPointer = statusBar(); - // Create a progress bar. + // Create the status bar widgets. progressBarPointer = new QProgressBar(); + zoomMinusButtonPointer = new QPushButton(); + currentZoomButtonPointer = new QPushButton(); + zoomPlusButtonPointer = new QPushButton(); + + // Set the button icons. + zoomMinusButtonPointer->setIcon(QIcon::fromTheme(QStringLiteral("list-remove-symbolic"))); + zoomPlusButtonPointer->setIcon(QIcon::fromTheme(QStringLiteral("list-add-symbolic"))); + + // Set the button icons to be flat (no borders). + zoomMinusButtonPointer->setFlat(true); + currentZoomButtonPointer->setFlat(true); + zoomPlusButtonPointer->setFlat(true); + + // Handle clicks on the zoom buttons. + connect(zoomMinusButtonPointer, SIGNAL(clicked()), this, SLOT(decrementZoom())); + connect(currentZoomButtonPointer, SIGNAL(clicked()), this, SLOT(getZoomFactorFromUser())); + connect(zoomPlusButtonPointer, SIGNAL(clicked()), this, SLOT(incrementZoom())); + + // Remove the padding around the current zoom button text. + currentZoomButtonPointer->setStyleSheet("padding: 0px;"); - // Add the progress bar to to the status bar. + // Add the widgets to the far right of the status bar. statusBarPointer->addPermanentWidget(progressBarPointer); + statusBarPointer->addPermanentWidget(zoomMinusButtonPointer); + statusBarPointer->addPermanentWidget(currentZoomButtonPointer); + statusBarPointer->addPermanentWidget(zoomPlusButtonPointer); // Update the status bar with the URL when a link is hovered. connect(tabWidgetPointer, SIGNAL(linkHovered(QString)), statusBarPointer, SLOT(showMessage(QString))); // Update the progress bar. connect(tabWidgetPointer, SIGNAL(showProgressBar(const int)), this, SLOT(showProgressBar(const int))); - connect(tabWidgetPointer, SIGNAL(hideProgressBar()), progressBarPointer, SLOT(hide())); + connect(tabWidgetPointer, SIGNAL(hideProgressBar()), this, SLOT(hideProgressBar())); // Update the URL line edit focus. connect(tabWidgetPointer, SIGNAL(clearUrlLineEditFocus()), this, SLOT(clearUrlLineEditFocus())); @@ -342,54 +530,300 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow() 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 the keyboard shortcuts. connect(f11ShortcutPointer, SIGNAL(activated()), fullScreenActionPointer, SLOT(trigger())); connect(escapeShortcutPointer, SIGNAL(activated()), this, SLOT(escape())); - // Load the initial website if this is the first window. - if (firstWindow) + // Get a handle for the Bookmarks menu. + bookmarksMenuPointer = qobject_cast(guiFactory()->container("bookmarks", this)); + + // Add a separator to the bookmarks menu. + bookmarksMenuPointer->addSeparator(); + + // Initialize the bookmark action lists. + bookmarkFolderFinalActionList = QList *>(); + bookmarksMenuActionList = QList *>(); + bookmarksMenuSubmenuList = QList *>(); + bookmarksToolBarActionList = QList(); + bookmarksToolBarSubfolderActionList = QList *>(); + + // Set the bookmarks toolbar context menu policy. + bookmarksToolBarPointer->setContextMenuPolicy(Qt::CustomContextMenu); + + // Show the custom bookmark context menu when requested. + connect(bookmarksToolBarPointer, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showBookmarkContextMenu(const QPoint&))); + + // Populate the bookmarks in this window. + populateBookmarksInThisWindow(); + + // 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); + updateZoomActions(Settings::zoomFactor()); + + // Populate the first tab. + if (firstWindow) // This is the first window. + { + // Load the initial website. tabWidgetPointer->loadInitialWebsite(); + } + else if (initialUrlStringPointer) // An initial URL was specified. + { + // Load the initial URL. + tabWidgetPointer->loadUrlFromLineEdit(*initialUrlStringPointer); + } +} + +// If actions are part of a context menu they do not need to be added to the list as they will be deleted automatically when the context menu closes. +void BrowserWindow::addBookmarkFolderFinalActions(QMenu *menuPointer, const double folderId, const bool addToList) +{ + // Get the database ID. + int folderDatabaseId = BookmarksDatabase::getFolderDatabaseId(folderId); + + // Add a separator. + menuPointer->addSeparator(); + + // Add the add bookmark action to the menu. + QAction *addBookmarkActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("bookmark-new")), i18nc("The add bookmark action", "Add Bookmark"), [=] + { + // Instantiate an add bookmark dialog. + AddBookmarkDialog *addBookmarkDialogPointer = new AddBookmarkDialog(this, tabWidgetPointer->getCurrentTabTitle(), tabWidgetPointer->getCurrentTabUrl(), + tabWidgetPointer->getCurrentTabFavoritIcon(), folderId); + + // Update the displayed bookmarks when a new one is added. + connect(addBookmarkDialogPointer, SIGNAL(bookmarkAdded()), this, SLOT(populateBookmarksInAllWindows())); + + // Show the dialog. + addBookmarkDialogPointer->show(); + } + ); + + // Add the add folder action to the menu. + QAction *addFolderActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("folder-add")), i18nc("The add folder action", "Add Folder"), [=] + { + // Instantiate an add folder dialog. + AddFolderDialog *addFolderDialogPointer = new AddFolderDialog(this, tabWidgetPointer->getCurrentTabFavoritIcon(), folderId); + + // Update the displayed bookmarks when a folder is added. + connect(addFolderDialogPointer, SIGNAL(folderAdded()), this, SLOT(populateBookmarksInAllWindows())); + + // Show the dialog. + addFolderDialogPointer->show(); + } + ); + + // Add a separator. + menuPointer->addSeparator(); + + // Add the open folder in new tabs action to the menu. + QAction *openFolderInNewTabsActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("tab-new")), i18nc("The open folder in new tabs action", "Open Folder in New Tabs"), [=] + { + // Get all the folder URLs. + QList *folderUrlsListPointer = BookmarksDatabase::getAllFolderUrls(folderId); + + // Open the URLs in new tabs. `true` removes the URL line edit focus, `true` opens the new tabs in an adjacent tab. `false` does not load a background tab. + for (QString url : *folderUrlsListPointer) + tabWidgetPointer->addTab(true, true, false, url); + } + ); + + // Add the open folder in background tabs action to the menu. + QAction *openFolderInBackgroundTabsActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("tab-new")), + i18nc("The open folder in background tabs action", "Open Folder in Background Tabs"), [=] + { + // Get all the folder URLs. + QList *folderUrlsListPointer = BookmarksDatabase::getAllFolderUrls(folderId); + + // Open the URLs in new tabs. `true` removes the URL line edit focus, `true` opens the new tabs in an adjacent tab. `true` loads a background tab. + for (QString url : *folderUrlsListPointer) + tabWidgetPointer->addTab(true, true, true, url); + } + ); + + // Add the open folder in new window action to the menu. + QAction *openFolderInNewWindowActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("window-new")), i18nc("The open folder in new window action", "Open Folder in New Window"), [=] + { + // Get all the folder URLs. + QList *folderUrlsListPointer = BookmarksDatabase::getAllFolderUrls(folderId); + + // Create a new browser window. + BrowserWindow *browserWindowPointer = new BrowserWindow(false, &folderUrlsListPointer->first()); + + // Get a count of the folder URLs. + const int folderUrls = folderUrlsListPointer->count(); + + // Load all the other URLs. `true` removes the URL line edit focus, `false` does not load the new tabs in adjacent tabs. `true` loads a background tab. + for (int i = 1; i < folderUrls; ++i) + browserWindowPointer->tabWidgetPointer->addTab(true, false, true, folderUrlsListPointer->value(i)); + + // Show the new browser window. + browserWindowPointer->show(); + } + ); + + // Add a separator. + menuPointer->addSeparator(); + + // Add the edit folder action to the menu if this is not the root bookmark menu. + if (folderId != 0) + { + QAction *editFolderActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("document-edit")), i18nc("The edit folder action", "Edit Folder"), [=] + { + // Get the current tab favorite icon. + QIcon currentTabFavoriteIcon = tabWidgetPointer->getCurrentTabFavoritIcon(); + + // Instantiate an edit folder dialog. + QDialog *editFolderDialogPointer = new EditFolderDialog(this, folderDatabaseId, currentTabFavoriteIcon); + + // Show the dialog. + editFolderDialogPointer->show(); + + // Process bookmark events. + connect(editFolderDialogPointer, SIGNAL(folderSaved()), this, SLOT(populateBookmarksInAllWindows())); + } + ); + + // Add the action to the beginning of the bookmark folder final action list if requsted. + if (addToList) + bookmarkFolderFinalActionList.prepend(new QPair(menuPointer, editFolderActionPointer)); + } + + // Add the delete folder action to the menu. + QAction *deleteFolderActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("edit-delete")), i18nc("Delete folder context menu entry", "Delete Folder"), [=] + { + // Create an items to delete list. + QList* itemsToDeleteListPointer = new QList; + + // Add the folder to the list of items to delete if it is not the root folder. + if (folderId != 0) + itemsToDeleteListPointer->append(folderDatabaseId); + + // Add the folder contents to the list of items to delete. + itemsToDeleteListPointer->append(*BookmarksDatabase::getFolderContentsDatabaseIdsRecursively(folderId)); + + // Instantiate a delete dialog message box. + QMessageBox deleteDialogMessageBox; + + // Set the icon. + deleteDialogMessageBox.setIcon(QMessageBox::Warning); + + // Set the window title. + deleteDialogMessageBox.setWindowTitle(i18nc("Delete bookmarks dialog title", "Delete Bookmarks")); + + // Set the text. + deleteDialogMessageBox.setText(i18ncp("Delete bookmarks dialog main message", "Delete %1 bookmark item?", "Delete %1 bookmark items?", itemsToDeleteListPointer->count())); + + // Set the informative text. + deleteDialogMessageBox.setInformativeText(i18nc("Delete bookmarks dialog secondary message", "This cannot be undone.")); + + // Set the standard buttons. + deleteDialogMessageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); + + // Set the default button. + deleteDialogMessageBox.setDefaultButton(QMessageBox::No); + + // Display the dialog and capture the return value. + int returnValue = deleteDialogMessageBox.exec(); + + // Delete the domain if instructed. + if (returnValue == QMessageBox::Yes) + { + // Get the parent folder ID. + double parentFolderId = BookmarksDatabase::getParentFolderId(folderDatabaseId); + + // Delete the folder and its contents. + for (const int databaseId : *itemsToDeleteListPointer) + BookmarksDatabase::deleteBookmark(databaseId); + + // Update the display order of the bookmarks in the parent folder. + BookmarksDatabase::updateFolderContentsDisplayOrder(parentFolderId); + + // Repopulate the bookmarks. + populateBookmarksInAllWindows(); + } + } + ); + + // Add the key sequences if this is the root bookmarks menu. + if (folderId == 0) + { + // Create the key sequences. + QKeySequence ctrlBKeySequence = QKeySequence(i18nc("The add bookmark key sequence.", "Ctrl+B")); + QKeySequence metaFKeySequence = QKeySequence(i18nc("The add folder key sequence.", "Meta+F")); + + // Set the action key sequences. + actionCollectionPointer->setDefaultShortcut(addBookmarkActionPointer, ctrlBKeySequence); + actionCollectionPointer->setDefaultShortcut(addFolderActionPointer, metaFKeySequence); + } + + // Add the actions to the beginning of the bookmark folder final action list if requested. + if (addToList) { + bookmarkFolderFinalActionList.prepend(new QPair(menuPointer, addBookmarkActionPointer)); + bookmarkFolderFinalActionList.prepend(new QPair(menuPointer, addFolderActionPointer)); + bookmarkFolderFinalActionList.prepend(new QPair(menuPointer, openFolderInNewTabsActionPointer)); + bookmarkFolderFinalActionList.prepend(new QPair(menuPointer, openFolderInBackgroundTabsActionPointer)); + bookmarkFolderFinalActionList.prepend(new QPair(menuPointer, openFolderInNewWindowActionPointer)); + bookmarkFolderFinalActionList.prepend(new QPair(menuPointer, deleteFolderActionPointer)); + } } -void BrowserWindow::addOrEditDomainSettings() const +void BrowserWindow::addOrEditDomainSettings() { // Remove the focus from the URL line edit. urlLineEditPointer->clearFocus(); - // 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 (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()); - } - else // Domain settings are currently applied. - { - // Instruct the domain settings dialog to edit the current domain. - domainSettingsDialogPointer = new DomainSettingsDialog(DomainSettingsDialog::EDIT_DOMAIN, currentDomainSettingsName); - } + // Get the current settings status. + int javaScriptInt = calculateSettingsInt(javaScriptEnabled, Settings::javaScriptEnabled()); + int localStorageInt = calculateSettingsInt(localStorageActionPointer->isChecked(), Settings::localStorageEnabled()); + int domStorageInt = calculateSettingsInt(domStorageActionPointer->isChecked(), Settings::domStorageEnabled()); - // Set the dialog window title. - domainSettingsDialogPointer->setWindowTitle(i18nc("The domain settings dialog title", "Domain Settings")); + // Get the current user agent string. + QString currentUserAgentString = tabWidgetPointer->getCurrentUserAgent(); - // Set the modality. - domainSettingsDialogPointer->setWindowModality(Qt::WindowModality::WindowModal);; + // Get the current user agent database string. + QString currentUserAgentDatabaseString = UserAgentHelper::getDatabaseUserAgentNameFromUserAgent(currentUserAgentString); - // Show the dialog. - domainSettingsDialogPointer->show(); + // Initialize the user agent database string. + QString userAgentDatabaseString = UserAgentHelper::SYSTEM_DEFAULT_DATABASE; + + // Replace the user agent database string if the current user agent is not the default. + if (currentUserAgentDatabaseString != Settings::userAgent()) + userAgentDatabaseString = currentUserAgentDatabaseString; + + // Initialize the zoom factor variables. + int zoomFactorInt = DomainsDatabase::SYSTEM_DEFAULT; + + // Use a custom zoom factor if currently applied. Doubles cannot be reliably compared using `==`, so a mathematical workaround is used. + if (abs(currentZoomFactorDouble - defaultZoomFactorDouble ) > 0.01) + zoomFactorInt = DomainsDatabase::CUSTOM; + + // Add the domain. + DomainsDatabase::addDomain(currentUrl.host(), javaScriptInt, localStorageInt, domStorageInt, userAgentDatabaseString, zoomFactorInt, currentZoomFactorDouble); + + // Apply the domain settings. + tabWidgetPointer->applyDomainSettingsAndReload(); + } + + // Create the domain settings dialog pointer. + DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog(this, DomainSettingsDialog::EDIT_DOMAIN, currentDomainSettingsName); // Reload the tabs when domain settings are updated. connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), tabWidgetPointer, SLOT(applyDomainSettingsAndReload())); + + // Show the dialog. + domainSettingsDialogPointer->show(); } void BrowserWindow::back() const @@ -401,34 +835,72 @@ void BrowserWindow::back() const tabWidgetPointer->back(); } +int BrowserWindow::calculateSettingsInt(const bool settingCurrentlyEnabled, const bool settingEnabledByDefault) const +{ + // Return the int that matches the current state. + if (settingCurrentlyEnabled == settingEnabledByDefault) // The current system default is used. + return DomainsDatabase::SYSTEM_DEFAULT; + else if (settingCurrentlyEnabled) // The setting is enabled, which is different from the system default. + return DomainsDatabase::ENABLED; + else // The setting is disabled, which is different from the system default. + return DomainsDatabase::DISABLED; +} + void BrowserWindow::clearUrlLineEditFocus() const { // Remove the focus from the URL line edit. urlLineEditPointer->clearFocus(); } +void BrowserWindow::decrementZoom() +{ + // Update the current zoom factor. + currentZoomFactorDouble = currentZoomFactorDouble - 0.25; + + // Check to make sure the zoom factor is in the valid range (0.25 to 5.00). + if (currentZoomFactorDouble < 0.25) + currentZoomFactorDouble = 0.25; + + // Set the new zoom factor. + tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactorDouble); + + // Update the on-the-fly action text. + updateZoomActions(currentZoomFactorDouble); +} + +void BrowserWindow::editBookmarks() +{ + // Instantiate an edit bookmarks dialog. + BookmarksDialog *bookmarksDialogPointer = new BookmarksDialog(this, tabWidgetPointer->getCurrentTabFavoritIcon(), tabWidgetPointer->getCurrentTabTitle(), tabWidgetPointer->getCurrentTabUrl()); + + // Update the displayed bookmarks when edited. + connect(bookmarksDialogPointer, SIGNAL(bookmarkUpdated()), this, SLOT(populateBookmarksInAllWindows())); + + // Show the dialog. + bookmarksDialogPointer->show(); +} + void BrowserWindow::escape() const { - // Process the excape according to the status of the browser. + // Process the escape 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. + else if (!findTextLineEditPointer->text().isEmpty()) // Find text is populated. { - // Clear the text in the line edit. + // Clear the find text 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(); + else if (findTextLineEditActionPointer->isVisible()) // Find text actions are visible. + { + // Hide the find text actions. + hideFindTextActions(); + } } void BrowserWindow::findNext() const @@ -451,15 +923,6 @@ void BrowserWindow::findPrevious() const 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. @@ -474,26 +937,49 @@ void BrowserWindow::fullScreenRequested(const bool toggleOn) // Toggle full screen mode. if (toggleOn) // Turn full screen mode on. { - // Set the window to be full screen. + // Enable full screen mode. fullScreenActionPointer->setFullScreen(window(), true); - // Hide all the bars. - menuBar()->setVisible(false); - navigationToolBarPointer->setVisible(false); - urlToolBarPointer->setVisible(false); - tabWidgetPointer->setTabBarVisible(false); - statusBar()->setVisible(false); + // 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); + bookmarksToolBarPointer->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 // Turn full screen mode off. + else // Disable full screen browsing mode. { - // Set the window to not be full screen. + // Disable full screen mode. fullScreenActionPointer->setFullScreen(window(), false); - // Show all the bars. + // Show the menu bar. menuBar()->setVisible(true); + + // Show the toolbars. navigationToolBarPointer->setVisible(true); urlToolBarPointer->setVisible(true); + + // Only show the bookmarks toolbar if it was previously visible. + if (bookmarksToolBarIsVisible) + bookmarksToolBarPointer->setVisible(true); + + // Show the tab bar. tabWidgetPointer->setTabBarVisible(true); + + // Show the status bar. statusBar()->setVisible(true); } } @@ -504,24 +990,32 @@ void BrowserWindow::getZoomFactorFromUser() bool okClicked; // Display a dialog to get the new zoom factor from the user. Format the double to display two decimals and have a 0.25 step. - double newZoomFactor = QInputDialog::getDouble(this, i18nc("The on-the-fly zoom factor dialog title", "On-The-Fly Zoom Factor"), + double newZoomFactorDouble = QInputDialog::getDouble(this, i18nc("The on-the-fly zoom factor dialog title", "On-The-Fly Zoom Factor"), i18nc("The instruction text of the on-the-fly zoom factor dialog", "Enter a zoom factor between 0.25 and 5.00"), - currentZoomFactor, .025, 5.00, 2, &okClicked, Qt::WindowFlags(), 0.25); + currentZoomFactorDouble, .025, 5.00, 2, &okClicked, Qt::WindowFlags(), 0.25); // Update the zoom factor if the user clicked OK. if (okClicked) { - // Update the current zoom factor. - currentZoomFactor = newZoomFactor; - // Set the new zoom factor. - tabWidgetPointer->applyOnTheFlyZoomFactor(newZoomFactor); + tabWidgetPointer->applyOnTheFlyZoomFactor(newZoomFactorDouble); // Update the on-the-fly action text. - updateZoomFactorAction(newZoomFactor); + updateZoomActions(newZoomFactorDouble); } } +void BrowserWindow::hideFindTextActions() const +{ + // Hide the find text actions. + findTextLineEditActionPointer->setVisible(false); + findTextLabelActionPointer->setVisible(false); + findNextActionPointer->setVisible(false); + findPreviousActionPointer->setVisible(false); + findCaseSensitiveActionPointer->setVisible(false); + hideFindTextActionPointer->setVisible(false); +} + void BrowserWindow::home() const { // Remove the focus from the URL line edit. @@ -531,6 +1025,36 @@ void BrowserWindow::home() const tabWidgetPointer->home(); } +void BrowserWindow::hideProgressBar() const +{ + // Hide the progress bar. + progressBarPointer->hide(); + + // Disable and hide the stop action. + stopActionPointer->setEnabled(false); + stopActionPointer->setVisible(false); + + // Enable and show the refresh action. + refreshActionPointer->setEnabled(true); + refreshActionPointer->setVisible(true); +} + +void BrowserWindow::incrementZoom() +{ + // Update the current zoom factor. + currentZoomFactorDouble = currentZoomFactorDouble + 0.25; + + // Check to make sure the zoom factor is in the valid range (0.25 to 5.00). + if (currentZoomFactorDouble > 5.0) + currentZoomFactorDouble = 5.0; + + // Set the new zoom factor. + tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactorDouble); + + // Update the on-the-fly action text. + updateZoomActions(currentZoomFactorDouble); +} + void BrowserWindow::loadUrlFromLineEdit(const QString &url) const { // Remove the focus from the URL line edit. @@ -540,6 +1064,258 @@ void BrowserWindow::loadUrlFromLineEdit(const QString &url) const tabWidgetPointer->loadUrlFromLineEdit(url); } +void BrowserWindow::newWindow() const +{ + // Create a new browser window. + BrowserWindow *browserWindowPointer = new BrowserWindow(); + + // Show the new browser window. + browserWindowPointer->show(); +} + +void BrowserWindow::populateBookmarksInAllWindows() const +{ + // Get a list of all the registered service names. + QStringList registeredServiceNames = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); + + // Get a list of all the Privacy Browser windows, which will be `com.stoutner.privacybrowser-` with the PID appended. + QStringList privacyBrowserServiceNames = registeredServiceNames.filter("com.stoutner.privacybrowser"); + + // Repopulate the bookmarks in each window. + for (QString privacyBrowserServiceName : privacyBrowserServiceNames) + { + // Prepare the D-Bus message. + QDBusMessage dBusMessage = QDBusMessage::createMethodCall(privacyBrowserServiceName, "/privacybrowser/MainWindow_1", "com.stoutner.privacybrowser.BrowserWindow", "populateBookmarksInThisWindow"); + + // Make it so. + QDBusConnection::sessionBus().send(dBusMessage); + } +} + +void BrowserWindow::populateBookmarksInThisWindow() +{ + // Remove all the final bookmark folder menu actions. + for (QPair *bookmarkFolderFinalActionPairPointer : bookmarkFolderFinalActionList) + { + // Remove the action. + bookmarkFolderFinalActionPairPointer->first->removeAction(bookmarkFolderFinalActionPairPointer->second); + } + + // Remove all the current menu bookmarks. + for (QPair *bookmarkMenuActionPairPointer : bookmarksMenuActionList) + { + // Remove the bookmark. + bookmarkMenuActionPairPointer->first->removeAction(bookmarkMenuActionPairPointer->second); + } + + // Remove all the current menu subfolders. + for (QPair *submenuPairPointer : bookmarksMenuSubmenuList) + { + // Remove the submenu from the parent menu. + submenuPairPointer->first->removeAction(submenuPairPointer->second->menuAction()); + } + + // Remove all the current toolbar subfolders. + for (QPair *subfolderActionPairPointer : bookmarksToolBarSubfolderActionList) + { + // Remove the action from the subfolder. + subfolderActionPairPointer->first->removeAction(subfolderActionPairPointer->second); + } + + // Remove all the current toolbar bookmarks. + for (QAction *bookmarkAction : bookmarksToolBarActionList) + { + // Remove the bookmark. + bookmarksToolBarPointer->removeAction(bookmarkAction); + } + + // Clear the action lists. + bookmarkFolderFinalActionList.clear(); + bookmarksMenuActionList.clear(); + bookmarksMenuSubmenuList.clear(); + bookmarksToolBarSubfolderActionList.clear(); + bookmarksToolBarActionList.clear(); + + // Populate the bookmarks subfolders, beginning with the root folder (`0`); + populateBookmarksMenuSubfolders(0, bookmarksMenuPointer); + + // Populate the bookmarks toolbar. + populateBookmarksToolBar(); + + // Get a handle for the bookmark toolbar layout. + QLayout *bookmarksToolBarLayoutPointer = bookmarksToolBarPointer->layout(); + + // Get the count of the bookmarks. + int bookmarkCount = bookmarksToolBarLayoutPointer->count(); + + // Set the layout of each bookmark to be left aligned. + for(int i = 0; i < bookmarkCount; ++i) + bookmarksToolBarLayoutPointer->itemAt(i)->setAlignment(Qt::AlignLeft); + + // Update the bookmarked action. + updateBookmarkedAction(); +} + +void BrowserWindow::populateBookmarksMenuSubfolders(const double folderId, QMenu *menuPointer) +{ + // Get the folder contents. + QList *folderContentsListPointer = BookmarksDatabase::getFolderContents(folderId); + + // Populate the bookmarks menu and toolbar. + for (BookmarkStruct bookmarkStruct : *folderContentsListPointer) + { + // Process the item according to the type. + if (bookmarkStruct.isFolder) // This item is a folder. + { + // Add a submenu to the menu. + QMenu *submenuPointer = menuPointer->addMenu(bookmarkStruct.favoriteIcon, bookmarkStruct.name); + + // Add the submenu to the beginning of the list of menus to be deleted on repopulate. + bookmarksMenuSubmenuList.prepend(new QPair(menuPointer, submenuPointer)); + + // Populate any subfolders. + populateBookmarksMenuSubfolders(bookmarkStruct.folderId, submenuPointer); + } + else // This item is a bookmark. + { + // Add the bookmark to the menu. + QAction *menuBookmarkActionPointer = menuPointer->addAction(bookmarkStruct.favoriteIcon, bookmarkStruct.name, [=] + { + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Load the URL. + tabWidgetPointer->loadUrlFromLineEdit(bookmarkStruct.url); + } + ); + + // Add the actions to the beginning of the list of bookmarks to be deleted on repopulate. + bookmarksMenuActionList.prepend(new QPair(menuPointer, menuBookmarkActionPointer)); + } + } + + // Add the extra items at the bottom of the menu. `true` adds them to the list of actions to be deleted on repopulate. + addBookmarkFolderFinalActions(menuPointer, folderId, true); +} + +void BrowserWindow::populateBookmarksToolBar() +{ + // Get the root folder contents (which has a folder ID of `0`). + QList *folderContentsListPointer = BookmarksDatabase::getFolderContents(0); + + // Populate the bookmarks toolbar. + for (BookmarkStruct bookmarkStruct : *folderContentsListPointer) + { + // Process the item according to the type. + if (bookmarkStruct.isFolder) // This item is a folder. + { + // Add the subfolder action. + QAction *toolBarSubfolderActionPointer = bookmarksToolBarPointer->addAction(bookmarkStruct.favoriteIcon, bookmarkStruct.name); + + // Add the bookmark database ID to the toolbar action. + toolBarSubfolderActionPointer->setData(bookmarkStruct.databaseId); + + // Add the action to the beginning of the list of actions to be deleted on repopulate. + bookmarksToolBarActionList.prepend(toolBarSubfolderActionPointer); + + // Create a subfolder menu. + QMenu *subfolderMenuPointer = new QMenu(); + + // Add the menu to the action. + toolBarSubfolderActionPointer->setMenu(subfolderMenuPointer); + + // Add the submenu to the toolbar menu list. + bookmarksToolBarMenuList.append(new QPair(subfolderMenuPointer, bookmarkStruct.folderId)); + + // Set the popup mode for the menu. + dynamic_cast(bookmarksToolBarPointer->widgetForAction(toolBarSubfolderActionPointer))->setPopupMode(QToolButton::InstantPopup); + + // Populate the subfolder. + populateBookmarksToolBarSubfolders(bookmarkStruct.folderId, subfolderMenuPointer); + } + else // This item is a bookmark. + { + // Add the bookmark to the toolbar. + QAction *toolBarBookmarkActionPointer = bookmarksToolBarPointer->addAction(bookmarkStruct.favoriteIcon, bookmarkStruct.name, [=] + { + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Load the URL. + tabWidgetPointer->loadUrlFromLineEdit(bookmarkStruct.url); + } + ); + + // Add the bookmark database ID to the toolbar action. + toolBarBookmarkActionPointer->setData(bookmarkStruct.databaseId); + + // Add the actions to the beginning of the current bookmarks lists. + bookmarksToolBarActionList.prepend(toolBarBookmarkActionPointer); + } + } + + // Add the extra items to the toolbar folder menus. The first item in the pair is the menu pointer. The second is the folder ID. + for (QPair *menuAndFolderIdPairPointer : bookmarksToolBarMenuList) + { + // Populate the final bookmarks menu entries. `true` adds them to the list of actions to be deleted on repopulate. + addBookmarkFolderFinalActions(menuAndFolderIdPairPointer->first, menuAndFolderIdPairPointer->second, true); + } +} + +void BrowserWindow::populateBookmarksToolBarSubfolders(const double folderId, QMenu *menuPointer) +{ + // Get the folder contents. + QList *folderContentsListPointer = BookmarksDatabase::getFolderContents(folderId); + + // Populate the bookmarks folder. + for (BookmarkStruct bookmarkStruct : *folderContentsListPointer) + { + // Get the bookmark URL. + QString bookmarkUrl = bookmarkStruct.url; + + // Process the item according to the type. + if (bookmarkStruct.isFolder) // This item is a folder. + { + // Add the subfolder action. + QAction *toolBarSubfolderActionPointer = menuPointer->addAction(bookmarkStruct.favoriteIcon, bookmarkStruct.name); + + // Add the action to the beginning of the list of actions to be deleted on repopulate. + bookmarksToolBarSubfolderActionList.prepend(new QPair(menuPointer, toolBarSubfolderActionPointer)); + + // Create a subfolder menu. + QMenu *subfolderMenuPointer = new QMenu(); + + // Add the submenu to the action. + toolBarSubfolderActionPointer->setMenu(subfolderMenuPointer); + + // Add the submenu to the toolbar menu list. + bookmarksToolBarMenuList.append(new QPair(subfolderMenuPointer, bookmarkStruct.folderId)); + + // Populate the subfolder menu. + populateBookmarksToolBarSubfolders(bookmarkStruct.folderId, subfolderMenuPointer); + } + else // This item is a bookmark. + { + // Add the bookmark to the folder. + QAction *toolBarBookmarkActionPointer = menuPointer->addAction(bookmarkStruct.favoriteIcon, bookmarkStruct.name, [=] + { + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Load the URL. + tabWidgetPointer->loadUrlFromLineEdit(bookmarkUrl); + } + ); + + // Add the bookmark database ID to the toolbar action. + toolBarBookmarkActionPointer->setData(bookmarkStruct.databaseId); + + // Add the action to the beginning of the list of actions to be deleted on repopulate. + bookmarksToolBarSubfolderActionList.prepend(new QPair(menuPointer, toolBarBookmarkActionPointer)); + } + } +} + void BrowserWindow::refresh() const { // Remove the focus from the URL line edit. @@ -549,6 +1325,150 @@ void BrowserWindow::refresh() const tabWidgetPointer->refresh(); } +void BrowserWindow::reloadAndBypassCache() const +{ + // Remove the focus from the URL line edit. + urlLineEditPointer->clearFocus(); + + // Refresh the web page. + tabWidgetPointer->refresh(); +} + +void BrowserWindow::showBookmarkContextMenu(const QPoint &point) +{ + // Get the bookmark action. + QAction *bookmarkActionPointer = bookmarksToolBarPointer->actionAt(point); + + // Check to see if an action was clicked. + if (bookmarkActionPointer) // An action was clicked. + { + // Create a bookmark context menu. + QMenu *bookmarkContextMenuPointer = new QMenu(); + + // Get the database ID from the action. + int databaseId = bookmarkActionPointer->data().toInt(); + + // Create the menu according to the type. + if (BookmarksDatabase::isFolder(databaseId)) // A folder was clicked. + { + // Populate the final bookmarks menu entries. `false` does not add the actions to the delete list, as they will be automatically deleted when the menu closes. + addBookmarkFolderFinalActions(bookmarkContextMenuPointer, BookmarksDatabase::getFolderId(databaseId), false); + } + else // A bookmark was clicked. + { + // Add the open in new tab action to the menu. + bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("tab-new")), i18nc("Open bookmark in new tab context menu entry", "Open in New Tab"), [=] + { + // Get the bookmark. + BookmarkStruct *bookmarkStructPointer = BookmarksDatabase::getBookmark(databaseId); + + // Open the bookmark in a new tab. `true` removes the URL line edit focus, `true` opens the new tab in an adjacent tab. `false` does not load a background tab. + tabWidgetPointer->addTab(true, true, false, bookmarkStructPointer->url); + } + ); + + // Add the open in background tab action to the menu. + bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("tab-new")), i18nc("Open bookmark in background tab context menu entry", "Open in Background Tab"), [=] + { + // Get the bookmark. + BookmarkStruct *bookmarkStructPointer = BookmarksDatabase::getBookmark(databaseId); + + // Open the bookmark in a new tab. `true` removes the URL line edit focus, `true` opens the new tab in an adjacent tab. `true` loads a background tab. + tabWidgetPointer->addTab(true, true, true, bookmarkStructPointer->url); + } + ); + + // Add the open in new window action to the menu. + bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("window-new")), i18nc("Open bookmark in new window context menu entry", "Open in New Window"), [=] + { + // Get the bookmark. + BookmarkStruct *bookmarkStructPointer = BookmarksDatabase::getBookmark(databaseId); + + // Create a new browser window and load the first URL. `false` indicates it is not the first browser window. + BrowserWindow *browserWindowPointer = new BrowserWindow(false, &bookmarkStructPointer->url); + + // Show the new browser window. + browserWindowPointer->show(); + } + ); + + // Add a separator. + bookmarkContextMenuPointer->addSeparator(); + + // Add the edit action to the menu. + bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("document-edit")), i18nc("Edit bookmark context menu entry", "Edit"), [=] + { + // Get the current tab favorite icon. + QIcon currentTabFavoriteIcon = tabWidgetPointer->getCurrentTabFavoritIcon(); + + // Instantiate an edit bookmark dialog. + QDialog *editBookmarkDialogPointer = new EditBookmarkDialog(this, databaseId, currentTabFavoriteIcon); + + // Show the dialog. + editBookmarkDialogPointer->show(); + + // Process bookmark events. + connect(editBookmarkDialogPointer, SIGNAL(bookmarkSaved()), this, SLOT(populateBookmarksInAllWindows())); + } + ); + + // Add the copy URL action to the menu. + bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("edit-copy")), i18nc("Copy bookmark URL context menu entry", "Copy URL"), [=] + { + // Get the bookmark. + BookmarkStruct *bookmarkStructPointer = BookmarksDatabase::getBookmark(databaseId); + + // Get a handle for the clipboard. + QClipboard *clipboard = QGuiApplication::clipboard(); + + // Place the URL on the keyboard. + clipboard->setText(bookmarkStructPointer->url); + } + ); + + // Add a separator. + bookmarkContextMenuPointer->addSeparator(); + + // Add the delete action to the menu. + bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("edit-delete")), i18nc("Delete bookmark context menu entry", "Delete"), [=] + { + // Get the parent folder ID. + double parentFolderId = BookmarksDatabase::getParentFolderId(databaseId); + + // Delete the bookmark. + BookmarksDatabase::deleteBookmark(databaseId); + + // Update the display order of the bookmarks in the parent folder. + BookmarksDatabase::updateFolderContentsDisplayOrder(parentFolderId); + + // Repopulate the bookmarks. + populateBookmarksInAllWindows(); + } + ); + } + + // Delete the menu from memory when it is closed. + bookmarkContextMenuPointer->setAttribute(Qt::WA_DeleteOnClose); + + // Display the context menu. + bookmarkContextMenuPointer->popup(bookmarksToolBarPointer->mapToGlobal(point)); + } + else // The toolbar background was clicked. + { + // Temporarily set the context menu policy to the default. + bookmarksToolBarPointer->setContextMenuPolicy(Qt::DefaultContextMenu); + + // Create a context menu event with the same position. + QContextMenuEvent *contextMenuEventPointer = new QContextMenuEvent(QContextMenuEvent::Mouse, point); + + // Send the context menu event to the toolbar. + QCoreApplication::sendEvent(bookmarksToolBarPointer, contextMenuEventPointer); + + // Reset the context menu policy. + bookmarksToolBarPointer->setContextMenuPolicy(Qt::CustomContextMenu); + } +} + void BrowserWindow::showCookiesDialog() { // Remove the focus from the URL line edit. @@ -566,44 +1486,36 @@ void BrowserWindow::showCookiesDialog() connect(cookiesDialogPointer, SIGNAL(deleteCookie(QNetworkCookie)), tabWidgetPointer, SLOT(deleteCookieFromStore(QNetworkCookie))); } -void BrowserWindow::showDownloadLocationBrowseDialog() const -{ - // Get the current download location. - QString currentDownloadLocation = downloadLocationComboBoxPointer->currentText(); - - // Resolve the system download directory if specified. - if (currentDownloadLocation == QStringLiteral("System Download Directory")) - currentDownloadLocation = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); - - // Get the new download location. - QString newDownloadLocation = QFileDialog::getExistingDirectory(configDialogPointer, i18nc("Select download location dialog caption", "Select Download Location"), currentDownloadLocation); - - // 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::showDomainSettingsDialog() const +void BrowserWindow::showDomainSettingsDialog() { // Remove the focus from the URL line edit. urlLineEditPointer->clearFocus(); // Instantiate the domain settings dialog. - DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog(); + DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog(this); + + // Reload the tabs when domain settings are updated. + connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), tabWidgetPointer, SLOT(applyDomainSettingsAndReload())); // Show the dialog. domainSettingsDialogPointer->show(); +} - // Reload the tabs when domain settings are updated. - connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), tabWidgetPointer, SLOT(applyDomainSettingsAndReload())); +void BrowserWindow::showFindTextActions() const +{ + // Show the find text actions. + findTextLineEditActionPointer->setVisible(true); + findTextLabelActionPointer->setVisible(true); + findNextActionPointer->setVisible(true); + findPreviousActionPointer->setVisible(true); + findCaseSensitiveActionPointer->setVisible(true); + hideFindTextActionPointer->setVisible(true); + + // Set the focus on the find line edit. + findTextLineEditPointer->setFocus(); + + // Select all the text in the find line edit. + findTextLineEditPointer->selectAll(); } void BrowserWindow::showProgressBar(const int &progress) const @@ -613,72 +1525,84 @@ void BrowserWindow::showProgressBar(const int &progress) const // Show the progress bar. progressBarPointer->show(); + + // Disable and hide the refresh action. + refreshActionPointer->setEnabled(false); + refreshActionPointer->setVisible(false); + + // Enable and show the stop action. + stopActionPointer->setEnabled(true); + stopActionPointer->setVisible(true); } void BrowserWindow::showSettingsDialog() { - // Create the settings widgets. - QWidget *privacySettingsWidgetPointer = new QWidget; - QWidget *generalSettingsWidgetPointer = new QWidget; + // Get a handle for the KConfig skeleton. + KConfigSkeleton *kConfigSkeletonPointer = Settings::self(); - // Instantiate the settings UI. - Ui::PrivacySettings privacySettingsUi; - Ui::GeneralSettings generalSettingsUi; + // Instantiate a settings dialog. + SettingsDialog *settingsDialogPointer = new SettingsDialog(this, kConfigSkeletonPointer); - // Setup the UI to display the settings widgets. - privacySettingsUi.setupUi(privacySettingsWidgetPointer); - generalSettingsUi.setupUi(generalSettingsWidgetPointer); + // Show the dialog + settingsDialogPointer->show(); - // 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; + // TODO. KConfigDialog does not respect expanding size policies. + //settingsDialogPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + //privacySettingsWidgetPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + //generalSettingsWidgetPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + //settingsDialogPointer->adjustSize(); - // Populate the combo box labels. - updateUserAgentLabel(userAgentComboBoxPointer->currentText()); - updateSearchEngineLabel(searchEngineComboBoxPointer->currentText()); + // Expand the config dialog. + settingsDialogPointer->resize(1000, 500); - // 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))); + // Apply the settings handled by KConfig. + connect(settingsDialogPointer, SIGNAL(spellCheckLanguagesUpdated()), tabWidgetPointer, SLOT(applySpellCheckLanguages())); + connect(settingsDialogPointer, SIGNAL(settingsChanged(QString)), tabWidgetPointer, SLOT(applyApplicationSettings())); + connect(settingsDialogPointer, SIGNAL(settingsChanged(QString)), tabWidgetPointer, SLOT(applyDomainSettingsAndReload())); +} - // Connect the download location directory browse button. - connect(browseButtonPointer, SIGNAL(clicked()), this, SLOT(showDownloadLocationBrowseDialog())); +QSize BrowserWindow::sizeHint() const +{ + // Return the default window size. + return QSize(1500, 1200); +} - // Instantiate a settings config dialog from the settings.kcfg file. - configDialogPointer = new KConfigDialog(this, QStringLiteral("settings"), Settings::self()); +void BrowserWindow::toggleBookmark() +{ + // Remove the focus from the URL line edit, which will have been focused when the user clicked on the bookmarked icon. + urlLineEditPointer->clearFocus(); - // 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")); + // Create or delete the bookmark + if (bookmarkedActionPointer->isChecked()) // The user checked the toggle. Create a bookmark. + { + // Create a bookmark struct. + BookmarkStruct *bookmarkStructPointer = new BookmarkStruct; - // Prevent interaction with the parent window while the dialog is open. - configDialogPointer->setWindowModality(Qt::WindowModal); + // Populate the bookmark struct. + bookmarkStructPointer->name = tabWidgetPointer->getCurrentTabTitle(); + bookmarkStructPointer->url = tabWidgetPointer->getCurrentTabUrl(); + bookmarkStructPointer->parentFolderId = 0; + bookmarkStructPointer->favoriteIcon = tabWidgetPointer->getCurrentTabFavoritIcon(); - // Make it so. - configDialogPointer->show(); + // Add the bookmark. + BookmarksDatabase::addBookmark(bookmarkStructPointer); + } + else // The user unchecked the toggle. Delete all related bookmarks. + { + // Delete the bookmarks. + BookmarksDatabase::deleteBookmarks(urlLineEditPointer->text()); - // 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())); + // Repopulate the bookmarks. + populateBookmarksInAllWindows(); } -QSize BrowserWindow::sizeHint() const +void BrowserWindow::toggleDeveloperTools() const { - // Return the default window size. - return QSize(1500, 1200); + // Toggle the developer tools. + tabWidgetPointer->toggleDeveloperTools(developerToolsActionPointer->isChecked()); } void BrowserWindow::toggleDomStorage() const @@ -720,48 +1644,67 @@ void BrowserWindow::toggleLocalStorage() const 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); - } + fullScreenRequested(fullScreenActionPointer->isChecked()); +} - // Hide the tab bar if specified. - if (Settings::fullScreenHideTabBar()) - tabWidgetPointer->setTabBarVisible(false); +void BrowserWindow::toggleViewSource() const +{ + // Get the current URL. + QString url = urlLineEditPointer->text(); - // Hide the status bar if specified. - if (Settings::fullScreenHideStatusBar()) - statusBar()->setVisible(false); + // Toggle the URL. + if (url.startsWith(QLatin1String("view-source:"))) // The source is currently being viewed. + { + // Remove `view-source:` from the URL. + url = url.remove(0, 12); } - else // Disable full screen browsing mode. + else // The source is not currently being viewed. { - // Disable full screen mode. - fullScreenActionPointer->setFullScreen(window(), false); + // Prepend `view-source:` from the URL. + url = url.prepend(QLatin1String("view-source:")); + } - // Show the menu bar. - menuBar()->setVisible(true); + // Make it so. + loadUrlFromLineEdit(url); +} - // Show the toolbars. - navigationToolBarPointer->setVisible(true); - urlToolBarPointer->setVisible(true); +void BrowserWindow::toggleViewBookmarksToolBar() +{ + // Store the current status of the bookmarks toolbar, which is used when exiting full screen browsing. + bookmarksToolBarIsVisible = viewBookmarksToolBarActionPointer->isChecked(); - // Show the tab bar. - tabWidgetPointer->setTabBarVisible(true); + // Update the visibility of the bookmarks toolbar. + bookmarksToolBarPointer->setVisible(bookmarksToolBarIsVisible); +} - // Show the status bar. - statusBar()->setVisible(true); +void BrowserWindow::toggleViewSourceInNewTab() const +{ + // Get the current URL. + QString url = urlLineEditPointer->text(); + + // Toggle the URL. + if (url.startsWith(QLatin1String("view-source:"))) // The source is currently being viewed. + { + // Remove `view-source:` from the URL. + url = url.remove(0, 12); + } + else // The source is not currently being viewed. + { + // Prepend `view-source:` from the URL. + url = url.prepend(QLatin1String("view-source:")); } + + // Add the new tab. `true` removes the URL line edit focus, `true` opens the new tab in an adjacent tab. `false` does not open a background tab. + tabWidgetPointer->addTab(true, true, false, url); +} + +void BrowserWindow::updateBookmarkedAction() const +{ + // Update the bookmarked action to reflect the current state. + if (bookmarkedActionPointer->isChecked()) + bookmarkedActionPointer->setIcon(QIcon::fromTheme("starred-symbolic")); + else + bookmarkedActionPointer->setIcon(QIcon::fromTheme("non-starred-symbolic")); } void BrowserWindow::updateCookiesAction(const int numberOfCookies) const @@ -770,6 +1713,12 @@ void BrowserWindow::updateCookiesAction(const int numberOfCookies) const cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", numberOfCookies)); } +void BrowserWindow::updateDefaultZoomFactor(const double newDefaultZoomFactorDouble) +{ + // Store the new default zoom factor. + defaultZoomFactorDouble = newDefaultZoomFactorDouble; +} + void BrowserWindow::updateDomStorageAction(const bool &isEnabled) const { // Set the action checked status. @@ -815,9 +1764,9 @@ void BrowserWindow::updateJavaScriptAction(const bool &isEnabled) // Set the icon according to the status. if (javaScriptEnabled) - javaScriptActionPointer->setIcon(QIcon(QStringLiteral(":/icons/javascript-warning"))); + javaScriptActionPointer->setIcon(QIcon(QLatin1String(":/icons/javascript-warning.svg"))); else - javaScriptActionPointer->setIcon(QIcon(QStringLiteral(":/icons/privacy-mode"))); + javaScriptActionPointer->setIcon(QIcon(QLatin1String(":/icons/privacy-mode.svg"))); // Set the action checked status. javaScriptActionPointer->setChecked(javaScriptEnabled); @@ -831,11 +1780,11 @@ void BrowserWindow::updateLocalStorageAction(const bool &isEnabled) // Update the local storage status. localStorageEnabled = isEnabled; - // Update the icon. + // Update the icon. On Gnome, the toolbar icons don't pick up unless the size is explicit, probably because the toolbar ends up being an intermediate size. if (localStorageEnabled) - localStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("disk-quota-high"))); + localStorageActionPointer->setIcon(QIcon::fromTheme(QLatin1String("disk-quota-high"), QIcon(QLatin1String("/usr/share/icons/gnome/32x32/actions/document-save-as.png")))); else - localStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("disk-quota"))); + localStorageActionPointer->setIcon(QIcon::fromTheme(QLatin1String("disk-quota"), QIcon(QLatin1String("/usr/share/icons/gnome/32x32/apps/kfm.png")))); // Set the action checked status. localStorageActionPointer->setChecked(localStorageEnabled); @@ -854,6 +1803,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const // Check the Mojeek user agent action. searchEngineMojeekActionPointer->setChecked(true); + // Update the search engine menu action icon. + searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find"))); + // Update the search engine menu action text. searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Mojeek")); } @@ -862,6 +1814,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const // Check the Monocles user agent action. searchEngineMonoclesActionPointer->setChecked(true); + // Update the search engine menu action icon. + searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find"))); + // Update the search engine menu action text. searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Monocles")); } @@ -870,6 +1825,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const // Check the MetaGer user agent action. searchEngineMetagerActionPointer->setChecked(true); + // Update the search engine menu action icon. + searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find"))); + // Update the search engine menu action text. searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - MetaGer")); } @@ -878,6 +1836,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const // Check the Google user agent action. searchEngineGoogleActionPointer->setChecked(true); + // Update the search engine menu action icon. + searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("im-google"), QIcon::fromTheme(QLatin1String("edit-find")))); + // Update the search engine menu action text. searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Google")); } @@ -886,6 +1847,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const // Check the Bing user agent action. searchEngineBingActionPointer->setChecked(true); + // Update the search engine menu action icon. + searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find"))); + // Update the search engine menu action text. searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Bing")); } @@ -894,6 +1858,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const // Check the Yahoo user agent action. searchEngineYahooActionPointer->setChecked(true); + // Update the search engine menu action icon. + searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("im-yahoo"), QIcon::fromTheme(QLatin1String("edit-find")))); + // Update the search engine menu action text. searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Yahoo")); } @@ -902,6 +1869,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const // Check the user agent. searchEngineCustomActionPointer->setChecked(true); + // Update the search engine menu action icon. + searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find"))); + // Update the search engine menu action text. searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Custom")); @@ -932,6 +1902,50 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const } } +void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl) +{ + // Get the new URL string in encoded form, which displays punycode. + QString newUrlString = newUrl.toEncoded(); + + // Update the view source actions. + if (newUrlString.startsWith(QLatin1String("view-source:"))) // The source is currently being viewed. + { + // Mark the view source checkbox. + viewSourceActionPointer->setChecked(true); + + // Update the view in new tab action text. + viewSourceInNewTabActionPointer->setText(i18nc("View rendered website in new tab action", "View Rendered Website in New Tab")); + } + else // The source is not currently being viewed. + { + // Unmark the view source checkbox. + viewSourceActionPointer->setChecked(false); + + // Update the view in new tab action text. + viewSourceInNewTabActionPointer->setText(i18nc("View source in new tab action", "View Source in New Tab")); + } + + // Update the URL line edit if it does not have focus. + if (!urlLineEditPointer->hasFocus()) + { + // Update the URL line edit. + urlLineEditPointer->setText(newUrlString); + + // Set the bookmarked action status. + bookmarkedActionPointer->setChecked(BookmarksDatabase::isBookmarked(newUrlString)); + + // Update the bookmarked action. + updateBookmarkedAction(); + + // Set the focus if the new URL is blank. + if (newUrlString == QStringLiteral("")) + urlLineEditPointer->setFocus(); + } + + // Store the current URL. + currentUrl = newUrl; +} + void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool &updateCustomUserAgentStatus) { // Initialize the custom user agent flag. @@ -943,6 +1957,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool // Check the Privacy Browser user agent action. userAgentPrivacyBrowserActionPointer->setChecked(true); + // Update the user agent menu action icon. + userAgentMenuActionPointer->setIcon(QIcon(":/icons/privacy-mode.svg")); + // Update the user agent menu action text. userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Privacy Browser")); } @@ -951,6 +1968,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool // check the WebEngine default user agent action. userAgentWebEngineDefaultActionPointer->setChecked(true); + // Update the user agent menu action icon. + userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("qtlogo"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))))); + // Update the user agent menu action text. userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - WebEngine default")); } @@ -959,6 +1979,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool // Check the Firefox on Linux user agent action. userAgentFirefoxLinuxActionPointer->setChecked(true); + // Update the user agent menu action icon. + userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))))); + // Update the user agent menu action text. userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Firefox on Linux")); } @@ -967,6 +1990,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool // Check the Chromium on Linux user agent action. userAgentChromiumLinuxActionPointer->setChecked(true); + // Update the user agent menu action icon. + userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))))); + // Update the user agent menu action text. userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Chromium on Linux")); } @@ -975,6 +2001,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool // Check the Firefox on Windows user agent action. userAgentFirefoxWindowsActionPointer->setChecked(true); + // Update the user agent menu action icon. + userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))))); + // Update the user agent menu action text. userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Firefox on Windows")); } @@ -983,6 +2012,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool // Check the Chrome on Windows user agent action. userAgentChromeWindowsActionPointer->setChecked(true); + // Update the user agent menu action icon. + userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))))); + // Update the user agent menu action text. userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Chrome on Windows")); } @@ -991,6 +2023,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool // Check the Edge on Windows user agent action. userAgentEdgeWindowsActionPointer->setChecked(true); + // Update the user agent menu action icon. + userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))); + // Update the user agent menu action text. userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Edge on Windows")); } @@ -999,6 +2034,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool // Check the Safari on macOS user agent action. userAgentSafariMacosActionPointer->setChecked(true); + // Update the user agent menu action icon. + userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))); + // Update the user agent menu action text. userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Safari on macOS")); } @@ -1007,6 +2045,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool // Check the user agent. userAgentCustomActionPointer->setChecked(true); + // Update the user agent menu action icon. + userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))); + // Update the user agent menu action text. userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Custom")); @@ -1018,6 +2059,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; @@ -1038,49 +2080,57 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool } } -void BrowserWindow::updateZoomFactorAction(const double &zoomFactor) +void BrowserWindow::updateViewBookmarksToolBarCheckbox(const bool visible) { - // Set the current zoom factor. - currentZoomFactor = zoomFactor; + // Update the view bookmarks toolbar checkbox. + viewBookmarksToolBarActionPointer->setChecked(visible); + + // Initialize the bookmarks toolbar visibility tracker if Privacy Browser has just launched. + if (bookmarksToolBarUninitialized) + { + // Set the initialization flag. + bookmarksToolBarUninitialized = false; - // 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()); + // Store the current status of the bookmarks toolbar, which is used when exiting full screen browsing. + bookmarksToolBarIsVisible = visible; + } } -void BrowserWindow::updateSearchEngineLabel(const QString &searchEngineString) const +void BrowserWindow::updateWindowTitle(const QString &title) { - // Update the search engine label. - searchEngineLabelPointer->setText(SearchEngineHelper::getSearchUrl(searchEngineString)); + // Update the window title. + setWindowTitle(title); } -void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl) +void BrowserWindow::updateZoomActions(const double zoomFactorDouble) { - // Update the URL line edit if it does not have focus. - if (!urlLineEditPointer->hasFocus()) - { - // Get the new URL string. - QString newUrlString = newUrl.toString(); + // Set the current zoom factor. + currentZoomFactorDouble = zoomFactorDouble; - // Update the URL line edit. - urlLineEditPointer->setText(newUrlString); + // Set the status of the default zoom action. + zoomDefaultActionPointer->setEnabled(currentZoomFactorDouble != defaultZoomFactorDouble); - // Set the focus if the new URL is blank. - if (newUrlString == QStringLiteral("")) - urlLineEditPointer->setFocus(); - } + // Set the status of the zoom in action and button. + zoomInActionPointer->setEnabled(currentZoomFactorDouble <= 4.99); + zoomPlusButtonPointer->setEnabled(currentZoomFactorDouble <= 4.99); - // Store the current URL. - currentUrl = newUrl; -} + // Set the status of the zoom out action and button. + zoomMinusButtonPointer->setEnabled(currentZoomFactorDouble > 0.25); + zoomOutActionPointer->setEnabled(currentZoomFactorDouble > 0.25); -void BrowserWindow::updateUserAgentLabel(const QString &userAgentDatabaseName) const -{ - // Update the user agent label. - userAgentLabelPointer->setText(UserAgentHelper::getUserAgentFromDatabaseName(userAgentDatabaseName)); + + // Update the zoom factor action text, formatting the double with 2 decimal places. `0` specifies no extra field width. `'0'` sets the format to not use scientific notation. + zoomFactorActionPointer->setText(ki18nc("The zoom factor action", "Zoom Factor - %1").subs(zoomFactorDouble, 0, '0', 2).toString()); + + // Update the status bar zoom factor label. + currentZoomButtonPointer->setText(ki18nc("The status bar zoom, which is just the formatted zoom factor", "%1").subs(zoomFactorDouble, 0, '0', 2).toString()); } -void BrowserWindow::updateWindowTitle(const QString &title) +void BrowserWindow::zoomDefault() { - // Update the window title. - setWindowTitle(title); + // Set the new zoom factor. + tabWidgetPointer->applyOnTheFlyZoomFactor(defaultZoomFactorDouble); + + // Update the on-the-fly action text. + updateZoomActions(defaultZoomFactorDouble); }