Changeset 84892 in vbox for trunk

Timestamp:

Jun 22, 2020 10:23:02 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Passing the default IUnattended properties to the wizard to initialize fields correctly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• manager/UIVirtualBoxManager.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -613 +613 @@
         AssertMsg(!comUnattendedInstaller.isNull(), ("Could not create unattended installer!\n"));
 
+        UIUnattendedInstallData unattendedInstallData;
+        unattendedInstallData.m_strUserName = comUnattendedInstaller.GetUser();
+        unattendedInstallData.m_strPassword = comUnattendedInstaller.GetPassword();
+
+        pWizard->setDefaultUnattendedInstallData(unattendedInstallData);
+
         /* Execute wizard: */
         pWizard->exec();
 
         /* Cache unattended install related info and delete the wizard before handling the unattended install stuff: */
-        UIUnattendedInstallData unattendedInstallData = pWizard->unattendedInstallData();
+        unattendedInstallData = pWizard->unattendedInstallData();
 
         delete pWizard;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -36 +36 @@
 class UIAction;
 class UIActionPool;
-class UIUnattendedInstallData;
+struct UIUnattendedInstallData;
 class UIVirtualBoxManagerWidget;
 class UIVirtualMachineItem;

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

@@ -511 +511 @@
 }
 
+void UIWizardNewVM::setDefaultUnattendedInstallData(const UIUnattendedInstallData &unattendedInstallData)
+{
+    m_unattendedInstallData = unattendedInstallData;
+}
+
 const UIUnattendedInstallData &UIWizardNewVM::unattendedInstallData() const
 {

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

@@ -73 +73 @@
     /** Returns the Id of newly created VM. */
     QUuid createdMachineId() const;
+    void setDefaultUnattendedInstallData(const UIUnattendedInstallData &unattendedInstallData);
     const UIUnattendedInstallData &unattendedInstallData() const;
     bool isUnattendedInstallEnabled() const;