#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>
KStandardAction::print(tabWidgetPointer, SLOT(print()), actionCollectionPointer);
QAction *printPreviewActionPointer = KStandardAction::printPreview(tabWidgetPointer, SLOT(printPreview()), actionCollectionPointer);
KStandardAction::quit(qApp, SLOT(closeAllWindows()), actionCollectionPointer);
- KStandardAction::zoomIn(this, SLOT(incrementZoom()), actionCollectionPointer);
- KStandardAction::zoomOut(this, SLOT(decrementZoom()), actionCollectionPointer);
+ zoomInActionPointer = KStandardAction::zoomIn(this, SLOT(incrementZoom()), actionCollectionPointer);
+ zoomOutActionPointer = KStandardAction::zoomOut(this, SLOT(decrementZoom()), actionCollectionPointer);
KStandardAction::redisplay(this, SLOT(refresh()), actionCollectionPointer);
fullScreenActionPointer = KStandardAction::fullScreen(this, SLOT(toggleFullScreen()), this, actionCollectionPointer);
QAction *backActionPointer = KStandardAction::back(this, SLOT(back()), actionCollectionPointer);
QAction *forwardActionPointer = KStandardAction::forward(this, SLOT(forward()), actionCollectionPointer);
KStandardAction::home(this, SLOT(home()), actionCollectionPointer);
+ KStandardAction::addBookmark(this, SLOT(showAddBookmarkDialog()), 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);
// Add the custom actions.
QAction *newTabActionPointer = actionCollectionPointer->addAction(QLatin1String("new_tab"));
QAction *newWindowActionPointer = actionCollectionPointer->addAction(QLatin1String("new_window"));
+ zoomDefaultActionPointer = actionCollectionPointer->addAction(QLatin1String("zoom_default"));
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();
viewSourceInNewTabActionPointer->setText(i18nc("View source in new tab action", "View Source in New Tab"));
newTabActionPointer->setText(i18nc("New tab action", "New Tab"));
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", "Hide Find Text"));
+ 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")));
+ zoomDefaultActionPointer->setIcon(QIcon::fromTheme(QLatin1String("zoom-fit-best")));
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")));
// 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 ctrl0KeySequence = QKeySequence(i18nc("The zoom default key sequence.", "Ctrl+0"));
QKeySequence ctrlF5KeySequence = QKeySequence(i18nc("The reload and bypass cache key sequence.", "Ctrl+F5"));
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 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 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 ctrlDKeySequence = QKeySequence(i18nc("The domain settings key sequence.", "Ctrl+D"));
+ 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(zoomDefaultActionPointer, ctrl0KeySequence);
actionCollectionPointer->setDefaultShortcut(reloadAndBypassCacheActionPointer, ctrlF5KeySequence);
actionCollectionPointer->setDefaultShortcut(viewSourceActionPointer, ctrlUKeySequence);
actionCollectionPointer->setDefaultShortcut(viewSourceInNewTabActionPointer, ctrlShiftUKeySequence);
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(searchEngineBingActionPointer, ctrlShiftBKeySequence);
actionCollectionPointer->setDefaultShortcut(searchEngineYahooActionPointer, ctrlShiftYKeySequence);
actionCollectionPointer->setDefaultShortcut(searchEngineCustomActionPointer, ctrlShiftCKeySequence);
- actionCollectionPointer->setDefaultShortcut(domainSettingsActionPointer, ctrlDKeySequence);
+ 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(zoomDefaultActionPointer, SIGNAL(triggered()), this, SLOT(zoomDefault()));
connect(reloadAndBypassCacheActionPointer, SIGNAL(triggered()), this, SLOT(reloadAndBypassCache()));
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()));
// 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.
// Process cookie changes.
connect(tabWidgetPointer, SIGNAL(updateCookiesAction(int)), this, SLOT(updateCookiesAction(int)));
+ // 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()));
// 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();
// Create the status bar widgets.
progressBarPointer = new QProgressBar();
- QPushButton *zoomMinusButtonPointer = new QPushButton();
+ zoomMinusButtonPointer = new QPushButton();
currentZoomButtonPointer = new QPushButton();
- QPushButton *zoomPlusButtonPointer = new QPushButton();
+ zoomPlusButtonPointer = new QPushButton();
// Set the button icons.
zoomMinusButtonPointer->setIcon(QIcon::fromTheme(QStringLiteral("list-remove-symbolic")));
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*>();
+
+ // 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.
+ 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());
updateLocalStorageAction(Settings::localStorageEnabled());
updateDomStorageAction(Settings::domStorageEnabled());
updateUserAgentActions(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent()), true);
- updateZoomFactorAction(Settings::zoomFactor());
+ updateZoomActions(Settings::zoomFactor());
// Load the initial website if this is the first window.
if (firstWindow)
tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactor);
// Update the on-the-fly action text.
- updateZoomFactorAction(currentZoomFactor);
+ updateZoomActions(currentZoomFactor);
+}
+
+void BrowserWindow::editBookmarks() const
+{
+ // Instantiate an edit bookmarks dialog.
+ BookmarksDialog *bookmarksDialogPointer = new BookmarksDialog(tabWidgetPointer->getCurrentTabFavoritIcon());
+
+ // Update the displayed bookmarks when edited.
+ connect(bookmarksDialogPointer, SIGNAL(bookmarkUpdated()), this, SLOT(populateBookmarks()));
+
+ // Show the dialog.
+ bookmarksDialogPointer->show();
}
void BrowserWindow::escape() const
// 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);
}
}
tabWidgetPointer->applyOnTheFlyZoomFactor(newZoomFactor);
// Update the on-the-fly action text.
- updateZoomFactorAction(newZoomFactor);
+ updateZoomActions(newZoomFactor);
}
}
tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactor);
// Update the on-the-fly action text.
- updateZoomFactorAction(currentZoomFactor);
+ updateZoomActions(currentZoomFactor);
}
void BrowserWindow::loadUrlFromLineEdit(const QString &url) const
(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.
tabWidgetPointer->refresh();
}
+void BrowserWindow::showAddBookmarkDialog() const
+{
+ // Instantiate an add bookmark dialog.
+ AddBookmarkDialog *addBookmarkDialogPointer = new AddBookmarkDialog(tabWidgetPointer->getCurrentTabTitle(), tabWidgetPointer->getCurrentTabUrl(), tabWidgetPointer->getCurrentTabFavoritIcon());
+
+ // Update the displayed bookmarks when a new one is added.
+ connect(addBookmarkDialogPointer, SIGNAL(bookmarkAdded()), this, SLOT(populateBookmarks()));
+
+ // Show the dialog.
+ addBookmarkDialogPointer->show();
+}
+
+void BrowserWindow::showBookmarkContextMenu(const QPoint&) const
+{
+ qDebug() << "Show the bookmark context menu.";
+}
+
void BrowserWindow::showCookiesDialog()
{
// 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.
cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", numberOfCookies));
}
+void BrowserWindow::updateDefaultZoomFactor(const double newDefaultZoomFactor)
+{
+ // Store the new default zoom factor.
+ defaultZoomFactor = newDefaultZoomFactor;
+}
+
void BrowserWindow::updateDomStorageAction(const bool &isEnabled) const
{
// Set the action checked status.
}
}
+void BrowserWindow::updateSearchEngineLabel(const QString &searchEngineString) const
+{
+ // Update the search engine label.
+ searchEngineLabelPointer->setText(SearchEngineHelper::getSearchUrl(searchEngineString));
+}
+
+void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl)
+{
+ // Get the new URL string.
+ QString newUrlString = newUrl.toString();
+
+ // 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 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.
}
}
-void BrowserWindow::updateZoomFactorAction(const double &zoomFactor)
+void BrowserWindow::updateUserAgentLabel(const QString &userAgentDatabaseName) const
{
- // Set the current zoom factor.
- currentZoomFactor = zoomFactor;
+ // 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(zoomFactor, 0, '0', 2).toString());
+void BrowserWindow::updateViewBookmarksToolBarCheckbox(const bool visible)
+{
+ // Update the view bookmarks toolbar checkbox.
+ viewBookmarksToolBarActionPointer->setChecked(visible);
- // Update the status bar zoom factor label.
- currentZoomButtonPointer->setText(ki18nc("The status bar zoom, which is just the formatted zoom factor", "%1").subs(zoomFactor, 0, '0', 2).toString());
+ // 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::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 &zoomFactor)
{
- // Get the new URL string.
- QString newUrlString = newUrl.toString();
+ // Set the current zoom factor.
+ currentZoomFactor = zoomFactor;
- // 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);
+ // Set the status of the default zoom action.
+ zoomDefaultActionPointer->setEnabled(currentZoomFactor != defaultZoomFactor);
- // 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);
+ // Set the status of the zoom in action and button.
+ zoomInActionPointer->setEnabled(currentZoomFactor <= 4.99);
+ zoomPlusButtonPointer->setEnabled(currentZoomFactor <= 4.99);
- // Update the view in new tab action text.
- viewSourceInNewTabActionPointer->setText(i18nc("View source in new tab action", "View Source in New Tab"));
- }
+ // Set the status of the zoom out action and button.
+ zoomMinusButtonPointer->setEnabled(currentZoomFactor > 0.25);
+ zoomOutActionPointer->setEnabled(currentZoomFactor > 0.25);
- // Update the URL line edit if it does not have focus.
- if (!urlLineEditPointer->hasFocus())
- {
- // Update the URL line edit.
- urlLineEditPointer->setText(newUrlString);
- // Set the focus if the new URL is blank.
- if (newUrlString == QStringLiteral(""))
- urlLineEditPointer->setFocus();
- }
+ // 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(zoomFactor, 0, '0', 2).toString());
- // Store the current URL.
- currentUrl = newUrl;
+ // Update the status bar zoom factor label.
+ currentZoomButtonPointer->setText(ki18nc("The status bar zoom, which is just the formatted zoom factor", "%1").subs(zoomFactor, 0, '0', 2).toString());
}
-void BrowserWindow::updateUserAgentLabel(const QString &userAgentDatabaseName) const
+void BrowserWindow::zoomDefault()
{
- // Update the user agent label.
- userAgentLabelPointer->setText(UserAgentHelper::getUserAgentFromDatabaseName(userAgentDatabaseName));
-}
+ // Set the new zoom factor.
+ tabWidgetPointer->applyOnTheFlyZoomFactor(defaultZoomFactor);
-void BrowserWindow::updateWindowTitle(const QString &title)
-{
- // Update the window title.
- setWindowTitle(title);
+ // Update the on-the-fly action text.
+ updateZoomActions(defaultZoomFactor);
}