Frontends

Timestamp:

Sep 12, 2023 12:54:09 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699, bugref:9072. Fixing 'type to search' functionality of log viewer. take 1.

Location:

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

Files:

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

-              r100962
+              r101092
     connect(m_pSearchWidget, &UIVMLogViewerSearchWidget::sigSearchUpdated,
             this, &UIVMLogViewerPaneContainer::sigSearchUpdated);
+    connect(m_pSearchWidget, &UIVMLogViewerSearchWidget::sigShowPane,
+            this, &UIVMLogViewerPaneContainer::sigShowSearchPane);
     /* Filter tab: */
 …
 bool UIVMLogViewerPaneContainer::eventFilter(QObject *pObject, QEvent *pEvent)
+{
+    if (currentIndex() == static_cast<Page>(Page_Search))
+    {
+        if (m_pSearchWidget->handleSearchRelatedEvents(pObject, pEvent))
+            return true;
+    }
+    /* Check if the search panel is interested in the event (most prob. key event): */
+    if (m_pSearchWidget && m_pSearchWidget->handleSearchRelatedEvents(pObject, pEvent))
+        return true;
     return UIPaneContainer::eventFilter(pObject, pEvent);
+}

r100962	r101092
63	63	void sigChangeFont(QFont font);
64	64	void sigResetToDefaults();
	65
	66	void sigShowSearchPane();
65	67
66	68	public:

-              r100963
+              r101092
+            {
                 /* Make sure current log-page is visible: */
                 //emit sigShowPanel(this);
+                emit sigShowPane();
                 /* Set focus on search-editor: */
                 m_pSearchEditor->setFocus();
 …
+            {
                 /* Make sure current log-page is visible: */
                 //emit sigShowPanel(this);
+                emit sigShowPane();
                 /* Set focus on search-editor: */
                 m_pSearchEditor->setFocus();

r100963	r101092
57	57	void sigHighlightingUpdated();
58	58	void sigSearchUpdated();
	59	void sigShowPane();
59	60
60	61	public:

-              r101090
+              r101092
             break;
+    }
+}
+void UIVMLogViewerWidget::sltShowSearchPane()
+{
+    AssertReturnVoid(m_pPanel);
+    m_pPanel->setVisible(true);
+    int iIndex = (int)UIVMLogViewerPaneContainer::Page_Search;
+    m_pPanel->setCurrentIndex(iIndex);
+    sltPanelCurrentTabChanged(iIndex);
+}
 …
     connect(m_pPanel, &UIVMLogViewerPaneContainer::sigCurrentTabChanged,
             this, &UIVMLogViewerWidget::sltPanelCurrentTabChanged);
+    connect(m_pPanel, &UIVMLogViewerPaneContainer::sigShowSearchPane,
+            this, &UIVMLogViewerWidget::sltShowSearchPane);
     m_pMainLayout->addWidget(m_pPanel);

r101090	r101092
147	147	void sltPanelContainerHidden();
148	148	void sltPanelCurrentTabChanged(int iIndex);
	149	void sltShowSearchPane();
149	150
150	151	private:

Note: See TracChangeset for help on using the changeset viewer.