Changeset 100919 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 21, 2023 12:29:25 PM (18 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158856

Message:

FE/Qt: bugref:10496, bugref:9072. Restoring event filtering for search panel.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerPanel.cpp (modified) (1 diff)
• UIVMLogViewerPanel.h (modified) (3 diffs)
• UIVMLogViewerSearchPanel.cpp (modified) (2 diffs)
• UIVMLogViewerSearchPanel.h (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.cpp

@@ -87 +87 @@
 }
 
+bool UIVMLogViewerPanelNew::eventFilter(QObject *pObject, QEvent *pEvent)
+{
+    if (currentIndex() == static_cast<Page>(Page_Search))
+    {
+        if (m_pSearchWidget->handleSearchRelatedEvents(pObject, pEvent))
+            return true;
+    }
+    return QIWithRetranslateUI<UIDialogPanelBase>::eventFilter(pObject, pEvent);
+}
 
 /*********************************************************************************************************************************

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.h

@@ -62 +62 @@
     /** @} */
 
-
-
     enum Page
     {
@@ -71 +69 @@
         Page_Preferences,
         Page_Max
-    };
+    }
+        ;
+protected:
 
+    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
 
 private:
@@ -81 +82 @@
     UIVMLogViewerSearchPanel *m_pSearchWidget;
     UIVMLogViewerWidget *m_pViewer;
-
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.cpp

@@ -305 +305 @@
 }
 
-bool UIVMLogViewerSearchPanel::eventFilter(QObject *pObject, QEvent *pEvent)
+bool UIVMLogViewerSearchPanel::handleSearchRelatedEvents(QObject *pObject, QEvent *pEvent)
 {
     /* Handle only events sent to viewer(): */
     if (pObject != viewer())
-        return UIVMLogViewerPanel::eventFilter(pObject, pEvent);
+        return false;
 
     /* Depending on event-type: */
@@ -367 +367 @@
 
     /* Call to base-class: */
-    return UIVMLogViewerPanel::eventFilter(pObject, pEvent);
+    return false;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.h

@@ -68 +68 @@
     /** Returns the number of the matches to the current search. */
     int matchCount() const;
+    /** Handles Qt @a pEvent, used for keyboard processing. */
+    bool handleSearchRelatedEvents(QObject *pObject, QEvent *pEvent);
 
 protected:
@@ -76 +78 @@
     /** Handles Qt key-press @a pEevent. */
     virtual void keyPressEvent(QKeyEvent *pEvent) RT_OVERRIDE;
-    /** Handles Qt @a pEvent, used for keyboard processing. */
-    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
     virtual void showEvent(QShowEvent *pEvent) RT_OVERRIDE;
     virtual void hideEvent(QHideEvent* pEvent) RT_OVERRIDE;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -762 +762 @@
     {
         /* Configure panel: */
-        installEventFilter(m_pFilterPanel);
+        //installEventFilter(m_pFilterPanel);
         m_pFilterPanel->hide();
         connect(m_pFilterPanel, &UIVMLogViewerFilterPanel::sigFilterApplied,
@@ -808 +808 @@
     m_pPanel = new UIVMLogViewerPanelNew(0, this);
     AssertReturnVoid(m_pPanel);
-    //     installEventFilter(m_pSearchPanel);
+    installEventFilter(m_pPanel);
     connect(m_pPanel, &UIVMLogViewerPanelNew::sigHighlightingUpdated,
             this, &UIVMLogViewerWidget::sltSearchResultHighLigting);