Changeset 85883 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 25, 2020 11:35:49 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9812: VM settings: Prepare cascade cleanup for Audio page.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsAudio.cpp (modified) (2 diffs)
• UIMachineSettingsAudio.h (modified) (2 diffs)

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

@@ -76 +76 @@
 UIMachineSettingsAudio::UIMachineSettingsAudio()
     : m_pCache(0)
+    , m_pCheckBoxAudio(0)
+    , m_pWidgetAudioSettings(0)
     , m_pAudioHostDriverLabel(0)
+    , m_pAudioHostDriverEditor(0)
     , m_pAudioControllerLabel(0)
+    , m_pAudioControllerEditor(0)
     , m_pLabelAudioExtended(0)
-    , m_pContainerAudioSubOptions(0)
-    , m_pAudioHostDriverEditor(0)
-    , m_pAudioControllerEditor(0)
+    , m_pCheckBoxAudioOutput(0)
+    , m_pCheckBoxAudioInput(0)
 {
     /* Prepare: */
@@ -208 +211 @@
     m_pCheckBoxAudioOutput->setEnabled(isMachineInValidMode());
     m_pCheckBoxAudioInput->setEnabled(isMachineInValidMode());
-    m_pContainerAudioSubOptions->setEnabled(m_pCheckBoxAudio->isChecked());
+    m_pWidgetAudioSettings->setEnabled(m_pCheckBoxAudio->isChecked());
 }
 
 void UIMachineSettingsAudio::prepare()
 {
-    prepareWidgets();
-
     /* Prepare cache: */
     m_pCache = new UISettingsCacheMachineAudio;
     AssertPtrReturnVoid(m_pCache);
 
-    /* Layout created in the .ui file. */
+    /* Prepare everything: */
+    prepareWidgets();
+    prepareConnections();
+
+    /* Apply language settings: */
+    retranslateUi();
+}
+
+void UIMachineSettingsAudio::prepareWidgets()
+{
+    /* Prepare main layout: */
+    QGridLayout *pMainLayout = new QGridLayout(this);
+    if (pMainLayout)
     {
-        /* Audio host-driver label & editor created in the .ui file. */
-        AssertPtrReturnVoid(m_pAudioHostDriverLabel);
-        AssertPtrReturnVoid(m_pAudioHostDriverEditor);
+        pMainLayout->setRowStretch(2, 1);
+
+        /* Prepare audio check-box: */
+        m_pCheckBoxAudio = new QCheckBox(this);
+        if (m_pCheckBoxAudio)
+            pMainLayout->addWidget(m_pCheckBoxAudio, 0, 0, 1, 2);
+
+        /* Prepare 20-px shifting spacer: */
+        QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
+        if (pSpacerItem)
+            pMainLayout->addItem(pSpacerItem, 1, 0);
+
+        /* Prepare audio settings widget: */
+        m_pWidgetAudioSettings = new QWidget(this);
+        if (m_pWidgetAudioSettings)
         {
-            /* Configure label & editor: */
-            m_pAudioHostDriverLabel->setBuddy(m_pAudioHostDriverEditor->focusProxy());
-        }
-
-        /* Audio controller label & editor created in the .ui file. */
-        AssertPtrReturnVoid(m_pAudioControllerLabel);
-        AssertPtrReturnVoid(m_pAudioControllerEditor);
-        {
-            /* Configure label & editor: */
-            m_pAudioControllerLabel->setBuddy(m_pAudioControllerEditor->focusProxy());
+            /* Prepare audio settings widget layout: */
+            QGridLayout *pLayoutAudioSettings = new QGridLayout(m_pWidgetAudioSettings);
+            if (pLayoutAudioSettings)
+            {
+                pLayoutAudioSettings->setContentsMargins(0, 0, 0, 0);
+
+                /* Prepare host driver label: */
+                m_pAudioHostDriverLabel = new QLabel(m_pWidgetAudioSettings);
+                if (m_pAudioHostDriverLabel)
+                {
+                    m_pAudioHostDriverLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    pLayoutAudioSettings->addWidget(m_pAudioHostDriverLabel, 0, 0);
+                }
+                /* Prepare host driver editor: */
+                m_pAudioHostDriverEditor = new UIAudioHostDriverEditor(m_pWidgetAudioSettings);
+                if (m_pAudioHostDriverEditor)
+                {
+                    m_pAudioHostDriverLabel->setBuddy(m_pAudioHostDriverEditor->focusProxy());
+                    pLayoutAudioSettings->addWidget(m_pAudioHostDriverEditor, 0, 1);
+                }
+
+                /* Prepare host controller label: */
+                m_pAudioControllerLabel = new QLabel(m_pWidgetAudioSettings);
+                if (m_pAudioControllerLabel)
+                {
+                    m_pAudioControllerLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    pLayoutAudioSettings->addWidget(m_pAudioControllerLabel, 1, 0);
+                }
+                /* Prepare host controller editor: */
+                m_pAudioControllerEditor = new UIAudioControllerEditor(m_pWidgetAudioSettings);
+                if (m_pAudioControllerEditor)
+                {
+                    m_pAudioControllerLabel->setBuddy(m_pAudioControllerEditor->focusProxy());
+                    pLayoutAudioSettings->addWidget(m_pAudioControllerEditor, 1, 1);
+                }
+
+                /* Prepare extended label: */
+                m_pLabelAudioExtended = new QLabel(m_pWidgetAudioSettings);
+                if (m_pLabelAudioExtended)
+                {
+                    m_pLabelAudioExtended->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    pLayoutAudioSettings->addWidget(m_pLabelAudioExtended, 2, 0);
+                }
+                /* Prepare output check-box: */
+                m_pCheckBoxAudioOutput = new QCheckBox(m_pWidgetAudioSettings);
+                if (m_pCheckBoxAudioOutput)
+                    pLayoutAudioSettings->addWidget(m_pCheckBoxAudioOutput, 2, 1);
+                /* Prepare input check-box: */
+                m_pCheckBoxAudioInput = new QCheckBox(m_pWidgetAudioSettings);
+                if (m_pCheckBoxAudioInput)
+                    pLayoutAudioSettings->addWidget(m_pCheckBoxAudioInput, 3, 1);
+
+                pMainLayout->addWidget(m_pWidgetAudioSettings, 1, 1, 1, 1);
+            }
         }
     }
-
-    /* Apply language settings: */
-    retranslateUi();
-}
-
-void UIMachineSettingsAudio::prepareWidgets()
-{
-    if (objectName().isEmpty())
-        setObjectName(QStringLiteral("UIMachineSettingsAudio"));
-    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    pMainLayout->setObjectName(QStringLiteral("pMainLayout"));
-    QWidget *pContainerAudioOptions = new QWidget();
-    pContainerAudioOptions->setObjectName(QStringLiteral("pContainerAudioOptions"));
-    QGridLayout *pContainerLayoutAudioOptions = new QGridLayout(pContainerAudioOptions);
-    pContainerLayoutAudioOptions->setObjectName(QStringLiteral("pContainerLayoutAudioOptions"));
-    pContainerLayoutAudioOptions->setContentsMargins(0, 0, 0, 0);
-    m_pCheckBoxAudio = new QCheckBox(pContainerAudioOptions);
-    m_pCheckBoxAudio->setObjectName(QStringLiteral("m_pCheckBoxAudio"));
-    pContainerLayoutAudioOptions->addWidget(m_pCheckBoxAudio, 0, 0, 1, 2);
-
-    QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
-    pContainerLayoutAudioOptions->addItem(pSpacerItem, 1, 0, 1, 1);
-
-    m_pContainerAudioSubOptions = new QWidget(pContainerAudioOptions);
-    m_pContainerAudioSubOptions->setObjectName(QStringLiteral("m_pContainerAudioSubOptions"));
-    QGridLayout *pContainerLayoutAudioSubOptions = new QGridLayout(m_pContainerAudioSubOptions);
-    pContainerLayoutAudioSubOptions->setContentsMargins(0, 0, 0, 0);
-    pContainerLayoutAudioSubOptions->setObjectName(QStringLiteral("pContainerLayoutAudioSubOptions"));
-    pContainerLayoutAudioSubOptions->setContentsMargins(0, 0, 0, 0);
-    m_pAudioHostDriverLabel = new QLabel(m_pContainerAudioSubOptions);
-    m_pAudioHostDriverLabel->setObjectName(QStringLiteral("m_pAudioHostDriverLabel"));
-    m_pAudioHostDriverLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    pContainerLayoutAudioSubOptions->addWidget(m_pAudioHostDriverLabel, 0, 0, 1, 1);
-
-    m_pAudioHostDriverEditor = new UIAudioHostDriverEditor(m_pContainerAudioSubOptions);
-    m_pAudioHostDriverEditor->setObjectName(QStringLiteral("m_pAudioHostDriverEditor"));
-    pContainerLayoutAudioSubOptions->addWidget(m_pAudioHostDriverEditor, 0, 1, 1, 1);
-
-    m_pAudioControllerLabel = new QLabel(m_pContainerAudioSubOptions);
-    m_pAudioControllerLabel->setObjectName(QStringLiteral("m_pAudioControllerLabel"));
-    m_pAudioControllerLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    pContainerLayoutAudioSubOptions->addWidget(m_pAudioControllerLabel, 1, 0, 1, 1);
-
-    m_pAudioControllerEditor = new UIAudioControllerEditor(m_pContainerAudioSubOptions);
-    m_pAudioControllerEditor->setObjectName(QStringLiteral("m_pAudioControllerEditor"));
-    pContainerLayoutAudioSubOptions->addWidget(m_pAudioControllerEditor, 1, 1, 1, 1);
-
-    m_pLabelAudioExtended = new QLabel(m_pContainerAudioSubOptions);
-    m_pLabelAudioExtended->setObjectName(QStringLiteral("m_pLabelAudioExtended"));
-    m_pLabelAudioExtended->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    pContainerLayoutAudioSubOptions->addWidget(m_pLabelAudioExtended, 2, 0, 1, 1);
-
-    m_pCheckBoxAudioOutput = new QCheckBox(m_pContainerAudioSubOptions);
-    m_pCheckBoxAudioOutput->setObjectName(QStringLiteral("m_pCheckBoxAudioOutput"));
-    QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-    sizePolicy.setHorizontalStretch(1);
-    sizePolicy.setVerticalStretch(0);
-    sizePolicy.setHeightForWidth(m_pCheckBoxAudioOutput->sizePolicy().hasHeightForWidth());
-    m_pCheckBoxAudioOutput->setSizePolicy(sizePolicy);
-    pContainerLayoutAudioSubOptions->addWidget(m_pCheckBoxAudioOutput, 2, 1, 1, 1);
-
-    m_pCheckBoxAudioInput = new QCheckBox(m_pContainerAudioSubOptions);
-    m_pCheckBoxAudioInput->setObjectName(QStringLiteral("m_pCheckBoxAudioInput"));
-    sizePolicy.setHeightForWidth(m_pCheckBoxAudioInput->sizePolicy().hasHeightForWidth());
-    m_pCheckBoxAudioInput->setSizePolicy(sizePolicy);
-    pContainerLayoutAudioSubOptions->addWidget(m_pCheckBoxAudioInput, 3, 1, 1, 1);
-
-    pContainerLayoutAudioOptions->addWidget(m_pContainerAudioSubOptions, 1, 1, 1, 1);
-    pMainLayout->addWidget(pContainerAudioOptions);
-
-    QSpacerItem *pSpacerItem1 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
-    pMainLayout->addItem(pSpacerItem1);
-
-    QObject::connect(m_pCheckBoxAudio, &QCheckBox::toggled, m_pContainerAudioSubOptions, &QWidget::setEnabled);
+}
+
+void UIMachineSettingsAudio::prepareConnections()
+{
+    QObject::connect(m_pCheckBoxAudio, &QCheckBox::toggled, m_pWidgetAudioSettings, &QWidget::setEnabled);
 }
 

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

