#3374 note-selection: adapt multiselect notes context menu

Signed-off-by: Patrizio Bekerle <[email protected]>

Author: pbek

CHANGELOG.md

@@ -5,6 +5,8 @@
 - **Notes and note folders can now be deleted together** in a single operation when enabling
   the experimental note tree feature (for [#3374](https://github.com/pbek/QOwnNotes/issues/3374))
   - When both notes and folders are selected, they will all be deleted after confirmation
+  - The context menu remove action adapts its text based on selection ("Remove notes", "Remove folders", or "Remove notes and folders")
+  - The selection label now shows counts for both notes and folders when selected together (e.g., "5 note(s) and 2 folder(s) selected")
   - The confirmation dialog adapts to show what will be deleted (notes only, folders only, or both)
   - The current note is now properly reset after deletion to prevent deleted notes from remaining visible
   - This avoids having to delete notes and folders separately

src/mainwindow.cpp

@@ -8541,7 +8541,30 @@ void MainWindow::reloadCurrentNoteTags() {
     } else {
         const QVector<Note> notes = selectedNotes();
         tagList = Tag::fetchAllOfNotes(notes);
-        const QString notesSelectedText = tr("%n notes selected", "", selectedNotesCount);
+
+        // Count notes and folders separately
+        const auto selectedItems = ui->noteTreeWidget->selectedItems();
+        int noteCount = 0;
+        int folderCount = 0;
+        for (const auto *item : selectedItems) {
+            const int itemType = item->data(0, Qt::UserRole + 1).toInt();
+            if (itemType == NoteType) {
+                noteCount++;
+            } else if (itemType == FolderType) {
+                folderCount++;
+            }
+        }
+
+        // Build selection text based on what's selected
+        QString notesSelectedText;
+        if (noteCount > 0 && folderCount > 0) {
+            notesSelectedText =
+                tr("%n note(s) and %1 folder(s) selected", "", noteCount).arg(folderCount);
+        } else if (folderCount > 0) {
+            notesSelectedText = tr("%n folder(s) selected", "", folderCount);
+        } else {
+            notesSelectedText = tr("%n notes selected", "", noteCount);
+        }
 
         ui->selectedTagsToolButton->setText(QString::number(selectedNotesCount));
         ui->selectedTagsToolButton->setToolTip(notesSelectedText);
@@ -9884,20 +9907,53 @@ void MainWindow::on_noteTreeWidget_customContextMenuRequested(const QPoint pos)
     }
 
     const QPoint globalPos = ui->noteTreeWidget->mapToGlobal(pos);
-    const int type = item->data(0, Qt::UserRole + 1).toInt();
+    const auto selectedItems = ui->noteTreeWidget->selectedItems();
+
+    // Check if we have a mixed selection of notes and folders
+    bool hasNotes = false;
+    bool hasFolders = false;
+    for (const auto *selectedItem : selectedItems) {
+        const int itemType = selectedItem->data(0, Qt::UserRole + 1).toInt();
+        if (itemType == NoteType) {
+            hasNotes = true;
+        } else if (itemType == FolderType) {
+            hasFolders = true;
+        }
+        if (hasNotes && hasFolders) {
+            break;
+        }
+    }
 
-    if (type == FolderType) {
+    // If we have a mixed selection or notes, show the notes context menu
+    // (which now supports both notes and folders)
+    if (hasNotes || (hasNotes && hasFolders)) {
+        openNotesContextMenu(globalPos, hasNotes, hasFolders);
+    } else if (hasFolders) {
+        // Only folders selected, show folder-specific context menu
         std::unique_ptr<QMenu> menu(NoteSubFolderTree::contextMenu(ui->noteTreeWidget));
         menu->exec(globalPos);
-    } else if (type == NoteType) {
-        openNotesContextMenu(globalPos);
     }
 }
 
-void MainWindow::openNotesContextMenu(const QPoint globalPos, bool multiNoteMenuEntriesOnly) {
+void MainWindow::openNotesContextMenu(const QPoint globalPos, bool hasNotes, bool hasFolders) {
     QMenu noteMenu;
     QAction *renameAction = nullptr;
 
+    // Calculate counts for proper labels
+    const auto selectedItems = ui->noteTreeWidget->selectedItems();
+    int noteCount = 0;
+    int folderCount = 0;
+    for (const auto *item : selectedItems) {
+        const int itemType = item->data(0, Qt::UserRole + 1).toInt();
+        if (itemType == NoteType) {
+            noteCount++;
+        } else if (itemType == FolderType) {
+            folderCount++;
+        }
+    }
+
+    bool multiNoteMenuEntriesOnly = (noteCount + folderCount) > 1;
+
     if (!multiNoteMenuEntriesOnly) {
         auto *createNoteAction = noteMenu.addAction(tr("New note"));
         connect(createNoteAction, &QAction::triggered, this,
@@ -9909,7 +9965,16 @@ void MainWindow::openNotesContextMenu(const QPoint globalPos, bool multiNoteMenu
                "the note"));
     }
 
-    auto *removeAction = noteMenu.addAction(tr("&Remove notes"));
+    // Set dynamic remove action text based on selection
+    QString removeActionText;
+    if (hasNotes && hasFolders) {
+        removeActionText = tr("&Remove notes and folders");
+    } else if (hasFolders) {
+        removeActionText = tr("&Remove folders");
+    } else {
+        removeActionText = tr("&Remove notes");
+    }
+    auto *removeAction = noteMenu.addAction(removeActionText);
     noteMenu.addSeparator();
 
     const QList<NoteFolder> noteFolders = NoteFolder::fetchAll();
@@ -9974,7 +10039,6 @@ void MainWindow::openNotesContextMenu(const QPoint globalPos, bool multiNoteMenu
     }
 
     QStringList noteNameList;
-    const auto selectedItems = ui->noteTreeWidget->selectedItems();
     for (QTreeWidgetItem *item : selectedItems) {
         // the note names are not unique anymore but the note subfolder
         // path will be taken into account in

src/mainwindow.h

@@ -1134,7 +1134,8 @@ class MainWindow : public QMainWindow {
 
     void initFakeVim(QOwnNotesMarkdownTextEdit *noteTextEdit);
 
-    void openNotesContextMenu(const QPoint globalPos, bool multiNoteMenuEntriesOnly = false);
+    void openNotesContextMenu(const QPoint globalPos, bool hasNotes = true,
+                              bool hasFolders = false);
 
     void updateCurrentNoteTextHash();