Changeset 103478 in vbox

Timestamp:

Feb 20, 2024 3:01:26 PM (13 months ago)

Author:

vboxsync

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

161814

Message:

FE/Qt: bugref:9072. Implementing buttons to navigate to the bottom/top of the log.

Location:

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

Files:

• UIVMLogPage.cpp (modified) (1 diff)
• UIVMLogViewerTextEdit.cpp (modified) (10 diffs)
• UIVMLogViewerTextEdit.h (modified) (4 diffs)

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

@@ -325 +325 @@
 {
     if (m_pTextEdit)
-        m_pTextEdit->scrollToEnd();
+        m_pTextEdit->scrollToBottom();
 }
 

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

@@ -33 +33 @@
 #include <QPainter>
 #include <QPlainTextEdit>
+#include <QLabel>
 #include <QScrollBar>
 #include <QStyle>
@@ -41 +42 @@
 #include "UIVMLogViewerTextEdit.h"
 #include "UIVMLogViewerWidget.h"
+
+/* Other VBox includes: */
+#include "iprt/assert.h"
 
 /** We use a modified scrollbar style for our QPlainTextEdits to get the
@@ -68 +72 @@
                                        "height: 0px;}");
 
+/*********************************************************************************************************************************
+*   UILogScrollLabel definition.                                                                                             *
+*********************************************************************************************************************************/
+
+class UILogScrollLabel : public QLabel
+{
+    Q_OBJECT;
+
+public:
+
+    UILogScrollLabel(QWidget *pParent);
+    void setOpacity(float fOpacity);
+
+protected:
+
+    virtual void paintEvent(QPaintEvent *pEvent) RT_OVERRIDE;
+
+private:
+
+    float m_fOpacity;
+};
+
 
 /*********************************************************************************************************************************
@@ -93 +119 @@
     QVector<float> m_markingsVector;
 };
+
+
+/*********************************************************************************************************************************
+*   UILogScrollLabel definition.                                                                                             *
+*********************************************************************************************************************************/
+
+UILogScrollLabel::UILogScrollLabel(QWidget *pParent)
+    : QLabel(pParent)
+    , m_fOpacity(1.f)
+{
+}
+
+void UILogScrollLabel::setOpacity(float fOpacity)
+{
+    if (m_fOpacity == fOpacity)
+        return;
+    m_fOpacity = fOpacity;
+    update();
+}
+
+void UILogScrollLabel::paintEvent(QPaintEvent *pEvent)
+{
+    Q_UNUSED(pEvent);
+    QPainter painter(this);
+    painter.setBrush(Qt::red);
+    painter.setOpacity(m_fOpacity);
+    painter.drawPixmap(0, 0, pixmap());
+}
 
 
@@ -204 +258 @@
     , m_bHasContextMenu(false)
     , m_iVerticalScrollBarValue(0)
+    , m_pScrollToBottomLabel(0)
+    , m_pScrollToTopLabel(0)
 {
     configure();
@@ -222 +278 @@
     setWrapLines(false);
     setReadOnly(true);
+    m_originalCursor = cursor();
 }
 
@@ -233 +290 @@
 {
     m_pLineNumberArea = new UILineNumberArea(this);
+    AssertReturnVoid(m_pLineNumberArea);
+
+    m_pScrollToBottomLabel = new UILogScrollLabel(this);
+    m_pScrollToTopLabel = new UILogScrollLabel(this);
+    AssertReturnVoid(m_pScrollToBottomLabel);
+    AssertReturnVoid(m_pScrollToTopLabel);
+
+    m_pScrollToBottomLabel->installEventFilter(this);
+    m_pScrollToTopLabel->installEventFilter(this);
+
+    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
+    m_pScrollToBottomLabel->setPixmap(UIIconPool::iconSet(":/vm_discard_32px.png").pixmap(iIconMetric, iIconMetric));
+    m_pScrollToBottomLabel->setOpacity(0.4);
+
+    m_pScrollToTopLabel->setPixmap(UIIconPool::iconSet(":/file_manager_go_up_24px.png").pixmap(iIconMetric, iIconMetric));
+    m_pScrollToTopLabel->setOpacity(0.4);
 
     connect(this, &UIVMLogViewerTextEdit::blockCountChanged, this, &UIVMLogViewerTextEdit::sltUpdateLineNumberAreaWidth);
@@ -339 +412 @@
 }
 
