Changeset 70272 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 21, 2017 12:35:24 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:9072 Mark logviewer scrollbar when all the maches are highligthed

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/logviewer/UIVMLogViewerSearchPanel.cpp (modified) (8 diffs)
• src/logviewer/UIVMLogViewerSearchPanel.h (modified) (4 diffs)
• src/logviewer/UIVMLogViewerWidget.cpp (modified) (7 diffs)
• src/logviewer/UIVMLogViewerWidget.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -545 +545 @@
         src/globals/UIMainEventListener.cpp \
         src/globals/UIThreadPool.cpp \
+        src/logviewer/UIVMLogViewerWidget.cpp \
         src/medium/UIMediumEnumerator.cpp \
         src/runtime/UIActionPoolRuntime.cpp \

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

@@ -21 +21 @@
 
 /* Qt includes: */
+# include <QAction>
 # include <QCheckBox>
 # include <QComboBox>
@@ -29 +30 @@
 # include <QLabel>
 # include <QPlainTextEdit>
+# include <QTextBlock>
 
 /* GUI includes: */
@@ -75 +77 @@
 }
 
+const QVector<float> &UIVMLogViewerSearchPanel::getMatchLocationVector() const
+{
+    return m_matchLocationVector;
+}
+
 void UIVMLogViewerSearchPanel::hideEvent(QHideEvent *pEvent)
 {
@@ -146 +153 @@
         if (m_iMatchCount != 0)
             m_iMatchCount = -1;
+
+        m_matchLocationVector.clear();
         pDocument->undo();
     }
     configureInfoLabels();
+    emit sigHighlightingUpdated();
 }
 
@@ -473 +483 @@
    }
    else
+   {
        m_iMatchCount = -1;
+       m_matchLocationVector.clear();
+   }
 
    QTextCursor resultCursor(pDocument);
@@ -513 +526 @@
    m_iSearchPosition = resultCursor.position();
    configureInfoLabels();
+   emit sigHighlightingUpdated();
 }
 
@@ -529 +543 @@
 {
     m_iMatchCount = 0;
+    m_matchLocationVector.clear();
     if (!pDocument)
         return;
@@ -540 +555 @@
     cursor.beginEditBlock();
     colorFormat.setBackground(Qt::yellow);
-
+    int lineCount = pDocument->lineCount();
     while (!highlightCursor.isNull() && !highlightCursor.atEnd())
     {
         /* Hightlighting searches is always from the top of the document forward: */
         highlightCursor = pDocument->find(searchString, highlightCursor, constructFindFlags(ForwardSearch));
-
         if (!highlightCursor.isNull())
         {
             highlightCursor.mergeCharFormat(colorFormat);
             ++m_iMatchCount;
+            /* The following assumes we have single line blocks only: */
+            int cursorLine = pDocument->findBlock(highlightCursor.position()).firstLineNumber();
+            if (lineCount != 0)
+                m_matchLocationVector.push_back(cursorLine / static_cast<float>(lineCount));
         }
     }

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

@@ -42 +42 @@
     Q_OBJECT;
 
+signals:
+    void sigHighlightingUpdated();
+
 public:
 
@@ -50 +53 @@
     void refresh();
     void reset();
+    const QVector<float> &getMatchLocationVector() const;
 
 protected:
@@ -63 +67 @@
       * @param  strSearchString  Specifies search-string. */
     void findCurrent(const QString &strSearchString);
+    void sltHighlightAllCheckBox();
 
-    void sltHighlightAllCheckBox();
 private:
     enum SearchDirection { ForwardSearch, BackwardSearch };
@@ -131 +135 @@
       n > 0: n matches found. */
     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. */
+    QVector<float> m_matchLocationVector;
 };
 
 
 #endif /* !___UIVMLogViewerSearchPanel_h___ */
+

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

@@ -27 +27 @@
 #  include <QFontDatabase>
 # endif
+# include <QPainter>
 # include <QPlainTextEdit>
 # include <QScrollBar>
