#3619 shortcuts: don't show actions that appear in multiple menus in the settings

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>

Author: pbek

CHANGELOG.md

@@ -5,8 +5,9 @@
 - Fixed custom shortcuts for actions that appear in multiple menus, such as
   **Find text in notes**, being treated as their default shortcut in the
   **Shortcuts** settings page; shortcut initialization now processes each
-  action only once so restored custom shortcuts no longer overwrite the stored
-  default shortcut used for visual marking and reset handling
+  action only once and the **Shortcuts** settings page only shows one row per
+  action, so restored custom shortcuts no longer overwrite the stored default
+  shortcut used for visual marking and reset handling
   (for [#3619](https://github.com/pbek/QOwnNotes/issues/3619))
 - Fixed a possible crash when changing **Icons** checkboxes in the **Color modes**
   settings by avoiding unnecessary web application client restarts for unrelated

src/dialogs/settingsdialog.cpp

@@ -459,6 +459,7 @@ void SettingsDialog::loadShortcutSettings() {
     ui->shortcutLoadingProgressBar->setVisible(true);
 
     int menuIndex = 0;
+    QSet<QString> processedActionObjectNames;
 
     // loop through all top-level menus and build the tree recursively
     for (const QMenu *menu : menus) {
@@ -471,7 +472,7 @@ void SettingsDialog::loadShortcutSettings() {
 
         buildShortcutTreeForMenu(menu, nullptr, settings, shortcutButtonActiveColor,
                                  shortcutButtonInactiveColor, disableShortcutButtonIcon,
-                                 clearButtonIcon, disabledMenuNames);
+                                 clearButtonIcon, disabledMenuNames, processedActionObjectNames);
     }
 
     ui->shortcutLoadingProgressBar->setVisible(false);
@@ -493,30 +494,11 @@ void SettingsDialog::loadShortcutSettings() {
  * @param clearButtonIcon             Icon for the clear button
  * @param disabledMenuNames           List of menu object names to skip
  */
-void SettingsDialog::buildShortcutTreeForMenu(const QMenu *menu, QTreeWidgetItem *parentItem,
-                                              SettingsService &settings,
-                                              const QColor &shortcutButtonActiveColor,
-                                              const QColor &shortcutButtonInactiveColor,
-                                              const QIcon &disableShortcutButtonIcon,
-                                              const QIcon &clearButtonIcon,
-                                              const QStringList &disabledMenuNames) {
-    // Count eligible actions first to decide whether to add this menu at all
-    int actionCount = 0;
-
-    foreach (QAction *action, menu->actions()) {
-        if (action->menu() != nullptr) {
-            if (!disabledMenuNames.contains(action->menu()->objectName())) {
-                actionCount++;
-            }
-        } else if (!action->objectName().isEmpty()) {
-            actionCount++;
-        }
-    }
-
-    if (actionCount == 0) {
-        return;
-    }
-
+void SettingsDialog::buildShortcutTreeForMenu(
+    const QMenu *menu, QTreeWidgetItem *parentItem, SettingsService &settings,
+    const QColor &shortcutButtonActiveColor, const QColor &shortcutButtonInactiveColor,
+    const QIcon &disableShortcutButtonIcon, const QIcon &clearButtonIcon,
+    const QStringList &disabledMenuNames, QSet<QString> &processedActionObjectNames) {
     // Add the menu item to the tree before populating children so that
     // setItemWidget() works correctly (items must be in the tree first)
     auto *menuItem = new QTreeWidgetItem();
@@ -543,7 +525,8 @@ void SettingsDialog::buildShortcutTreeForMenu(const QMenu *menu, QTreeWidgetItem
 
             buildShortcutTreeForMenu(subMenu, menuItem, settings, shortcutButtonActiveColor,
                                      shortcutButtonInactiveColor, disableShortcutButtonIcon,
-                                     clearButtonIcon, disabledMenuNames);
+                                     clearButtonIcon, disabledMenuNames,
+                                     processedActionObjectNames);
             continue;
         }
 
@@ -554,6 +537,11 @@ void SettingsDialog::buildShortcutTreeForMenu(const QMenu *menu, QTreeWidgetItem
             continue;
         }
 
+        if (processedActionObjectNames.contains(actionObjectName)) {
+            continue;
+        }
+        processedActionObjectNames.insert(actionObjectName);
+
         // create the tree widget item
         auto *actionItem = new QTreeWidgetItem();
         actionItem->setText(0, action->text().remove(QStringLiteral("&")));
@@ -677,6 +665,16 @@ void SettingsDialog::buildShortcutTreeForMenu(const QMenu *menu, QTreeWidgetItem
 
         ui->shortcutTreeWidget->setItemWidget(actionItem, 2, globalShortcutKeyWidget);
     }
+
+    if (menuItem->childCount() == 0) {
+        if (parentItem == nullptr) {
+            const int index = ui->shortcutTreeWidget->indexOfTopLevelItem(menuItem);
+            delete ui->shortcutTreeWidget->takeTopLevelItem(index);
+        } else {
+            parentItem->removeChild(menuItem);
+            delete menuItem;
+        }
+    }
 }
 
 /**

src/dialogs/settingsdialog.h

@@ -152,13 +152,11 @@ class SettingsDialog : public MasterDialog {
 
     void loadShortcutSettings();
 
-    void buildShortcutTreeForMenu(const QMenu *menu, QTreeWidgetItem *parentItem,
-                                  SettingsService &settings,
-                                  const QColor &shortcutButtonActiveColor,
-                                  const QColor &shortcutButtonInactiveColor,
-                                  const QIcon &disableShortcutButtonIcon,
-                                  const QIcon &clearButtonIcon,
-                                  const QStringList &disabledMenuNames);
+    void buildShortcutTreeForMenu(
+        const QMenu *menu, QTreeWidgetItem *parentItem, SettingsService &settings,
+        const QColor &shortcutButtonActiveColor, const QColor &shortcutButtonInactiveColor,
+        const QIcon &disableShortcutButtonIcon, const QIcon &clearButtonIcon,
+        const QStringList &disabledMenuNames, QSet<QString> &processedActionObjectNames);
 
     void storeShortcutSettings();