Changeset 100921 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

Timestamp:

Aug 21, 2023 12:59:21 PM (19 months ago)

Author:

vboxsync

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

158858

Message:

FE/Qt: bugref:10496, bugref:9072. Refactoring filter panel. not complete.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp (modified) (7 diffs)

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

@@ -60 +60 @@
 #include "UIVMLogViewerWidget.h"
 #include "UIVMLogViewerBookmarksPanel.h"
-#include "UIVMLogViewerFilterPanel.h"
 #include "UIVMLogViewerOptionsPanel.h"
 
@@ -213 +212 @@
     , m_fIsPolished(false)
     , m_pTabWidget(0)
-    , m_pFilterPanel(0)
     , m_pBookmarksPanel(0)
     , m_pOptionsPanel(0)
@@ -429 +427 @@
 
     /* Re-Apply the filter settings: */
-    if (m_pFilterPanel)
-        m_pFilterPanel->applyFilter();
+    if (m_pPanel)
+        m_pPanel->applyFilter();
 }
 
@@ -445 +443 @@
 
     /* re-Apply the filter settings: */
-    if (m_pFilterPanel)
-        m_pFilterPanel->applyFilter();
+    if (m_pPanel)
+        m_pPanel->applyFilter();
 
     m_pTabWidget->blockSignals(false);
@@ -553 +551 @@
     /* Dont refresh the search here as it is refreshed by the filtering mechanism
        which is updated as tab current index changes (see sltFilterApplied): */
-    if (m_pFilterPanel)
-        m_pFilterPanel->applyFilter();
+    if (m_pPanel)
+        m_pPanel->applyFilter();
 
     /* We keep a separate QVector<LogBookmark> for each log page: */
@@ -758 +756 @@
 
     /* Create VM Log-Viewer filter-panel: */
-    m_pFilterPanel = new UIVMLogViewerFilterPanel(0, this);
-    if (m_pFilterPanel)
-    {
-        /* Configure panel: */
-        //installEventFilter(m_pFilterPanel);
-        m_pFilterPanel->hide();
-        connect(m_pFilterPanel, &UIVMLogViewerFilterPanel::sigFilterApplied,
-                this, &UIVMLogViewerWidget::sltFilterApplied);
-
-        /* Add into layout: */
-        m_pMainLayout->addWidget(m_pFilterPanel);
-    }
+    // m_pFilterPanel = new UIVMLogViewerFilterPanel(0, this);
+    // if (m_pFilterPanel)
+    // {
+    //     /* Configure panel: */
+    //     //installEventFilter(m_pFilterPanel);
+    //     m_pFilterPanel->hide();
+
+    //     /* Add into layout: */
+    //     m_pMainLayout->addWidget(m_pFilterPanel);
+    // }
 
     /* Create VM Log-Viewer bookmarks-panel: */
@@ -813 +809 @@
     connect(m_pPanel, &UIVMLogViewerPanelNew::sigSearchUpdated,
             this, &UIVMLogViewerWidget::sltHandleSearchUpdated);
+    connect(m_pPanel, &UIVMLogViewerPanelNew::sigFilterApplied,
+            this, &UIVMLogViewerWidget::sltFilterApplied);
 
     m_pMainLayout->addWidget(m_pPanel);