Changeset 95245 in vbox

Timestamp:

Jun 10, 2022 9:05:10 AM (3 years ago)

Author:

vboxsync

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

151792

Message:

FE/Qt/Ds: bugref:6899: Machine settings: USB page accessibility improvements (part 1); Moving USB controller type stuff into separate UIUSBControllerEditor widget.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/editors/UIUSBControllerEditor.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.cpp ) (5 diffs)
• src/settings/editors/UIUSBControllerEditor.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.h ) (4 diffs)
• src/settings/machine/UIMachineSettingsUSB.cpp (modified) (20 diffs)
• src/settings/machine/UIMachineSettingsUSB.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -933 +933 @@
         src/settings/editors/UIShortcutConfigurationEditor.h \
         src/settings/editors/UISnapshotFolderEditor.h \
+        src/settings/editors/UIUSBControllerEditor.h \
         src/settings/editors/UIVideoMemoryEditor.h \
         src/settings/editors/UIVirtualCPUEditor.h \
@@ -1510 +1511 @@
         src/settings/editors/UIShortcutConfigurationEditor.cpp \
         src/settings/editors/UISnapshotFolderEditor.cpp \
+        src/settings/editors/UIUSBControllerEditor.cpp \
         src/settings/editors/UIVideoMemoryEditor.cpp \
         src/settings/editors/UIVirtualCPUEditor.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBControllerEditor.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIAudioControllerEditor class implementation.
+ * VBox Qt GUI - UIUSBControllerEditor class implementation.
  */
 
@@ -17 +17 @@
 
 /* Qt includes: */
-#include <QComboBox>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QButtonGroup>
+#include <QRadioButton>
+#include <QVBoxLayout>
 
 /* GUI includes: */
 #include "UICommon.h"
-#include "UIConverter.h"
-#include "UIAudioControllerEditor.h"
+#include "UIUSBControllerEditor.h"
 
 /* COM includes: */
@@ -31 +29 @@
 
 
-UIAudioControllerEditor::UIAudioControllerEditor(QWidget *pParent /* = 0 */)
+UIUSBControllerEditor::UIUSBControllerEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_enmValue(KAudioControllerType_Max)
-    , m_pLabel(0)
-    , m_pCombo(0)
+    , m_enmValue(KUSBControllerType_Max)
+    , m_pRadioButtonUSB1(0)
+    , m_pRadioButtonUSB2(0)
+    , m_pRadioButtonUSB3(0)
 {
     prepare();
 }
 
