#1077 supplemental Ctrl-F support

Author: MaartenHilferink

qtgui/exe/src/DmsActions.cpp

@@ -76,6 +76,7 @@ void createDmsActions() {
     main_window->connect(main_window->m_find_treeitem_action.get(), &QAction::triggered, main_window, &MainWindow::findTreeItem);
     main_window->m_edit_menu->addAction(main_window->m_find_treeitem_action.get());
     main_window->m_find_treeitem_action->setShortcut(QKeySequence(QObject::tr("Ctrl+F")));
+    main_window->m_find_treeitem_action->setShortcutContext(Qt::ApplicationShortcut);
 
     // update treeitem
     main_window->m_update_treeitem_action = std::make_unique<QAction>(QObject::tr("&Update TreeItem"));

qtgui/exe/src/DmsMainWindow.cpp

@@ -48,6 +48,7 @@
 #include "DmsErrorWindow.h"
 #include "DmsAddressBar.h"
 #include "StatisticsBrowser.h"
+#include "UpdatableBrowser.h"
 
 #include "StateChangeNotification.h"
 #include "stg/AbstrStorageManager.h"
@@ -1855,6 +1856,38 @@ void MainWindow::expandRecursiveFromCurrentItem() {
 }
 
 void MainWindow::findTreeItem() {
+    // Check if focus is on a widget that has its own find functionality
+    auto focusWidget = QApplication::focusWidget();
+
+    // Don't open tree item search if detail pages, statistics, or value info has focus
+    // (they have their own Ctrl+F handlers)
+    if (focusWidget)
+    {
+        // Check if the focus widget is or is a child of a widget with its own find handler
+        auto parent = focusWidget;
+        while (parent)
+        {
+            auto helperWindowType = parent->property("DmsHelperWindowType").value<QVariant>().toInt();
+            if (helperWindowType == DmsHelperWindowType::HW_DETAILPAGES 
+                || helperWindowType == DmsHelperWindowType::HW_STATISTICS 
+                || helperWindowType == DmsHelperWindowType::HW_VALUEINFO)
+            {
+                // Let the widget handle Ctrl+F itself
+                return;
+            }
+
+            // Check if it's a DataView (table view, map view, etc.)
+            if (dynamic_cast<QDmsViewArea*>(parent))
+            {
+                // DataView might have its own find functionality
+                return;
+            }
+
+            parent = parent->parentWidget();
+        }
+    }
+
+    // Focus is on treeview, address bar, or main window - open tree item search
     if (!m_treeview->find_window)
     {
         m_treeview->find_window = new FindTextWindow(m_treeview);