Changeset 70308 in vbox for trunk/src/VBox

Timestamp:

Dec 22, 2017 11:44:17 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9072 Reapply search and highlighting after each filtering

Location:

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

Files:

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

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

@@ -56 +56 @@
     AssertReturnVoid(pCurrentPage);
     QString strInputText = m_pViewer->currentLog();
-    if (!strInputText.isNull())
+    if (strInputText.isNull())
+        return;
+
+    /* Prepare filter-data: */
+    QString strFilteredText;
+    const QRegExp rxFilterExp(m_strFilterText, Qt::CaseInsensitive);
+
+    /* If filter regular-expression is not empty and valid, filter the log: */
+    if (!rxFilterExp.isEmpty() && rxFilterExp.isValid())
     {
-        /* Prepare filter-data: */
-        QString strFilteredText;
-        const QRegExp rxFilterExp(m_strFilterText, Qt::CaseInsensitive);
-
-        /* If filter regular-expression is not empty and valid, filter the log: */
-        if (!rxFilterExp.isEmpty() && rxFilterExp.isValid())
-        {
-            while (!strInputText.isEmpty())
+        while (!strInputText.isEmpty())
+        {
+            /* Read each line and check if it matches regular-expression: */
+            const int index = strInputText.indexOf('\n');
+            if (index > 0)
             {
-                /* Read each line and check if it matches regular-expression: */
-                const int index = strInputText.indexOf('\n');
-                if (index > 0)
-                {
-                    QString strLine = strInputText.left(index + 1);
-                    if (strLine.contains(rxFilterExp))
-                        strFilteredText.append(strLine);
-                }
-                strInputText.remove(0, index + 1);
+                QString strLine = strInputText.left(index + 1);
+                if (strLine.contains(rxFilterExp))
+                    strFilteredText.append(strLine);
             }
-            pCurrentPage->setPlainText(strFilteredText);
-        }
-        /* Restore entire log when filter regular expression is empty or not valid: */
-        else
-            pCurrentPage->setPlainText(strInputText);
-
-        /* Move the cursor position to end: */
-        QTextCursor cursor = pCurrentPage->textCursor();
-        cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
-        pCurrentPage->setTextCursor(cursor);
+            strInputText.remove(0, index + 1);
+        }
+        QTextDocument *document = pCurrentPage->document();
+        if(document)
+            document->setPlainText(strFilteredText);
     }
+    /* Restore entire log when filter regular expression is empty or not valid: */
+    else
+        pCurrentPage->setPlainText(strInputText);
+
+    /* Move the cursor position to end: */
+    QTextCursor cursor = pCurrentPage->textCursor();
+    cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
+    pCurrentPage->setTextCursor(cursor);
+
+    emit sigFilterApplied();
 }
 
@@ -161 +165 @@
 {
     /* Prepare connections: */
-    connect(m_pCloseButton, SIGNAL(clicked()), this, SLOT(hide()));
-    connect(m_pFilterComboBox, SIGNAL(editTextChanged(const QString &)),
-            this, SLOT(filter(const QString &)));
+    connect(m_pCloseButton, &UIMiniCancelButton::clicked, this, &UIVMLogViewerFilterPanel::hide);
+    connect(m_pFilterComboBox, &QComboBox::editTextChanged, this, &UIVMLogViewerFilterPanel::filter);
 }
 

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

@@ -38 +38 @@
     Q_OBJECT;
 
+signals:
+
+    /* Notifies listeners that the filter has been applied. */
+    void sigFilterApplied();
+
 public:
 
@@ -49 +54 @@
       * @param  iCurrentIndex  Specifies index of current log-page, but it is actually not used in the method. */
     void applyFilter(const int iCurrentIndex = 0);
+
 private slots:
 
@@ -76 +82 @@
     UIVMLogViewerWidget *m_pViewer;
     /** Holds the instance of main-layout we create. */
-    QHBoxLayout *m_pMainLayout;
+    QHBoxLayout         *m_pMainLayout;
     /** Holds the instance of close-button we create. */
-    UIMiniCancelButton *m_pCloseButton;
+    UIMiniCancelButton  *m_pCloseButton;
     /** Holds the instance of filter-label we create. */
-    QLabel *m_pFilterLabel;
+    QLabel              *m_pFilterLabel;
     /** Holds instance of filter combo-box we create. */
-    QComboBox *m_pFilterComboBox;
+    QComboBox           *m_pFilterComboBox;
     /** Holds the filter text. */
-    QString m_strFilterText;
+    QString              m_strFilterText;
 };
 

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

@@ -43 +43 @@
 
 signals:
+
     void sigHighlightingUpdated();
 
@@ -70 +71 @@
 
 private:
+
     enum SearchDirection { ForwardSearch, BackwardSearch };
     /** Prepares search-panel. */
@@ -141 +143 @@
 
 #endif /* !___UIVMLogViewerSearchPanel_h___ */
-

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

@@ -174 +174 @@
 {
     /* Disconnect this connection to avoid initial signals during page creation/deletion: */
-    disconnect(m_pViewerContainer, SIGNAL(currentChanged(int)), m_pFilterPanel, SLOT(applyFilter(int)));
+    disconnect(m_pViewerContainer, &QITabWidget::currentChanged, m_pFilterPanel, &UIVMLogViewerFilterPanel::applyFilter);
     disconnect(m_pViewerContainer, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltTabIndexChange);
 
@@ -228 +228 @@
 
     /* Setup this connection after refresh to avoid initial signals during page creation: */
-    connect(m_pViewerContainer, SIGNAL(currentChanged(int)), m_pFilterPanel, SLOT(applyFilter(int)));
+    connect(m_pViewerContainer, &QITabWidget::currentChanged, m_pFilterPanel, &UIVMLogViewerFilterPanel::applyFilter);
     connect(m_pViewerContainer, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltTabIndexChange);
 
@@ -304 +304 @@
 }
 
+void UIVMLogViewerWidget::
+sltFilterApplied()
+{
+    /* Reapply the search to get highlighting etc. correctly */
+    if (m_pSearchPanel && m_pSearchPanel->isVisible())
+        m_pSearchPanel->refresh();
+}
+
 void UIVMLogViewerWidget::setMachine(const CMachine &machine)
 {
@@ -372 +380 @@
         /* Add VM Log-Viewer filter-panel to main-layout: */
         m_pMainLayout->insertWidget(3, m_pFilterPanel);
+        connect(m_pFilterPanel, &UIVMLogViewerFilterPanel::sigFilterApplied,
+                this, &UIVMLogViewerWidget::sltFilterApplied);
     }
 }

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

@@ -93 +93 @@
     void sltTabIndexChange(int tabIndex);
 
+    void sltFilterApplied();
+
 private: