Changeset 88734 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 27, 2021 12:56:38 PM (4 years ago)

Author:

vboxsync

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

144052

Message:

FE/Qt: bugref:9930. More fixing related to filtering

Location:

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

Files:

• UIVMLogPage.cpp (modified) (1 diff)
• UIVMLogPage.h (modified) (1 diff)
• UIVMLogViewerFilterPanel.cpp (modified) (5 diffs)
• UIVMLogViewerFilterPanel.h (modified) (1 diff)
• UIVMLogViewerSearchPanel.cpp (modified) (2 diffs)
• UIVMLogViewerTextEdit.cpp (modified) (1 diff)
• UIVMLogViewerTextEdit.h (modified) (1 diff)

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

@@ -328 +328 @@
     return m_iLogFileId;
 }
+
+void UIVMLogPage::scrollToEnd()
+{
+    if (m_pTextEdit)
+        m_pTextEdit->scrollToEnd();
+}

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

@@ -102 +102 @@
     int logFileId() const;
 
+    void scrollToEnd();
+
 private slots:
 

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

@@ -266 +266 @@
 void UIVMLogViewerFilterPanel::applyFilter()
 {
-    filter();
+    if (isVisible())
+        filter();
+    else
+        resetFiltering();
     retranslateUi();
 }
@@ -294 +297 @@
 
     if (m_filterTermSet.empty())
-    {
-        document->setPlainText(*originalLogString);
-        emit sigFilterApplied(true /* isOriginalLog */);
-        m_iFilteredLineCount = document->lineCount();
-        return;
-    }
+        resetFiltering();
 
     /* Prepare filter-data: */
@@ -325 +323 @@
 
     emit sigFilterApplied(false /* isOriginalLog */);
-}
-
-void resetFiltering()
-{
+    logPage->scrollToEnd();
+}
+
+void UIVMLogViewerFilterPanel::resetFiltering()
+{
+    UIVMLogPage *logPage = viewer()->currentLogPage();
+    QTextDocument *document = textDocument();
+    if (!logPage || !document)
+        return;
+
+    document->setPlainText(logPage->logString());
+    m_iFilteredLineCount = document->lineCount();
+    m_iUnfilteredLineCount = document->lineCount();
+    logPage->scrollToEnd();
 }
 
@@ -390 +398 @@
         return;
     m_filterTermSet.clear();
-    applyFilter();
+    resetFiltering();
     if (m_pFilterTermsLineEdit)
         m_pFilterTermsLineEdit->clearAll();
@@ -601 +609 @@
     /* Set focus to combo-box: */
     m_pFilterComboBox->setFocus();
+    applyFilter();
+}
+
+void UIVMLogViewerFilterPanel::hideEvent(QHideEvent *pEvent)
+{
+    UIVMLogViewerPanel::hideEvent(pEvent);
+    applyFilter();
 }
 

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

@@ -73 +73 @@
     bool eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
     void showEvent(QShowEvent *pEvent) /* override */;
+    void hideEvent(QHideEvent *pEvent) /* override */;
 
 private slots:

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

@@ -415 +415 @@
 void UIVMLogViewerSearchPanel::clearHighlighting()
 {
-    // if (!viewer())
-    //     return;
-    // QTextDocument* pDocument = textDocument();
-    // if (pDocument)
-    //     pDocument->undo();
-
     QPlainTextEdit *pTextEdit = textEdit();
     if (pTextEdit)
@@ -430 +424 @@
 {
     clearHighlighting();
-    // if (!pDocument)
-    //     return;
-    // if (searchString.isEmpty())
-    //     return;
-
-    // QTextCursor highlightCursor(pDocument);
-    // QTextCharFormat colorFormat(highlightCursor.charFormat());
-    // QTextCursor cursor(pDocument);
-    // cursor.beginEditBlock();
-    // colorFormat.setBackground(Qt::yellow);
-    // for (int i = 0; i < m_matchedCursorPosition.size(); ++i)
-    // {
-    //     highlightCursor.setPosition(m_matchedCursorPosition[i]);
-    //     highlightCursor.setPosition(m_matchedCursorPosition[i] + searchString.length(), QTextCursor::KeepAnchor);
-
-    //     if (!highlightCursor.isNull())
-    //     {
-    //         highlightCursor.mergeCharFormat(colorFormat);
-    //     }
-    // }
-    // cursor.endEditBlock();
     QPlainTextEdit *pTextEdit = textEdit();
 

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

@@ -416 +416 @@
 }
 
+void UIVMLogViewerTextEdit::scrollToEnd()
+{
+    moveCursor(QTextCursor::End);
+    ensureCursorVisible();
+}
+
 int UIVMLogViewerTextEdit::visibleLineCount()
 {

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

@@ -54 +54 @@
 
     void scrollToLine(int lineNumber);
+    void scrollToEnd();
     void setBookmarkLineSet(const QSet<int>& lineSet);
     void setShownTextIsFiltered(bool warning);