Changeset 70589 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.cpp

Timestamp:

Jan 15, 2018 1:00:21 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9072: Further improvements to log viewer: A better handling of 'no log files' case and enabling line wrapping through the setting panel

File:

• trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.cpp (modified) (3 diffs)

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

@@ -190 +190 @@
 #endif
     setFont(font);
+    setWordWrapMode(QTextOption::NoWrap);
     setWordWrapMode(QTextOption::NoWrap);
     setReadOnly(true);
@@ -389 +390 @@
 int  UIVMLogViewerTextEdit::lineNumberForPos(const QPoint &position)
 {
+    QTextCursor cursor = cursorForPosition(position);
+    QTextBlock block = cursor.block();
+    return block.blockNumber() + 1;
+}
+
+QPair<int, QString> UIVMLogViewerTextEdit::bookmarkForPos(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());
+    return QPair<int, QString>(lineNumberForPos(position), block.text());
 }
 
@@ -437 +439 @@
         return;
     m_bWrapLines = bWrapLines;
+    if(m_bWrapLines)
+    {
+        setLineWrapMode(QPlainTextEdit::WidgetWidth);
+        setWordWrapMode(QTextOption::WordWrap);
+    }
+    else
+    {
+        setWordWrapMode(QTextOption::NoWrap);
+        setWordWrapMode(QTextOption::NoWrap);
+    }
+
     update();
 }