Changeset 70574 in vbox

Timestamp:

Jan 13, 2018 1:18:15 PM (7 years ago)

Author:

vboxsync

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

120261

Message:

FE/Qt bugref:9072: Logviewer bookmarks can be now managed through line number widget of the plain text edit

Location:

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

Files:

• UIVMLogPage.cpp (modified) (3 diffs)
• UIVMLogPage.h (modified) (2 diffs)
• UIVMLogViewerTextEdit.cpp (modified) (8 diffs)
• UIVMLogViewerTextEdit.h (modified) (3 diffs)

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

@@ -82 +82 @@
     m_pMainLayout->addWidget(m_pTextEdit);
 
-    connect(qobject_cast<UIVMLogViewerTextEdit*>(m_pTextEdit), &UIVMLogViewerTextEdit::sigContextMenuBookmarkAction,
+    connect(qobject_cast<UIVMLogViewerTextEdit*>(m_pTextEdit), &UIVMLogViewerTextEdit::sigAddBookmark,
             this, &UIVMLogPage::sltAddBookmark);
+    connect(qobject_cast<UIVMLogViewerTextEdit*>(m_pTextEdit), &UIVMLogViewerTextEdit::sigDeleteBookmark,
+            this, &UIVMLogPage::sltDeleteBookmark);
 }
 
@@ -186 +188 @@
 }
 
