Changeset 90073 in vbox

Timestamp:

Jul 7, 2021 6:38:10 AM (4 years ago)

Author:

vboxsync

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

145570

Message:

FE/Qt: bugref:9996: Some initilization fixes.

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (3 diffs)
• UIWizardNewVM.h (modified) (5 diffs)
• UIWizardNewVMHardwarePageBasic.cpp (modified) (4 diffs)
• UIWizardNewVMHardwarePageBasic.h (modified) (3 diffs)
• UIWizardNewVMNameOSTypePageBasic.cpp (modified) (2 diffs)

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

@@ -64 +64 @@
     , m_fStartHeadless(false)
     , m_fSkipUnattendedInstall(false)
+    , m_fEFIEnabled(false)
     , m_iCPUCount(1)
     , m_iMemorySize(0)
@@ -672 +673 @@
 }
 
+const CGuestOSType &UIWizardNewVM::guestOSType() const
+{
+    return m_comGuestOSType;;
+}
+
+void UIWizardNewVM::setGuestOSType(const CGuestOSType &guestOSType)
+{
+    m_comGuestOSType= guestOSType;
+}
+
 bool UIWizardNewVM::installGuestAdditions() const
 {
@@ -702 +713 @@
     /* We hide/show unattended install page depending on the value of isUnattendedEnabled: */
     setUnattendedPageVisible(isUnattendedEnabled());
+}
+
+bool UIWizardNewVM::EFIEnabled() const
+{
+    return m_fEFIEnabled;
+}
+
+void UIWizardNewVM::setEFIEnabled(bool fEnabled)
+{
+    m_fEFIEnabled = fEnabled;
 }
 

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

@@ -29 +29 @@
 #include "CMachine.h"
 #include "CMedium.h"
+#include "CGuestOSType.h"
 
 #define newVMWizardPropertySet(functionName, value)                     \
@@ -112 +113 @@
     void setGuestOSFamilyId(const QString &strGuestOSFamilyId);
 
+    const CGuestOSType &guestOSType() const;
+    void setGuestOSType(const CGuestOSType &guestOSType);
+
     bool installGuestAdditions() const;
     void setInstallGuestAdditions(bool fInstallGA);
@@ -120 +124 @@
     bool skipUnattendedInstall() const;
     void setSkipUnattendedInstall(bool fSkipUnattendedInstall);
+
+    bool EFIEnabled() const;
+    void setEFIEnabled(bool fEnabled);
 
     const QString &ISOFilePath() const;
@@ -201 +208 @@
     /** Holds the VM OS family ID. */
     QString  m_strGuestOSFamilyId;
+    /** Holds the VM OS type. */
+    CGuestOSType m_comGuestOSType;
 
     /** True if guest additions are to be installed during unattended install. */
@@ -206 +215 @@
     bool m_fStartHeadless;
     bool m_fSkipUnattendedInstall;
+    bool m_fEFIEnabled;
 
     QString m_strUserName;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMHardwarePageBasic.cpp ¶

@@ -64 +64 @@
         connect(m_pVirtualCPUEditor, &UIVirtualCPUEditor::sigValueChanged,
             this, &UIWizardNewVMHardwarePageBasic::sltCPUCountChanged);
+    if (m_pEFICheckBox)
+        connect(m_pEFICheckBox, &QCheckBox::toggled,
+                this, &UIWizardNewVMHardwarePageBasic::sltEFIEnabledChanged);
 
 }
@@ -88 +91 @@
     retranslateUi();
 
-    // if (!field("type").canConvert<CGuestOSType>())
-    //     return;
-
-    // CGuestOSType type = field("type").value<CGuestOSType>();
-    // ULONG recommendedRam = type.GetRecommendedRAM();
-    // if (m_pBaseMemoryEditor)
-    //     m_pBaseMemoryEditor->setValue(recommendedRam);
-
-    // KFirmwareType fwType = type.GetRecommendedFirmware();
-    // if (m_pEFICheckBox)
-    //     m_pEFICheckBox->setChecked(fwType != KFirmwareType_BIOS);
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    if (pWizard)
+    {
+        CGuestOSType type = pWizard->guestOSType();
+        if (!type.isNull())
+        {
+            if (!m_userModifiedParameters.contains("MemorySize"))
+            {
+                ULONG recommendedRam = type.GetRecommendedRAM();
+                if (m_pBaseMemoryEditor)
+                    m_pBaseMemoryEditor->setValue(recommendedRam);
+            }
+            if (!m_userModifiedParameters.contains("EFIEnabled"))
+            {
+                KFirmwareType fwType = type.GetRecommendedFirmware();
+                if (m_pEFICheckBox)
+                    m_pEFICheckBox->setChecked(fwType != KFirmwareType_BIOS);
+            }
+        }
+    }
 }
 
@@ -130 +142 @@
 {
     newVMWizardPropertySet(MemorySize, iValue);
+    m_userModifiedParameters << "MemorySize";
 }
 
@@ -136 +149 @@
     newVMWizardPropertySet(CPUCount, iCount);
 }
+
+void UIWizardNewVMHardwarePageBasic::sltEFIEnabledChanged(bool fEnabled)
+{
+    newVMWizardPropertySet(EFIEnabled, fEnabled);
+    m_userModifiedParameters << "EFIEnabled";
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMHardwarePageBasic.h ¶

@@ -23 +23 @@
 
 /* Qt includes: */
+#include <QSet>
 #include <QVariant>
 
@@ -63 +64 @@
     void sltMemorySizeChanged(int iValue);
     void sltCPUCountChanged(int iCount);
+    void sltEFIEnabledChanged(bool fEnabled);
 
 private:
@@ -82 +84 @@
        QIRichTextLabel    *m_pLabel;
     /** @} */
+    /** This set is used to decide if we have to set wizard's parameters
+      * some default values or not. When user modifies a value through a widget we
+      * no longer touch user set value during page initilization. see initializePage. */
+    QSet<QString> m_userModifiedParameters;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePageBasic.cpp ¶

@@ -412 +412 @@
      * So simply disconnect the text-edit signal. */
     if (m_pNameAndSystemEditor)
+    {
         m_pNameAndSystemEditor->disconnect(SIGNAL(sigNameChanged(const QString &)), this, SLOT(sltNameChanged(const QString &)));
+        newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
+    }
 }
 
@@ -440 +443 @@
     retranslateUi();
 
-    /* Make sure parameters are initialized correctly: */
-    if (m_pNameAndSystemEditor)
-        newVMWizardPropertySet(GuestOSFamilyId, m_pNameAndSystemEditor->familyId());
-
-    if (m_pNameAndSystemEditor)
-        m_pNameAndSystemEditor->setFocus();
-    setSkipCheckBoxEnable();
+    /* Initialize this page's widgets etc: */
+    {
+        if (m_pNameAndSystemEditor)
+            m_pNameAndSystemEditor->setFocus();
+        setSkipCheckBoxEnable();
+    }
+
+    /* Initialize some of the wizard's parameters: */
+    {
+        if (m_pNameAndSystemEditor)
+        {
+            newVMWizardPropertySet(GuestOSFamilyId, m_pNameAndSystemEditor->familyId());
+            newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
+            /* Vm name, folder, file path etc. will be initilized by composeMachineFilePath: */
+        }
+    }
 }