-void UIAudioControllerEditor::setValue(KAudioControllerType enmValue)
+void UIUSBControllerEditor::setValue(KUSBControllerType enmValue)
 {
     /* Update cached value and
@@ -47 +46 @@
     {
         m_enmValue = enmValue;
-        populateCombo();
+        updateButtonSet();
     }
 }
 
-KAudioControllerType UIAudioControllerEditor::value() const
+KUSBControllerType UIUSBControllerEditor::value() const
 {
-    return m_pCombo ? m_pCombo->currentData().value<KAudioControllerType>() : m_enmValue;
+    if (   m_pRadioButtonUSB1
+        && m_pRadioButtonUSB1->isChecked())
+        return KUSBControllerType_OHCI;
+    else if (   m_pRadioButtonUSB2
+             && m_pRadioButtonUSB2->isChecked())
+        return KUSBControllerType_EHCI;
+    else if (   m_pRadioButtonUSB3
+             && m_pRadioButtonUSB3->isChecked())
+        return KUSBControllerType_XHCI;
+    return m_enmValue;
 }
 
-int UIAudioControllerEditor::minimumLabelHorizontalHint() const
+void UIUSBControllerEditor::retranslateUi()
 {
-    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
-}
-
-void UIAudioControllerEditor::setMinimumLayoutIndent(int iIndent)
-{
-    if (m_pLayout)
-        m_pLayout->setColumnMinimumWidth(0, iIndent);
-}
-
-void UIAudioControllerEditor::retranslateUi()
-{
-    if (m_pLabel)
-        m_pLabel->setText(tr("Audio &Controller:"));
-    if (m_pCombo)
+    if (m_pRadioButtonUSB1)
     {
-        for (int i = 0; i < m_pCombo->count(); ++i)
-        {
-            const KAudioControllerType enmType = m_pCombo->itemData(i).value<KAudioControllerType>();
-            m_pCombo->setItemText(i, gpConverter->toString(enmType));
-        }
-        m_pCombo->setToolTip(tr("Selects the type of the virtual sound card. Depending on this value, "
-                                "VirtualBox will provide different audio hardware to the virtual machine."));
+        m_pRadioButtonUSB1->setText(tr("USB &1.1 (OHCI) Controller"));
+        m_pRadioButtonUSB1->setToolTip(tr("When chosen, enables the virtual USB OHCI controller of "
+                                          "this machine. The USB OHCI controller provides USB 1.0 support."));
+    }
+    if (m_pRadioButtonUSB2)
+    {
+        m_pRadioButtonUSB2->setText(tr("USB &2.0 (OHCI + EHCI) Controller"));
+        m_pRadioButtonUSB2->setToolTip(tr("When chosen, enables the virtual USB OHCI and EHCI "
+                                          "controllers of this machine. Together they provide USB 2.0 support."));
+    }
+    if (m_pRadioButtonUSB3)
+    {
+        m_pRadioButtonUSB3->setText(tr("USB &3.0 (xHCI) Controller"));
+        m_pRadioButtonUSB3->setToolTip(tr("When chosen, enables the virtual USB xHCI controller of "
+                                          "this machine. The USB xHCI controller provides USB 3.0 support."));
     }
 }
 
-void UIAudioControllerEditor::prepare()
+void UIUSBControllerEditor::prepare()
 {
     /* Create main layout: */
-    m_pLayout = new QGridLayout(this);
-    if (m_pLayout)
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    if (pLayout)
     {
-        m_pLayout->setContentsMargins(0, 0, 0, 0);
+        pLayout->setContentsMargins(0, 0, 0, 0);
 
-        /* Create label: */
-        m_pLabel = new QLabel(this);
-        if (m_pLabel)
+        /* Prepare button-group: */
+        QButtonGroup *pButtonGroup = new QButtonGroup(this);
+        if (pButtonGroup)
         {
-            m_pLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            m_pLayout->addWidget(m_pLabel, 0, 0);
-        }
-
-        /* Create combo layout: */
-        QHBoxLayout *pComboLayout = new QHBoxLayout;
-        if (pComboLayout)
-        {
-            /* Create combo: */
-            m_pCombo = new QComboBox(this);
-            if (m_pCombo)
+            /* Prepare USB1 radio-button: */
+            m_pRadioButtonUSB1 = new QRadioButton(this);
+            if (m_pRadioButtonUSB1)
             {
-                /* This is necessary since contents is dynamical now: */
-                m_pCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-                if (m_pLabel)
-                    m_pLabel->setBuddy(m_pCombo);
-                pComboLayout->addWidget(m_pCombo);
+                m_pRadioButtonUSB1->setVisible(false);
+                pLayout->addWidget(m_pRadioButtonUSB1);
+            }
+            /* Prepare USB2 radio-button: */
+            m_pRadioButtonUSB2 = new QRadioButton(this);
+            if (m_pRadioButtonUSB2)
+            {
+                m_pRadioButtonUSB2->setVisible(false);
+                pLayout->addWidget(m_pRadioButtonUSB2);
+            }
+            /* Prepare USB3 radio-button: */
+            m_pRadioButtonUSB3 = new QRadioButton(this);
+            if (m_pRadioButtonUSB3)
+            {
+                m_pRadioButtonUSB3->setVisible(false);
+                pLayout->addWidget(m_pRadioButtonUSB3);
             }
 
-            /* Add stretch: */
-            pComboLayout->addStretch();
-
-            /* Add combo-layout into main-layout: */
-            m_pLayout->addLayout(pComboLayout, 0, 1);
+            connect(pButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
+                    this, &UIUSBControllerEditor::sigValueChanged);
         }
     }
 
-    /* Populate combo: */
-    populateCombo();
+    /* Update button set: */
+    updateButtonSet();
 
     /* Apply language settings: */
@@ -129 +132 @@
 }
 
