Changeset 91616 in vbox

Timestamp:

Oct 7, 2021 10:50:28 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: 9996. Fixing several initialization issues on hardware parameters.

Location:

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

Files:

• UIWizardNewVMExpertPage.cpp (modified) (2 diffs)
• UIWizardNewVMHardwarePage.cpp (modified) (3 diffs)

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

@@ -313 +313 @@
     ULONG recommendedRam = type.GetRecommendedRAM();
 
-    /* Set memory size of the widget and (through signals) wizard: */
-    if (m_pHardwareWidgetContainer && !m_userModifiedParameters.contains("MemorySize"))
-        m_pHardwareWidgetContainer->setMemorySize(recommendedRam);
-
-
-    KFirmwareType fwType = type.GetRecommendedFirmware();
-    if (m_pHardwareWidgetContainer && !m_userModifiedParameters.contains("EFIEnabled"))
+    if (m_pHardwareWidgetContainer)
     {
         m_pHardwareWidgetContainer->blockSignals(true);
-        m_pHardwareWidgetContainer->setEFIEnabled(fwType != KFirmwareType_BIOS);
+
+        /* Set memory size of the widget and the wizard: */
+        if (!m_userModifiedParameters.contains("MemorySize"))
+        {
+            m_pHardwareWidgetContainer->setMemorySize(recommendedRam);
+            pWizard->setMemorySize(recommendedRam);
+        }
+
+        /* Set Firmware Type of the widget and the wizard: */
+        KFirmwareType fwType = type.GetRecommendedFirmware();
+        if (!m_userModifiedParameters.contains("EFIEnabled"))
+        {
+            m_pHardwareWidgetContainer->setEFIEnabled(fwType != KFirmwareType_BIOS);
+            pWizard->setEFIEnabled(fwType != KFirmwareType_BIOS);
+        }
+
+        /* Initialize CPU count:*/
+        int iCPUCount = type.GetRecommendedCPUCount();
+        if (!m_userModifiedParameters.contains("CPUCount"))
+        {
+            m_pHardwareWidgetContainer->setCPUCount(iCPUCount);
+            pWizard->setCPUCount(iCPUCount);
+        }
         m_pHardwareWidgetContainer->blockSignals(false);
     }
+
     LONG64 iRecommendedDiskSize = type.GetRecommendedHDD();
-
     /* Prepare initial disk choice: */
     if (!m_userModifiedParameters.contains("SelectedDiskSource"))
@@ -766 +782 @@
     AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     wizardWindow<UIWizardNewVM>()->setCPUCount(iCount);
+    m_userModifiedParameters << "CPUCount";
 }
 

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

@@ -84 +84 @@
         if (!type.isNull())
         {
+            m_pHardwareWidgetContainer->blockSignals(true);
             if (!m_userModifiedParameters.contains("MemorySize"))
             {
                 ULONG recommendedRam = type.GetRecommendedRAM();
                 m_pHardwareWidgetContainer->setMemorySize(recommendedRam);
+                pWizard->setMemorySize(recommendedRam);
             }
             if (!m_userModifiedParameters.contains("CPUCount"))
@@ -93 +95 @@
                 ULONG recommendedCPUs = type.GetRecommendedCPUCount();
                 m_pHardwareWidgetContainer->setCPUCount(recommendedCPUs);
+                pWizard->setCPUCount(recommendedCPUs);
             }
             if (!m_userModifiedParameters.contains("EFIEnabled"))
@@ -98 +101 @@
                 KFirmwareType fwType = type.GetRecommendedFirmware();
                 m_pHardwareWidgetContainer->setEFIEnabled(fwType != KFirmwareType_BIOS);
+                pWizard->setEFIEnabled(fwType != KFirmwareType_BIOS);
             }
+            m_pHardwareWidgetContainer->blockSignals(false);
         }
     }