Changeset 79587 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 8, 2019 10:01:12 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9495: New Cloud VM wizard: 2nd basic and expert pages: Adjusting validation.

Location:

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

Files:

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

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

@@ -44 +44 @@
     if (comForm.isNotNull())
         m_pFormEditor->setVirtualSystemDescriptionForm(comForm);
+}
+
+CCloudClient UIWizardNewCloudVMPage2::client() const
+{
+    return qobject_cast<UIWizardNewCloudVM*>(wizardImp())->client();
+}
+
+CVirtualSystemDescription UIWizardNewCloudVMPage2::vsd() const
+{
+    return qobject_cast<UIWizardNewCloudVM*>(wizardImp())->vsd();
 }
 
@@ -113 +123 @@
 }
 
+bool UIWizardNewCloudVMPageBasic2::isComplete() const
+{
+    /* Initial result: */
+    bool fResult = true;
+
+    /* Check cloud settings: */
+    fResult =    client().isNotNull()
+              && vsd().isNotNull()
+              && vsdForm().isNotNull();
+
+    /* Return result: */
+    return fResult;
+}
+
 bool UIWizardNewCloudVMPageBasic2::validatePage()
 {

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

@@ -26 +26 @@
 #include "UIWizardPage.h"
 
+/* COM includes: */
+#include "COMEnums.h"
+#include "CCloudClient.h"
+#include "CVirtualSystemDescription.h"
+#include "CVirtualSystemDescriptionForm.h"
+
 /* Forward declarations: */
 class QIRichTextLabel;
@@ -40 +46 @@
     void refreshFormPropertiesTable();
 
+    /** Returns Cloud Client object. */
+    CCloudClient client() const;
+    /** Returns Virtual System Description object. */
+    CVirtualSystemDescription vsd() const;
     /** Returns Virtual System Description Form object. */
     CVirtualSystemDescriptionForm vsdForm() const;
@@ -73 +83 @@
     virtual void initializePage() /* override */;
 
+    /** Returns whether page is complete. */
+    virtual bool isComplete() const /* override */;
+
     /** Performs page validation. */
     virtual bool validatePage() /* override */;

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

@@ -252 +252 @@
 
     /* Check cloud settings: */
-    fResult =    client().isNotNull()
-              && !imageId().isNull()
-              && vsd().isNotNull()
+    fResult =    UIWizardNewCloudVMPage1::client().isNotNull()
+              && UIWizardNewCloudVMPage1::vsd().isNotNull()
               && UIWizardNewCloudVMPage1::vsdForm().isNotNull();