-void UIAudioControllerEditor::populateCombo()
+void UIUSBControllerEditor::updateButtonSet()
 {
-    if (m_pCombo)
+    /* Load currently supported types: */
+    CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+    m_supportedValues = comProperties.GetSupportedUSBControllerTypes();
+
+    /* Make sure requested value if sane is present as well: */
+    if (   m_enmValue != KUSBControllerType_Max
+        && !m_supportedValues.contains(m_enmValue))
+        m_supportedValues.prepend(m_enmValue);
+
+    /* Update visibility for all values: */
+    if (m_pRadioButtonUSB1)
+        m_pRadioButtonUSB1->setVisible(m_supportedValues.contains(KUSBControllerType_OHCI));
+    if (m_pRadioButtonUSB2)
+        m_pRadioButtonUSB2->setVisible(m_supportedValues.contains(KUSBControllerType_EHCI));
+    if (m_pRadioButtonUSB3)
+        m_pRadioButtonUSB3->setVisible(m_supportedValues.contains(KUSBControllerType_XHCI));
+
+    /* Look for proper button to choose: */
+    switch (m_enmValue)
     {
-        /* Clear combo first of all: */
-        m_pCombo->clear();
-
-        /* Load currently supported audio driver types: */
-        CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
-        m_supportedValues = comProperties.GetSupportedAudioControllerTypes();
-
-        /* Make sure requested value if sane is present as well: */
-        if (   m_enmValue != KAudioControllerType_Max
-            && !m_supportedValues.contains(m_enmValue))
-            m_supportedValues.prepend(m_enmValue);
-
-        /* Update combo with all the supported values: */
-        foreach (const KAudioControllerType &enmType, m_supportedValues)
-            m_pCombo->addItem(QString(), QVariant::fromValue(enmType));
-
-        /* Look for proper index to choose: */
-        const int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
-        if (iIndex != -1)
-            m_pCombo->setCurrentIndex(iIndex);
-
-        /* Retranslate finally: */
-        retranslateUi();
+        default:
+        case KUSBControllerType_OHCI:
+        {
+            if (m_pRadioButtonUSB1)
+                m_pRadioButtonUSB1->setChecked(true);
+            break;
+        }
+        case KUSBControllerType_EHCI:
+        {
+            if (m_pRadioButtonUSB2)
+                m_pRadioButtonUSB2->setChecked(true);
+            break;
+        }
+        case KUSBControllerType_XHCI:
+        {
+            if (m_pRadioButtonUSB3)
+                m_pRadioButtonUSB3->setChecked(true);
+            break;
+        }
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBControllerEditor.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIAudioControllerEditor class declaration.
+ * VBox Qt GUI - UIUSBControllerEditor class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_settings_editors_UIAudioControllerEditor_h
-#define FEQT_INCLUDED_SRC_settings_editors_UIAudioControllerEditor_h
+#ifndef FEQT_INCLUDED_SRC_settings_editors_UIUSBControllerEditor_h
+#define FEQT_INCLUDED_SRC_settings_editors_UIUSBControllerEditor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -33 +33 @@
 
 /* Forward declarations: */
-class QComboBox;
-class QGridLayout;
-class QLabel;
+class QRadioButton;
 
-/** QWidget subclass used as an audio controller editor. */
-class SHARED_LIBRARY_STUFF UIAudioControllerEditor : public QIWithRetranslateUI<QWidget>
+/** QWidget subclass used as a USB controller editor. */
+class SHARED_LIBRARY_STUFF UIUSBControllerEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about value change. */
+    void sigValueChanged();
 
 public:
 
     /** Constructs editor passing @a pParent to the base-class. */
-    UIAudioControllerEditor(QWidget *pParent = 0);
+    UIUSBControllerEditor(QWidget *pParent = 0);
 
     /** Defines editor @a enmValue. */
-    void setValue(KAudioControllerType enmValue);
+    void setValue(KUSBControllerType enmValue);
     /** Returns editor value. */
-    KAudioControllerType value() const;
+    KUSBControllerType value() const;
 
     /** Returns the vector of supported values. */
-    QVector<KAudioControllerType> supportedValues() const { return m_supportedValues; }
-
-    /** Returns minimum layout hint. */
-    int minimumLabelHorizontalHint() const;
-    /** Defines minimum layout @a iIndent. */
-    void setMinimumLayoutIndent(int iIndent);
+    QVector<KUSBControllerType> supportedValues() const { return m_supportedValues; }
 
 protected:
@@ -69 +67 @@
     /** Prepares all. */
     void prepare();
-    /** Populates combo. */
-    void populateCombo();
+
+    /** Updates button set. */
+    void updateButtonSet();
 
     /** Holds the value to be selected. */
-    KAudioControllerType  m_enmValue;
+    KUSBControllerType  m_enmValue;
 
     /** Holds the vector of supported values. */
-    QVector<KAudioControllerType>  m_supportedValues;
+    QVector<KUSBControllerType>  m_supportedValues;
 
-    /** Holds the main layout instance. */
-    QGridLayout *m_pLayout;
-    /** Holds the label instance. */
-    QLabel      *m_pLabel;
-    /** Holds the combo instance. */
-    QComboBox   *m_pCombo;
+    /** Holds the USB1 radio-button instance. */
+    QRadioButton     *m_pRadioButtonUSB1;
+    /** Holds the USB2 radio-button instance. */
+    QRadioButton     *m_pRadioButtonUSB2;
+    /** Holds the USB3 radio-button instance. */
+    QRadioButton     *m_pRadioButtonUSB3;
 };
 
-#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIAudioControllerEditor_h */
+#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIUSBControllerEditor_h */

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

@@ -40 +40 @@
 #include "QIToolBar.h"
 #include "UICommon.h"
+#include "UIUSBControllerEditor.h"
 
 /* COM includes: */
@@ -136 +137 @@
     UIDataSettingsMachineUSB()
         : m_fUSBEnabled(false)
-        , m_USBControllerType(KUSBControllerType_Null)
+        , m_enmUSBControllerType(KUSBControllerType_Null)
     {}
 
@@ -144 +145 @@
         return true
                && (m_fUSBEnabled == other.m_fUSBEnabled)
-               && (m_USBControllerType == other.m_USBControllerType)
+               && (m_enmUSBControllerType == other.m_enmUSBControllerType)
                ;
     }