@@ -76 +76 @@
     /** Prepares widgets. */
     void prepareWidgets();
+    /** Prepares connections. */
+    void prepareConnections();
     /** Cleanups all. */
     void cleanup();
@@ -85 +87 @@
     UISettingsCacheMachineAudio *m_pCache;
 
-    QCheckBox *m_pCheckBoxAudio;
-    QCheckBox *m_pCheckBoxAudioOutput;
-    QCheckBox *m_pCheckBoxAudioInput;
-
     /** @name Widgets
      * @{ */
-        QLabel *m_pAudioHostDriverLabel;
-        QLabel *m_pAudioControllerLabel;
-        QLabel *m_pLabelAudioExtended;
-        QWidget *m_pContainerAudioSubOptions;
+        /** Holds the audio check-box instance. */
+        QCheckBox               *m_pCheckBoxAudio;
+        /** Holds the audio settings widget instance. */
+        QWidget                 *m_pWidgetAudioSettings;
+        /** Holds the host audio driver label instance. */
+        QLabel                  *m_pAudioHostDriverLabel;
+        /** Holds the host audio driver editor instance. */
         UIAudioHostDriverEditor *m_pAudioHostDriverEditor;
+        /** Holds the host audio controller label instance. */
+        QLabel                  *m_pAudioControllerLabel;
+        /** Holds the host audio controller instance instance. */
         UIAudioControllerEditor *m_pAudioControllerEditor;
+        /** Holds the audio extended label instance. */
+        QLabel                  *m_pLabelAudioExtended;
+        /** Holds the audio output check-box instance. */
+        QCheckBox               *m_pCheckBoxAudioOutput;
+        /** Holds the audio input check-box instance. */
+        QCheckBox               *m_pCheckBoxAudioInput;
     /** @} */
 };