Changeset 95286 in vbox for trunk/src

Timestamp:

Jun 15, 2022 1:30:01 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:6899: Machine settings: USB page accessibility improvements (part 4); Moving USB settings stuff into separate UIUSBSettingsEditor widget.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/editors/UIUSBSettingsEditor.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.cpp ) (8 diffs)
• src/settings/editors/UIUSBSettingsEditor.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.h ) (6 diffs)
• src/settings/machine/UIMachineSettingsSF.cpp (modified) (1 diff)
• src/settings/machine/UIMachineSettingsUSB.cpp (modified) (12 diffs)
• src/settings/machine/UIMachineSettingsUSB.h (modified) (3 diffs)

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

@@ -936 +936 @@
         src/settings/editors/UIUSBFilterDetailsEditor.h \
         src/settings/editors/UIUSBFiltersEditor.h \
+        src/settings/editors/UIUSBSettingsEditor.h \
         src/settings/editors/UIVideoMemoryEditor.h \
         src/settings/editors/UIVirtualCPUEditor.h \
@@ -1515 +1516 @@
         src/settings/editors/UIUSBFilterDetailsEditor.cpp \
         src/settings/editors/UIUSBFiltersEditor.cpp \
+        src/settings/editors/UIUSBSettingsEditor.cpp \
         src/settings/editors/UIVideoMemoryEditor.cpp \
         src/settings/editors/UIVirtualCPUEditor.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIAudioSettingsEditor class implementation.
+ * VBox Qt GUI - UIUSBSettingsEditor class implementation.
  */
 
@@ -22 +22 @@
 
 /* GUI includes: */
-#include "UIAudioControllerEditor.h"
-#include "UIAudioFeaturesEditor.h"
-#include "UIAudioHostDriverEditor.h"
-#include "UIAudioSettingsEditor.h"
+#include "UIUSBControllerEditor.h"
+#include "UIUSBSettingsEditor.h"
 
 
-UIAudioSettingsEditor::UIAudioSettingsEditor(QWidget *pParent /* = 0 */)
+UIUSBSettingsEditor::UIUSBSettingsEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fFeatureEnabled(false)
     , m_pCheckboxFeature(0)
     , m_pWidgetSettings(0)
-    , m_pEditorAudioHostDriver(0)
-    , m_pEditorAudioController(0)
-    , m_pEditorAudioFeatures(0)
+    , m_pEditorController(0)
+    , m_pEditorFilters(0)
 {
     prepare();
 }
 
-void UIAudioSettingsEditor::setFeatureEnabled(bool fEnabled)
+void UIUSBSettingsEditor::setFeatureEnabled(bool fEnabled)
 {
     if (m_fFeatureEnabled != fEnabled)
@@ -50 +47 @@
 }
 
-bool UIAudioSettingsEditor::isFeatureEnabled() const
+bool UIUSBSettingsEditor::isFeatureEnabled() const
 {
     return m_pCheckboxFeature ? m_pCheckboxFeature->isChecked() : m_fFeatureEnabled;
 }
 
-void UIAudioSettingsEditor::setFeatureAvailable(bool fAvailable)
+void UIUSBSettingsEditor::setFeatureAvailable(bool fAvailable)
 {
     if (m_pCheckboxFeature)
@@ -61 +58 @@
 }
 
-void UIAudioSettingsEditor::setHostDriverType(KAudioDriverType enmType)
+void UIUSBSettingsEditor::setUsbControllerType(KUSBControllerType enmType)
 {
-    if (m_pEditorAudioHostDriver)
-        m_pEditorAudioHostDriver->setValue(enmType);
+    if (m_pEditorController)
+        m_pEditorController->setValue(enmType);
 }
 
-KAudioDriverType UIAudioSettingsEditor::hostDriverType() const
+KUSBControllerType UIUSBSettingsEditor::usbControllerType() const
 {
-    return m_pEditorAudioHostDriver ? m_pEditorAudioHostDriver->value() : KAudioDriverType_Max;
+    return m_pEditorController ? m_pEditorController->value() : KUSBControllerType_Max;
 }
 
-void UIAudioSettingsEditor::setHostDriverOptionAvailable(bool fAvailable)
+void UIUSBSettingsEditor::setUsbControllerOptionAvailable(bool fAvailable)
 {
-    if (m_pEditorAudioHostDriver)
-        m_pEditorAudioHostDriver->setEnabled(fAvailable);
+    if (m_pEditorController)
+        m_pEditorController->setEnabled(fAvailable);
 }
 
