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

Timestamp:

Aug 23, 2024 4:31:38 PM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

164570

Message:

FE/Qt: reverting r164547.

Location:

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

Files:

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

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

@@ -742 +742 @@
 }
 
-bool UIWizardNewVM::isGuestOSTypeSupported(const QString &strGuestOSTypeId) const
-{
-    if (strGuestOSTypeId.isEmpty())
-        return true;
-    return gpGlobalSession->guestOSTypeManager().isGuestOSTypeIDSupported(strGuestOSTypeId);
-}
-
 void UIWizardNewVM::setDetectedWindowsImageNamesAndIndices(const QVector<QString> &names, const QVector<ulong> &ids)
 {
@@ -808 +801 @@
     if (!isUnattendedInstallSupported())
         return false;
-    if (!isGuestOSTypeSupported(detectedOSTypeId()))
-        return false;
     return true;
 }

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

@@ -158 +158 @@
         bool emptyDiskRecommended() const;
         void setEmptyDiskRecommended(bool fEmptyDiskRecommended);
-
-        bool isGuestOSTypeSupported(const QString &strGuestOSTypeId) const;
 
         void setDetectedWindowsImageNamesAndIndices(const QVector<QString> &names, const QVector<ulong> &ids);

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

@@ -474 +474 @@
     }
     UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
-    if (pWizard)
-    {
-        if (!pWizard->isGuestOSTypeSupported(pWizard->detectedOSTypeId()))
-            m_pNameAndSystemEditor->markImageEditor(true, UIWizardNewVM::tr("ISO file is for an unsupported guest OS type"), "");
-        if (pWizard->installGuestAdditions() && m_pGAInstallationISOContainer)
-            m_pGAInstallationISOContainer->mark();
-    }
+    if (pWizard && pWizard->installGuestAdditions() && m_pGAInstallationISOContainer)
+        m_pGAInstallationISOContainer->mark();
     if (isUnattendedEnabled())
         m_pAdditionalOptionsContainer->mark();
@@ -636 +631 @@
         }
     }
-    /* Don't allow VM creation if detect OS type id (from selected ISO) is unsupported: */
-    if (!pWizard->isGuestOSTypeSupported(pWizard->detectedOSTypeId()))
-        fIsComplete = false;
+
     if (pWizard->diskSource() == SelectedDiskSource_Existing && gpMediumEnumerator->medium(m_pDiskSelector->id()).isNull())
     {
@@ -997 +990 @@
         return;
     }
-    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
-    if (pWizard)
-    {
-        if (!pWizard->isGuestOSTypeSupported(pWizard->detectedOSTypeId()))
-        {
-            m_pSkipUnattendedCheckBox->setEnabled(false);
-            return;
-        }
-    }
+
     m_pSkipUnattendedCheckBox->setEnabled(UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor));
 }

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

@@ -353 +353 @@
 bool UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(UINameAndSystemEditor *pNameAndSystemEditor, QString strDetectedOSType)
 {
-    if (!gpGlobalSession->guestOSTypeManager().isGuestOSTypeIDSupported(strDetectedOSType))
-        return false;
     AssertReturn(pNameAndSystemEditor, false);
     if (!strDetectedOSType.isEmpty())
@@ -522 +520 @@
     if (m_pNameAndSystemEditor->name().isEmpty())
         return false;
-    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
-    if (pWizard)
-    {
-        if (!pWizard->isGuestOSTypeSupported(pWizard->detectedOSTypeId()))
-            return false;
-    }
     return UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor);
 }
@@ -598 +590 @@
      * - Unattended cannot determine OS type from the ISO,
      * - Unattended can determine the OS type from the ISO but cannot install it,
-     * - Unattended detects OS type from ISO but this OS type arch. is not supported, page validation will fail,
      * - User has disabled unattended explicitly,
      * - Unattended install will kick off.
@@ -616 +607 @@
                                            .arg(UIWizardNewVM::tr("This OS type cannot be installed unattendedly. "
                                                                   "The install needs to be started manually."));
-        else if (!pWizard->isGuestOSTypeSupported(pWizard->detectedOSTypeId()))
-            strMessage =  UIWizardNewVM::tr("Detected OS type: %1. %2")
-                                           .arg(strType)
-                                           .arg(UIWizardNewVM::tr("This OS type is not supported by your host. "
-                                                                  "You need to either deselect ISO image or pick another one to continue."));
         else if (pWizard->skipUnattendedInstall())
             strMessage = UIWizardNewVM::tr("You have selected to skip unattended guest OS install, "
@@ -781 +767 @@
                                                 UIWizardNewVM::tr("Invalid file path or unreadable file"),
                                                 UIWizardNewVM::tr("File path is valid"));
-        UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
-        if (pWizard)
-        {
-            if (!pWizard->isGuestOSTypeSupported(pWizard->detectedOSTypeId()))
-                m_pNameAndSystemEditor->markImageEditor(true, UIWizardNewVM::tr("ISO file is for an unsupported guest OS type"), "");
-        }
     }
 }
@@ -804 +784 @@
         return;
     }
-    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
-    if (pWizard)
-    {
-        if (!pWizard->isGuestOSTypeSupported(pWizard->detectedOSTypeId()))
-        {
-            m_pSkipUnattendedCheckBox->setEnabled(false);
-            return;
-        }
-    }
+
     m_pSkipUnattendedCheckBox->setEnabled(UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor));
 }