Changeset 74628 in vbox for trunk/src/VBox

Timestamp:

Oct 5, 2018 1:06:48 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9620: UIApplianceImportEditorWidget: A bit of fixes for options layout; coding-style fixes.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp

@@ -74 +74 @@
 void UIApplianceImportEditorWidget::prepareWidgets()
 {
+    /* Create path selector label: */
     m_pPathSelectorLabel = new QIRichTextLabel(this);
     if (m_pPathSelectorLabel)
     {
+        /* Add into layout: */
         m_pLayout->addWidget(m_pPathSelectorLabel);
     }
+
+    /* Create path selector editor: */
     m_pPathSelector = new UIFilePathSelector(this);
     if (m_pPathSelector)
@@ -86 +90 @@
         m_pPathSelector->setPath(vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder());
         connect(m_pPathSelector, &UIFilePathSelector::pathChanged, this, &UIApplianceImportEditorWidget::sltHandlePathChanged);
+
+        /* Add into layout: */
         m_pLayout->addWidget(m_pPathSelector);
     }
 
+    /* Create options layout: */
     m_pOptionsLayout = new QGridLayout;
-
-    m_pMACComboBox = new QComboBox;
-    if (m_pMACComboBox)
-    {
-        m_pMACComboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    if (m_pOptionsLayout)
+    {
+        m_pOptionsLayout->setColumnStretch(0, 0);
+        m_pOptionsLayout->setColumnStretch(1, 1);
+
+        /* Create MAC address policy label: */
+        m_pMACComboBoxLabel = new QLabel;
+        if (m_pMACComboBoxLabel)
+        {
+            m_pMACComboBoxLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+
+            /* Add into layout: */
+            m_pOptionsLayout->addWidget(m_pMACComboBoxLabel, 0, 0);
+        }
+
+        /* Create MAC address policy combo: */
+        m_pMACComboBox = new QComboBox;
+        if (m_pMACComboBox)
+        {
+            m_pMACComboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+            m_pMACComboBoxLabel->setBuddy(m_pMACComboBox);
+
+            /* Add into layout: */
+            m_pOptionsLayout->addWidget(m_pMACComboBox, 0, 1, 1, 2);
+        }
+
+        /* Create additional options label: */
+        m_pAdditionalOptionsLabel = new QLabel;
+        if (m_pAdditionalOptionsLabel)
+        {
+            m_pAdditionalOptionsLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+
+            /* Add into layout: */
+            m_pOptionsLayout->addWidget(m_pAdditionalOptionsLabel, 1, 0);
+        }
+
+        /* Create import HDs as VDIs checkbox: */
+        m_pImportHDsAsVDI = new QCheckBox;
+        {
+            m_pImportHDsAsVDI->setCheckState(Qt::Checked);
+
+            /* Add into layout: */
+            m_pOptionsLayout->addWidget(m_pImportHDsAsVDI, 1, 1);
+        }
+
         /* Add into layout: */
-        m_pOptionsLayout->addWidget(m_pMACComboBox, 0, 1);
-    }
-
-        /* Create format combo-box label: */
-    m_pMACComboBoxLabel = new QLabel;
-    if (m_pMACComboBoxLabel)
-    {
-        m_pMACComboBoxLabel->setAlignment(Qt::AlignLeft | Qt::AlignTrailing | Qt::AlignVCenter);
-        /* Add into layout: */
-        m_pOptionsLayout->addWidget(m_pMACComboBoxLabel, 0, 0);
-    }
-
-    if (m_pMACComboBoxLabel)
-        m_pMACComboBoxLabel->setBuddy(m_pMACComboBox);
-
-    m_pAdditionalOptionsLabel = new QLabel;
-    if (m_pAdditionalOptionsLabel)
-    {
-        m_pAdditionalOptionsLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
-        m_pOptionsLayout->addWidget(m_pAdditionalOptionsLabel, 2, 0, 1, 1);
-    }
-
-    m_pImportHDsAsVDI = new QCheckBox;
-    {
-        m_pOptionsLayout->addWidget(m_pImportHDsAsVDI, 2, 1);
-        m_pImportHDsAsVDI->setCheckState(Qt::Checked);
-    }
-
-
-    m_pLayout->addLayout(m_pOptionsLayout);
+        m_pLayout->addLayout(m_pOptionsLayout);
+    }
+
+    /* Populate MAC address import combo: */
     populateMACAddressImportPolicies();
+    /* And connect this combo' signals afterwards: */
     connect(m_pMACComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &UIApplianceImportEditorWidget::sltHandleMACAddressImportPolicyComboChange);
+
+    /* Apply language settings: */
     retranslateUi();
 }