@@ -48 +49 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+/** We use a modified scrollbar style for our QPlainTextEdits to get the
+    markings on the scrollbars correctly. The default scrollbarstyle does not
+    reveal the height of the pushbuttons on the scrollbar to compute the marking
+    locations correctlt. so we turn them off: */
+const QString verticalScrollBarStyle("QScrollBar:vertical {"
+                                     "border: 1px ridge grey; "
+                                     "margin: 0px 0px 0 0px;}"
+                                     "QScrollBar::handle:vertical {"
+                                     "min-height: 10px;"
+                                     "background: grey;}"
+                                     "QScrollBar::add-line:vertical {"
+                                     "width: 0px;}"
+                                     "QScrollBar::sub-line:vertical {"
+                                     "width: 0px;}");
+
+const QString horizontalScrollBarStyle("QScrollBar:horizontal {"
+                                       "border: 1px ridge grey; "
+                                       "margin: 0px 0px 0 0px;}"
+                                       "QScrollBar::handle:horizontal {"
+                                       "min-height: 10px;"
+                                       "background: grey;}"
+                                       "QScrollBar::add-line:horizontal {"
+                                       "height: 0px;}"
+                                       "QScrollBar::sub-line:horizontal {"
+                                       "height: 0px;}");
+
+class UIIndicatorScrollBar : public QScrollBar
+{
+    Q_OBJECT;
+
+public:
+
+    UIIndicatorScrollBar(QWidget *parent = 0)
+        :QScrollBar(parent)
+    {
+        setStyleSheet(verticalScrollBarStyle);
+    }
+
+    void setMarkingsVector(const QVector<float> &vector)
+    {
+        m_markingsVector = vector;
+    }
+
+protected:
+
+    virtual void paintEvent(QPaintEvent *pEvent) /* override */
+    {
+        QScrollBar::paintEvent(pEvent);
+        /* Put a red line to marking position: */
+        for (int i = 0; i < m_markingsVector.size(); ++i)
+        {
+            QPointF p1 = QPointF(0, m_markingsVector[i] * height());
+            QPointF p2 = QPointF(width(), m_markingsVector[i] * height());
+
+            QPainter painter(this);
+            painter.setRenderHint(QPainter::Antialiasing, true);
+            painter.setPen(QPen(QColor(255, 0, 0, 255), 1.2f));
+            painter.drawLine(p1, p2);
+        }
+    }
+
+private:
+    /* Stores the relative (to scrollbar's height) positions of markings,
+       where we draw a horizontal line. */
+    QVector<float> m_markingsVector;
+};
 UIVMLogViewerWidget::UIVMLogViewerWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */, const CMachine &machine /* = CMachine() */)
     : QIWithRetranslateUI<QWidget>(pParent)
@@ -205 +272 @@
 }
 
+void UIVMLogViewerWidget::sltSearchResultHighLigting()
+{
+    if (!m_pSearchPanel)
+        return;
+
+    if (!currentLogPage())
+        return;
+    UIIndicatorScrollBar* scrollBar = qobject_cast<UIIndicatorScrollBar*>(currentLogPage()->verticalScrollBar());
+    if (scrollBar)
+        scrollBar->setMarkingsVector(m_pSearchPanel->getMatchLocationVector());
+
+    m_markingsVector = m_pSearchPanel->getMatchLocationVector();
+    currentLogPage()->repaint();
+}
+
 void UIVMLogViewerWidget::setMachine(const CMachine &machine)
 {
@@ -260 +342 @@
         /* Add VM Log-Viewer search-panel to main-layout: */
         m_pMainLayout->insertWidget(2, m_pSearchPanel);
+        connect(m_pSearchPanel, &UIVMLogViewerSearchPanel::sigHighlightingUpdated,
+                this, &UIVMLogViewerWidget::sltSearchResultHighLigting);
     }
 
@@ -579 +663 @@
         {
             /* Configure Log-Viewer: */
+            pLogViewer->setVerticalScrollBar(new UIIndicatorScrollBar());
+            pLogViewer->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+            QScrollBar *pHorizontalScrollBar = pLogViewer->horizontalScrollBar();
+            if (pHorizontalScrollBar)
+            {
+                pHorizontalScrollBar->setStyleSheet(horizontalScrollBarStyle);
+            }
 #if defined(RT_OS_SOLARIS)
             /* Use system fixed-width font on Solaris hosts as the Courier family fonts don't render well. */
@@ -588 +679 @@
             pLogViewer->setFont(font);
             pLogViewer->setWordWrapMode(QTextOption::NoWrap);
-            pLogViewer->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
             pLogViewer->setReadOnly(true);
             /* Add Log-Viewer to page-layout: */
@@ -603 +693 @@
     return m_logMap[currentLogPage()];
 }
+
+#include "UIVMLogViewerWidget.moc"

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

@@ -73 +73 @@
 protected:
 
-
     /** Returns whether the window should be maximized when geometry being restored. */
     virtual bool shouldBeMaximized() const /* override */;
@@ -87 +86 @@
     /** Handles filter action triggering. */
     void sltFilter();
+
+    /** Handles the search result highlight changes. */
+    void sltSearchResultHighLigting();
 
 private:
@@ -168 +170 @@
     /** @} */
 
+    QVector<float> m_markingsVector;
+
     friend class UIVMLogViewerSearchPanel;
     friend class UIVMLogViewerFilterPanel;