-void UIAudioSettingsEditor::setControllerType(KAudioControllerType enmType)
+void UIUSBSettingsEditor::setUsbFilters(const QList<UIDataUSBFilter> &filters)
 {
-    if (m_pEditorAudioController)
-        m_pEditorAudioController->setValue(enmType);
+    if (m_pEditorFilters)
+        m_pEditorFilters->setValue(filters);
 }
 
-KAudioControllerType UIAudioSettingsEditor::controllerType() const
+QList<UIDataUSBFilter> UIUSBSettingsEditor::usbFilters() const
 {
-    return m_pEditorAudioController ? m_pEditorAudioController->value() : KAudioControllerType_Max;
+    return m_pEditorFilters ? m_pEditorFilters->value() : QList<UIDataUSBFilter>();
 }
 
-void UIAudioSettingsEditor::setControllerOptionAvailable(bool fAvailable)
+void UIUSBSettingsEditor::setUsbFiltersOptionAvailable(bool fAvailable)
 {
-    if (m_pEditorAudioController)
-        m_pEditorAudioController->setEnabled(fAvailable);
+    if (m_pEditorFilters)
+        m_pEditorFilters->setEnabled(fAvailable);
 }
 
-void UIAudioSettingsEditor::setEnableOutput(bool fConnected)
-{
-    if (m_pEditorAudioFeatures)
-        m_pEditorAudioFeatures->setEnableOutput(fConnected);
-}
-
-bool UIAudioSettingsEditor::outputEnabled() const
-{
-    return m_pEditorAudioFeatures ? m_pEditorAudioFeatures->outputEnabled() : false;
-}
-
-void UIAudioSettingsEditor::setEnableInput(bool fConnected)
-{
-    if (m_pEditorAudioFeatures)
-        m_pEditorAudioFeatures->setEnableInput(fConnected);
-}
-
-bool UIAudioSettingsEditor::inputEnabled() const
-{
-    return m_pEditorAudioFeatures ? m_pEditorAudioFeatures->inputEnabled() : false;
-}
-
-void UIAudioSettingsEditor::setFeatureOptionsAvailable(bool fAvailable)
-{
-    if (m_pEditorAudioFeatures)
-        m_pEditorAudioFeatures->setEnabled(fAvailable);
-}
-
-void UIAudioSettingsEditor::retranslateUi()
+void UIUSBSettingsEditor::retranslateUi()
 {
     if (m_pCheckboxFeature)
     {
-        m_pCheckboxFeature->setText(tr("Enable &Audio"));
-        m_pCheckboxFeature->setToolTip(tr("When checked, a virtual PCI audio card will be plugged into the virtual machine "
-                                          "and will communicate with the host audio system using the specified driver."));
+        m_pCheckboxFeature->setText(tr("Enable &USB Controller"));
+        m_pCheckboxFeature->setToolTip(tr("When checked, enables the virtual USB controller of this machine."));
     }
-
-    /* These editors have own labels, but we want them to be properly layouted according to each other: */
-    int iMinimumLayoutHint = 0;
-    if (m_pEditorAudioHostDriver)
-        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioHostDriver->minimumLabelHorizontalHint());
-    if (m_pEditorAudioController)
-        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioController->minimumLabelHorizontalHint());
-    if (m_pEditorAudioFeatures)
-        iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAudioFeatures->minimumLabelHorizontalHint());
-    if (m_pEditorAudioHostDriver)
-        m_pEditorAudioHostDriver->setMinimumLayoutIndent(iMinimumLayoutHint);
-    if (m_pEditorAudioController)
-        m_pEditorAudioController->setMinimumLayoutIndent(iMinimumLayoutHint);
-    if (m_pEditorAudioFeatures)
-        m_pEditorAudioFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
 }
 
-void UIAudioSettingsEditor::sltHandleFeatureToggled()
+void UIUSBSettingsEditor::sltHandleFeatureToggled()
 {
     /* Update widget availability: */
@@ -154 +107 @@
 }
 
-void UIAudioSettingsEditor::prepare()
+void UIUSBSettingsEditor::prepare()
 {
     /* Prepare stuff: */
@@ -167 +120 @@
 }
 
