Changeset 86821 in vbox

Timestamp:

Nov 6, 2020 12:19:28 PM (4 years ago)

Author:

vboxsync

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

141265

Message:

FE/Qt: bugref:9831. Some fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• helpbrowser/UIHelpBrowserWidget.cpp (modified) (12 diffs)
• logviewer/UIVMLogViewerSearchPanel.cpp (modified) (3 diffs)
• manager/chooser/UIChooserSearchWidget.cpp (modified) (1 diff)
• medium/UIMediumSearchWidget.cpp (modified) (1 diff)
• widgets/UISearchLineEdit.cpp (modified) (1 diff)
• widgets/UISearchLineEdit.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -86 +86 @@
     void sigDragging(const QPoint &delta);
     void sigSearchTextChanged(const QString &strSearchText);
+    void sigSelectNextMatch();
+    void sigSelectPreviousMatch();
 
 public:
 
     UIFindInPageWidget(QWidget *pParent = 0);
+    void setMatchCountAndCurrentIndex(int iTotalMatchCount, int iCurrentlyScrolledIndex);
+    void clearSearchField();
 
 protected:
@@ -100 +104 @@
     void retranslateUi();
     UISearchLineEdit  *m_pSearchLineEdit;
-    QIToolButton      *m_pDownButton;
-    QIToolButton      *m_pUpButton;
+    QIToolButton      *m_pNextButton;
+    QIToolButton      *m_pPreviousButton;
     QLabel            *m_pDragMoveLabel;
     QPoint m_previousMousePosition;
@@ -140 +144 @@
     void sltHandleFindWidgetDrag(const QPoint &delta);
     void sltHandleFindInPageSearchTextChange(const QString &strSearchText);
+    void sltSelectPreviousMatch();
+    void sltSelectNextMatch();
 
 private:
@@ -146 +152 @@
     bool isRectInside(const QRect &rect, int iMargin) const;
     void moveFindWidgetIn(int iMargin);
+    void findAllMatches(const QString &searchString);
+    void highlightFinds(int iSearchTermLength);
+    void selectMatch(int iMatchIndex, int iSearchStringLength);
     const QHelpEngine* m_pHelpEngine;
-
     UIFindInPageWidget *m_pFindInPageWidget;
     /* Initilized as false and set to true once the find widget is positioned during first resize. */
     bool m_fFindWidgetPositioned;
     const int m_iMarginForFindWidget;
+    /** Document positions of the cursors within the document for all matches. */
+    QVector<int>   m_matchedCursorPosition;
+    int m_iSelectedMatchIndex;
+    int m_iSearchTermLength;
 };
 
@@ -255 +267 @@
 };
 
+
 /*********************************************************************************************************************************
-*   UIFindInPageWidget implementation.                                                                                        *
+*   UIFindInPageWidget implementation.                                                                                           *
 *********************************************************************************************************************************/
 UIFindInPageWidget::UIFindInPageWidget(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pSearchLineEdit(0)
-    , m_pDownButton(0)
-    , m_pUpButton(0)
+    , m_pNextButton(0)
+    , m_pPreviousButton(0)
     , m_previousMousePosition(-1, -1)
 {
     prepare();
+}
+
+void UIFindInPageWidget::setMatchCountAndCurrentIndex(int iTotalMatchCount, int iCurrentlyScrolledIndex)
+{
+    if (!m_pSearchLineEdit)
+        return;
+    m_pSearchLineEdit->setMatchCount(iTotalMatchCount);
+    m_pSearchLineEdit->setScrollToIndex(iCurrentlyScrolledIndex);
+}
+
+void UIFindInPageWidget::clearSearchField()
+{
+    if (!m_pSearchLineEdit)
+        return;
+    m_pSearchLineEdit->blockSignals(true);
+    m_pSearchLineEdit->reset();
+    m_pSearchLineEdit->blockSignals(false);
 }
 
@@ -296 +326 @@
     m_pSearchLineEdit = new UISearchLineEdit;
     AssertReturnVoid(pLayout && m_pSearchLineEdit);
-
+    setFocusProxy(m_pSearchLineEdit);
     QFontMetrics fontMetric(m_pSearchLineEdit->font());
     setMinimumSize(40 * fontMetric.width("x"),
@@ -316 +346 @@
     pLayout->addWidget(m_pSearchLineEdit);
 
-    m_pUpButton = new QIToolButton;
-    m_pDownButton = new QIToolButton;
-
-    pLayout->addWidget(m_pUpButton);
-    pLayout->addWidget(m_pDownButton);
-
-    m_pUpButton->setIcon(UIIconPool::iconSet(":/arrow_up_10px.png"));
-    m_pDownButton->setIcon(UIIconPool::iconSet(":/arrow_down_10px.png"));
-
+    m_pPreviousButton = new QIToolButton;
+    m_pNextButton = new QIToolButton;
+
+    pLayout->addWidget(m_pPreviousButton);
+    pLayout->addWidget(m_pNextButton);
+
+    m_pPreviousButton->setIcon(UIIconPool::iconSet(":/arrow_up_10px.png"));
+    m_pNextButton->setIcon(UIIconPool::iconSet(":/arrow_down_10px.png"));
+
+    connect(m_pPreviousButton, &QIToolButton::pressed, this, &UIFindInPageWidget::sigSelectPreviousMatch);
+    connect(m_pNextButton, &QIToolButton::pressed, this, &UIFindInPageWidget::sigSelectNextMatch);
 }
 
@@ -581 +613 @@
     , m_fFindWidgetPositioned(false)
     , m_iMarginForFindWidget(qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin))
