Changeset 95166 in vbox for trunk/src

Timestamp:

Jun 1, 2022 6:58:02 PM (3 years ago)

Author:

vboxsync

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

151663

Message:

FE/Qt: bugref:9515.

• Disabling os type/family selectors in guided mode if we can detect those from the ISO,
• Improving info label text a bit.

Location:

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

Files:

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

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

@@ -716 +716 @@
 void UIWizardNewVM::setISOFilePath(const QString &strISOFilePath)
 {
-    QFileInfo isoFileInfo(strISOFilePath);
-    if (!isoFileInfo.exists())
-        return;
-
     AssertReturnVoid(!m_comUnattended.isNull());
     m_comUnattended.SetIsoPath(strISOFilePath);

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

@@ -528 +528 @@
     QString strMessage;
     if (m_pNameAndSystemEditor->ISOImagePath().isEmpty())
-        strMessage = UIWizardNewVM::tr("No ISO selected, the guest OS will need to be installed manually.");
+        strMessage = UIWizardNewVM::tr("No ISO image is selected, the guest OS will need to be installed manually.");
     else if (pWizard->detectedOSTypeId().isEmpty())
-        strMessage = UIWizardNewVM::tr("OS type cannot be determined from the selected ISO, the guest OS will need to be installed manually.");
+        strMessage = UIWizardNewVM::tr("OS type cannot be determined from the selected ISO, "
+                                       "the guest OS will need to be installed manually.");
     else if (!pWizard->detectedOSTypeId().isEmpty())
     {
+        QString strType = uiCommon().vmGuestOSTypeDescription(pWizard->detectedOSTypeId());
         if (!pWizard->isUnattendedInstallSupported())
-            strMessage = UIWizardNewVM::tr("Detected OS type cannot be installed unattendedly, the guest OS will need to be installed manually.");
+            strMessage = QString("%1 %2. %3").arg(UIWizardNewVM::tr("Detected OS type: ")).arg(strType)
+                                                 .arg(UIWizardNewVM::tr("This OS type cannot be installed unattendedly. The install "
+                                                                        "needs to be started manually."));
         else if (pWizard->skipUnattendedInstall())
             strMessage = UIWizardNewVM::tr("You have selected to skip unattended guest OS install, the guest OS will need to be installed manually.");
         else
-            strMessage = UIWizardNewVM::tr("After closing this wizard the guest OS system will start installing from the selected ISO.");
+            strMessage = QString("%1 %2. %3").arg(UIWizardNewVM::tr("Detected OS type: ")).arg(strType)
+                                                 .arg(UIWizardNewVM::tr("This OS type can be installed unattendedly. The install "
+                                                                        "will start after this wizard is closed."));
     }
 
@@ -603 +609 @@
     setEditionSelectorEnabled();
     updateInfoLabel();
+
+    /* Disable OS type selector(s) to prevent user from changing guest OS type manually: */
+    if (m_pNameAndSystemEditor)
+        m_pNameAndSystemEditor->setOSTypeStuffEnabled(pWizard->detectedOSTypeId().isEmpty());
+
     emit completeChanged();
 }