-void UIAudioSettingsEditor::prepareWidgets()
+void UIUSBSettingsEditor::prepareWidgets()
 {
     /* Prepare main layout: */
@@ -190 +143 @@
         {
             /* Prepare settings layout: */
-            QVBoxLayout *pLayoutAudioSettings = new QVBoxLayout(m_pWidgetSettings);
-            if (pLayoutAudioSettings)
+            QVBoxLayout *pLayoutSettings = new QVBoxLayout(m_pWidgetSettings);
+            if (pLayoutSettings)
             {
-                pLayoutAudioSettings->setContentsMargins(0, 0, 0, 0);
+                pLayoutSettings->setContentsMargins(0, 0, 0, 0);
 
-                /* Prepare host driver editor: */
-                m_pEditorAudioHostDriver = new UIAudioHostDriverEditor(m_pWidgetSettings);
-                if (m_pEditorAudioHostDriver)
-                    pLayoutAudioSettings->addWidget(m_pEditorAudioHostDriver);
+                /* Prepare USB controller editor: */
+                m_pEditorController = new UIUSBControllerEditor(m_pWidgetSettings);
+                if (m_pEditorController)
+                    pLayoutSettings->addWidget(m_pEditorController);
 
-                /* Prepare controller editor: */
-                m_pEditorAudioController = new UIAudioControllerEditor(m_pWidgetSettings);
-                if (m_pEditorAudioController)
-                    pLayoutAudioSettings->addWidget(m_pEditorAudioController);
-
-                /* Prepare features editor: */
-                m_pEditorAudioFeatures = new UIAudioFeaturesEditor(m_pWidgetSettings);
-                if (m_pEditorAudioFeatures)
-                    pLayoutAudioSettings->addWidget(m_pEditorAudioFeatures);
+                /* Prepare USB filters editor: */
+                m_pEditorFilters = new UIUSBFiltersEditor(m_pWidgetSettings);
+                if (m_pEditorFilters)
+                    pLayoutSettings->addWidget(m_pEditorFilters);
             }
 
@@ -216 +164 @@
 }
 
-void UIAudioSettingsEditor::prepareConnections()
+void UIUSBSettingsEditor::prepareConnections()
 {
     if (m_pCheckboxFeature)
+    {
         connect(m_pCheckboxFeature, &QCheckBox::stateChanged,
-                this, &UIAudioSettingsEditor::sltHandleFeatureToggled);
+                this, &UIUSBSettingsEditor::sltHandleFeatureToggled);
+        connect(m_pCheckboxFeature, &QCheckBox::stateChanged,
+                this, &UIUSBSettingsEditor::sigValueChanged);
+    }
+    if (m_pEditorController)
+        connect(m_pEditorController, &UIUSBControllerEditor::sigValueChanged,
+                this, &UIUSBSettingsEditor::sigValueChanged);
+    if (m_pEditorFilters)
+        connect(m_pEditorFilters, &UIUSBFiltersEditor::sigValueChanged,
+                this, &UIUSBSettingsEditor::sigValueChanged);
 }
 
-void UIAudioSettingsEditor::updateFeatureAvailability()
+void UIUSBSettingsEditor::updateFeatureAvailability()
 {
     m_pWidgetSettings->setEnabled(m_pCheckboxFeature->isChecked());

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIAudioSettingsEditor class declaration.
+ * VBox Qt GUI - UIUSBSettingsEditor class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_settings_editors_UIAudioSettingsEditor_h
-#define FEQT_INCLUDED_SRC_settings_editors_UIAudioSettingsEditor_h
+#ifndef FEQT_INCLUDED_SRC_settings_editors_UIUSBSettingsEditor_h
+#define FEQT_INCLUDED_SRC_settings_editors_UIUSBSettingsEditor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -28 +28 @@
 #include "QIWithRetranslateUI.h"
 #include "UILibraryDefs.h"
-#include "UIPortForwardingTable.h"
+#include "UIUSBFiltersEditor.h"
 
 /* COM includes: */
@@ -35 +35 @@
 /* Forward declarations: */
 class QCheckBox;
-class UIAudioControllerEditor;
-class UIAudioFeaturesEditor;
-class UIAudioHostDriverEditor;
+class UIUSBControllerEditor;
 
-/** QWidget subclass used as a audio settings editor. */
-class SHARED_LIBRARY_STUFF UIAudioSettingsEditor : public QIWithRetranslateUI<QWidget>
+/** QWidget subclass used as a USB settings editor. */
+class SHARED_LIBRARY_STUFF UIUSBSettingsEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about value change. */
+    void sigValueChanged();
 
 public:
 
     /** Constructs editor passing @a pParent to the base-class. */
-    UIAudioSettingsEditor(QWidget *pParent = 0);
+    UIUSBSettingsEditor(QWidget *pParent = 0);
 
     /** @name General stuff
@@ -60 +63 @@
     /** @} */
 
-    /** @name Host driver editor stuff
+    /** @name USB controller editor stuff
      * @{ */
-        /** Defines host driver @a enmType. */
-        void setHostDriverType(KAudioDriverType enmType);
-        /** Returns host driver type. */
-        KAudioDriverType hostDriverType() const;
+        /** Defines USB controller @a enmType. */
+        void setUsbControllerType(KUSBControllerType enmType);
+        /** Returns USB controller type. */
+        KUSBControllerType usbControllerType() const;
 
-        /** Defines whether host driver option @a fAvailable. */
-        void setHostDriverOptionAvailable(bool fAvailable);
+        /** Defines whether USB controller option @a fAvailable. */
+        void setUsbControllerOptionAvailable(bool fAvailable);
     /** @} */
 
-    /** @name Controller editor stuff
+    /** @name USB filters editor stuff
      * @{ */
-        /** Defines controller @a enmType. */
-        void setControllerType(KAudioControllerType enmValue);
-        /** Returns controller type. */
-        KAudioControllerType controllerType() const;
+        /** Defines a list of USB @a filters. */
+        void setUsbFilters(const QList<UIDataUSBFilter> &filters);
+        /** Returns a list of USB filters. */
+        QList<UIDataUSBFilter> usbFilters() const;
 
-        /** Defines whether controller option @a fAvailable. */
-        void setControllerOptionAvailable(bool fAvailable);
-    /** @} */
-
-    /** @name Features editor stuff
-     * @{ */
-        /** Defines whether 'enable output' feature in @a fOn. */
-        void setEnableOutput(bool fOn);
-        /** Returns 'enable output' feature value. */
-        bool outputEnabled() const;
-
-        /** Defines whether 'enable input' feature in @a fOn. */
-        void setEnableInput(bool fOn);
-        /** Returns 'enable input' feature value. */
-        bool inputEnabled() const;
-
-        /** Defines whether feature options @a fAvailable. */
-        void setFeatureOptionsAvailable(bool fAvailable);
+        /** Defines whether USB filters option @a fAvailable. */
+        void setUsbFiltersOptionAvailable(bool fAvailable);
     /** @} */
 
@@ -129 +116 @@
      * @{ */
         /** Holds the feature check-box instance. */
-        QCheckBox               *m_pCheckboxFeature;
+        QCheckBox             *m_pCheckboxFeature;
         /** Holds the settings widget instance. */
-        QWidget                 *m_pWidgetSettings;
-        /** Holds the host driver editor instance. */
-        UIAudioHostDriverEditor *m_pEditorAudioHostDriver;
+        QWidget               *m_pWidgetSettings;
         /** Holds the controller editor instance. */
-        UIAudioControllerEditor *m_pEditorAudioController;
-        /** Holds the features editor instance. */
-        UIAudioFeaturesEditor   *m_pEditorAudioFeatures;
+        UIUSBControllerEditor *m_pEditorController;
+        /** Holds the filters editor instance. */
+        UIUSBFiltersEditor    *m_pEditorFilters;
     /** @} */
 };
 
-#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIAudioSettingsEditor_h */
+#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIUSBSettingsEditor_h */

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

@@ -233 +233 @@
         if (m_pEditorSharedFolders)
             pLayout->addWidget(m_pEditorSharedFolders);
-
-        pLayout->addStretch();
     }
 }

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

@@ -38 +38 @@
 #include "QIToolBar.h"
 #include "UICommon.h"
-#include "UIUSBControllerEditor.h"
-#include "UIUSBFilterDetailsEditor.h"
 #include "UIUSBFiltersEditor.h"
+#include "UIUSBSettingsEditor.h"
 
 /* COM includes: */
@@ -106 +105 @@
 UIMachineSettingsUSB::UIMachineSettingsUSB()
     : m_pCache(0)