-{
+    , m_iSelectedMatchIndex(0)
+    , m_iSearchTermLength(0)
+{
+    setUndoRedoEnabled(true);
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigDragging,
             this, &UIHelpBrowserViewer::sltHandleFindWidgetDrag);
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigSearchTextChanged,
             this, &UIHelpBrowserViewer::sltHandleFindInPageSearchTextChange);
+
+    connect(m_pFindInPageWidget, &UIFindInPageWidget::sigSelectPreviousMatch,
+            this, &UIHelpBrowserViewer::sltSelectPreviousMatch);
+    connect(m_pFindInPageWidget, &UIFindInPageWidget::sigSelectNextMatch,
+            this, &UIHelpBrowserViewer::sltSelectNextMatch);
+
     m_pFindInPageWidget->setVisible(false);
     retranslateUi();
@@ -614 +655 @@
 void UIHelpBrowserViewer::toggleFindInPageWidget(bool fVisible)
 {
-    if (m_pFindInPageWidget)
-    {
-        m_pFindInPageWidget->setVisible(fVisible);
-        update();
-    }
+    if (!m_pFindInPageWidget)
+        return;
+    m_pFindInPageWidget->setVisible(fVisible);
+
+    if (!fVisible)
+    {
+        document()->undo();
+        m_pFindInPageWidget->clearSearchField();
+    }
+    else
+        m_pFindInPageWidget->setFocus();
 }
 
@@ -684 +731 @@
 }
 
- bool UIHelpBrowserViewer::isRectInside(const QRect &rect, int iMargin) const
+bool UIHelpBrowserViewer::isRectInside(const QRect &rect, int iMargin) const
 {
     if (rect.left() < iMargin || rect.top() < iMargin)
@@ -693 +740 @@
 }
 
