Changeset 79580 in vbox for trunk/src/VBox

Timestamp:

Jul 7, 2019 4:12:08 PM (6 years ago)

Author:

vboxsync

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

131870

Message:

FE/Qt: bugref:9495: New Cloud VM wizard: Short wizard form runnable from another wizard which can provide this one with proper client and description.

Location:

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

Files:

• UIWizardNewCloudVM.cpp (modified) (2 diffs)
• UIWizardNewCloudVM.h (modified) (2 diffs)
• UIWizardNewCloudVMPageBasic2.cpp (modified) (4 diffs)
• UIWizardNewCloudVMPageBasic2.h (modified) (4 diffs)
• UIWizardNewCloudVMPageExpert.cpp (modified) (4 diffs)
• UIWizardNewCloudVMPageExpert.h (modified) (2 diffs)

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

@@ -27 +27 @@
 
 
-UIWizardNewCloudVM::UIWizardNewCloudVM(QWidget *pParent)
+UIWizardNewCloudVM::UIWizardNewCloudVM(QWidget *pParent,
+                                       const CCloudClient &comClient /* = CCloudClient() */,
+                                       const CVirtualSystemDescription &comDescription /* = CVirtualSystemDescription() */)
     : UIWizard(pParent, WizardType_NewCloudVM)
+    , m_comClient(comClient)
+    , m_comVSD(comDescription)
+    , m_fFullWizard(m_comClient.isNull() || m_comVSD.isNull())
 {
 #ifndef VBOX_WS_MAC
@@ -46 +51 @@
         case WizardMode_Basic:
         {
-            setPage(Page1, new UIWizardNewCloudVMPageBasic1);
-            setPage(Page2, new UIWizardNewCloudVMPageBasic2);
+            if (m_fFullWizard)
+                setPage(Page1, new UIWizardNewCloudVMPageBasic1);
+            setPage(Page2, new UIWizardNewCloudVMPageBasic2(m_fFullWizard));
             break;
         }
         case WizardMode_Expert:
         {
-            setPage(PageExpert, new UIWizardNewCloudVMPageExpert);
+            setPage(PageExpert, new UIWizardNewCloudVMPageExpert(m_fFullWizard));
             break;
         }

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

@@ -51 +51 @@
     };
 
-    /** Constructs new cloud vm wizard passing @a pParent to the base-class. */
-    UIWizardNewCloudVM(QWidget *pParent);
+    /** Constructs New Cloud VM wizard passing @a pParent to the base-class.
+      * @param  comClient       Brings the Cloud Client object to work with.
+      * @param  comDescription  Brings the Virtual System Description object to use. */
+    UIWizardNewCloudVM(QWidget *pParent,
+                       const CCloudClient &comClient = CCloudClient(),
+                       const CVirtualSystemDescription &comDescription = CVirtualSystemDescription());
 
     /** Prepares all. */
@@ -91 +95 @@
     /** Holds the Virtual System Description Form object reference. */
     CVirtualSystemDescriptionForm  m_comVSDForm;
+
+    /** Holds whether we want full wizard form or short one. */
+    bool  m_fFullWizard;
 };
 

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

@@ -31 +31 @@
 *********************************************************************************************************************************/
 
-UIWizardNewCloudVMPage2::UIWizardNewCloudVMPage2()
+UIWizardNewCloudVMPage2::UIWizardNewCloudVMPage2(bool fFullWizard)
+    : m_fFullWizard(fFullWizard)
+    , m_fPolished(false)
 {
 }
@@ -54 +56 @@
 *********************************************************************************************************************************/
 
