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

Timestamp:

Sep 20, 2022 10:00:40 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10288: Extend Details pane with TPM info.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (3 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• globals/UIDetailsGenerator.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -1067 +1067 @@
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_BootOrder:       strResult = QApplication::translate("UICommon", "Boot Order"); break;
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_ChipsetType:     strResult = QApplication::translate("UICommon", "Chipset Type"); break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_TpmType:         strResult = QApplication::translate("UICommon", "TPM Type"); break;
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Firmware:        strResult = QApplication::translate("UICommon", "Firmware"); break;
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Acceleration:    strResult = QApplication::translate("UICommon", "Acceleration"); break;
@@ -1089 +1090 @@
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_BootOrder:       strResult = "BootOrder"; break;
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_ChipsetType:     strResult = "ChipsetType"; break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_TpmType:         strResult = "TPMType"; break;
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Firmware:        strResult = "Firmware"; break;
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Acceleration:    strResult = "Acceleration"; break;
@@ -1114 +1116 @@
     if (strDetailsElementOptionTypeSystem.compare("ChipsetType", Qt::CaseInsensitive) == 0)
         return UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_ChipsetType;
+    if (strDetailsElementOptionTypeSystem.compare("TPMType", Qt::CaseInsensitive) == 0)
+        return UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_TpmType;
     if (strDetailsElementOptionTypeSystem.compare("Firmware", Qt::CaseInsensitive) == 0)
         return UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Firmware;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -715 +715 @@
         DetailsElementOptionTypeSystem_BootOrder       = RT_BIT(3),
         DetailsElementOptionTypeSystem_ChipsetType     = RT_BIT(4),
-        DetailsElementOptionTypeSystem_Firmware        = RT_BIT(5),
-        DetailsElementOptionTypeSystem_Acceleration    = RT_BIT(6),
+        DetailsElementOptionTypeSystem_TpmType         = RT_BIT(5),
+        DetailsElementOptionTypeSystem_Firmware        = RT_BIT(6),
+        DetailsElementOptionTypeSystem_Acceleration    = RT_BIT(7),
         DetailsElementOptionTypeSystem_Default         = 0xFFFF
     };

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.cpp

@@ -61 +61 @@
 #include "CStringFormValue.h"
 #include "CSystemProperties.h"
+#include "CTrustedPlatformModule.h"
 #include "CUSBController.h"
 #include "CUSBDeviceFilter.h"
@@ -301 +302 @@
             table << UITextTableLine(QApplication::translate("UIDetails", "Chipset Type", "details (system)"),
                                      gpConverter->toString(enmChipsetType));
+    }
+
+    /* TPM type: */
+    if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_TpmType)
+    {
+        CTrustedPlatformModule comModule = comMachine.GetTrustedPlatformModule();
+        const KTpmType enmTpmType = comModule.GetType();
+        if (enmTpmType != KTpmType_None)
+            table << UITextTableLine(QApplication::translate("UIDetails", "TPM Type", "details (system)"),
+                                     gpConverter->toString(enmTpmType));
     }