#include "ui_SettingsGeneral.h"
#include "ui_SettingsPrivacy.h"
#include "ui_SettingsSpellCheck.h"
+#include "databases/BookmarksDatabase.h"
+#include "dialogs/AddBookmarkDialog.h"
+#include "dialogs/BookmarksDialog.h"
#include "dialogs/CookiesDialog.h"
#include "dialogs/DomainSettingsDialog.h"
#include "helpers/SearchEngineHelper.h"
#include "helpers/UserAgentHelper.h"
+#include "structs/BookmarkStruct.h"
// KDE Frameworks headers.
#include <KActionCollection>
#include <KColorScheme>
-#include <KToolBar>
+#include <KXMLGUIFactory>
// Qt toolkit headers.
#include <QFileDialog>
QAction *backActionPointer = KStandardAction::back(this, SLOT(back()), actionCollectionPointer);
QAction *forwardActionPointer = KStandardAction::forward(this, SLOT(forward()), actionCollectionPointer);
KStandardAction::home(this, SLOT(home()), actionCollectionPointer);
+ KStandardAction::addBookmark(this, SLOT(addBookmark()), actionCollectionPointer);
+ QAction *editBookmarksActionPointer = KStandardAction::editBookmarks(this, SLOT(editBookmarks()), actionCollectionPointer);
KStandardAction::preferences(this, SLOT(showSettingsDialog()), actionCollectionPointer);
KStandardAction::find(this, SLOT(showFindTextActions()), actionCollectionPointer);
findNextActionPointer = KStandardAction::findNext(this, SLOT(findNext()), actionCollectionPointer);
QAction *reloadAndBypassCacheActionPointer = actionCollectionPointer->addAction(QLatin1String("reload_and_bypass_cache"));
viewSourceActionPointer = actionCollectionPointer->addAction(QLatin1String("view_source"));
viewSourceInNewTabActionPointer = actionCollectionPointer->addAction(QLatin1String("view_source_in_new_tab"));
+ 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"));
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"));
- javaScriptActionPointer = actionCollectionPointer->addAction(QLatin1String("javascript"));
- localStorageActionPointer = actionCollectionPointer->addAction(QLatin1String("local_storage"));
- domStorageActionPointer = actionCollectionPointer->addAction(QLatin1String("dom_storage"));
findCaseSensitiveActionPointer = actionCollectionPointer->addAction(QLatin1String("find_case_sensitive"));
hideFindTextActionPointer = actionCollectionPointer->addAction(QLatin1String("hide_find_actions"));
searchEngineBingActionPointer->setCheckable(true);
searchEngineYahooActionPointer->setCheckable(true);
searchEngineCustomActionPointer->setCheckable(true);
+ viewBookmarksToolBarActionPointer->setCheckable(true);
// Instantiate the user agent helper.
UserAgentHelper *userAgentHelperPointer = new UserAgentHelper();
newWindowActionPointer->setText(i18nc("New window action", "New Window"));
zoomDefaultActionPointer->setText(i18nc("Zoom default action", "Zoom Default"));
reloadAndBypassCacheActionPointer->setText(i18nc("Reload and bypass cache action", "Reload and Bypass Cache"));
+ 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);
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"));
hideFindTextActionPointer->setText(i18nc("Hide Find Text action (the text should include the language-specific escape keyboard shortcut).", "Hide Find Text (Esc)"));
reloadAndBypassCacheActionPointer->setIcon(QIcon::fromTheme(QLatin1String("view-refresh")));
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"))));
+ domStorageActionPointer->setIcon(QIcon::fromTheme(QLatin1String("code-class"), QIcon(QLatin1String("/usr/share/icons/gnome/32x32/actions/gtk-unindent-ltr.png"))));
userAgentPrivacyBrowserActionPointer->setIcon(QIcon(":/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"),
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")));
+ viewBookmarksToolBarActionPointer->setIcon(QIcon::fromTheme(QLatin1String("bookmarks")));
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"))));
- domStorageActionPointer->setIcon(QIcon::fromTheme(QLatin1String("code-class"), QIcon(QLatin1String("/usr/share/icons/gnome/32x32/actions/gtk-unindent-ltr.png"))));
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")));
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+;"));
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);
connect(viewSourceActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSource()));
connect(viewSourceInNewTabActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSourceInNewTab()));
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()));
// Get handles for the toolbars.
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();
connect(f11ShortcutPointer, SIGNAL(activated()), fullScreenActionPointer, SLOT(trigger()));
connect(escapeShortcutPointer, SIGNAL(activated()), this, SLOT(escape()));
+ // Get a handle for the Bookmarks menu.
+ bookmarksMenuPointer = qobject_cast<QMenu*>(guiFactory()->container("bookmarks", this));
+
+ // Add a separator to the bookmarks menu.
+ bookmarksMenuPointer->addSeparator();
+
+ // Initialize the current bookmarks lists.
+ bookmarksMenuCurrentActionList = QList<QAction*>();
+ bookmarksToolBarCurrentActionList = QList<QAction*>();
+
+ // Populate the bookmarks.
+ populateBookmarks();
+
// 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());
tabWidgetPointer->loadInitialWebsite();
}
+void BrowserWindow::addBookmark() const
+{
+ // Instantiate an add bookmark dialog.
+ AddBookmarkDialog *addBookmarkDialogPointer = new AddBookmarkDialog(tabWidgetPointer->getCurrentTabTitle(), tabWidgetPointer->getCurrentTabUrl(), tabWidgetPointer->getCurrentTabFavoritIcon());
+
+ // Show the dialog.
+ addBookmarkDialogPointer->show();
+}
+
void BrowserWindow::addOrEditDomainSettings() const
{
// Remove the focus from the URL line edit.
updateZoomActions(currentZoomFactor);
}
+void BrowserWindow::editBookmarks() const
+{
+ // Instantiate an edit bookmarks dialog.
+ BookmarksDialog *bookmarksDialogPointer = new BookmarksDialog();
+
+ // Update the displayed bookmarks when edited.
+ connect(bookmarksDialogPointer, SIGNAL(bookmarkUpdated()), this, SLOT(populateBookmarks()));
+
+ // Show the dialog.
+ bookmarksDialogPointer->show();
+}
+
void BrowserWindow::escape() const
{
// Process the escape according to the status of the browser.
// 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);
}
}
(new BrowserWindow)->show();
}
+void BrowserWindow::populateBookmarks()
+{
+ // Remove all the current menu bookmarks.
+ for (QAction *bookmarkAction : bookmarksMenuCurrentActionList)
+ {
+ // Remove the bookmark.
+ bookmarksMenuPointer->removeAction(bookmarkAction);
+ }
+
+ // Remove all the current toolbar bookmarks.
+ for (QAction *bookmarkAction : bookmarksToolBarCurrentActionList)
+ {
+ // Remove the bookmark.
+ bookmarksToolBarPointer->removeAction(bookmarkAction);
+ }
+
+ // Clear the current bookmark lists.
+ bookmarksMenuCurrentActionList.clear();
+ bookmarksToolBarCurrentActionList.clear();
+
+ // Get a list of the bookmarks.
+ std::list<BookmarkStruct> *bookmarkListPointer = BookmarksDatabase::getBookmarks();
+
+ // Populate the bookmarks menu.
+ for (BookmarkStruct bookmarkStruct : *bookmarkListPointer)
+ {
+ // Get the bookmark URL.
+ QString bookmarkUrl = bookmarkStruct.bookmarkUrl;
+
+ // Add the bookmark to the menu.
+ QAction *menuBookmarkActionPointer = bookmarksMenuPointer->addAction(bookmarkStruct.favoriteIcon, bookmarkStruct.bookmarkName, [=]
+ {
+ // Remove the focus from the URL line edit.
+ urlLineEditPointer->clearFocus();
+
+ // Load the URL.
+ tabWidgetPointer->loadUrlFromLineEdit(bookmarkUrl);
+ }
+ );
+
+ // Add the bookmark to the toolbar.
+ QAction *toolBarBookmarkActionPointer = bookmarksToolBarPointer->addAction(bookmarkStruct.favoriteIcon, bookmarkStruct.bookmarkName, [=]
+ {
+ // Remove the focus from the URL line edit.
+ urlLineEditPointer->clearFocus();
+
+ // Load the URL.
+ tabWidgetPointer->loadUrlFromLineEdit(bookmarkUrl);
+ }
+ );
+
+ // Add the actions to the current bookmarks lists.
+ bookmarksMenuCurrentActionList.append(menuBookmarkActionPointer);
+ bookmarksToolBarCurrentActionList.append(toolBarBookmarkActionPointer);
+ }
+
+ // 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);
+}
+
void BrowserWindow::refresh() const
{
// Remove the focus from the URL line edit.
void BrowserWindow::toggleFullScreen()
{
// Toggle the full screen status.
- if (fullScreenActionPointer->isChecked()) // Enable full screen browsing mode.
- {
- // Enable full screen mode.
- fullScreenActionPointer->setFullScreen(window(), true);
-
- // Hide the menu bar if specified.
- if (Settings::fullScreenHideMenuBar())
- menuBar()->setVisible(false);
-
- // Hide the toolbars if specified.
- if (Settings::fullScreenHideToolBars())
- {
- navigationToolBarPointer->setVisible(false);
- urlToolBarPointer->setVisible(false);
- }
-
- // Hide the tab bar if specified.
- if (Settings::fullScreenHideTabBar())
- tabWidgetPointer->setTabBarVisible(false);
-
- // Hide the status bar if specified.
- if (Settings::fullScreenHideStatusBar())
- statusBar()->setVisible(false);
- }
- else // Disable full screen browsing mode.
- {
- // Disable full screen mode.
- fullScreenActionPointer->setFullScreen(window(), false);
-
- // Show the menu bar.
- menuBar()->setVisible(true);
-
- // Show the toolbars.
- navigationToolBarPointer->setVisible(true);
- urlToolBarPointer->setVisible(true);
-
- // Show the tab bar.
- tabWidgetPointer->setTabBarVisible(true);
-
- // Show the status bar.
- statusBar()->setVisible(true);
- }
+ fullScreenRequested(fullScreenActionPointer->isChecked());
}
void BrowserWindow::toggleViewSource() const
loadUrlFromLineEdit(url);
}
+void BrowserWindow::toggleViewBookmarksToolBar()
+{
+ // Store the current status of the bookmarks toolbar, which is used when exiting full screen browsing.
+ bookmarksToolBarIsVisible = viewBookmarksToolBarActionPointer->isChecked();
+
+ // Update the visibility of the bookmarks toolbar.
+ bookmarksToolBarPointer->setVisible(bookmarksToolBarIsVisible);
+}
+
void BrowserWindow::toggleViewSourceInNewTab() const
{
// Get the current URL.
userAgentLabelPointer->setText(UserAgentHelper::getUserAgentFromDatabaseName(userAgentDatabaseName));
}
+void BrowserWindow::updateViewBookmarksToolBarCheckbox(const bool visible)
+{
+ // 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;
+
+ // Store the current status of the bookmarks toolbar, which is used when exiting full screen browsing.
+ bookmarksToolBarIsVisible = visible;
+ }
+}
+
void BrowserWindow::updateWindowTitle(const QString &title)
{
// Update the window title.
projects / PrivacyBrowserPC.git / blobdiff