+bool UIVMLogViewerTextEdit::eventFilter(QObject *pObject, QEvent *pEvent)
+{
+    if (pObject == m_pScrollToBottomLabel || pObject == m_pScrollToTopLabel)
+    {
+        UILogScrollLabel *pLabel = qobject_cast<UILogScrollLabel*>(pObject);
+        if (pLabel)
+        {
+            switch(pEvent->type())
+            {
+                case (QEvent::Enter):
+                {
+                    setCursor(Qt::PointingHandCursor);
+                    pLabel->setOpacity(1.0);
+                    break;
+                }
+                case (QEvent::Leave):
+                {
+                    setCursor(m_originalCursor);
+                    pLabel->setOpacity(0.4);
+                    break;
+                }
+                case (QEvent::MouseButtonPress):
+                {
+                    if (pObject == m_pScrollToBottomLabel)
+                        scrollToBottom();
+                    else
+                        scrollToTop();
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+    }
+    return QIWithRetranslateUI<QPlainTextEdit>::eventFilter(pObject, pEvent);
+}
+
 void UIVMLogViewerTextEdit::contextMenuEvent(QContextMenuEvent *pEvent)
 {
@@ -384 +494 @@
         m_pLineNumberArea->setGeometry(QRect(cr.left(), cr.top(), lineNumberAreaWidth(), cr.height()));
     }
+
+   if (m_pScrollToBottomLabel && m_pScrollToTopLabel)
+   {
+       QScrollBar *pVScrollBar = verticalScrollBar();
+       QScrollBar *pHScrollBar = horizontalScrollBar();
+
+       int iMarginX = 0;
+       if (pVScrollBar)
+           iMarginX = pVScrollBar->width();
+       if (iMarginX == 0)
+           iMarginX = m_pScrollToBottomLabel->width();
+       iMarginX += 2 * QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin);
+       int iMarginY = 0;
+       if (pHScrollBar)
+           iMarginY = pHScrollBar->height();
+       if (iMarginY == 0)
+           iMarginY = m_pScrollToTopLabel->height();
+
+
+       m_pScrollToBottomLabel->move(width() - iMarginX - m_pScrollToBottomLabel->width(),
+                                     0.5 * m_pScrollToBottomLabel->height());
+
+       m_pScrollToTopLabel->move(width() - iMarginX - m_pScrollToTopLabel->width(),
+                                  height() - iMarginY - 1.5 * m_pScrollToTopLabel->height());
+   }
 }
 
@@ -452 +587 @@
 }
 
-void UIVMLogViewerTextEdit::scrollToEnd()
+void UIVMLogViewerTextEdit::scrollToBottom()
 {
     moveCursor(QTextCursor::End);
+    ensureCursorVisible();
+}
+
+void UIVMLogViewerTextEdit::scrollToTop()
+{
+    moveCursor(QTextCursor::Start);
     ensureCursorVisible();
 }

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

@@ -32 +32 @@
 #endif
 
+class UILogScrollLabel;
+
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
@@ -63 +65 @@
 
     void scrollToLine(int lineNumber);
-    void scrollToEnd();
+    void scrollToBottom();
+    void scrollToTop();
     void setBookmarkLineSet(const QSet<int>& lineSet);
     void setShownTextIsFiltered(bool warning);
@@ -90 +93 @@
     virtual void leaveEvent(QEvent * pEvent) RT_OVERRIDE;
     virtual void retranslateUi() RT_OVERRIDE;
+    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
 
 private slots:
@@ -127 +131 @@
     bool         m_bHasContextMenu;
     int          m_iVerticalScrollBarValue;
+    UILogScrollLabel *m_pScrollToBottomLabel;
+    UILogScrollLabel *m_pScrollToTopLabel;
+    QCursor      m_originalCursor;
  };