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

Timestamp:

Dec 13, 2017 8:53:52 AM (7 years ago)

Author:

vboxsync

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

119646

Message:

FE/Qt: bugref:9072 Replace QTextEdit with QPlainTextEdit in logviewer

Location:

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

Files:

• UIVMLogViewerDialog.cpp (modified) (1 diff)
• UIVMLogViewerFilterPanel.cpp (modified) (2 diffs)
• UIVMLogViewerSearchPanel.cpp (modified) (3 diffs)
• UIVMLogViewerWidget.cpp (modified) (9 diffs)
• UIVMLogViewerWidget.h (modified) (3 diffs)

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

@@ -29 +29 @@
 # include <QPushButton>
 # include <QScrollBar>
-# include <QTextEdit>
+# include <QPlainTextEdit>
 # include <QVBoxLayout>
 

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

@@ -27 +27 @@
 # endif
 # include <QLabel>
-# include <QTextEdit>
+# include <QPlainTextEdit>
 # include <QTextCursor>
 
@@ -53 +53 @@
 {
     Q_UNUSED(iCurrentIndex);
-    QTextEdit *pCurrentPage = m_pViewer->currentLogPage();
+    QPlainTextEdit *pCurrentPage = m_pViewer->currentLogPage();
     AssertReturnVoid(pCurrentPage);
     QString strInputText = m_pViewer->currentLog();

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

@@ -28 +28 @@
 # include <QHBoxLayout>
 # include <QLabel>
-# include <QTextEdit>
+# include <QPlainTextEdit>
 
 /* GUI includes: */
@@ -80 +80 @@
     {
         /* Get current log-page: */
-        QTextEdit *pBrowser = m_pViewer->currentLogPage();
+        QPlainTextEdit *pBrowser = m_pViewer->currentLogPage();
         /* If current log-page is valid and cursor has selection: */
         if (pBrowser && pBrowser->textCursor().hasSelection())
@@ -371 +371 @@
 {
     /* Get current log-page: */
-    QTextEdit *pBrowser = m_pViewer->currentLogPage();
+    QPlainTextEdit *pBrowser = m_pViewer->currentLogPage();
     if (!pBrowser) return;
 

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

@@ -27 +27 @@
 #  include <QFontDatabase>
 # endif
-# include <QTextEdit>
+# include <QPlainTextEdit>
 
 /* GUI includes: */
@@ -137 +137 @@
             {
                 /* Create a log viewer page and append the read text to it: */
-                QTextEdit *pLogViewer = createLogPage(QFileInfo(strFileName).fileName());
+                QPlainTextEdit *pLogViewer = createLogPage(QFileInfo(strFileName).fileName());
                 pLogViewer->setPlainText(strText);
                 /* Move the cursor position to end: */
@@ -143 +143 @@
                 cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
                 pLogViewer->setTextCursor(cursor);
-                /* Add the actual file name and the QTextEdit containing the content to a list: */
+                /* Add the actual file name and the QPlainTextEdit containing the content to a list: */
                 m_book << qMakePair(strFileName, pLogViewer);
                 /* Add the log-text to the map: */
@@ -155 +155 @@
     if (!isAnyLogPresent)
     {
-        QTextEdit *pDummyLog = createLogPage("VBox.log");
+        QPlainTextEdit *pDummyLog = createLogPage("VBox.log");
         pDummyLog->setWordWrapMode(QTextOption::WordWrap);
-        pDummyLog->setHtml(tr("<p>No log files found. Press the "
+        pDummyLog->appendHtml(tr("<p>No log files found. Press the "
                               "<b>Refresh</b> button to rescan the log folder "
                               "<nobr><b>%1</b></nobr>.</p>")
@@ -494 +494 @@
 }
 
-QTextEdit* UIVMLogViewerWidget::currentLogPage() const
+QPlainTextEdit* UIVMLogViewerWidget::currentLogPage() const
 {
     /* If viewer-container is enabled: */
@@ -501 +501 @@
         /* Get and return current log-page: */
         QWidget *pContainer = m_pViewerContainer->currentWidget();
-        QTextEdit *pBrowser = pContainer->findChild<QTextEdit*>();
+        QPlainTextEdit *pBrowser = pContainer->findChild<QPlainTextEdit*>();
         Assert(pBrowser);
         return pBrowser ? pBrowser : 0;
@@ -509 +509 @@
 }
 
-QTextEdit* UIVMLogViewerWidget::createLogPage(const QString &strName)
+QPlainTextEdit* UIVMLogViewerWidget::createLogPage(const QString &strName)
 {
     /* Create page-container: */
@@ -519 +519 @@
         AssertPtrReturn(pPageLayout, 0);
         /* Create Log-Viewer: */
-        QTextEdit *pLogViewer = new QTextEdit(pPageContainer);
+        QPlainTextEdit *pLogViewer = new QPlainTextEdit(pPageContainer);
         AssertPtrReturn(pLogViewer, 0);
         {
@@ -527 +527 @@
             QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont);
 #else
-            QFont font = pLogViewer->currentFont();
+            QFont font;
             font.setFamily("Courier New,courier");
 #endif

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

@@ -34 +34 @@
 /* Forward declarations: */
 class QITabWidget;
-class QTextEdit;
+class QPlainTextEdit;
 class QVBoxLayout;
 class UIToolBar;
@@ -41 +41 @@
 
 /* Type definitions: */
-typedef QPair<QString, QTextEdit*> LogPage;
+typedef QPair<QString, QPlainTextEdit*> LogPage;
 typedef QList<LogPage> LogBook;
-typedef QMap<QTextEdit*, QString> VMLogMap;
+typedef QMap<QPlainTextEdit*, QString> VMLogMap;
 
 /** QIMainWindow extension
@@ -114 +114 @@
 
     /** Returns the current log-page. */
-    QTextEdit* currentLogPage() const;
+    QPlainTextEdit* currentLogPage() const;
     /** Returns the newly created log-page using @a strPage filename. */
-    QTextEdit* createLogPage(const QString &strPage);
+    QPlainTextEdit* createLogPage(const QString &strPage);
     /** Returns the content of current log-page. */
     const QString& currentLog();