+void UIHelpBrowserViewer::findAllMatches(const QString &searchString)
+{
+    QTextDocument *pDocument = document();
+    AssertReturnVoid(pDocument);
+
+    m_matchedCursorPosition.clear();
+    if (searchString.isEmpty())
+        return;
+    QTextCursor cursor(pDocument);
+    QTextDocument::FindFlags flags;
+    int iMatchCount = 0;
+    while (!cursor.isNull() && !cursor.atEnd())
+    {
+        cursor = pDocument->find(searchString, cursor, flags);
+        if (!cursor.isNull())
+        {
+            m_matchedCursorPosition << cursor.position() - searchString.length();
+            ++iMatchCount;
+        }
+    }
+}
+
+void UIHelpBrowserViewer::highlightFinds(int iSearchTermLength)
+{
+    QTextDocument* pDocument = document();
+    AssertReturnVoid(pDocument);
+    /* Clear previous highlight: */
+    pDocument->undo();
+
+    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] + iSearchTermLength, QTextCursor::KeepAnchor);
+        if (!highlightCursor.isNull())
+            highlightCursor.mergeCharFormat(colorFormat);
+    }
+    cursor.endEditBlock();
+}
+
+void UIHelpBrowserViewer::selectMatch(int iMatchIndex, int iSearchStringLength)
+{
+    QTextCursor cursor = textCursor();
+    /* Move the cursor to the beginning of the matched string: */
+    cursor.setPosition(m_matchedCursorPosition.at(iMatchIndex), QTextCursor::MoveAnchor);
+    /* Move the cursor to the end of the matched string while keeping the anchor at the begining thus selecting the text: */
+    cursor.setPosition(m_matchedCursorPosition.at(iMatchIndex) + iSearchStringLength, QTextCursor::KeepAnchor);
+    ensureCursorVisible();
+    setTextCursor(cursor);
+}
+
 void UIHelpBrowserViewer::sltHandleOpenInNewTab()
 {
@@ -718 +820 @@
 void UIHelpBrowserViewer::sltHandleFindInPageSearchTextChange(const QString &strSearchText)
 {
-    printf("%s\n", qPrintable(strSearchText));
-}
+    m_iSearchTermLength = strSearchText.length();
+    findAllMatches(strSearchText);
+    highlightFinds(m_iSearchTermLength);
+    //scrollToMatch(int iMatchIndex);
+    selectMatch(0, m_iSearchTermLength);
+    if (m_pFindInPageWidget)
+        m_pFindInPageWidget->setMatchCountAndCurrentIndex(m_matchedCursorPosition.size(), 0);
+}
+
+void UIHelpBrowserViewer::sltSelectPreviousMatch()
+{
+    m_iSelectedMatchIndex = m_iSelectedMatchIndex <= 0 ? m_matchedCursorPosition.size() - 1 : (m_iSelectedMatchIndex - 1);
+    selectMatch(m_iSelectedMatchIndex, m_iSearchTermLength);
+    if (m_pFindInPageWidget)
+        m_pFindInPageWidget->setMatchCountAndCurrentIndex(m_matchedCursorPosition.size(), m_iSelectedMatchIndex);
+}
+
+void UIHelpBrowserViewer::sltSelectNextMatch()
+{
+    m_iSelectedMatchIndex = m_iSelectedMatchIndex >= m_matchedCursorPosition.size() - 1 ? 0 : (m_iSelectedMatchIndex + 1);
+    selectMatch(m_iSelectedMatchIndex, m_iSearchTermLength);
+    if (m_pFindInPageWidget)
+        m_pFindInPageWidget->setMatchCountAndCurrentIndex(m_matchedCursorPosition.size(), m_iSelectedMatchIndex);
+}
+
 
 /*********************************************************************************************************************************

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

@@ -409 +409 @@
     {
         m_pSearchEditor->setMatchCount(m_matchedCursorPosition.size());
-        m_pSearchEditor->setScroolToIndex(m_matchedCursorPosition.empty() ? -1 : 0);
+        m_pSearchEditor->setScrollToIndex(m_matchedCursorPosition.empty() ? -1 : 0);
     }
     if (m_pHighlightAllCheckBox->isChecked())
@@ -494 +494 @@
     textEdit()->ensureCursorVisible();
     textEdit()->setTextCursor(cursor);
-    return;
 }
 
@@ -505 +504 @@
     selectMatch(m_iSelectedMatchIndex, m_pSearchEditor->text());
     if (m_pSearchEditor)
-        m_pSearchEditor->setScroolToIndex(m_iSelectedMatchIndex);
+        m_pSearchEditor->setScrollToIndex(m_iSelectedMatchIndex);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserSearchWidget.cpp

@@ -54 +54 @@
     if (!m_pLineEdit)
         return;
-    m_pLineEdit->setScroolToIndex(iScrollToIndex);
+    m_pLineEdit->setScrollToIndex(iScrollToIndex);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.cpp

@@ -262 +262 @@
         return;
     m_pSearchTermLineEdit->setMatchCount(iMatchCount);
-    m_pSearchTermLineEdit->setScroolToIndex(iScrollToIndex);
-}
+    m_pSearchTermLineEdit->setScrollToIndex(iScrollToIndex);
+}

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

@@ -75 +75 @@
 }
 
-void UISearchLineEdit::setScroolToIndex(int iScrollToIndex)
+void UISearchLineEdit::setScrollToIndex(int iScrollToIndex)
 {
     if (m_iScrollToIndex == iScrollToIndex)

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

@@ -41 +41 @@
     UISearchLineEdit(QWidget *pParent = 0);
     void setMatchCount(int iMatchCount);
-    void setScroolToIndex(int iScrollToIndex);
+    void setScrollToIndex(int iScrollToIndex);
     void reset();