@@ -154 +155 @@
 
     /** Holds whether the USB is enabled. */
-    bool m_fUSBEnabled;
+    bool                m_fUSBEnabled;
     /** Holds the USB controller type. */
-    KUSBControllerType m_USBControllerType;
+    KUSBControllerType  m_enmUSBControllerType;
 };
 
@@ -337 +338 @@
     , m_pCheckBoxUSB(0)
     , m_pWidgetUSBSettings(0)
-    , m_pRadioButtonUSB1(0)
-    , m_pRadioButtonUSB2(0)
-    , m_pRadioButtonUSB3(0)
+    , m_pEditorController(0)
     , m_pLabelSeparatorFilters(0)
     , m_pLayoutFilters(0)
@@ -352 +351 @@
     , m_pMenuUSBDevices(0)
 {
-    /* Prepare: */
     prepare();
 }
@@ -358 +356 @@
 UIMachineSettingsUSB::~UIMachineSettingsUSB()
 {
-    /* Cleanup: */
     cleanup();
 }
@@ -389 +386 @@
     /* Gather old USB data: */
     oldUsbData.m_fUSBEnabled = !m_machine.GetUSBControllers().isEmpty();
-    oldUsbData.m_USBControllerType = m_machine.GetUSBControllerCountByType(KUSBControllerType_XHCI) > 0 ? KUSBControllerType_XHCI :
-                                     m_machine.GetUSBControllerCountByType(KUSBControllerType_EHCI) > 0 ? KUSBControllerType_EHCI :
-                                     m_machine.GetUSBControllerCountByType(KUSBControllerType_OHCI) > 0 ? KUSBControllerType_OHCI :
-                                     KUSBControllerType_Null;
+    oldUsbData.m_enmUSBControllerType = m_machine.GetUSBControllerCountByType(KUSBControllerType_XHCI) > 0 ? KUSBControllerType_XHCI
+                                      : m_machine.GetUSBControllerCountByType(KUSBControllerType_EHCI) > 0 ? KUSBControllerType_EHCI
+                                      : m_machine.GetUSBControllerCountByType(KUSBControllerType_OHCI) > 0 ? KUSBControllerType_OHCI
+                                      : KUSBControllerType_Null;
 
     /* Check whether controller is valid: */