-UIWizardNewCloudVMPageBasic2::UIWizardNewCloudVMPageBasic2()
+UIWizardNewCloudVMPageBasic2::UIWizardNewCloudVMPageBasic2(bool fFullWizard)
+    : UIWizardNewCloudVMPage2(fFullWizard)
 {
     /* Create main layout: */
@@ -92 +95 @@
 void UIWizardNewCloudVMPageBasic2::initializePage()
 {
+    /* If wasn't polished yet: */
+    if (!m_fPolished)
+    {
+        if (!m_fFullWizard)
+        {
+            /* Generate VSD form, asynchronously: */
+            QMetaObject::invokeMethod(this, "sltInitShortWizardForm", Qt::QueuedConnection);
+        }
+        m_fPolished = true;
+    }
+
     /* Refresh form properties: */
     refreshFormPropertiesTable();
@@ -131 +145 @@
     return fResult;
 }
+
+void UIWizardNewCloudVMPageBasic2::sltInitShortWizardForm()
+{
+    /* Create Virtual System Description Form: */
+    qobject_cast<UIWizardNewCloudVM*>(wizardImp())->createVSDForm();
+
+    /* Refresh form properties table: */
+    refreshFormPropertiesTable();
+}

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

@@ -35 +35 @@
 
     /** Constructs 2nd page base. */
-    UIWizardNewCloudVMPage2();
+    UIWizardNewCloudVMPage2(bool fFullWizard);
 
     /** Refreshes form properties table. */
@@ -42 +42 @@
     /** Returns Virtual System Description Form object. */
     CVirtualSystemDescriptionForm vsdForm() const;
+
+    /** Holds whether wizard should be in full form. */
+    bool  m_fFullWizard;
+    /** Holds whether starting page was polished. */
+    bool  m_fPolished;
 
     /** Holds the Form Editor widget instance. */
@@ -55 +60 @@
 
     /** Constructs 2nd basic page. */
-    UIWizardNewCloudVMPageBasic2();
+    UIWizardNewCloudVMPageBasic2(bool fFullWizard);
 
 protected:
@@ -71 +76 @@
     virtual bool validatePage() /* override */;
 
+private slots:
+
+    /** Initializes short wizard form. */
+    void sltInitShortWizardForm();
+
 private:
 

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

@@ -33 +33 @@
 
 
-UIWizardNewCloudVMPageExpert::UIWizardNewCloudVMPageExpert()
-    : m_pCntDestination(0)
+UIWizardNewCloudVMPageExpert::UIWizardNewCloudVMPageExpert(bool fFullWizard)
+    : UIWizardNewCloudVMPage2(fFullWizard)
+    , m_pCntDestination(0)
     , m_pSettingsCnt(0)
 {
@@ -45 +46 @@
         if (m_pCntDestination)
         {
+            /* There is no destination table in short wizard form: */
+            if (!m_fFullWizard)
+                m_pCntDestination->setVisible(false);
+
             /* Create destination layout: */
             m_pDestinationLayout = new QGridLayout(m_pCntDestination);
@@ -219 +224 @@
 {
     /* If wasn't polished yet: */
-    if (!m_fPolished)
-    {
-        /* Populate destinations: */
-        populateDestinations();
-        /* Choose one of them, asynchronously: */
-        QMetaObject::invokeMethod(this, "sltHandleDestinationChange", Qt::QueuedConnection);
-        m_fPolished = true;
+    if (!UIWizardNewCloudVMPage1::m_fPolished || !UIWizardNewCloudVMPage2::m_fPolished)
+    {
+        if (m_fFullWizard)
+        {
+            /* Populate destinations: */
+            populateDestinations();
+            /* Choose one of them, asynchronously: */
+            QMetaObject::invokeMethod(this, "sltHandleDestinationChange", Qt::QueuedConnection);
+        }
+        else
+        {
+            /* Generate VSD form, asynchronously: */
+            QMetaObject::invokeMethod(this, "sltInitShortWizardForm", Qt::QueuedConnection);
+        }
+        UIWizardNewCloudVMPage1::m_fPolished = true;
+        UIWizardNewCloudVMPage2::m_fPolished = true;
     }
 
@@ -321 +335 @@
     emit completeChanged();
 }
+
+void UIWizardNewCloudVMPageExpert::sltInitShortWizardForm()
+{
+    /* Create Virtual System Description Form: */
+    qobject_cast<UIWizardNewCloudVM*>(wizardImp())->createVSDForm();
+
+    /* Refresh form properties table: */
+    refreshFormPropertiesTable();
+}

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

@@ -39 +39 @@
 
     /** Constructs expert page. */
-    UIWizardNewCloudVMPageExpert();
+    UIWizardNewCloudVMPageExpert(bool fFullWizard);
 
 protected:
@@ -74 +74 @@
     void sltHandleInstanceListChange();
 
+    /** Initializes short wizard form. */
+    void sltInitShortWizardForm();
+
 private: