Changeset 79684 in vbox

Timestamp:

Jul 11, 2019 7:57:10 AM (6 years ago)

Author:

vboxsync

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

132014

Message:

FE/Qt: bugref:9495: New Cloud VM wizard: 2nd basic and expert pages: VSD form is no more critical for final creation/launching step because it's using client and VSD fields, not the form itself; Also if form is present, it will be acquired and cleared right before the final step.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm

Files:

• UIWizardNewCloudVMPageBasic2.cpp (modified) (4 diffs)
• UIWizardNewCloudVMPageBasic2.h (modified) (1 diff)
• UIWizardNewCloudVMPageExpert.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic2.cpp ¶

@@ -54 +54 @@
 {
     return qobject_cast<UIWizardNewCloudVM*>(wizardImp())->vsd();
+}
+
+void UIWizardNewCloudVMPage2::setVSDForm(const CVirtualSystemDescriptionForm &comForm)
+{
+    qobject_cast<UIWizardNewCloudVM*>(wizardImp())->setVSDForm(comForm);
 }
 
@@ -130 +135 @@
     /* Check cloud settings: */
     fResult =    client().isNotNull()
-              && vsd().isNotNull()
-              && vsdForm().isNotNull();
+              && vsd().isNotNull();
 
     /* Return result: */
@@ -147 +151 @@
     /* Check whether we have proper VSD form: */
     CVirtualSystemDescriptionForm comForm = vsdForm();
-    fResult = comForm.isNotNull();
-    Assert(fResult);
-
     /* Give changed VSD back: */
-    if (fResult)
+    if (comForm.isNotNull())
     {
         comForm.GetVirtualSystemDescription();
@@ -157 +158 @@
         if (!fResult)
             msgCenter().cannotAcquireVirtualSystemDescriptionFormProperty(comForm);
+        setVSDForm(CVirtualSystemDescriptionForm());
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic2.h ¶

@@ -50 +50 @@
     /** Returns Virtual System Description object. */
     CVirtualSystemDescription vsd() const;
+
+    /** Defines Virtual System Description @a comForm object. */
+    void setVSDForm(const CVirtualSystemDescriptionForm &comForm);
     /** Returns Virtual System Description Form object. */
     CVirtualSystemDescriptionForm vsdForm() const;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp ¶

@@ -253 +253 @@
     /* Check cloud settings: */
     fResult =    UIWizardNewCloudVMPage1::client().isNotNull()
-              && UIWizardNewCloudVMPage1::vsd().isNotNull()
-              && UIWizardNewCloudVMPage1::vsdForm().isNotNull();
+              && UIWizardNewCloudVMPage1::vsd().isNotNull();
 
     /* Return result: */
@@ -270 +269 @@
     /* Check whether we have proper VSD form: */
     CVirtualSystemDescriptionForm comForm = UIWizardNewCloudVMPage1::vsdForm();
-    fResult = comForm.isNotNull();
-    Assert(fResult);
-
     /* Give changed VSD back: */
-    if (fResult)
+    if (comForm.isNotNull())
     {
         comForm.GetVirtualSystemDescription();
@@ -280 +276 @@
         if (!fResult)
             msgCenter().cannotAcquireVirtualSystemDescriptionFormProperty(comForm);
+        UIWizardNewCloudVMPage1::setVSDForm(CVirtualSystemDescriptionForm());
     }