-    , m_pCheckBoxUSB(0)
-    , m_pWidgetUSBSettings(0)
-    , m_pEditorController(0)
-    , m_pEditorFilters(0)
+    , m_pEditorUsbSettings(0)
 {
     prepare();
@@ -121 +117 @@
 bool UIMachineSettingsUSB::isUSBEnabled() const
 {
-    return m_pCheckBoxUSB->isChecked();
+    return m_pEditorUsbSettings->isFeatureEnabled();
 }
 
@@ -207 +203 @@
 
     /* Load old USB data from cache: */
-    if (m_pCheckBoxUSB)
-        m_pCheckBoxUSB->setChecked(oldUsbData.m_fUSBEnabled);
-    if (m_pEditorController)
-        m_pEditorController->setValue(oldUsbData.m_enmUSBControllerType);
-    if (m_pEditorFilters)
-    {
+    if (m_pEditorUsbSettings)
+    {
+        m_pEditorUsbSettings->setFeatureEnabled(oldUsbData.m_fUSBEnabled);
+        m_pEditorUsbSettings->setUsbControllerType(oldUsbData.m_enmUSBControllerType);
+
         /* For each filter => load it from cache: */
         QList<UIDataUSBFilter> filters;
@@ -231 +226 @@
             filters << filter;
         }
-        m_pEditorFilters->setValue(filters);
-    }
-
-    /* Update widget availability: */
-    if (m_pCheckBoxUSB)
-        sltHandleUsbAdapterToggle(m_pCheckBoxUSB->isChecked());
+        m_pEditorUsbSettings->setUsbFilters(filters);
+    }
 
     /* Polish page finally: */
