Changeset 100921 in vbox for trunk/src/VBox

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.

Location:

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

Files:

• UIVMLogViewerPanel.cpp (modified) (5 diffs)
• UIVMLogViewerPanel.h (modified) (5 diffs)
• UIVMLogViewerWidget.cpp (modified) (7 diffs)
• UIVMLogViewerWidget.h (modified) (1 diff)

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

@@ -37 +37 @@
 #include "UIVMLogViewerWidget.h"
 #include "UIVMLogViewerSearchPanel.h"
+#include "UIVMLogViewerFilterPanel.h"
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
@@ -43 +44 @@
 UIVMLogViewerPanelNew::UIVMLogViewerPanelNew(QWidget *pParent, UIVMLogViewerWidget *pViewer)
     : QIWithRetranslateUI<UIDialogPanelBase>(pParent)
+    , m_pViewer(pViewer)
     , m_pSearchWidget(0)
-    , m_pViewer(pViewer)
+    , m_pFilterWidget(0)
 {
     prepare();
@@ -51 +53 @@
 void UIVMLogViewerPanelNew::prepare()
 {
+    /* Search tab: */
     m_pSearchWidget = new UIVMLogViewerSearchPanel(0, m_pViewer);
-    insertTab(0, m_pSearchWidget);
+    insertTab(Page_Search, m_pSearchWidget);
 
     connect(m_pSearchWidget, &UIVMLogViewerSearchPanel::sigHighlightingUpdated,
@@ -58 +61 @@
     connect(m_pSearchWidget, &UIVMLogViewerSearchPanel::sigSearchUpdated,
             this, &UIVMLogViewerPanelNew::sigSearchUpdated);
+
+    /* Filter tab: */
+    m_pSearchWidget = new UIVMLogViewerSearchPanel(0, m_pViewer);
+    insertTab(Page_Filter, m_pSearchWidget);
+
+    connect(m_pFilterWidget, &UIVMLogViewerFilterPanel::sigFilterApplied,
+            this, &UIVMLogViewerPanelNew::sigFilterApplied);
 
     retranslateUi();
@@ -82 +92 @@
 }
 
+void UIVMLogViewerPanelNew::applyFilter()
+{
+    if (m_pFilterWidget)
+        m_pFilterWidget->applyFilter();
+}
+
 void UIVMLogViewerPanelNew::retranslateUi()
 {
-    setTabText(0, "Find");
+    setTabText(Page_Search, "Find");
+    setTabText(Page_Filter, "Filter");
 }
 

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

@@ -40 +40 @@
 class UIVMLogViewerWidget;
 class UIVMLogViewerSearchPanel;
+class UIVMLogViewerFilterPanel;
 
 class UIVMLogViewerPanelNew : public QIWithRetranslateUI<UIDialogPanelBase>
@@ -49 +50 @@
     void sigHighlightingUpdated();
     void sigSearchUpdated();
+    void sigFilterApplied();
 
 public:
@@ -62 +64 @@
     /** @} */
 
+    /** @name Filter page pass through functions
+      * @{ */
+        void applyFilter();
+    /** @} */
+
+
     enum Page
     {
@@ -69 +77 @@
         Page_Preferences,
         Page_Max
-    }
-        ;
+    };
+
 protected:
 
@@ -80 +88 @@
     void prepare() override;
 
+    UIVMLogViewerWidget *m_pViewer;
+
     UIVMLogViewerSearchPanel *m_pSearchWidget;
-    UIVMLogViewerWidget *m_pViewer;
+    UIVMLogViewerFilterPanel *m_pFilterWidget;
 };
 

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);

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

@@ -227 +227 @@
     /** @name Panel instances and a QMap for mapping panel instances to related actions.
       * @{ */
-        UIVMLogViewerFilterPanel    *m_pFilterPanel;
         UIVMLogViewerBookmarksPanel *m_pBookmarksPanel;
         UIVMLogViewerOptionsPanel   *m_pOptionsPanel;