@@ -447 +444 @@
     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: */
-    if (m_pRadioButtonUSB1)
-        m_pRadioButtonUSB1->setVisible(supportedTypes.contains(KUSBControllerType_OHCI));
-    if (m_pRadioButtonUSB2)
-        m_pRadioButtonUSB2->setVisible(supportedTypes.contains(KUSBControllerType_EHCI));
-    if (m_pRadioButtonUSB3)
-        m_pRadioButtonUSB3->setVisible(supportedTypes.contains(KUSBControllerType_XHCI));
-
     /* Load old USB data from cache: */
     if (m_pCheckBoxUSB)
         m_pCheckBoxUSB->setChecked(oldUsbData.m_fUSBEnabled);
-    switch (oldUsbData.m_USBControllerType)
-    {
-        default:
-        case KUSBControllerType_OHCI:
-        {
-            if (m_pRadioButtonUSB1)
-                m_pRadioButtonUSB1->setChecked(true);
-            break;
-        }
-        case KUSBControllerType_EHCI:
-        {
-            if (m_pRadioButtonUSB2)
-                m_pRadioButtonUSB2->setChecked(true);
-            break;
-        }
-        case KUSBControllerType_XHCI:
-        {
-            if (m_pRadioButtonUSB3)
-                m_pRadioButtonUSB3->setChecked(true);
-            break;
-        }
-    }
+    if (m_pEditorController)
+        m_pEditorController->setValue(oldUsbData.m_enmUSBControllerType);
 
     /* For each filter => load it from cache: */
@@ -517 +479 @@
     if (m_pCheckBoxUSB)
         newUsbData.m_fUSBEnabled = m_pCheckBoxUSB->isChecked();
-    if (!newUsbData.m_fUSBEnabled)
-        newUsbData.m_USBControllerType = KUSBControllerType_Null;
-    else
-    {
-        if (   m_pRadioButtonUSB1
-            && m_pRadioButtonUSB1->isChecked())
-            newUsbData.m_USBControllerType = KUSBControllerType_OHCI;
-        else if (   m_pRadioButtonUSB2
-                 && m_pRadioButtonUSB2->isChecked())
-            newUsbData.m_USBControllerType = KUSBControllerType_EHCI;
-        else if (   m_pRadioButtonUSB3
-                 && m_pRadioButtonUSB3->isChecked())
-            newUsbData.m_USBControllerType = KUSBControllerType_XHCI;
-    }
+    if (m_pEditorController)
+        newUsbData.m_enmUSBControllerType = newUsbData.m_fUSBEnabled ? m_pEditorController->value() : KUSBControllerType_Null;
 
     /* For each filter: */
@@ -566 +516 @@
     /* USB 2.0/3.0 Extension Pack presence test: */
     if (   m_pCheckBoxUSB->isChecked()
-        && (m_pRadioButtonUSB2->isChecked() || m_pRadioButtonUSB3->isChecked()))
+        && (   m_pEditorController->value() == KUSBControllerType_EHCI
+            || m_pEditorController->value() == KUSBControllerType_XHCI))
     {
         CExtPackManager extPackManager = uiCommon().virtualBox().GetExtensionPackManager();
@@ -591 +542 @@
 {
     setTabOrder(pWidget, m_pCheckBoxUSB);
-    setTabOrder(m_pCheckBoxUSB, m_pRadioButtonUSB1);
-    setTabOrder(m_pRadioButtonUSB1, m_pRadioButtonUSB2);
-    setTabOrder(m_pRadioButtonUSB2, m_pRadioButtonUSB3);
-    setTabOrder(m_pRadioButtonUSB3, m_pTreeWidgetFilters);
+    setTabOrder(m_pCheckBoxUSB, m_pEditorController);
+    setTabOrder(m_pEditorController, m_pTreeWidgetFilters);
 }
 
@@ -601 +550 @@
     m_pCheckBoxUSB->setToolTip(tr("When checked, enables the virtual USB controller of this machine."));
     m_pCheckBoxUSB->setText(tr("Enable &USB Controller"));
-    m_pRadioButtonUSB1->setToolTip(tr("When chosen, enables the virtual USB OHCI controller of "
-                                      "this machine. The USB OHCI controller provides USB 1.0 support."));
-    m_pRadioButtonUSB1->setText(tr("USB &1.1 (OHCI) Controller"));
-    m_pRadioButtonUSB2->setToolTip(tr("When chosen, enables the virtual USB OHCI and EHCI "
-                                      "controllers of this machine. Together they provide USB 2.0 support."));
-    m_pRadioButtonUSB2->setText(tr("USB &2.0 (OHCI + EHCI) Controller"));
-    m_pRadioButtonUSB3->setToolTip(tr("When chosen, enables the virtual USB xHCI controller of "
-                                      "this machine. The USB xHCI controller provides USB 3.0 support."));
-    m_pRadioButtonUSB3->setText(tr("USB &3.0 (xHCI) Controller"));
     m_pLabelSeparatorFilters->setText(tr("USB Device &Filters"));
     QTreeWidgetItem *pQtreewidgetitem = m_pTreeWidgetFilters->headerItem();
@@ -648 +588 @@
     m_pCheckBoxUSB->setEnabled(isMachineOffline());
     m_pWidgetUSBSettings->setEnabled(isMachineInValidMode() && m_pCheckBoxUSB->isChecked());
-    m_pRadioButtonUSB1->setEnabled(isMachineOffline() && m_pCheckBoxUSB->isChecked());
-    m_pRadioButtonUSB2->setEnabled(isMachineOffline() && m_pCheckBoxUSB->isChecked());
-    m_pRadioButtonUSB3->setEnabled(isMachineOffline() && m_pCheckBoxUSB->isChecked());
+    m_pEditorController->setEnabled(isMachineOffline() && m_pCheckBoxUSB->isChecked());
 }
 
@@ -657 +595 @@
     /* Enable/disable USB children: */
     m_pWidgetUSBSettings->setEnabled(isMachineInValidMode() && fEnabled);
