Changeset 100926 in vbox

Timestamp:

Aug 21, 2023 3:35:07 PM (18 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10496, bugref:9072. Refactoring filter panel. second part.

Location:

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

Files:

• UIVMLogViewerFilterPanel.cpp (modified) (6 diffs)
• UIVMLogViewerFilterPanel.h (modified) (3 diffs)
• UIVMLogViewerPanel.cpp (modified) (1 diff)

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

@@ -275 +275 @@
     , m_iUnfilteredLineCount(0)
     , m_iFilteredLineCount(0)
-    , m_pMainLayout(0)
 {
     prepareWidgets();
@@ -434 +433 @@
 void UIVMLogViewerFilterPanel::prepareWidgets()
 {
-    m_pMainLayout = new QHBoxLayout;
-    AssertReturnVoid(m_pMainLayout);
-
-    prepareRadioButtonGroup();
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    AssertReturnVoid(pMainLayout);
+
+    prepareRadioButtonGroup(pMainLayout);
 
     /* Create combo/button layout: */
@@ -472 +471 @@
         }
 
-        m_pMainLayout->addLayout(pComboButtonLayout, 1);
+        pMainLayout->addLayout(pComboButtonLayout, 1);
     }
 
@@ -480 +479 @@
     {
         m_pFilterTermsLineEdit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-        m_pMainLayout->addWidget(m_pFilterTermsLineEdit, 3);
+        pMainLayout->addWidget(m_pFilterTermsLineEdit, 3);
     }
 
@@ -488 +487 @@
     {
         m_pResultLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-        m_pMainLayout->addWidget(m_pResultLabel, 0);
-    }
-}
-
-void UIVMLogViewerFilterPanel::prepareRadioButtonGroup()
+        pMainLayout->addWidget(m_pResultLabel, 0);
+    }
+    pMainLayout->addStretch(1);
+}
+
+void UIVMLogViewerFilterPanel::prepareRadioButtonGroup(QVBoxLayout *pLayout)
 {
     /* Create radio-button container: */
@@ -548 +548 @@
 
         /* Add into layout: */
-        m_pMainLayout->addWidget(m_pRadioButtonContainer);
+        pLayout->addWidget(m_pRadioButtonContainer);
     }
 

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

@@ -45 +45 @@
 class QLabel;
 class QLineEdit;
+class QVBoxLayout;
 class QIToolButton;
 class QRadioButton;
@@ -100 +101 @@
     };
 
-    void prepareRadioButtonGroup();
+    void prepareRadioButtonGroup(QVBoxLayout *pLayout);
 
     bool applyFilterTermsToString(const QString& string);
@@ -120 +121 @@
     int                  m_iUnfilteredLineCount;
     int                  m_iFilteredLineCount;
-    QHBoxLayout         *m_pMainLayout;
 };
 

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

@@ -63 +63 @@
 
     /* Filter tab: */
-    m_pSearchWidget = new UIVMLogViewerSearchPanel(0, m_pViewer);
-    insertTab(Page_Filter, m_pSearchWidget);
+    m_pFilterWidget = new UIVMLogViewerFilterPanel(0, m_pViewer);
+    insertTab(Page_Filter, m_pFilterWidget);
 
     connect(m_pFilterWidget, &UIVMLogViewerFilterPanel::sigFilterApplied,