Changeset 88735 in vbox for trunk/src/VBox

Timestamp:

Apr 27, 2021 1:22:01 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Syncing search and filtering

Location:

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

Files:

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

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

@@ -271 +271 @@
         resetFiltering();
     retranslateUi();
+    emit sigFilterApplied();
 }
 
@@ -321 +322 @@
     cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
     pCurrentTextEdit->setTextCursor(cursor);
-
-    emit sigFilterApplied(false /* isOriginalLog */);
     logPage->scrollToEnd();
 }
@@ -398 +397 @@
         return;
     m_filterTermSet.clear();
-    resetFiltering();
+    applyFilter();
     if (m_pFilterTermsLineEdit)
         m_pFilterTermsLineEdit->clearAll();

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

@@ -47 +47 @@
 signals:
 
-    /* Notifies listeners that the filter has been applied. @a isOriginalLog is true
-     if filter function returns early for some reason (no filter term etc.) and log page
-     content is set to original log file. @a isOriginalLog is false if content is reduced (filtered)*/
-    void sigFilterApplied(bool isOriginalLog);
+    void sigFilterApplied();
 
 public:

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

@@ -405 +405 @@
 
     /* Dont refresh the search here as it is refreshed by the filtering mechanism
-       which is updated as tab current index changes: */
+       which is updated as tab current index changes (see sltFilterApplied): */
     if (m_pFilterPanel)
         m_pFilterPanel->applyFilter();
@@ -414 +414 @@
 }
 
-void UIVMLogViewerWidget::sltFilterApplied(bool isOriginal)
-{
-    if (currentLogPage())
-        currentLogPage()->setFiltered(!isOriginal);
+void UIVMLogViewerWidget::sltFilterApplied()
+{
     /* Reapply the search to get highlighting etc. correctly */
     if (m_pSearchPanel && m_pSearchPanel->isVisible())

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

@@ -120 +120 @@
     /** Handles the tab change of the logviewer. */
     void sltCurrentTabChanged(int tabIndex);
-    /* if @a isOriginal true than the result of the filtering is equal to
-       the original log file for some reason. */
-    void sltFilterApplied(bool isOriginal);
+    void sltFilterApplied();
     /* Handles the UIVMLogPage signal which is emitted when isFiltered property
        of UIVMLogPage is changed. */