-    m_pRadioButtonUSB1->setEnabled(isMachineOffline() && fEnabled);
-    m_pRadioButtonUSB2->setEnabled(isMachineOffline() && fEnabled);
-    m_pRadioButtonUSB3->setEnabled(isMachineOffline() && fEnabled);
+    m_pEditorController->setEnabled(isMachineOffline() && fEnabled);
     if (fEnabled)
     {
@@ -923 +859 @@
         {
             /* Prepare USB settings widget layout: */
-            m_pLayoutUSBSettings = new QVBoxLayout(m_pWidgetUSBSettings);
-            if (m_pLayoutUSBSettings)
-            {
-                m_pLayoutUSBSettings->setContentsMargins(0, 0, 0, 0);
-
-                /* Prepare USB radio-buttons: */
-                prepareRadioButtons();
+            QVBoxLayout *pLayoutUSBSettings = new QVBoxLayout(m_pWidgetUSBSettings);
+            if (pLayoutUSBSettings)
+            {
+                pLayoutUSBSettings->setContentsMargins(0, 0, 0, 0);
+
+                /* Prepare USB controller editor: */
+                m_pEditorController = new UIUSBControllerEditor(m_pWidgetUSBSettings);
+                if (m_pEditorController)
+                    pLayoutUSBSettings->addWidget(m_pEditorController);
 
                 /* Prepare separator: */
                 m_pLabelSeparatorFilters = new QILabelSeparator(m_pWidgetUSBSettings);
                 if (m_pLabelSeparatorFilters)
-                    m_pLayoutUSBSettings->addWidget(m_pLabelSeparatorFilters);
+                    pLayoutUSBSettings->addWidget(m_pLabelSeparatorFilters);
 
                 /* Prepare USB filters layout: */
@@ -948 +886 @@
                     prepareFiltersToolbar();
 
-                    m_pLayoutUSBSettings->addLayout(m_pLayoutFilters);
+                    pLayoutUSBSettings->addLayout(m_pLayoutFilters);
                 }
             }
@@ -954 +892 @@
             pLayoutMain->addWidget(m_pWidgetUSBSettings, 1, 1, 1, 2);
         }
-    }
-}
-
-void UIMachineSettingsUSB::prepareRadioButtons()
-{
-    /* Prepare USB1 radio-button: */
-    m_pRadioButtonUSB1 = new QRadioButton(m_pWidgetUSBSettings);
-    if (m_pRadioButtonUSB1)
-    {
-        m_pRadioButtonUSB1->setVisible(false);
-        m_pLayoutUSBSettings->addWidget(m_pRadioButtonUSB1);
-    }
-    /* Prepare USB2 radio-button: */
-    m_pRadioButtonUSB2 = new QRadioButton(m_pWidgetUSBSettings);
-    if (m_pRadioButtonUSB2)
-    {
-        m_pRadioButtonUSB2->setVisible(false);
-        m_pLayoutUSBSettings->addWidget(m_pRadioButtonUSB2);
-    }
-    /* Prepare USB3 radio-button: */
-    m_pRadioButtonUSB3 = new QRadioButton(m_pWidgetUSBSettings);
-    if (m_pRadioButtonUSB3)
-    {
-        m_pRadioButtonUSB3->setVisible(false);
-        m_pLayoutUSBSettings->addWidget(m_pRadioButtonUSB3);
     }
 }
@@ -1060 +973 @@
 {
     /* Configure validation connections: */
-    connect(m_pCheckBoxUSB, &QCheckBox::stateChanged, this, &UIMachineSettingsUSB::revalidate);
-    connect(m_pRadioButtonUSB1, &QRadioButton::toggled, this, &UIMachineSettingsUSB::revalidate);
-    connect(m_pRadioButtonUSB2, &QRadioButton::toggled, this, &UIMachineSettingsUSB::revalidate);
-    connect(m_pRadioButtonUSB3, &QRadioButton::toggled, this, &UIMachineSettingsUSB::revalidate);
+    connect(m_pCheckBoxUSB, &QCheckBox::stateChanged,
+            this, &UIMachineSettingsUSB::revalidate);
+    connect(m_pEditorController, &UIUSBControllerEditor::sigValueChanged,
+            this, &UIMachineSettingsUSB::revalidate);
 
     /* Configure widget connections: */
@@ -1150 +1063 @@
             /* Create/update USB controllers: */
             if (newUsbData.m_fUSBEnabled)
-                fSuccess = createUSBControllers(newUsbData.m_USBControllerType);
+                fSuccess = createUSBControllers(newUsbData.m_enmUSBControllerType);
         }
 

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

