Changeset 90885 in vbox for trunk/src/VBox

Timestamp:

Aug 25, 2021 2:28:36 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Some layout fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards

Files:

• clonevd/UIWizardCloneVDPageExpert.cpp (modified) (3 diffs)
• newvd/UIWizardNewVDPageExpert.cpp (modified) (1 diff)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

@@ -47 +47 @@
     if (m_pMediumSizePathGroupBox)
     {
-        pMainLayout->addWidget(m_pMediumSizePathGroupBox, 0, 0, 2, 2);
+        pMainLayout->addWidget(m_pMediumSizePathGroupBox, 0, 0, 4, 2);
         connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumLocationButtonClicked,
                 this, &UIWizardCloneVDPageExpert::sltSelectLocationButtonClicked);
@@ -59 +59 @@
     if (m_pFormatGroupBox)
     {
-        pMainLayout-> addWidget(m_pFormatGroupBox, 2, 0, 6, 1);
+        pMainLayout-> addWidget(m_pFormatGroupBox, 4, 0, 7, 1);
         connect(m_pFormatGroupBox, &UIDiskFormatsGroupBox::sigMediumFormatChanged,
                 this, &UIWizardCloneVDPageExpert::sltMediumFormatChanged);
@@ -67 +67 @@
     if (m_pVariantGroupBox)
     {
-        pMainLayout-> addWidget(m_pVariantGroupBox, 2, 1, 6, 1);
+        pMainLayout-> addWidget(m_pVariantGroupBox, 4, 1, 3, 1);
         connect(m_pVariantGroupBox, &UIDiskVariantGroupBox::sigMediumVariantChanged,
                 this, &UIWizardCloneVDPageExpert::sltMediumVariantChanged);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

@@ -68 +68 @@
     m_pVariantGroup = new UIDiskVariantGroupBox(true /* fExpertMode */, 0);
 
-    pMainLayout->addWidget(m_pSizeAndPathGroup, 0, 0, 2, 2);
-    pMainLayout->addWidget(m_pFormatGroup, 2, 0, 6, 1);
-    pMainLayout->addWidget(m_pVariantGroup, 2, 1, 6, 1);
+    pMainLayout->addWidget(m_pSizeAndPathGroup, 0, 0, 4, 2);
+    pMainLayout->addWidget(m_pFormatGroup, 4, 0, 7, 1);
+    pMainLayout->addWidget(m_pVariantGroup, 4, 1, 3, 1);
 
     connect(m_pFormatGroup, &UIDiskFormatsGroupBox::sigMediumFormatChanged,

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -398 +398 @@
 
     setOSTypeDependedValues();
+    setSkipCheckBoxEnable();
     disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
     updateDiskWidgetsAfterMediumFormatChange();
@@ -868 +869 @@
 void UIWizardNewVMPageExpert::setSkipCheckBoxEnable()
 {
-    if (!m_pSkipUnattendedCheckBox)
+    AssertReturnVoid(m_pSkipUnattendedCheckBox && m_pNameAndSystemEditor);
+    const QString &strPath = m_pNameAndSystemEditor->image();
+    if (strPath.isNull() || strPath.isEmpty())
+    {
+        m_pSkipUnattendedCheckBox->setEnabled(false);
         return;
-    if (m_pNameAndSystemEditor)
-    {
-        const QString &strPath = m_pNameAndSystemEditor->image();
-        m_pSkipUnattendedCheckBox->setEnabled(!strPath.isNull() && !strPath.isEmpty());
-    }
+    }
+    m_pSkipUnattendedCheckBox->setEnabled(UIWizardNewVMNameOSTypePage::checkISOFile(m_pNameAndSystemEditor));
 }