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

Timestamp:

Mar 2, 2021 2:13:51 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Making sure we set the virtual disk correctly

Location:

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

Files:

• UIWizardNewVMPageBasic4.cpp (modified) (6 diffs)
• UIWizardNewVMPageBasic4.h (modified) (1 diff)
• UIWizardNewVMPageExpert.cpp (modified) (3 diffs)

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

@@ -77 +77 @@
     if (returnCode == static_cast<int>(UIMediumSelector::ReturnCode_Accepted) && !uMediumId.isNull())
     {
-        /* Update medium-combo if necessary: */
         m_pDiskSelector->setCurrentItem(uMediumId);
-        /* Focus on hard disk combo: */
         m_pDiskSelector->setFocus();
-        m_virtualDisk = uiCommon().medium(uMediumId).medium();
-    }
-}
-
-bool UIWizardNewVMPage4::getWithNewVirtualDiskWizard()
-{
-    /* Create New Virtual Hard Drive wizard: */
-    UISafePointerWizardNewVD pWizard = new UIWizardNewVD(thisImp(),
-                                                         fieldImp("machineBaseName").toString(),
-                                                         fieldImp("machineFolder").toString(),
-                                                         fieldImp("type").value<CGuestOSType>().GetRecommendedHDD(),
-                                                         wizardImp()->mode());
-    pWizard->prepare();
-    bool fResult = false;
-    if (pWizard->exec() == QDialog::Accepted)
-    {
-        fResult = true;
-        m_virtualDisk = pWizard->virtualDisk();
-        m_pDiskSelector->setCurrentItem(m_virtualDisk.GetId());
-        m_pDiskExisting->click();
-    }
-    if (pWizard)
-        delete pWizard;
-    return fResult;
-}
-
-void UIWizardNewVMPage4::ensureNewVirtualDiskDeleted()
-{
-    /* Make sure virtual-disk valid: */
-    if (m_virtualDisk.isNull())
-        return;
-
-    /* Remember virtual-disk attributes: */
-    QString strLocation = m_virtualDisk.GetLocation();
-    /* Prepare delete storage progress: */
-    CProgress progress = m_virtualDisk.DeleteStorage();
-    if (m_virtualDisk.isOk())
-    {
-        /* Show delete storage progress: */
-        msgCenter().showModalProgressDialog(progress, thisImp()->windowTitle(), ":/progress_media_delete_90px.png", thisImp());
-        if (!progress.isOk() || progress.GetResultCode() != 0)
-            msgCenter().cannotDeleteHardDiskStorage(progress, strLocation, thisImp());
-    }
-    else
-        msgCenter().cannotDeleteHardDiskStorage(m_virtualDisk, strLocation, thisImp());
-
-    /* Detach virtual-disk anyway: */
-    m_virtualDisk.detach();
+    }
 }
 
@@ -154 +105 @@
     m_pDiskSelector->setEnabled(fEnabled);
     m_pDiskSelectionButton->setEnabled(fEnabled);
+}
+
+void UIWizardNewVMPage4::setVirtualDiskFromDiskCombo()
+{
+    QUuid currentId;
+    if (!m_virtualDisk.isNull())
+        currentId = m_virtualDisk.GetId();
+    QUuid id = m_pDiskSelector->id();
+    /* Do nothing else if m_virtualMedium is already set to what combobox has: */
+    if (id == currentId)
+        return;
+    if (m_pDiskSelector)
+    {
+        CMedium medium = uiCommon().medium(id).medium();
+        if (!medium.isNull())
+            setVirtualDisk(medium);
+    }
 }
 
@@ -303 +271 @@
         setSelectedDiskSource(SelectedDiskSource_Empty);
     else if (m_pDiskSourceButtonGroup->checkedButton() == m_pDiskExisting)
+    {
         setSelectedDiskSource(SelectedDiskSource_Existing);
+        setVirtualDiskFromDiskCombo();
+    }
     else
         setSelectedDiskSource(SelectedDiskSource_New);
@@ -315 +286 @@
 void UIWizardNewVMPageBasic4::sltVirtualSelectedDiskSourceChanged()
 {
+    /* Make sure to set m_virtualDisk: */
+    setVirtualDiskFromDiskCombo();
     emit completeChanged();
 }
@@ -390 +363 @@
 void UIWizardNewVMPageBasic4::cleanupPage()
 {
-    /* Call to base-class: */
-    ensureNewVirtualDiskDeleted();
     UIWizardPage::cleanupPage();
 }
@@ -399 +370 @@
     if (selectedDiskSource() == SelectedDiskSource_New)
         return mediumSize() >= m_uMediumSizeMin && mediumSize() <= m_uMediumSizeMax;
+
     if (selectedDiskSource() == SelectedDiskSource_Existing)
-        return m_virtualDisk.isNull();
+        return !m_virtualDisk.isNull();
+
     return true;
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic4.h

@@ -59 +59 @@
     SelectedDiskSource selectedDiskSource() const;
     void setSelectedDiskSource(SelectedDiskSource enmSelectedDiskSource);
-
-    void getWithFileOpenDialog();
     bool getWithNewVirtualDiskWizard();
-
 
     QWidget *createDiskWidgets();
     virtual QWidget *createDiskVariantAndSizeWidgets();
-
-    void ensureNewVirtualDiskDeleted();
+    void getWithFileOpenDialog();
     void retranslateWidgets();
 
     void setEnableDiskSelectionWidgets(bool fEnable);
+    void setVirtualDiskFromDiskCombo();
     bool m_fRecommendedNoDisk;
 

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

@@ -150 +150 @@
 void UIWizardNewVMPageExpert::sltGetWithFileOpenDialog()
 {
-    /* Call to base-class: */
-    getWithFileOpenDialog();
 }
 
@@ -337 +335 @@
 void UIWizardNewVMPageExpert::cleanupPage()
 {
-    /* Call to base-class: */
-    ensureNewVirtualDiskDeleted();
     cleanupMachineFolder();
 }
@@ -462 +458 @@
             if (m_pDiskNew->isChecked())
             {
-                /* Show the New Virtual Hard Drive wizard if necessary: */
-                fResult = getWithNewVirtualDiskWizard();
             }
         }