@@ -28 +28 @@
 class QCheckBox;
 class QHBoxLayout;
-class QRadioButton;
-class QVBoxLayout;
 class QTreeWidgetItem;
 class QILabelSeparator;
+class QIToolBar;
 class QITreeWidget;
 class VBoxUSBMenu;
-class QIToolBar;
+class UIUSBControllerEditor;
 struct UIDataSettingsMachineUSB;
 struct UIDataSettingsMachineUSBFilter;
@@ -122 +121 @@
     /** Prepares widgets. */
     void prepareWidgets();
-    /** Prepares radio-buttons. */
-    void prepareRadioButtons();
     /** Prepares filters tree-widget. */
     void prepareFiltersTreeWidget();
@@ -156 +153 @@
      * @{ */
         /** Holds the USB check-box instance. */
-        QCheckBox        *m_pCheckBoxUSB;
+        QCheckBox             *m_pCheckBoxUSB;
         /** Holds the USB settings widget instance. */
-        QWidget          *m_pWidgetUSBSettings;
-        /** Holds the USB settings widget layout instance. */
-        QVBoxLayout      *m_pLayoutUSBSettings;
-        /** Holds the USB1 radio-button instance. */
-        QRadioButton     *m_pRadioButtonUSB1;
-        /** Holds the USB2 radio-button instance. */
-        QRadioButton     *m_pRadioButtonUSB2;
-        /** Holds the USB3 radio-button instance. */
-        QRadioButton     *m_pRadioButtonUSB3;
+        QWidget               *m_pWidgetUSBSettings;
+        /** Holds the USB controller editor instance. */
+        UIUSBControllerEditor *m_pEditorController;
         /** Holds the USB widget separator instance. */
-        QILabelSeparator *m_pLabelSeparatorFilters;
+        QILabelSeparator      *m_pLabelSeparatorFilters;
         /** Holds the USB filters layout instance. */
-        QHBoxLayout      *m_pLayoutFilters;
+        QHBoxLayout           *m_pLayoutFilters;
         /** Holds the USB filters tree-widget instance. */
-        QITreeWidget     *m_pTreeWidgetFilters;
+        QITreeWidget          *m_pTreeWidgetFilters;
         /** Holds the USB filters toolbar instance. */
-        QIToolBar        *m_pToolbarFilters;
+        QIToolBar             *m_pToolbarFilters;
         /** Holds the New action instance. */
-        QAction          *m_pActionNew;
+        QAction               *m_pActionNew;
         /** Holds the Add action instance. */
-        QAction          *m_pActionAdd;
+        QAction               *m_pActionAdd;
         /** Holds the Edit action instance. */
-        QAction          *m_pActionEdit;
+        QAction               *m_pActionEdit;
         /** Holds the Remove action instance. */
-        QAction          *m_pActionRemove;
+        QAction               *m_pActionRemove;
         /** Holds the Move Up action instance. */
-        QAction          *m_pActionMoveUp;
+        QAction               *m_pActionMoveUp;
         /** Holds the Move Down action instance. */
-        QAction          *m_pActionMoveDown;
+        QAction               *m_pActionMoveDown;
         /** Holds the USB devices menu instance. */
-        VBoxUSBMenu      *m_pMenuUSBDevices;
+        VBoxUSBMenu           *m_pMenuUSBDevices;
     /** @} */
 };