Changeset 70559 in vbox for trunk/src/VBox

Timestamp:

Jan 12, 2018 2:29:48 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:9072: Mark bookmarked line in text edit's line number widget

Location:

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

Files:

• UIVMLogPage.cpp (modified) (4 diffs)
• UIVMLogPage.h (modified) (1 diff)
• UIVMLogViewerTextEdit.cpp (modified) (2 diffs)
• UIVMLogViewerTextEdit.h (modified) (3 diffs)
• UIVMLogViewerWidget.cpp (modified) (1 diff)

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

@@ -183 +183 @@
          return;
     m_bookmarkVector.remove(index, 1);
+    updateTextEditBookmarkLineSet();
 }
 
@@ -188 +189 @@
 {
     m_bookmarkVector.clear();
+    updateTextEditBookmarkLineSet();
 }
 
@@ -198 +200 @@
 
     int lineNumber = m_bookmarkVector.at(bookmarkIndex).first;
-    QTextDocument* document = m_pTextEdit->document();
-    if(!document)
-        return;
-
-    QTextCursor cursor(document->findBlockByLineNumber(lineNumber));
-    m_pTextEdit->moveCursor(QTextCursor::End);
-    m_pTextEdit->setTextCursor(cursor);
-
+    m_pTextEdit->scrollToLine(lineNumber);
 }
 
@@ -216 +211 @@
 {
     m_bookmarkVector.push_back(bookmark);
+    updateTextEditBookmarkLineSet();
     emit sigBookmarksUpdated();
 }
+
+void UIVMLogPage::updateTextEditBookmarkLineSet()
+{
+    if(!m_pTextEdit)
+        return;
+    QSet<int> bookmarkLinesSet;
+    for(int i = 0; i < m_bookmarkVector.size(); ++i)
+    {
+        bookmarkLinesSet.insert(m_bookmarkVector.at(i).first);
+    }
+    m_pTextEdit->setBookmarkLineSet(bookmarkLinesSet);
+}
+
 // void UIVMLogViewerWidget::sltCreateBookmarkAtCurrent()
 // {

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

@@ -99 +99 @@
     void cleanup();
     void retranslateUi();
+    void updateTextEditBookmarkLineSet();
 
     QHBoxLayout    *m_pMainLayout;

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

@@ -201 +201 @@
         if (block.isVisible() && bottom >= event->rect().top()) {
             QString number = QString::number(blockNumber + 1);
+            if (m_bookmarkLineSet.contains(blockNumber + 1))
+            {
+                painter.setBackgroundMode(Qt::OpaqueMode);
+                painter.setBackground(QBrush(Qt::red));
+            }
+            else
+            {
+                painter.setBackgroundMode(Qt::TransparentMode);
+            }
             painter.setPen(Qt::black);
             painter.drawText(0, top, m_pLineNumberArea->width(), m_pLineNumberArea->fontMetrics().lineSpacing(),
@@ -275 +284 @@
 }
 
+void UIVMLogViewerTextEdit::scrollToLine(int lineNumber)
+{
+    QTextDocument* pDocument = document();
+    if(!pDocument)
+        return;
+
+    int halfPageLineCount = 0.5 * visibleLineCount() ;
+    QTextCursor cursor(pDocument->findBlockByLineNumber(qMax(lineNumber - halfPageLineCount, 0)));
+    moveCursor(QTextCursor::End);
+    setTextCursor(cursor);
+}
+
+int UIVMLogViewerTextEdit::visibleLineCount()
+{
+    int height = 0;
+    if(viewport())
+        height = viewport()->height();
+    if(verticalScrollBar() && verticalScrollBar()->isVisible())
+        height -= horizontalScrollBar()->height();
+    int singleLineHeight = fontMetrics().lineSpacing();
+    if(singleLineHeight == 0)
+        return 0;
+    return height / singleLineHeight;
+}
+
+void UIVMLogViewerTextEdit::setBookmarkLineSet(const QSet<int>& lineSet)
+{
+    m_bookmarkLineSet = lineSet;
+    repaint();
+}
 
 #include "UIVMLogViewerTextEdit.moc"

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

@@ -44 +44 @@
     void clearScrollBarMarkingsVector();
 
+    void scrollToLine(int lineNumber);
+
+    void setBookmarkLineSet(const QSet<int>& lineSet);
+
 protected:
 
@@ -54 +58 @@
     void sltUpdateLineNumberAreaWidth(int newBlockCount);
     void sltUpdateLineNumberArea(const QRect &, int);
+    int  visibleLineCount();
 
 private:
@@ -63 +68 @@
     QPair<int, QString>  m_iContextMenuBookmark;
     QWidget             *m_pLineNumberArea;
+    QSet<int>            m_bookmarkLineSet;
 };
 

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

@@ -132 +132 @@
     if(!currentLogPage() || !m_pBookmarksPanel)
         return;
+    disconnect(m_pBookmarksPanel, &UIVMLogViewerBookmarksPanel::sigBookmarkSelected,
+            this, &UIVMLogViewerWidget::gotoBookmark);
     m_pBookmarksPanel->updateBookmarkList(currentLogPage()->bookmarkVector());
+    connect(m_pBookmarksPanel, &UIVMLogViewerBookmarksPanel::sigBookmarkSelected,
+            this, &UIVMLogViewerWidget::gotoBookmark);
 }