Changeset 78459 in vbox

Timestamp:

May 10, 2019 7:31:41 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9072. Using UISearchLineEdit in the log viewer.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• logviewer/UIVMLogViewerSearchPanel.cpp (modified) (16 diffs)
• logviewer/UIVMLogViewerSearchPanel.h (modified) (4 diffs)
• logviewer/UIVMLogViewerWidget.cpp (modified) (2 diffs)
• widgets/UISearchLineEdit.cpp (modified) (1 diff)
• widgets/UISearchLineEdit.h (modified) (1 diff)

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

@@ -32 +32 @@
 #include "QIToolButton.h"
 #include "UIIconPool.h"
+#include "UISearchLineEdit.h"
 #include "UIVMLogPage.h"
 #include "UIVMLogViewerSearchPanel.h"
@@ -70 +71 @@
     /* Private member vars */
     QBrush m_baseBrush;
+
 };
 
@@ -80 +82 @@
     , m_pMatchWholeWordCheckBox(0)
     , m_pHighlightAllCheckBox(0)
-    , m_iSearchPosition(0)
+    , m_iSearchCursorPosition(0)
     , m_iMatchCount(0)
 {
@@ -89 +91 @@
 void UIVMLogViewerSearchPanel::refresh()
 {
-    m_iSearchPosition = 0;
+    m_iSearchCursorPosition = 0;
     /* We start the search from the end of the doc. assuming log's end is more interesting: */
     search(BackwardSearch, true);
@@ -97 +99 @@
 void UIVMLogViewerSearchPanel::reset()
 {
-    m_iSearchPosition = 0;
+    m_iSearchCursorPosition = 0;
     m_matchLocationVector.clear();
-    m_iMatchCount = 0;
+    setMatchCount(0);
+    if (m_pSearchEditor)
+        m_pSearchEditor->reset();
 }
 
@@ -112 +116 @@
 }
 
-int UIVMLogViewerSearchPanel::marchCount() const
+int UIVMLogViewerSearchPanel::matchCount() const
 {
     return m_iMatchCount;
@@ -141 +145 @@
     {
         /* Reset the position to force the search restart from the document's end: */
-        m_iSearchPosition = 0;
+        m_iSearchCursorPosition = 0;
         search(BackwardSearch, true);
         emit sigHighlightingUpdated();
@@ -161 +165 @@
         pBrowser->setTextCursor(cursor);
     }
-    m_iSearchPosition = -1;
-    m_iMatchCount = 0;
+    m_iSearchCursorPosition = -1;
+    setMatchCount(0);
     emit sigSearchUpdated();
     clearHighlighting();
@@ -216 +220 @@
 
         /* Create search-editor: */
-        m_pSearchEditor = new UIVMLogViewerSearchField(0 /* parent */);
+        m_pSearchEditor = new UISearchLineEdit(0 /* parent */);
         if (m_pSearchEditor)
         {
@@ -409 +413 @@
         /* Select all the text: */
         m_pSearchEditor->selectAll();
+        m_pSearchEditor->setMatchCount(m_iMatchCount);
     }
 }
@@ -424 +429 @@
 
     const QString &searchString = m_pSearchEditor->text();
-    m_iMatchCount = countMatches(pDocument, searchString);
+    setMatchCount(countMatches(pDocument, searchString));
     emit sigSearchUpdated();
 
@@ -443 +448 @@
 
     QTextCursor resultCursor(pDocument);
-    int startPosition = m_iSearchPosition;
+    int startPosition = m_iSearchCursorPosition;
     if (direction == BackwardSearch)
         startPosition -= searchString.length();
@@ -460 +465 @@
         if (direction == ForwardSearch)
         {
-            m_iSearchPosition = startCursor.position();
+            m_iSearchCursorPosition = startCursor.position();
             search(ForwardSearch, false);
             return;
@@ -468 +473 @@
             /* Set the search position away from the end position to be
                able to find the string at the end of the document: */
-            m_iSearchPosition = endCursor.position() + searchString.length();
+            m_iSearchCursorPosition = endCursor.position() + searchString.length();
             search(BackwardSearch, false);
             return;
@@ -474 +479 @@
     }
     pTextEdit->setTextCursor(resultCursor);
-    m_iSearchPosition = resultCursor.position();
+    m_iSearchCursorPosition = resultCursor.position();
 }
 
@@ -550 +555 @@
 }
 
+void UIVMLogViewerSearchPanel::setMatchCount(int iCount)
+{
+    if (m_iMatchCount == iCount)
+        return;
+    m_iMatchCount = iCount;
+    if (m_pSearchEditor)
+        m_pSearchEditor->setMatchCount(iCount);
+}
+
 QTextDocument::FindFlags UIVMLogViewerSearchPanel::constructFindFlags(SearchDirection eDirection) const
 {

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

@@ -34 +34 @@
 class QWidget;
 class QIToolButton;
+class UISearchLineEdit;
 class UIVMLogViewerSearchField;
 class UIVMLogViewerWidget;
@@ -59 +60 @@
     virtual QString panelName() const /* override */;
     /** Returns the number of the matches to the current search. */
-    int marchCount() const;
+    int matchCount() const;
 
 protected:
@@ -103 +104 @@
     /** Searches the whole document and return the number of matches to the current search term. */
     int countMatches(QTextDocument *pDocument, const QString &searchString) const;
+    void setMatchCount(int iCount);
     /** Holds the instance of search-editor we create. */
-    UIVMLogViewerSearchField *m_pSearchEditor;
+    UISearchLineEdit *m_pSearchEditor;
 
     QIToolButton *m_pNextButton;
@@ -114 +116 @@
 
     /** Holds the position where we start the next search. */
-    int          m_iSearchPosition;
+    int          m_iSearchCursorPosition;
     /** Holds the number of the matches for the string. 0 for no matches. */
     int          m_iMatchCount;
+
     /** Stores relative positions of the lines of the matches. The values are [0,1]
         0 being the first line 1 being the last. */

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

@@ -312 +312 @@
     for (int i = 0; i < m_logPageList.size(); ++i)
         if (UIVMLogPage *pPage = qobject_cast<UIVMLogPage*>(m_logPageList[i]))
-            pPage->setSearchMatchCount(m_pSearchPanel->marchCount());
+            pPage->setSearchMatchCount(m_pSearchPanel->matchCount());
 }
 
@@ -768 +768 @@
         }
         pLogPage->setSearchResultOverlayShowHide(m_pSearchPanel->isVisible());
-        pLogPage->setSearchMatchCount(m_pSearchPanel->marchCount());
+        pLogPage->setSearchMatchCount(m_pSearchPanel->matchCount());
         pLogPage->setScrollBarMarkingsVector(m_pSearchPanel->matchLocationVector());
     }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISearchLineEdit.cpp

@@ -83 +83 @@
 }
 
+void UISearchLineEdit::reset()
+{
+    clear();
+    m_iMatchCount = 0;
+    m_iScrollToIndex = 0;
+    colorBackground(false);
+}
+
 void UISearchLineEdit::colorBackground(bool fWarning)
 {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISearchLineEdit.h

@@ -42 +42 @@
     void setMatchCount(int iMatchCount);
     void setScroolToIndex(int iScrollToIndex);
+    void reset();
 
 protected: