Changeset 83978 in vbox

Timestamp:

Apr 24, 2020 6:50:13 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: Removing some html tags from session information table text

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information

Files:

• UIInformationConfiguration.cpp (modified) (8 diffs)
• UIInformationConfiguration.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationConfiguration.cpp

@@ -78 +78 @@
     resetTable();
     QFontMetrics fontMetrics(m_pTableWidget->font());
-    QTextDocument textDocument;
-
     int iMaxColumn1Length = 0;
-
     /* General section: */
     insertTitleRow(m_strGeneralTitle, UIIconPool::iconSet(":/machine_16px.png"), fontMetrics);
     insertInfoRows(UIDetailsGenerator::generateMachineInformationGeneral(m_machine,
                                                                          UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral_Default),
-                   fontMetrics, textDocument, iMaxColumn1Length);
+                   fontMetrics, iMaxColumn1Length);
 
     /* System section: */
     insertTitleRow(m_strSystemTitle, UIIconPool::iconSet(":/chipset_16px.png"), fontMetrics);
     insertInfoRows(UIDetailsGenerator::generateMachineInformationSystem(m_machine,
-                                                                         UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Default),
-                   fontMetrics, textDocument, iMaxColumn1Length);
+                                                                        UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Default),
+                   fontMetrics, iMaxColumn1Length);
 
     /* Display section: */
@@ -98 +95 @@
     insertInfoRows(UIDetailsGenerator::generateMachineInformationDisplay(m_machine,
                                                                          UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Default),
-                   fontMetrics, textDocument, iMaxColumn1Length);
+                   fontMetrics, iMaxColumn1Length);
 
     /* Storage section: */
@@ -104 +101 @@
     insertInfoRows(UIDetailsGenerator::generateMachineInformationStorage(m_machine,
                                                                          UIExtraDataMetaDefs::DetailsElementOptionTypeStorage_Default),
-                   fontMetrics, textDocument, iMaxColumn1Length);
+                   fontMetrics, iMaxColumn1Length);
 
     /* Audio section: */
     insertTitleRow(m_strAudioTitle, UIIconPool::iconSet(":/sound_16px.png"), fontMetrics);
     insertInfoRows(UIDetailsGenerator::generateMachineInformationAudio(m_machine,
-                                                                         UIExtraDataMetaDefs::DetailsElementOptionTypeAudio_Default),
-                   fontMetrics, textDocument, iMaxColumn1Length);
+                                                                       UIExtraDataMetaDefs::DetailsElementOptionTypeAudio_Default),
+                   fontMetrics, iMaxColumn1Length);
 
     /* Network section: */
@@ -116 +113 @@
     insertInfoRows(UIDetailsGenerator::generateMachineInformationNetwork(m_machine,
                                                                          UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_Default),
-                   fontMetrics, textDocument, iMaxColumn1Length);
+                   fontMetrics, iMaxColumn1Length);
 
     /* Serial port section: */
@@ -122 +119 @@
     insertInfoRows(UIDetailsGenerator::generateMachineInformationSerial(m_machine,
                                                                         UIExtraDataMetaDefs::DetailsElementOptionTypeSerial_Default),
-                   fontMetrics, textDocument, iMaxColumn1Length);
+                   fontMetrics, iMaxColumn1Length);
 
     /* USB section: */
     insertTitleRow(m_strUSBTitle, UIIconPool::iconSet(":/usb_16px.png"), fontMetrics);
     insertInfoRows(UIDetailsGenerator::generateMachineInformationUSB(m_machine,
-                                                                        UIExtraDataMetaDefs::DetailsElementOptionTypeUsb_Default),
-                   fontMetrics, textDocument, iMaxColumn1Length);
+                                                                     UIExtraDataMetaDefs::DetailsElementOptionTypeUsb_Default),
+                   fontMetrics, iMaxColumn1Length);
 
     /* Share folders section: */
@@ -134 +131 @@
     insertInfoRows(UIDetailsGenerator::generateMachineInformationSharedFolders(m_machine,
                                                                                UIExtraDataMetaDefs::DetailsElementOptionTypeSharedFolders_Default),
-                   fontMetrics, textDocument, iMaxColumn1Length);
+                   fontMetrics, iMaxColumn1Length);
 
     m_pTableWidget->resizeColumnToContents(0);
@@ -167 +164 @@
 }
 
-void UIInformationConfiguration::insertInfoRows(const UITextTable &table, const QFontMetrics &fontMetrics,
-                                                QTextDocument &textDocument, int &iMaxColumn1Length)
+void UIInformationConfiguration::insertInfoRows(const UITextTable &table, const QFontMetrics &fontMetrics, int &iMaxColumn1Length)
 {
     foreach (const UITextTableLine &line, table)
     {
-        textDocument.setHtml(line.string2());
-        insertInfoRow(line.string1(), textDocument.toPlainText(), fontMetrics, iMaxColumn1Length);
+        insertInfoRow(removeHtmlFromString(line.string1()),
+                      removeHtmlFromString(line.string2()),
+                      fontMetrics, iMaxColumn1Length);
     }
 }
@@ -213 +210 @@
     }
 }
+
+QString UIInformationConfiguration::removeHtmlFromString(const QString &strOriginal)
+{
+    QTextDocument textDocument;
+    textDocument.setHtml(strOriginal);
+    return textDocument.toPlainText();
+}

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationConfiguration.h

@@ -66 +66 @@
     void prepareObjects();
     void insertTitleRow(const QString &strTitle, const QIcon &icon, const QFontMetrics &fontMetrics);
-    void insertInfoRows(const UITextTable &table, const QFontMetrics &fontMetrics,
-                        QTextDocument &textDocument, int &iMaxColumn1Length);
+    void insertInfoRows(const UITextTable &table, const QFontMetrics &fontMetrics, int &iMaxColumn1Length);
     void insertInfoRow(const QString strText1, const QString &strText2,
                        const QFontMetrics &fontMetrics, int &iMaxColumn1Length);
     void resetTable();
+    QString removeHtmlFromString(const QString &strOriginal);
 
     CMachine m_machine;