Changeset 82825 in vbox for trunk/src/VBox

Timestamp:

Jan 22, 2020 12:15:10 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9611: UIMachineSettingsUSB: Get rid of hardcoded USB controller types, instead acquire these types through CSystemProperties interface; This isn't the same trivial like with other controls since radio-buttons for all types already pre-created, so we are showing missed types instead of creating them.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -416 +416 @@
     const UIDataSettingsMachineUSB &oldUsbData = m_pCache->base();
 
+    /* Load currently supported USB controllers: */
+    CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+    QVector<KUSBControllerType> supportedTypes = comProperties.GetSupportedUSBControllerTypes();
+    /* Take currently requested type into account if it's sane: */
+    if (!supportedTypes.contains(oldUsbData.m_USBControllerType) && oldUsbData.m_USBControllerType != KUSBControllerType_Null)
+        supportedTypes.prepend(oldUsbData.m_USBControllerType);
+
+    /* Adjust radio-button visibility: */
+    mRbUSB1->setVisible(supportedTypes.contains(KUSBControllerType_OHCI));
+    mRbUSB2->setVisible(supportedTypes.contains(KUSBControllerType_EHCI));
+    mRbUSB3->setVisible(supportedTypes.contains(KUSBControllerType_XHCI));
+
     /* Load old USB data from the cache: */
     mGbUSB->setChecked(oldUsbData.m_fUSBEnabled);
@@ -803 +815 @@
     Ui::UIMachineSettingsUSB::setupUi(this);
 
+    /* Hide radio-button initially: */
+    mRbUSB1->setVisible(false);
+    mRbUSB2->setVisible(false);
+    mRbUSB3->setVisible(false);
+
     /* Prepare cache: */
     m_pCache = new UISettingsCacheMachineUSB;