Changeset 88115 in vbox

Timestamp:

Mar 15, 2021 9:34:32 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Attaching the selected ISO file to the new vm in case unattended install is skipped

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (1 diff)
• UIWizardNewVMPageBasic1.cpp (modified) (6 diffs)
• UIWizardNewVMPageBasic1.h (modified) (2 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (1 diff)
• UIWizardNewVMPageExpert.h (modified) (1 diff)

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

@@ -422 +422 @@
         }
 
-        /* Attach empty optical drive: */
+        /* Attach optical drive: */
         KStorageBus enmDVDBus = comGuestType.GetRecommendedDVDStorageBus();
         CStorageController comDVDController = m_machine.GetStorageControllerByInstance(enmDVDBus, 0);
         if (!comDVDController.isNull())
         {
-            machine.AttachDevice(comDVDController.GetName(), 1, 0, KDeviceType_DVD, CMedium());
+            CMedium opticalDisk;
+            QString strISOFilePath = getStringFieldValue("ISOFilePath");
+            if (!strISOFilePath.isEmpty() && !getBoolFieldValue("isUnattendedEnabled"))
+            {
+                QFileInfo isoFileInfo(strISOFilePath);
+                if (isoFileInfo.exists() && isoFileInfo.isReadable())
+                {
+                    CVirtualBox vbox = uiCommon().virtualBox();
+                    opticalDisk =
+                        vbox.OpenMedium(strISOFilePath, KDeviceType_DVD,  KAccessMode_ReadWrite, false);
+                    if (!vbox.isOk())
+                        msgCenter().cannotOpenMedium(vbox, strISOFilePath, this);
+                }
+            }
+            machine.AttachDevice(comDVDController.GetName(), 1, 0, KDeviceType_DVD, opticalDisk);
             if (!machine.isOk())
                 msgCenter().cannotAttachDevice(machine, UIMediumDeviceType_DVD, QString(),
                                                StorageSlot(enmDVDBus, 1, 0), this);
-
         }
 

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

@@ -361 +361 @@
         m_pSkipUnattendedCheckBox->setToolTip(UIWizardNewVM::tr("<p>When checked selected ISO file will be mounted to the CD drive "
                                                                 "of the virtual machine but the unattended installation will "
-                                                                "not start</p>"));
+                                                                "not start.</p>"));
     }
 }
@@ -378 +378 @@
     const QString &strPath = m_pNameAndSystemEditor->ISOFilePath();
     if (strPath.isNull() || strPath.isEmpty())
+        return false;
+    if (m_pSkipUnattendedCheckBox && m_pSkipUnattendedCheckBox->isChecked())
         return false;
     return true;
@@ -422 +424 @@
 }
 
-void UIWizardNewVMPage1::setSkipCheckBoxEnable(bool fEnable)
-{
-    if (m_pSkipUnattendedCheckBox)
-        m_pSkipUnattendedCheckBox->setEnabled(fEnable);
+void UIWizardNewVMPage1::setSkipCheckBoxEnable()
+{
+    if (!m_pSkipUnattendedCheckBox)
+        return;
+    if (m_pNameAndSystemEditor)
+    {
+        const QString &strPath = m_pNameAndSystemEditor->ISOFilePath();
+        m_pSkipUnattendedCheckBox->setEnabled(!strPath.isNull() && !strPath.isEmpty());
+    }
 }
 
@@ -471 +478 @@
     registerField("ISOFilePath", this, "ISOFilePath");
     registerField("isUnattendedEnabled", this, "isUnattendedEnabled");
-    registerField("skipUnattendedInstall", this, "skipUnattendedInstall");
+    //registerField("skipUnattendedInstall", this, "skipUnattendedInstall");
     registerField("detectedOSTypeId", this, "detectedOSTypeId");
 }
@@ -542 +549 @@
     if (m_pNameAndSystemEditor)
         m_pNameAndSystemEditor->setFocus();
-    setSkipCheckBoxEnable(isUnattendedEnabled());
+    setSkipCheckBoxEnable();
 }
 
@@ -567 +574 @@
     if (fileInfo.exists() && fileInfo.isReadable())
         uiCommon().updateRecentlyUsedMediumListAndFolder(UIMediumDeviceType_DVD, strPath);
-    setSkipCheckBoxEnable(isUnattendedEnabled());
+    setSkipCheckBoxEnable();
     emit completeChanged();
 }

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

@@ -86 +86 @@
     /** Return false if ISO path is not empty but points to an missing or unreadable file. */
     bool checkISOFile() const;
-    void setSkipCheckBoxEnable(bool fEnable);
+    void setSkipCheckBoxEnable();
     /** @name Widgets
      * @{ */
@@ -126 +126 @@
     Q_PROPERTY(QString ISOFilePath READ ISOFilePath);
     Q_PROPERTY(bool isUnattendedEnabled READ isUnattendedEnabled);
-    Q_PROPERTY(bool skipUnattendedInstall READ skipUnattendedInstall);
+    //Q_PROPERTY(bool skipUnattendedInstall READ skipUnattendedInstall);
     Q_PROPERTY(QString detectedOSTypeId READ detectedOSTypeId);
 

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

@@ -83 +83 @@
     registerField("ISOFilePath", this, "ISOFilePath");
     registerField("isUnattendedEnabled", this, "isUnattendedEnabled");
-    registerField("skipUnattendedInstall", this, "skipUnattendedInstall");
+    //registerField("skipUnattendedInstall", this, "skipUnattendedInstall");
     registerField("startHeadless", this, "startHeadless");
     registerField("detectedOSTypeId", this, "detectedOSTypeId");

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

@@ -55 +55 @@
     Q_PROPERTY(QString ISOFilePath READ ISOFilePath);
     Q_PROPERTY(bool isUnattendedEnabled READ isUnattendedEnabled);
-    Q_PROPERTY(bool skipUnattendedInstall READ skipUnattendedInstall);
+    //Q_PROPERTY(bool skipUnattendedInstall READ skipUnattendedInstall);
     Q_PROPERTY(bool startHeadless READ startHeadless);
     Q_PROPERTY(QString detectedOSTypeId READ detectedOSTypeId);