Changeset 90072 in vbox for trunk/src

Timestamp:

Jul 6, 2021 4:47:36 PM (4 years ago)

Author:

vboxsync

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

145567

Message:

FE/Qt: bugref:9996: Skipping unattended page in some cases.

Location:

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

Files:

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

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

@@ -66 +66 @@
     , m_iCPUCount(1)
     , m_iMemorySize(0)
-
+    , m_iUnattendedInstallPageIndex(-1)
 {
 #ifndef VBOX_WS_MAC
@@ -88 +88 @@
         {
             addPage(new UIWizardNewVMNameOSTypePageBasic);
-            addPage(new UIWizardNewVMUnattendedPageBasic);
+            m_iUnattendedInstallPageIndex = addPage(new UIWizardNewVMUnattendedPageBasic);
+            setUnattendedPageVisible(false);
             addPage(new UIWizardNewVMHardwarePageBasic);
             addPage(new UIWizardNewVMDiskPageBasic);
@@ -699 +700 @@
 {
     m_fSkipUnattendedInstall = fSkipUnattendedInstall;
+    /* We hide/show unattended install page depending on the value of isUnattendedEnabled: */
+    setUnattendedPageVisible(isUnattendedEnabled());
 }
 
@@ -709 +712 @@
 {
     m_strISOFilePath = strISOFilePath;
+    /* We hide/show unattended install page depending on the value of isUnattendedEnabled: */
+    setUnattendedPageVisible(isUnattendedEnabled());
 }
 
@@ -817 +822 @@
     return m_strGuestOSFamilyId.contains("windows", Qt::CaseInsensitive);
 }
+
+void UIWizardNewVM::setUnattendedPageVisible(bool fVisible)
+{
+    if (m_iUnattendedInstallPageIndex != -1)
+        setPageVisible(m_iUnattendedInstallPageIndex, fVisible);
+}

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

@@ -87 +87 @@
     const UIUnattendedInstallData &unattendedInstallData() const;
     bool isGuestOSTypeWindows() const;
+
     CMedium &virtualDisk();
     void setVirtualDisk(const CMedium &medium);
@@ -165 +166 @@
     QString getNextControllerName(KStorageBus type);
     void setFieldsFromDefaultUnttendedInstallData();
+    void setUnattendedPageVisible(bool fVisible);
 
     /** @name Variables
@@ -213 +215 @@
     int m_iCPUCount;
     int m_iMemorySize;
+    int m_iUnattendedInstallPageIndex;
 };
 

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

@@ -321 +321 @@
 }
 
-// bool UIWizardNewVMNameOSTypePage::skipUnattendedInstall() const
-// {
-//     return m_pSkipUnattendedCheckBox && m_pSkipUnattendedCheckBox->isChecked();
-// }
-
 bool UIWizardNewVMNameOSTypePage::checkISOFile(UINameAndSystemEditor *pNameAndSystemEditor)
 {
@@ -387 +382 @@
         connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOSFamilyChanged, this, &UIWizardNewVMNameOSTypePageBasic::sltGuestOSFamilyChanged);
     }
+    if (m_pSkipUnattendedCheckBox)
+        connect(m_pSkipUnattendedCheckBox, &QCheckBox::toggled, this, &UIWizardNewVMNameOSTypePageBasic::sltSkipUnattendedInstallChanged);
 }
 
@@ -486 +483 @@
 {
     newVMWizardPropertySet(GuestOSFamilyId, strGuestOSFamilyId);
+}
+
+void UIWizardNewVMNameOSTypePageBasic::sltSkipUnattendedInstallChanged(bool fSkip)
+{
+    newVMWizardPropertySet(SkipUnattendedInstall, fSkip);
 }
 

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

@@ -53 +53 @@
     /** Return false if ISO path is not empty but points to an missing or unreadable file. */
     bool checkISOFile(UINameAndSystemEditor *pNameAndSystemEditor);
-
-//         QString guestOSFamiyId() const;
-//         const QString &detectedOSTypeId() const;
-//         bool skipUnattendedInstall() const;
 }
 
@@ -84 +80 @@
     void sltISOPathChanged(const QString &strPath);
     void sltGuestOSFamilyChanged(const QString &strGuestOSFamilyId);
+    void sltSkipUnattendedInstallChanged(bool fSkip);
 
 private: