Changeset 88877 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 5, 2021 1:01:54 PM (4 years ago)

Author:

vboxsync

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

144212

Message:

FE/Qt: bugref:9930. Some more logviewer fixes

Location:

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

Files:

• UIVMLogPage.cpp (modified) (1 diff)
• UIVMLogViewerWidget.cpp (modified) (2 diffs)

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

@@ -150 +150 @@
     if (!m_pTextEdit)
         return;
-    m_pTextEdit->appendHtml(strText);
+    if (document())
+        document()->setHtml(strText);
     update();
 }

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

@@ -915 +915 @@
         }
         strTabTitle.append(QFileInfo(strFileName).fileName());
-        m_pTabWidget->addTab(pLogPage, strTabTitle);
+
+
+        m_pTabWidget->blockSignals(true);
+        int iIndex = m_pTabWidget->addTab(pLogPage, strTabTitle);
+        /* !!Hack alert. Setting html to text edit while th tab is not current ends up in an empty text edit: */
+        if (noLogsToShow)
+            m_pTabWidget->setCurrentIndex(iIndex);
+        m_pTabWidget->blockSignals(false);
 
         pLogPage->setLogContent(strLogContent, noLogsToShow);
         pLogPage->setScrollBarMarkingsVector(m_pSearchPanel->matchLocationVector());
+
     }
 }
@@ -970 +978 @@
         {
             QString strDummyTabText = QString(tr("<p>No log files for the machine %1 found. Press the "
-                                                 "<b>Rescan</b> button to rescan the log folder "
+                                                 "<b>Reload</b> button to reload the log folder "
                                                  "<nobr><b>%2</b></nobr>.</p>")
                                               .arg(strMachineName).arg(comMachine.GetLogFolder()));