+void UIVMLogPage::deleteBookmark(LogBookmark bookmark)
+{
+    int index = -1;
+    for(int i = 0; i < m_bookmarkVector.size(); ++i)
+    {
+        if(m_bookmarkVector.at(i).first)
+        {
+            index = i;
+            break;
+        }
+    }
+    if(index != -1)
+        deleteBookmark(index);
+}
+
+
 void UIVMLogPage::deleteAllBookmarks()
 {
@@ -211 +229 @@
 {
     m_bookmarkVector.push_back(bookmark);
+    updateTextEditBookmarkLineSet();
+    emit sigBookmarksUpdated();
+}
+
+void UIVMLogPage::sltDeleteBookmark(LogBookmark bookmark)
+{
+    deleteBookmark(bookmark);
     updateTextEditBookmarkLineSet();
     emit sigBookmarksUpdated();

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

@@ -82 +82 @@
 
     void deleteBookmark(int index);
+    void deleteBookmark(LogBookmark bookmark);
 
     const QVector<LogBookmark>& bookmarkVector() const;
@@ -93 +94 @@
 
     void sltAddBookmark(LogBookmark bookmark);
+    void sltDeleteBookmark(LogBookmark bookmark);
 
 private:

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

@@ -113 +113 @@
     UILineNumberArea(UIVMLogViewerTextEdit *textEdit)
         :QWidget(textEdit)
-        , m_pTextEdit(textEdit){}
+        , m_pTextEdit(textEdit)
+    {
+        setMouseTracking(true);
+    }
 
     QSize sizeHint() const
     {
+        if(!m_pTextEdit)
+            return QSize();
         return QSize(m_pTextEdit->lineNumberAreaWidth(), 0);
     }
@@ -124 +129 @@
     void paintEvent(QPaintEvent *event)
     {
-        m_pTextEdit->lineNumberAreaPaintEvent(event);
+        if(m_pTextEdit)
+            m_pTextEdit->lineNumberAreaPaintEvent(event);
+    }
+
+    void mouseMoveEvent(QMouseEvent *pEvent)
+    {
+        m_pTextEdit->setMouseCursorLine(m_pTextEdit->lineNumberForPos(pEvent->pos()));
+        repaint();
+    }
+
+    void mousePressEvent(QMouseEvent *pEvent)
+    {
+        m_pTextEdit->toggleBookmark(m_pTextEdit->bookmarkForPos(pEvent->pos()));
     }
 
@@ -135 +152 @@
     :QPlainTextEdit(parent)
     , m_pLineNumberArea(0)
-{
-
+    , m_mouseCursorLine(-1)
+{
+    setMouseTracking(true);
     //setStyleSheet("background-color: rgba(240, 240, 240, 75%) ");
     prepare();
@@ -203 +221 @@
             if (m_bookmarkLineSet.contains(blockNumber + 1))
             {
-                painter.setBackgroundMode(Qt::OpaqueMode);
-                painter.setBackground(QBrush(Qt::red));
+                QPainterPath path;
+                path.addRect(0, top, m_pLineNumberArea->width(), m_pLineNumberArea->fontMetrics().lineSpacing());
+                painter.fillPath(path, QColor(204, 255, 51, 125));
+                painter.drawPath(path);
             }
-            else
+            if((blockNumber + 1) == m_mouseCursorLine)
             {
-                painter.setBackgroundMode(Qt::TransparentMode);
+                painter.setPen(Qt::red);
+                painter.drawRect(0, top, m_pLineNumberArea->width(), m_pLineNumberArea->fontMetrics().lineSpacing());
             }
+
             painter.setPen(Qt::black);
             painter.drawText(0, top, m_pLineNumberArea->width(), m_pLineNumberArea->fontMetrics().lineSpacing(),
@@ -225 +247 @@
     QMenu *menu = createStandardContextMenu();
     QAction *pAction = menu->addAction(tr("Bookmark"));
-    QTextBlock block = cursorForPosition(pEvent->pos()).block();
-    m_iContextMenuBookmark.first = block.firstLineNumber();
-    m_iContextMenuBookmark.second = block.text();
-
+    m_iContextMenuBookmark = bookmarkForPos(pEvent->pos());
     if (pAction)
         connect(pAction, &QAction::triggered, this, &UIVMLogViewerTextEdit::sltBookmark);
@@ -246 +265 @@
     QRect cr = contentsRect();
     m_pLineNumberArea->setGeometry(QRect(cr.left(), cr.top(), lineNumberAreaWidth(), cr.height()));
+}
+
+void UIVMLogViewerTextEdit::mouseMoveEvent(QMouseEvent *pEvent)
+{
+    setMouseCursorLine(lineNumberForPos(pEvent->pos()));
+    m_pLineNumberArea->repaint();
 }
 
@@ -267 +292 @@
 void UIVMLogViewerTextEdit::sltBookmark()
 {
-    emit sigContextMenuBookmarkAction(m_iContextMenuBookmark);
+    emit sigAddBookmark(m_iContextMenuBookmark);
 }
 
@@ -315 +340 @@
 }
 
+int  UIVMLogViewerTextEdit::lineNumberForPos(const QPoint &position)
+{
+    QTextBlock block = cursorForPosition(position).block();
+    return block.firstLineNumber() + 1;
+}
+
+QPair<int, QString> UIVMLogViewerTextEdit::bookmarkForPos(const QPoint &position)
+{
+    QTextBlock block = cursorForPosition(position).block();
+    return QPair<int, QString>(block.firstLineNumber() + 1, block.text());
+}
+
+void UIVMLogViewerTextEdit::setMouseCursorLine(int lineNumber)
+{
+    m_mouseCursorLine = lineNumber;
+}
+
+void UIVMLogViewerTextEdit::toggleBookmark(const QPair<int, QString>& bookmark)
+{
+    int lineNumber = bookmark.first;
+
+    if(m_bookmarkLineSet.contains(lineNumber))
+        emit sigDeleteBookmark(bookmark);
+    else
+        emit sigAddBookmark(bookmark);
+}
+
 #include "UIVMLogViewerTextEdit.moc"

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

@@ -32 +32 @@
 signals:
 
-    void sigContextMenuBookmarkAction(QPair<int, QString> bookmark);
+    void sigAddBookmark(QPair<int, QString> bookmark);
+    void sigDeleteBookmark(QPair<int, QString> bookmark);
 
 public:
@@ -50 +51 @@
 protected:
 
-    void contextMenuEvent(QContextMenuEvent *pEvent);
-    void resizeEvent(QResizeEvent *pEvent);
+    void contextMenuEvent(QContextMenuEvent *pEvent) /* override */;
+    void resizeEvent(QResizeEvent *pEvent) /* override */;
+    void mouseMoveEvent(QMouseEvent *pEvent) /* override */;
 
 private slots:
@@ -64 +66 @@
     void prepare();
     void prepareWidgets();
-
-    /* Line number and text at the context menu position */
+    QPair<int, QString> bookmarkForPos(const QPoint &position);
+    int  lineNumberForPos(const QPoint &position);
+    void setMouseCursorLine(int lineNumber);
+    /** If bookmark exists this function removes it, if not it adds the bookmark. */
+    void toggleBookmark(const QPair<int, QString>& bookmark);
+    /** Line number and text at the context menu position */
     QPair<int, QString>  m_iContextMenuBookmark;
     QWidget             *m_pLineNumberArea;
+    /** Set of bookmarked lines. This set is updated from UIVMLogPage. This set is
+        used only for lookup in this class. */
     QSet<int>            m_bookmarkLineSet;
+    /** Number of the line under the mouse cursor. */
+    int                  m_mouseCursorLine;
+
+    friend class UILineNumberArea;
 };