X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.cpp;h=805b592f5326375bb7e1b91a48beb8648657317c;hb=3b22acd838008fd54234acc475edca434510b501;hp=f85726dd9e080cdbf4f95b8b69a0aef7a8416e74;hpb=29dbafaca706ea6a34cd881060ebf680378f39b4;p=PrivacyBrowserPC.git diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index f85726d..805b592 100644 --- a/src/windows/BrowserWindow.cpp +++ b/src/windows/BrowserWindow.cpp @@ -66,7 +66,7 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) setCentralWidget(tabWidgetPointer); // Get a handle for the action collection. - KActionCollection *actionCollectionPointer = this->actionCollection(); + actionCollectionPointer = this->actionCollection(); // Add the standard actions. KStandardAction::print(tabWidgetPointer, SLOT(print()), actionCollectionPointer); @@ -79,7 +79,6 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) 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); @@ -113,7 +112,6 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) searchEngineBingActionPointer = actionCollectionPointer->addAction(QLatin1String("search_engine_bing")); searchEngineYahooActionPointer = actionCollectionPointer->addAction(QLatin1String("search_engine_yahoo")); searchEngineCustomActionPointer = actionCollectionPointer->addAction(QLatin1String("search_engine_custom")); - QAction *addFolderPointer = actionCollectionPointer->addAction(QLatin1String("add_folder")); viewBookmarksToolBarActionPointer = actionCollectionPointer->addAction(QLatin1String("view_bookmarks_toolbar")); QAction *domainSettingsActionPointer = actionCollectionPointer->addAction(QLatin1String("domain_settings")); cookiesActionPointer = actionCollectionPointer->addAction(QLatin1String("cookies")); @@ -193,7 +191,6 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) searchEngineGoogleActionPointer->setText(i18nc("Search engine", "Google")); searchEngineBingActionPointer->setText(i18nc("Search engine", "Bing")); searchEngineYahooActionPointer->setText(i18nc("Search engine", "Yahoo")); - addFolderPointer->setText(i18nc("Add folder", "Add Folder")); 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)); @@ -228,7 +225,6 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) 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"))); - addFolderPointer->setIcon(QIcon::fromTheme(QLatin1String("folder-add"))); 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")))); @@ -265,7 +261,6 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) 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 altFKeySequence = QKeySequence(i18nc("The add folder key sequence.", "Alt+F")); 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+;")); @@ -300,7 +295,6 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) actionCollectionPointer->setDefaultShortcut(searchEngineYahooActionPointer, ctrlShiftYKeySequence); actionCollectionPointer->setDefaultShortcut(searchEngineCustomActionPointer, ctrlShiftCKeySequence); actionCollectionPointer->setDefaultShortcut(editBookmarksActionPointer, ctrlAltShiftBKeySequence); - actionCollectionPointer->setDefaultShortcut(addFolderPointer, altFKeySequence); actionCollectionPointer->setDefaultShortcut(viewBookmarksToolBarActionPointer, ctrlAltBKeySequence); actionCollectionPointer->setDefaultShortcut(domainSettingsActionPointer, ctrlShiftDKeySequence); actionCollectionPointer->setDefaultShortcut(cookiesActionPointer, ctrlSemicolonKeySequence); @@ -313,7 +307,6 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) connect(viewSourceActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSource())); connect(viewSourceInNewTabActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSourceInNewTab())); connect(zoomFactorActionPointer, SIGNAL(triggered()), this, SLOT(getZoomFactorFromUser())); - connect(addFolderPointer, SIGNAL(triggered()), this, SLOT(showAddFolderDialog())); connect(viewBookmarksToolBarActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewBookmarksToolBar())); connect(cookiesActionPointer, SIGNAL(triggered()), this, SLOT(showCookiesDialog())); connect(domainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(showDomainSettingsDialog())); @@ -404,11 +397,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. @@ -518,6 +516,7 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) bookmarksMenuPointer->addSeparator(); // Initialize the current bookmarks lists. + finalBookmarkFolderMenuActionList = QList *>(); bookmarksMenuActionList = QList *>(); bookmarksMenuSubmenuList = QList *>(); bookmarksToolBarActionList = QList(); @@ -553,6 +552,195 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) } } +void BrowserWindow::addFinalBookmarkFolderMenuActions(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. + 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(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. + 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(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. + 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, `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. + 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` loads a background tab. + for (QString url : *folderUrlsListPointer) + tabWidgetPointer->addTab(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, `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 if this is not the root bookmark menu. + if (folderId != 0) + { + QAction *editFolderActionPointer = 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 action to the beginning of the final bookmark folder menu action list. + finalBookmarkFolderMenuActionList.prepend(new QPair(menuPointer, editFolderActionPointer)); + } + + // Add the delete folder action to the menu. + QAction *deleteFolderActionPointer = 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 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. + populateBookmarks(); + } + } + ); + + // 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 final bookmark folder menu action list. + finalBookmarkFolderMenuActionList.prepend(new QPair(menuPointer, addBookmarkActionPointer)); + finalBookmarkFolderMenuActionList.prepend(new QPair(menuPointer, addFolderActionPointer)); + finalBookmarkFolderMenuActionList.prepend(new QPair(menuPointer, openFolderInNewTabsActionPointer)); + finalBookmarkFolderMenuActionList.prepend(new QPair(menuPointer, openFolderInBackgroundTabsActionPointer)); + finalBookmarkFolderMenuActionList.prepend(new QPair(menuPointer, openFolderInNewWindowActionPointer)); + finalBookmarkFolderMenuActionList.prepend(new QPair(menuPointer, deleteFolderActionPointer)); +} + void BrowserWindow::addOrEditDomainSettings() const { // Remove the focus from the URL line edit. @@ -807,11 +995,18 @@ void BrowserWindow::newWindow() const void BrowserWindow::populateBookmarks() { + // Remove all the final bookmark folder menu actions. + for (QPair *finalBookmarkFolderMenuActionPair : finalBookmarkFolderMenuActionList) + { + // Remove the action. + finalBookmarkFolderMenuActionPair->first->removeAction(finalBookmarkFolderMenuActionPair->second); + } + // 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 +1017,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 +1051,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 +1093,9 @@ void BrowserWindow::populateBookmarksMenuSubfolders(const double folderId, QMenu bookmarksMenuActionList.prepend(new QPair(menuPointer, menuBookmarkActionPointer)); } } + + // Add the extra items at the bottom of the menu. + addFinalBookmarkFolderMenuActions(menuPointer, folderId); } void BrowserWindow::populateBookmarksToolBar() @@ -956,163 +1157,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. + addFinalBookmarkFolderMenuActions(menuAndFolderIdPairPointer->first, menuAndFolderIdPairPointer->second); } } @@ -1188,30 +1234,6 @@ void BrowserWindow::reloadAndBypassCache() const 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::showAddFolderDialog() const -{ - // Instantiate an add folder dialog. - AddFolderDialog *addFolderDialogPointer = new AddFolderDialog(tabWidgetPointer->getCurrentTabFavoritIcon()); - - // Update the displayed bookmarks when a folder is added. - connect(addFolderDialogPointer, SIGNAL(folderAdded()), this, SLOT(populateBookmarks())); - - // Show the dialog. - addFolderDialogPointer->show(); -} - void BrowserWindow::showBookmarkContextMenu(const QPoint &point) { // Get the bookmark action. @@ -1229,163 +1251,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. + addFinalBookmarkFolderMenuActions(bookmarkContextMenuPointer, BookmarksDatabase::getFolderId(databaseId)); } else // A bookmark was clicked. { @@ -1761,6 +1628,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 +1753,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 +1992,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();