From 234200f6e94439df6133a8eb61552a68dc9b3a5e Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Sat, 7 Oct 2023 14:49:17 -0700 Subject: [PATCH] Add final entries to the bookmarks folder menus. https://redmine.stoutner.com/issues/1091 --- doc/index.docbook | 46 ++- src/databases/BookmarksDatabase.cpp | 77 ++++ src/databases/BookmarksDatabase.h | 2 + src/windows/BrowserWindow.cpp | 549 ++++++++++++---------------- src/windows/BrowserWindow.h | 4 + 5 files changed, 348 insertions(+), 330 deletions(-) diff --git a/doc/index.docbook b/doc/index.docbook index 9a41b3e..a89f652 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -14,19 +14,19 @@ along with Privacy Browser PC. If not, see . --> - Privacy Browser"> + + Privacy Browser"> - - SorenStoutner"> - soren@stoutner.com"> + + SorenStoutner"> + soren@stoutner.com"> - - + + - - Translatable Entity"> - + + Translatable Entity"> + ]> @@ -1142,6 +1142,32 @@ + + + Bookmarks + + + + + + + + &Ctrl;B + + Bookmarks + Add Bookmark + + + + + + Add a new bookmark. + + + + + + Settings diff --git a/src/databases/BookmarksDatabase.cpp b/src/databases/BookmarksDatabase.cpp index e786eb6..1050ba7 100644 --- a/src/databases/BookmarksDatabase.cpp +++ b/src/databases/BookmarksDatabase.cpp @@ -188,6 +188,56 @@ void BookmarksDatabase::deleteBookmark(const int databaseId) deleteBookmarkQuery.exec(); } +void BookmarksDatabase::deleteBookmarks(const QString url) +{ + // Get a handle for the bookmarks database. + QSqlDatabase bookmarksDatabase = QSqlDatabase::database(CONNECTION_NAME); + + // Instantiate a parent folder IDs query. + QSqlQuery parentFolderIdsQuery(bookmarksDatabase); + + // Prepare the parent folder IDs query. + parentFolderIdsQuery.prepare("SELECT " + PARENT_FOLDER_ID + " FROM " + BOOKMARKS_TABLE + " WHERE " + IS_FOLDER + " = 0 AND " + BOOKMARK_URL + " = :url"); + + // Bind the query values. + parentFolderIdsQuery.bindValue(":url", url); + + // Execute the query. + parentFolderIdsQuery.exec(); + + // Instantiate a delete bookmarks query. + QSqlQuery deleteBookmarksQuery(bookmarksDatabase); + + // Prepare the delete bookmark query. + deleteBookmarksQuery.prepare("DELETE FROM " + BOOKMARKS_TABLE + " WHERE " + IS_FOLDER + " = 0 AND " + BOOKMARK_URL + " = :url"); + + // Bind the query values. + deleteBookmarksQuery.bindValue(":url", url); + + // Execute the query. + deleteBookmarksQuery.exec(); + + // Create a parent folder IDs list. A standard list can be sorted and deduplicated. + std::list parentFolderIdsList; + + // Populate the parent folder IDs list. + while (parentFolderIdsQuery.next()) + { + // Add the parent folder ID to the list. + parentFolderIdsList.push_back(parentFolderIdsQuery.value(PARENT_FOLDER_ID).toDouble()); + } + + // Sort the parent folder IDs list. + parentFolderIdsList.sort(); + + // Remove duplicate entries from the parent folder IDs list. + parentFolderIdsList.unique(); + + // Update the display order of each folder where a bookmark was deleted. + for (const double parentFolderId : parentFolderIdsList) + updateFolderContentsDisplayOrder(parentFolderId); +} + double BookmarksDatabase::generateFolderId() { // Get the current time in epoch format (milliseconds). @@ -760,6 +810,33 @@ QList* BookmarksDatabase::getSubfolders(const double folderId) return subfoldersListPointer; } +bool BookmarksDatabase::isBookmarked(const QString url) +{ + // Get a handle for the bookmarks database. + QSqlDatabase bookmarksDatabase = QSqlDatabase::database(CONNECTION_NAME); + + // Instantiate an is bookmarked query. + QSqlQuery isBookmarkedQuery(bookmarksDatabase); + + // Set the query to be forward only, which is more performant. + isBookmarkedQuery.setForwardOnly(true); + + // Prepare the is bookmarked query. + isBookmarkedQuery.prepare("SELECT " + ID + " FROM " + BOOKMARKS_TABLE + " WHERE " + IS_FOLDER + " = 0 AND " + BOOKMARK_URL + " = :url"); + + // Bind the query values. + isBookmarkedQuery.bindValue(":url", url); + + // Execute the query. + isBookmarkedQuery.exec(); + + // Move to the first entry. + isBookmarkedQuery.first(); + + // Return true if the query is valid (there is at least one item). + return isBookmarkedQuery.isValid(); +} + bool BookmarksDatabase::isFolder(const int databaseId) { // Get a handle for the bookmarks database. diff --git a/src/databases/BookmarksDatabase.h b/src/databases/BookmarksDatabase.h index 1e88140..932a1e4 100644 --- a/src/databases/BookmarksDatabase.h +++ b/src/databases/BookmarksDatabase.h @@ -37,6 +37,7 @@ public: static void addDatabase(); static void addFolder(const BookmarkStruct *bookmarkStructPointer); static void deleteBookmark(const int databaseId); + static void deleteBookmarks(const QString url); static QList* getAllFolderUrls(const double folderId); static BookmarkStruct* getBookmark(const int databaseId); static std::list* getBookmarks(); @@ -49,6 +50,7 @@ public: static int getFolderItemCount(const double folderId); static double getParentFolderId(const int databaseId); static QList* getSubfolders(const double folderId); + static bool isBookmarked(const QString url); static bool isFolder(const int databaseId); static void updateBookmark(const BookmarkStruct *bookmarkStructPointer); static void updateBookmarkName(const int databaseId, const QString &bookmarkName); diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index f85726d..6b313f2 100644 --- a/src/windows/BrowserWindow.cpp +++ b/src/windows/BrowserWindow.cpp @@ -404,11 +404,16 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) // 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. + // 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. @@ -553,6 +558,167 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) } } +void BrowserWindow::addFinalBookmarkFolderMenuEntries(QMenu *menuPointer, double folderId) +{ + // Get the database ID. + int folderDatabaseId = BookmarksDatabase::getFolderDatabaseId(folderId); + + // Add a separator. + menuPointer->addSeparator(); + + // Add the add bookmark action to the menu. + menuPointer->addAction(QIcon::fromTheme(QLatin1String("bookmark-new")), i18nc("The add bookmark action", "Add Bookmark"), [=] + { + // Instantiate an add bookmark dialog. + AddBookmarkDialog *addBookmarkDialogPointer = new AddBookmarkDialog(tabWidgetPointer->getCurrentTabTitle(), tabWidgetPointer->getCurrentTabUrl(), + tabWidgetPointer->getCurrentTabFavoritIcon(), folderId); + + // Update the displayed bookmarks when a new one is added. + connect(addBookmarkDialogPointer, SIGNAL(bookmarkAdded()), this, SLOT(populateBookmarks())); + + // Show the dialog. + addBookmarkDialogPointer->show(); + } + ); + + // Add the add folder action to the menu. + menuPointer->addAction(QIcon::fromTheme(QLatin1String("folder-add")), i18nc("The add folder action", "Add Folder"), [=] + { + // Instantiate an add folder dialog. + AddFolderDialog *addFolderDialogPointer = new AddFolderDialog(tabWidgetPointer->getCurrentTabFavoritIcon(), folderId); + + // Update the displayed bookmarks when a folder is added. + connect(addFolderDialogPointer, SIGNAL(folderAdded()), this, SLOT(populateBookmarks())); + + // Show the dialog. + addFolderDialogPointer->show(); + } + ); + + // Add a separator. + menuPointer->addSeparator(); + + // Add the open folder in new tabs action to the menu. + 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, `false` does not load a background tab. + for (QString url : *folderUrlsListPointer) + tabWidgetPointer->addTab(true, false, url); + } + ); + + // Add the open folder in background tabs action to the menu. + 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` loads a background tab. + for (QString url : *folderUrlsListPointer) + tabWidgetPointer->addTab(true, true, url); + } + ); + + // Add the open folder in new window action to the menu. + 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, `true` loads a background tab. + for (int i = 1; i < folderUrls; ++i) + browserWindowPointer->tabWidgetPointer->addTab(true, true, folderUrlsListPointer->value(i)); + + // Show the new browser window. + browserWindowPointer->show(); + } + ); + + // Add a separator. + menuPointer->addSeparator(); + + // Add the edit folder action to the menu. + menuPointer->addAction(QIcon::fromTheme(QLatin1String("edit-entry")), 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(folderDatabaseId, currentTabFavoriteIcon); + + // Show the dialog. + editFolderDialogPointer->show(); + + // Process bookmark events. + connect(editFolderDialogPointer, SIGNAL(folderSaved()), this, SLOT(populateBookmarks())); + } + ); + + // Add the delete folder action to the menu. + menuPointer->addAction(QIcon::fromTheme(QLatin1String("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. + 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. + populateBookmarks(); + } + } + ); +} + void BrowserWindow::addOrEditDomainSettings() const { // Remove the focus from the URL line edit. @@ -808,10 +974,10 @@ void BrowserWindow::newWindow() const void BrowserWindow::populateBookmarks() { // Remove all the current menu bookmarks. - for (QPair *bookmarkPairPointer : bookmarksMenuActionList) + for (QPair *bookmarkMenuActionPairPointer : bookmarksMenuActionList) { // Remove the bookmark. - bookmarkPairPointer->first->removeAction(bookmarkPairPointer->second); + bookmarkMenuActionPairPointer->first->removeAction(bookmarkMenuActionPairPointer->second); } // Remove all the current menu subfolders. @@ -822,10 +988,10 @@ void BrowserWindow::populateBookmarks() } // Remove all the current toolbar subfolders. - for (QPair *subfolderPairPointer : bookmarksToolBarSubfolderActionList) + for (QPair *subfolderActionPairPointer : bookmarksToolBarSubfolderActionList) { // Remove the action from the subfolder. - subfolderPairPointer->first->removeAction(subfolderPairPointer->second); + subfolderActionPairPointer->first->removeAction(subfolderActionPairPointer->second); } // Remove all the current toolbar bookmarks. @@ -856,6 +1022,9 @@ void BrowserWindow::populateBookmarks() // 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) @@ -895,6 +1064,9 @@ void BrowserWindow::populateBookmarksMenuSubfolders(const double folderId, QMenu bookmarksMenuActionList.prepend(new QPair(menuPointer, menuBookmarkActionPointer)); } } + + // Add the extra items at the bottom of the menu. + addFinalBookmarkFolderMenuEntries(menuPointer, folderId); } void BrowserWindow::populateBookmarksToolBar() @@ -956,163 +1128,8 @@ void BrowserWindow::populateBookmarksToolBar() // 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) { - // Add a separator. - menuAndFolderIdPairPointer->first->addSeparator(); - - // Add the open folder in new tabs action to the menu. - menuAndFolderIdPairPointer->first->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(menuAndFolderIdPairPointer->second); - - // Open the URLs in new tabs. `true` removes the URL line edit focus, `false` does not load a background tab. - for (QString url : *folderUrlsListPointer) - tabWidgetPointer->addTab(true, false, url); - } - ); - - // Add the open folder in background tabs action to the menu. - menuAndFolderIdPairPointer->first->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(menuAndFolderIdPairPointer->second); - - // Open the URLs in new tabs. `true` removes the URL line edit focus, `true` loads a background tab. - for (QString url : *folderUrlsListPointer) - tabWidgetPointer->addTab(true, true, url); - } - ); - - // Add the open folder in new window action to the menu. - menuAndFolderIdPairPointer->first->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(menuAndFolderIdPairPointer->second); - - // 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, `true` loads a background tab. - for (int i = 1; i < folderUrls; ++i) - browserWindowPointer->tabWidgetPointer->addTab(true, true, folderUrlsListPointer->value(i)); - - // Show the new browser window. - browserWindowPointer->show(); - } - ); - - // Add a separator. - menuAndFolderIdPairPointer->first->addSeparator(); - - // Add the add bookmark action to the menu. - menuAndFolderIdPairPointer->first->addAction(QIcon::fromTheme(QLatin1String("bookmark-new")), i18nc("The add bookmark action", "Add Bookmark"), [=] - { - // Instantiate an add bookmark dialog. - AddBookmarkDialog *addBookmarkDialogPointer = new AddBookmarkDialog(tabWidgetPointer->getCurrentTabTitle(), tabWidgetPointer->getCurrentTabUrl(), - tabWidgetPointer->getCurrentTabFavoritIcon(), menuAndFolderIdPairPointer->second); - - // Update the displayed bookmarks when a new one is added. - connect(addBookmarkDialogPointer, SIGNAL(bookmarkAdded()), this, SLOT(populateBookmarks())); - - // Show the dialog. - addBookmarkDialogPointer->show(); - } - ); - - // Add the add folder action to the menu. - menuAndFolderIdPairPointer->first->addAction(QIcon::fromTheme(QLatin1String("folder-add")), i18nc("The add folder action", "Add Folder"), [=] - { - // Instantiate an add folder dialog. - AddFolderDialog *addFolderDialogPointer = new AddFolderDialog(tabWidgetPointer->getCurrentTabFavoritIcon(), menuAndFolderIdPairPointer->second); - - // Update the displayed bookmarks when a folder is added. - connect(addFolderDialogPointer, SIGNAL(folderAdded()), this, SLOT(populateBookmarks())); - - // Show the dialog. - addFolderDialogPointer->show(); - } - ); - - // Add a separator. - menuAndFolderIdPairPointer->first->addSeparator(); - - // Add the edit folder action to the menu. - menuAndFolderIdPairPointer->first->addAction(QIcon::fromTheme(QLatin1String("edit-entry")), 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(BookmarksDatabase::getFolderDatabaseId(menuAndFolderIdPairPointer->second), currentTabFavoriteIcon); - - // Show the dialog. - editFolderDialogPointer->show(); - - // Process bookmark events. - connect(editFolderDialogPointer, SIGNAL(folderSaved()), this, SLOT(populateBookmarks())); - } - ); - - // Add the delete folder action to the menu. - menuAndFolderIdPairPointer->first->addAction(QIcon::fromTheme(QLatin1String("delete")), i18nc("Delete folder context menu entry", "Delete Folder"), [=] - { - // Get the folder database ID. - int folderDatabaseId = BookmarksDatabase::getFolderDatabaseId(menuAndFolderIdPairPointer->second); - - // Create an items to delete list. - QList* itemsToDeleteListPointer = new QList; - - // Add the folder to the list of items to delete. - itemsToDeleteListPointer->append(folderDatabaseId); - - // Add the folder contents to the list of items to delete. - itemsToDeleteListPointer->append(*BookmarksDatabase::getFolderContentsDatabaseIdsRecursively(menuAndFolderIdPairPointer->second)); - - // 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. - populateBookmarks(); - } - } - ); + // Populate the final bookmarks menu entries. + addFinalBookmarkFolderMenuEntries(menuAndFolderIdPairPointer->first, menuAndFolderIdPairPointer->second); } } @@ -1229,163 +1246,8 @@ void BrowserWindow::showBookmarkContextMenu(const QPoint &point) // Create the menu according to the type. if (BookmarksDatabase::isFolder(databaseId)) // A folder was clicked. { - // Get the folder ID. - double folderId = BookmarksDatabase::getFolderId(databaseId); - - // Add the open folder in new tabs action to the menu. - bookmarkContextMenuPointer->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, `false` does not load a background tab. - for (QString url : *folderUrlsListPointer) - tabWidgetPointer->addTab(true, false, url); - } - ); - - // Add the open folder in background tabs action to the menu. - bookmarkContextMenuPointer->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` loads a background tab. - for (QString url : *folderUrlsListPointer) - tabWidgetPointer->addTab(true, true, url); - } - ); - - // Add the open folder in new window action to the menu. - bookmarkContextMenuPointer->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, `true` loads a background tab. - for (int i = 1; i < folderUrls; ++i) - browserWindowPointer->tabWidgetPointer->addTab(true, true, folderUrlsListPointer->value(i)); - - // Show the new browser window. - browserWindowPointer->show(); - } - ); - - // Add a separator. - bookmarkContextMenuPointer->addSeparator(); - - // Add the add bookmark action to the menu. - bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("bookmark-new")), i18nc("The add bookmark action", "Add Bookmark"), [=] - { - // Instantiate an add bookmark dialog. - AddBookmarkDialog *addBookmarkDialogPointer = new AddBookmarkDialog(tabWidgetPointer->getCurrentTabTitle(), tabWidgetPointer->getCurrentTabUrl(), - tabWidgetPointer->getCurrentTabFavoritIcon(), folderId); - - // Update the displayed bookmarks when a new one is added. - connect(addBookmarkDialogPointer, SIGNAL(bookmarkAdded()), this, SLOT(populateBookmarks())); - - // Show the dialog. - addBookmarkDialogPointer->show(); - } - ); - - // Add the add folder action to the menu. - bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("folder-add")), i18nc("The add folder action", "Add Folder"), [=] - { - // Instantiate an add folder dialog. - AddFolderDialog *addFolderDialogPointer = new AddFolderDialog(tabWidgetPointer->getCurrentTabFavoritIcon(), folderId); - - // Update the displayed bookmarks when a folder is added. - connect(addFolderDialogPointer, SIGNAL(folderAdded()), this, SLOT(populateBookmarks())); - - // Show the dialog. - addFolderDialogPointer->show(); - } - ); - - // Add a separator. - bookmarkContextMenuPointer->addSeparator(); - - // Add the edit folder action to the menu. - bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("edit-entry")), 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(BookmarksDatabase::getFolderDatabaseId(folderId), currentTabFavoriteIcon); - - // Show the dialog. - editFolderDialogPointer->show(); - - // Process bookmark events. - connect(editFolderDialogPointer, SIGNAL(folderSaved()), this, SLOT(populateBookmarks())); - } - ); - - // Add the delete folder action to the menu. - bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("delete")), i18nc("Delete folder context menu entry", "Delete Folder"), [=] - { - // Get the folder database ID. - int folderDatabaseId = BookmarksDatabase::getFolderDatabaseId(folderId); - - // Create an items to delete list. - QList* itemsToDeleteListPointer = new QList; - - // Add the folder to the list of items to delete. - 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. - populateBookmarks(); - } - } - ); + // Populate the final bookmarks menu entries. + addFinalBookmarkFolderMenuEntries(bookmarkContextMenuPointer, BookmarksDatabase::getFolderId(databaseId)); } else // A bookmark was clicked. { @@ -1761,6 +1623,38 @@ QSize BrowserWindow::sizeHint() const return QSize(1500, 1200); } +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(); + + // Create or delete the bookmark + if (bookmarkedActionPointer->isChecked()) // The user checked the toggle. Create a bookmark. + { + // Create a bookmark struct. + BookmarkStruct *bookmarkStructPointer = new BookmarkStruct; + + // Populate the bookmark struct. + bookmarkStructPointer->name = tabWidgetPointer->getCurrentTabTitle(); + bookmarkStructPointer->url = tabWidgetPointer->getCurrentTabUrl(); + bookmarkStructPointer->parentFolderId = 0; + bookmarkStructPointer->favoriteIcon = tabWidgetPointer->getCurrentTabFavoritIcon(); + + // Add the bookmark. + BookmarksDatabase::addBookmark(bookmarkStructPointer); + } + else // The user unchecked the toggle. Delete all related bookmarks. + { + // Delete the bookmarks. + BookmarksDatabase::deleteBookmarks(urlLineEditPointer->text()); + + + } + + // Repopulate the bookmarks. + populateBookmarks(); +} + void BrowserWindow::toggleDomStorage() const { // Remove the focus from the URL line edit. @@ -1854,6 +1748,15 @@ void BrowserWindow::toggleViewSourceInNewTab() const tabWidgetPointer->addTab(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 { // Update the action text. @@ -2084,6 +1987,12 @@ void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl) // 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(); diff --git a/src/windows/BrowserWindow.h b/src/windows/BrowserWindow.h index eb6f82e..722fc1c 100644 --- a/src/windows/BrowserWindow.h +++ b/src/windows/BrowserWindow.h @@ -79,6 +79,7 @@ private Q_SLOTS: void showFindTextActions() const; void showProgressBar(const int &progress) const; void showSettingsDialog(); + void toggleBookmark(); void toggleDomStorage() const; void toggleFindCaseSensitive() const; void toggleJavaScript() const; @@ -107,6 +108,7 @@ private Q_SLOTS: private: // The private variables. + QAction *bookmarkedActionPointer; QList *> bookmarksMenuActionList; QMenu *bookmarksMenuPointer; QList *> bookmarksMenuSubmenuList; @@ -177,8 +179,10 @@ private: QPushButton *zoomPlusButtonPointer; // The private functions. + void addFinalBookmarkFolderMenuEntries(QMenu *menuPointer, double folderId); void populateBookmarksMenuSubfolders(const double folderId, QMenu *menuPointer); void populateBookmarksToolBar(); void populateBookmarksToolBarSubfolders(const double folderId, QMenu *menuPointer); + void updateBookmarkedAction() const; }; #endif -- 2.43.0