#3374 mainwindow: allow deleting of single folder with Del key in notetree-mode

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

Author: pbek

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - You can now **add a link to a card** to the current note in the
   **Nextcloud Deck dialog** (for [#3357](https://github.com/pbek/QOwnNotes/issues/3357))
+- In _note tree mode_, if only one folder is selected, you can delete it with the `Del` key
+  (for [#3374](https://github.com/pbek/QOwnNotes/issues/3374))
 
 ## 25.10.1
 

src/mainwindow.cpp

@@ -4704,11 +4704,17 @@ void MainWindow::removeSelectedNotes() {
     // store updated notes to disk
     storeUpdatedNotesToDisk();
 
-    const int selectedItemsCount = getSelectedNotesCount();
+    const auto selItems = ui->noteTreeWidget->selectedItems();
+    const int selectedItemsCount = selItems.count();
 
     if (selectedItemsCount == 0) {
         return;
     }
+    if (selectedItemsCount == 1 && selItems[0]->data(0, Qt::UserRole + 1) == FolderType) {
+        // If just one folder is selected, remove the folder
+        NoteSubFolderTree::removeSelectedNoteSubFolders(ui->noteTreeWidget);
+        return;
+    }
 
     if (Utils::Gui::question(
             this, tr("Remove selected notes"),
@@ -4741,7 +4747,6 @@ void MainWindow::removeSelectedNotes() {
             const QSignalBlocker blocker1(ui->noteTreeWidget);
             Q_UNUSED(blocker1)
 
-            const auto selItems = ui->noteTreeWidget->selectedItems();
             for (QTreeWidgetItem *item : selItems) {
                 if (item->data(0, Qt::UserRole + 1) != NoteType) {
                     continue;

src/widgets/notesubfoldertree.h

@@ -20,6 +20,7 @@ class NoteSubFolderTree : public QTreeWidget {
     void reload();
 
     static QMenu *contextMenu(QTreeWidget *parent);
+    static void removeSelectedNoteSubFolders(QTreeWidget *treeWidget);
 
    public Q_SLOTS:
     void onItemExpanded(QTreeWidgetItem *item);
@@ -30,8 +31,6 @@ class NoteSubFolderTree : public QTreeWidget {
     void onItemChanged(QTreeWidgetItem *item, int column);
     void onItemSelectionChanged();
 
-    static void removeSelectedNoteSubFolders(QTreeWidget *treeWidget);
-
    Q_SIGNALS:
     void currentSubFolderChanged();
     void multipleSubfoldersSelected();