Changeset 93540 in vbox for trunk/src/VBox

Timestamp:

Feb 2, 2022 7:21:28 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt, Main/Unattended. bugref:9515, bugref:9781. Adding necessary member variables to new vm wizard for detected image names and indices.

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (1 diff)
• UIWizardNewVM.h (modified) (2 diffs)
• UIWizardNewVMExpertPage.cpp (modified) (1 diff)
• UIWizardNewVMNameOSTypePage.cpp (modified) (3 diffs)
• UIWizardNewVMNameOSTypePage.h (modified) (1 diff)

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

@@ -832 +832 @@
 }
 
+void UIWizardNewVM::setDetectedImageNamesAndIndices(const QVector<QString> &names, const QVector<ULONG> &ids)
+{
+    AssertMsg(names.size() == ids.size(),
+              ("Sizes of the arrays for names and indices of the detected images should be equal."));
+    m_detectedImageNames = names;
+    m_detectedImageIndices = ids;
+}
+
+const QVector<QString> &UIWizardNewVM::detectedImageNames() const
+{
+    return m_detectedImageNames;
+}
+
+const QVector<ULONG> &UIWizardNewVM::detectedImageIndices() const
+{
+    return m_detectedImageIndices;
+}
+
 QVector<KMediumVariant> UIWizardNewVM::mediumVariants() const
 {

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

@@ -171 +171 @@
         void setEmptyDiskRecommended(bool fEmptyDiskRecommended);
 
+        void setDetectedImageNamesAndIndices(const QVector<QString> &names, const QVector<ULONG> &ids);
+        const QVector<QString> &detectedImageNames() const;
+        const QVector<ULONG> &detectedImageIndices() const;
+
         QVector<KMediumVariant> mediumVariants() const;
     /** @} */
@@ -224 +228 @@
        /** Type Id od the OS detected from the ISO file by IUnattended. */
        QString m_strDetectedOSTypeId;
+       /* Name and index lists of the images detected from an ISO. Currently only for Windows ISOs. */
+       QVector<QString> m_detectedImageNames;
+       QVector<ULONG> m_detectedImageIndices;
 
        /** Holds the VM OS family ID. */

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

@@ -148 +148 @@
     AssertReturnVoid(pWizard);
 
-    UIWizardNewVMNameOSTypeCommon::detectOSType(strISOPath, pWizard);
-
+    UIWizardNewVMNameOSTypeCommon::detectOSAndImagesFromISO(strISOPath, pWizard);
 
     if (UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId()))

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

@@ -311 +311 @@
 }
 
-void UIWizardNewVMNameOSTypeCommon::detectOSType(const QString &strISOPath, UIWizardNewVM *pWizard)
+void UIWizardNewVMNameOSTypeCommon::detectOSAndImagesFromISO(const QString &strISOPath, UIWizardNewVM *pWizard)
 {
     if (!pWizard)
@@ -327 +327 @@
     comUnatteded.DetectIsoOS();
     pWizard->setDetectedOSTypeId(comUnatteded.GetDetectedOSTypeId());
+
+    pWizard->setDetectedImageNamesAndIndices(comUnatteded.GetDetectedImageNames(),
+                                             comUnatteded.GetDetectedImageIndices());
 }
 
@@ -479 +482 @@
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(this->wizard());
     AssertReturnVoid(pWizard);
-    UIWizardNewVMNameOSTypeCommon::detectOSType(strPath, pWizard);
+    UIWizardNewVMNameOSTypeCommon::detectOSAndImagesFromISO(strPath, pWizard);
 
     if (UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId()))

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

@@ -43 +43 @@
     bool cleanupMachineFolder(UIWizardNewVM *pWizard, bool fWizardCancel = false);
     void composeMachineFilePath(UINameAndSystemEditor *pNameAndSystemEditor, UIWizardNewVM *pWizard);
-    void detectOSType(const QString &strISOPath, UIWizardNewVM *pWizard);
+    void detectOSAndImagesFromISO(const QString &strISOPath, UIWizardNewVM *pWizard);
     /** Return false if ISO path is not empty but points to an missing or unreadable file. */
     bool checkISOFile(UINameAndSystemEditor *pNameAndSystemEditor);