@@ -248 +239 @@
 {
     /* Sanity check: */
-    if (   !m_pCache
-        || !m_pEditorFilters)
+    if (!m_pCache)
         return;
 
@@ -256 +246 @@
 
     /* Gather new USB data: */
-    if (m_pCheckBoxUSB)
-        newUsbData.m_fUSBEnabled = m_pCheckBoxUSB->isChecked();
-    if (m_pEditorController)
-        newUsbData.m_enmUSBControllerType = newUsbData.m_fUSBEnabled ? m_pEditorController->value() : KUSBControllerType_Null;
-    if (m_pEditorFilters)
-    {
+    if (m_pEditorUsbSettings)
+    {
+        newUsbData.m_fUSBEnabled = m_pEditorUsbSettings->isFeatureEnabled();
+        newUsbData.m_enmUSBControllerType = newUsbData.m_fUSBEnabled
+                                          ? m_pEditorUsbSettings->usbControllerType()
+                                          : KUSBControllerType_Null;
         /* For each filter => save it to cache: */
-        const QList<UIDataUSBFilter> filters = m_pEditorFilters->value();
+        const QList<UIDataUSBFilter> filters = m_pEditorUsbSettings->usbFilters();
         for (int iFilterIndex = 0; iFilterIndex < filters.size(); ++iFilterIndex)
         {
@@ -306 +296 @@
 
     /* USB 2.0/3.0 Extension Pack presence test: */
-    if (   m_pCheckBoxUSB->isChecked()
-        && (   m_pEditorController->value() == KUSBControllerType_EHCI
-            || m_pEditorController->value() == KUSBControllerType_XHCI))
+    if (   m_pEditorUsbSettings
+        && m_pEditorUsbSettings->isFeatureEnabled()
+        && (   m_pEditorUsbSettings->usbControllerType() == KUSBControllerType_EHCI
+            || m_pEditorUsbSettings->usbControllerType() == KUSBControllerType_XHCI))
     {
         CExtPackManager extPackManager = uiCommon().virtualBox().GetExtensionPackManager();
@@ -332 +323 @@
 void UIMachineSettingsUSB::setOrderAfter(QWidget *pWidget)
 {
-    setTabOrder(pWidget, m_pCheckBoxUSB);
-    setTabOrder(m_pCheckBoxUSB, m_pEditorController);
-    setTabOrder(m_pEditorController, m_pEditorFilters);
+    setTabOrder(pWidget, m_pEditorUsbSettings);
 }
 
 void UIMachineSettingsUSB::retranslateUi()
 {
-    m_pCheckBoxUSB->setToolTip(tr("When checked, enables the virtual USB controller of this machine."));
-    m_pCheckBoxUSB->setText(tr("Enable &USB Controller"));
 }
 
@@ -346 +333 @@
 {
     /* Polish USB page availability: */
-    m_pCheckBoxUSB->setEnabled(isMachineOffline());
-    m_pWidgetUSBSettings->setEnabled(isMachineInValidMode() && m_pCheckBoxUSB->isChecked());
-    m_pEditorController->setEnabled(isMachineOffline() && m_pCheckBoxUSB->isChecked());
-}
-
-void UIMachineSettingsUSB::sltHandleUsbAdapterToggle(bool fEnabled)
-{
-    /* Enable/disable USB children: */
-    m_pWidgetUSBSettings->setEnabled(isMachineInValidMode() && fEnabled);
-    m_pEditorController->setEnabled(isMachineOffline() && fEnabled);
+    m_pEditorUsbSettings->setFeatureAvailable(isMachineOffline());
+    m_pEditorUsbSettings->setUsbControllerOptionAvailable(isMachineOffline());
+    m_pEditorUsbSettings->setUsbFiltersOptionAvailable(isMachineInValidMode());
 }
 
@@ -375 +355 @@
 {
     /* Prepare main layout: */
-    QGridLayout *pLayoutMain = new QGridLayout(this);
-    if (pLayoutMain)
-    {
-        pLayoutMain->setRowStretch(2, 1);
-        pLayoutMain->setColumnStretch(1, 1);
-
-        /* Prepare USB check-box: */
-        m_pCheckBoxUSB = new QCheckBox;
-        if (m_pCheckBoxUSB)
-            pLayoutMain->addWidget(m_pCheckBoxUSB, 0, 0, 1, 2);
-
-        /* Prepare 20-px shifting spacer: */
-        QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
-        if (pSpacerItem)
-            pLayoutMain->addItem(pSpacerItem, 1, 0);
-
-        /* Prepare USB settings widget: */
-        m_pWidgetUSBSettings = new QWidget(this);
-        if (m_pWidgetUSBSettings)
-        {
-            /* Prepare USB settings widget layout: */
-            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 USB filters editor: */
-                m_pEditorFilters = new UIUSBFiltersEditor(m_pWidgetUSBSettings);
-                if (m_pEditorFilters)
-                    pLayoutUSBSettings->addWidget(m_pEditorFilters);
-            }
-
-            pLayoutMain->addWidget(m_pWidgetUSBSettings, 1, 1, 1, 2);
-        }
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    if (pLayout)
+    {
+        /* Prepare settings editor: */
+        m_pEditorUsbSettings = new UIUSBSettingsEditor(this);
+        if (m_pEditorUsbSettings)
+            pLayout->addWidget(m_pEditorUsbSettings);
     }
 }
@@ -420 +368 @@
 {
     /* Configure validation connections: */
-    connect(m_pCheckBoxUSB, &QCheckBox::stateChanged,
+    connect(m_pEditorUsbSettings, &UIUSBSettingsEditor::sigValueChanged,
             this, &UIMachineSettingsUSB::revalidate);
-    connect(m_pEditorController, &UIUSBControllerEditor::sigValueChanged,
-            this, &UIMachineSettingsUSB::revalidate);
-    connect(m_pEditorFilters, &UIUSBFiltersEditor::sigValueChanged,
-            this, &UIMachineSettingsUSB::revalidate);
-
-    /* Configure widget connections: */
-    connect(m_pCheckBoxUSB, &QCheckBox::toggled,
-            this, &UIMachineSettingsUSB::sltHandleUsbAdapterToggle);
 }
 

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

@@ -26 +26 @@
 
 /* Forward declarations: */
-class QCheckBox;
-class UIUSBControllerEditor;
-class UIUSBFiltersEditor;
+class UIUSBSettingsEditor;
 struct UIDataSettingsMachineUSB;
 struct UIDataSettingsMachineUSBFilter;
@@ -80 +78 @@
     virtual void polishPage() RT_OVERRIDE;
 
-private slots:
-
-    /** Handles whether USB adapted is @a fEnabled. */
-    void sltHandleUsbAdapterToggle(bool fEnabled);
-
 private:
 
@@ -112 +105 @@
     /** @name Widgets
      * @{ */
-        /** Holds the USB check-box instance. */
-        QCheckBox             *m_pCheckBoxUSB;
-        /** Holds the USB settings widget instance. */
-        QWidget               *m_pWidgetUSBSettings;
-        /** Holds the USB controller editor instance. */
-        UIUSBControllerEditor *m_pEditorController;
-        /** Holds the USB filters editor instance. */
-        UIUSBFiltersEditor    *m_pEditorFilters;
+        /** Holds the USB settings editor instance. */
+        UIUSBSettingsEditor *m_pEditorUsbSettings;
     /** @} */
 };