Changeset 91467 in vbox for trunk/src

Timestamp:

Sep 29, 2021 5:57:13 PM (4 years ago)

Author:

vboxsync

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

147151

Message:

FE/Qt: bugref:9996: UIWizardExportApp: Get rid of New Cloud VM wizard dependency.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance

Files:

• UIWizardExportApp.cpp (modified) (6 diffs)
• UIWizardExportApp.h (modified) (4 diffs)
• UIWizardExportAppPageBasic3.cpp (modified) (4 diffs)
• UIWizardExportAppPageBasic3.h (modified) (1 diff)
• UIWizardExportAppPageExpert.cpp (modified) (4 diffs)
• UIWizardExportAppPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp ¶

@@ -26 +26 @@
 #include "UIModalWindowManager.h"
 #include "UINotificationCenter.h"
+#include "UIProgressObject.h"
 #include "UIWizardExportApp.h"
 #include "UIWizardExportAppPageBasic1.h"
@@ -31 +32 @@
 #include "UIWizardExportAppPageBasic3.h"
 #include "UIWizardExportAppPageExpert.h"
-#include "UIWizardNewCloudVM.h"
 
 /* COM includes: */
@@ -200 +200 @@
 }
 
+CVirtualSystemDescriptionForm UIWizardExportApp::vsdLaunchForm()
+{
+    return m_comVsdLaunchForm;
+}
+
+void UIWizardExportApp::setVsdLaunchForm(const CVirtualSystemDescriptionForm &comForm)
+{
+    m_comVsdLaunchForm = comForm;
+}
+
 CloudExportMode UIWizardExportApp::cloudExportMode() const
 {
@@ -213 +223 @@
 {
     wizardButton(WizardButtonType_Next)->click();
+}
+
+void UIWizardExportApp::disableButtons()
+{
+    wizardButton(WizardButtonType_Expert)->setEnabled(false);
+    wizardButton(WizardButtonType_Back)->setEnabled(false);
+    wizardButton(WizardButtonType_Next)->setEnabled(false);
 }
 
@@ -332 +349 @@
 }
 
+bool UIWizardExportApp::createVsdLaunchForm()
+{
+    /* Prepare result: */
+    bool fResult = false;
+
+    /* Acquire prepared client and description: */
+    CCloudClient comClient = cloudClient();
+    CVirtualSystemDescription comVSD = vsd();
+    AssertReturn(comClient.isNotNull() && comVSD.isNotNull(), false);
+
+    /* Get Launch description form: */
+    CVirtualSystemDescriptionForm comForm;
+    CProgress comProgress = comClient.GetLaunchDescriptionForm(comVSD, comForm);
+    /* Check for immediate errors: */
+    if (!comClient.isOk())
+        msgCenter().cannotAcquireCloudClientParameter(comClient);
+    else
+    {
+        /* Make sure progress initially valid: */
+        if (!comProgress.isNull() && !comProgress.GetCompleted())
+        {
+            /* Create take snapshot progress object: */
+            QPointer<UIProgressObject> pObject = new UIProgressObject(comProgress, this);
+            if (pObject)
+            {
+                connect(pObject.data(), &UIProgressObject::sigProgressChange,
+                        this, &UIWizardExportApp::sltHandleProgressChange);
+                connect(pObject.data(), &UIProgressObject::sigProgressComplete,
+                        this, &UIWizardExportApp::sltHandleProgressFinished);
+                sltHandleProgressStarted();
+                pObject->exec();
+                if (pObject)
+                    delete pObject;
+                else
+                {
+                    // Premature application shutdown,
+                    // exit immediately:
+                    return fResult;
+                }
+            }
+        }
+
+        /* Check for progress errors: */
+        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+            msgCenter().cannotAcquireCloudClientParameter(comProgress);
+        else
+        {
+            /* Check whether form really read: */
+            if (comForm.isNotNull())
+            {
+                /* Remember Virtual System Description Form: */
+                setVsdLaunchForm(comForm);
+
+                /* Finally, success: */
+                fResult = true;
+            }
+        }
+    }
+
+    /* Return result: */
+    return fResult;
+}
+
+bool UIWizardExportApp::createCloudVM()
+{
+    /* Acquire prepared client and description: */
+    CCloudClient comClient = cloudClient();
+    CVirtualSystemDescription comVSD = vsd();
+    AssertReturn(comClient.isNotNull() && comVSD.isNotNull(), false);
+
+    /* Initiate cloud VM creation procedure: */
+    CCloudMachine comMachine;
+
+    /* Create cloud VM: */
+    UINotificationProgressCloudMachineCreate *pNotification = new UINotificationProgressCloudMachineCreate(comClient,
+                                                                                                           comMachine,
+                                                                                                           comVSD,
+                                                                                                           format(),
+                                                                                                           profileName());
+    connect(pNotification, &UINotificationProgressCloudMachineCreate::sigCloudMachineCreated,
+            &uiCommon(), &UICommon::sltHandleCloudMachineAdded);
+    gpNotificationCenter->append(pNotification);
+
+    /* Return result: */
+    return true;
+}
+
 void UIWizardExportApp::populatePages()
 {
@@ -370 +474 @@
 bool UIWizardExportApp::exportVMs(CAppliance &comAppliance)
 {
-    /* Prepare result: */
-    bool fResult = false;
-
-    /* New Cloud VM wizard can be created
-     * in certain cases and should be cleaned up
-     * afterwards, thus this is a global variable: */
-    UISafePointerWizardNewCloudVM pNewCloudVMWizard;
-
-    /* Main API request sequence, can be interrupted after any step: */
-    do
-    {
-        /* Get the map of the password IDs: */
-        EncryptedMediumMap encryptedMedia;
-        foreach (const QString &strPasswordId, comAppliance.GetPasswordIds())
-            foreach (const QUuid &uMediumId, comAppliance.GetMediumIdsForPasswordId(strPasswordId))
-                encryptedMedia.insert(strPasswordId, uMediumId);
-
-        /* Ask for the disk encryption passwords if necessary: */
-        if (!encryptedMedia.isEmpty())
-        {
-            /* Modal dialog can be destroyed in own event-loop as a part of application
-             * termination procedure. We have to make sure that the dialog pointer is
-             * always up to date. So we are wrapping created dialog with QPointer. */
-            QPointer<UIAddDiskEncryptionPasswordDialog> pDlg =
-                new UIAddDiskEncryptionPasswordDialog(this,
-                                                      window()->windowTitle(),
-                                                      encryptedMedia);
-
-            /* Execute the dialog: */
-            if (pDlg->exec() != QDialog::Accepted)
-            {
-                /* Delete the dialog: */
-                delete pDlg;
-                break;
-            }
-
-            /* Acquire the passwords provided: */
-            const EncryptionPasswordMap encryptionPasswords = pDlg->encryptionPasswords();
-
+    /* Get the map of the password IDs: */
+    EncryptedMediumMap encryptedMedia;
+    foreach (const QString &strPasswordId, comAppliance.GetPasswordIds())
+        foreach (const QUuid &uMediumId, comAppliance.GetMediumIdsForPasswordId(strPasswordId))
+            encryptedMedia.insert(strPasswordId, uMediumId);
+
+    /* Ask for the disk encryption passwords if necessary: */
+    if (!encryptedMedia.isEmpty())
+    {
+        /* Modal dialog can be destroyed in own event-loop as a part of application
+         * termination procedure. We have to make sure that the dialog pointer is
+         * always up to date. So we are wrapping created dialog with QPointer. */
+        QPointer<UIAddDiskEncryptionPasswordDialog> pDlg =
+            new UIAddDiskEncryptionPasswordDialog(this,
+                                                  window()->windowTitle(),
+                                                  encryptedMedia);
+
+        /* Execute the dialog: */
+        if (pDlg->exec() != QDialog::Accepted)
+        {
             /* Delete the dialog: */
             delete pDlg;
-
-            /* Provide appliance with passwords if possible: */
-            comAppliance.AddPasswords(encryptionPasswords.keys().toVector(),
-                                      encryptionPasswords.values().toVector());
-            if (!comAppliance.isOk())
-            {
-                msgCenter().cannotAddDiskEncryptionPassword(comAppliance);
-                break;
-            }
-        }
-
-        /* Prepare export options: */
-        QVector<KExportOptions> options;
-        switch (macAddressExportPolicy())
-        {
-            case MACAddressExportPolicy_StripAllNonNATMACs: options.append(KExportOptions_StripAllNonNATMACs); break;
-            case MACAddressExportPolicy_StripAllMACs: options.append(KExportOptions_StripAllMACs); break;
-            default: break;
-        }
-        if (isManifestSelected())
-            options.append(KExportOptions_CreateManifest);
-        if (isIncludeISOsSelected())
-            options.append(KExportOptions_ExportDVDImages);
-
-        /* Is this VM being exported to cloud? */
-        if (isFormatCloudOne())
-        {
-            /* We can have wizard and it's result
-             * should be distinguishable: */
-            int iWizardResult = -1;
-
-            switch (cloudExportMode())
-            {
-                case CloudExportMode_AskThenExport:
-                {
-                    /* Get the required parameters to init short wizard mode: */
-                    CCloudClient comClient = cloudClient();
-                    CVirtualSystemDescription comDescription = vsd();
-                    /* Create and run wizard as modal dialog, but prevent final step: */
-                    QWidget *pWizardParent = windowManager().realParentWindow(this);
-                    const QString strGroupName = QString("/%1/%2").arg(format(), profileName());
-                    pNewCloudVMWizard = new UIWizardNewCloudVM(pWizardParent, strGroupName, comClient, comDescription, mode());
-                    windowManager().registerNewParent(pNewCloudVMWizard, pWizardParent);
-                    pNewCloudVMWizard->setFinalStepPrevented(true);
-                    iWizardResult = pNewCloudVMWizard->exec();
-                    break;
-                }
-                default:
-                    break;
-            }
-
-            /* We should stop everything only if
-             * there was wizard and it was rejected: */
-            if (iWizardResult == QDialog::Rejected)
-                break;
-
-            /* Prepare Export VM progress: */
-            CProgress comProgress = comAppliance.Write(format(), options, uri());
-            if (!comAppliance.isOk())
-            {
-                msgCenter().cannotExportAppliance(comAppliance, this);
-                break;
-            }
-
-            /* Show Export VM progress: */
-            msgCenter().showModalProgressDialog(comProgress, QApplication::translate("UIWizardExportApp", "Exporting Appliance ..."),
-                                                ":/progress_export_90px.png", this);
-            if (comProgress.GetCanceled())
-                break;
-            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-            {
-                msgCenter().cannotExportAppliance(comProgress, comAppliance.GetPath(), this);
-                break;
-            }
-
-            /* We can have wizard and it's result
-             * should be distinguishable: */
-            iWizardResult = -1;
-
-            switch (cloudExportMode())
-            {
-                case CloudExportMode_AskThenExport:
-                {
-                    /* Run the wizard as modal dialog again,
-                     * moreover in auto-finish mode and
-                     * do not prevent final step. */
-                    pNewCloudVMWizard->setFinalStepPrevented(false);
-                    pNewCloudVMWizard->scheduleAutoFinish();
-                    iWizardResult = pNewCloudVMWizard->exec();
-                    break;
-                }
-                case CloudExportMode_ExportThenAsk:
-                {
-                    /* Get the required parameters to init short wizard mode: */
-                    CCloudClient comClient = cloudClient();
-                    CVirtualSystemDescription comDescription = vsd();
-                    /* Create and run short wizard mode as modal dialog: */
-                    QWidget *pWizardParent = windowManager().realParentWindow(this);
-                    const QString strGroupName = QString("/%1/%2").arg(format(), profileName());
-                    pNewCloudVMWizard = new UIWizardNewCloudVM(pWizardParent, strGroupName, comClient, comDescription, mode());
-                    windowManager().registerNewParent(pNewCloudVMWizard, pWizardParent);
-                    iWizardResult = pNewCloudVMWizard->exec();
-                    break;
-                }
-                default:
-                    break;
-            }
-
-            /* We should stop everything only if
-             * there was wizard and it was rejected: */
-            if (iWizardResult == QDialog::Rejected)
-                break;
-        }
-        /* Is this VM being exported locally? */
-        else
-        {
-            /* Export appliance: */
-            UINotificationProgressApplianceExport *pNotification = new UINotificationProgressApplianceExport(comAppliance,
-                                                                                                             format(),
-                                                                                                             options,
-                                                                                                             uri());
-            gpNotificationCenter->append(pNotification);
-        }
-
-        /* Success finally: */
-        fResult = true;
-    }
-    while (0);
-
-    /* Cleanup New Cloud VM wizard if any: */
-    delete pNewCloudVMWizard;
-
-    /* Return result: */
-    return fResult;
-}
+            return false;
+        }
+
+        /* Acquire the passwords provided: */
+        const EncryptionPasswordMap encryptionPasswords = pDlg->encryptionPasswords();
+
+        /* Delete the dialog: */
+        delete pDlg;
+
+        /* Provide appliance with passwords if possible: */
+        comAppliance.AddPasswords(encryptionPasswords.keys().toVector(),
+                                  encryptionPasswords.values().toVector());
+        if (!comAppliance.isOk())
+        {
+            msgCenter().cannotAddDiskEncryptionPassword(comAppliance);
+            return false;
+        }
+    }
+
+    /* Prepare export options: */
+    QVector<KExportOptions> options;
+    switch (macAddressExportPolicy())
+    {
+        case MACAddressExportPolicy_StripAllNonNATMACs: options.append(KExportOptions_StripAllNonNATMACs); break;
+        case MACAddressExportPolicy_StripAllMACs: options.append(KExportOptions_StripAllMACs); break;
+        default: break;
+    }
+    if (isManifestSelected())
+        options.append(KExportOptions_CreateManifest);
+    if (isIncludeISOsSelected())
+        options.append(KExportOptions_ExportDVDImages);
+
+    /* Is this VM being exported to cloud? */
+    if (isFormatCloudOne())
+    {
+        /* Prepare Export VM progress: */
+        CProgress comProgress = comAppliance.Write(format(), options, uri());
+        if (!comAppliance.isOk())
+        {
+            msgCenter().cannotExportAppliance(comAppliance, this);
+            return false;
+        }
+
+        /* Show Export VM progress: */
+        msgCenter().showModalProgressDialog(comProgress, QApplication::translate("UIWizardExportApp", "Exporting Appliance ..."),
+                                            ":/progress_export_90px.png", this);
+        if (comProgress.GetCanceled())
+            return false;
+        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+        {
+            msgCenter().cannotExportAppliance(comProgress, comAppliance.GetPath(), this);
+            return false;
+        }
+    }
+    /* Is this VM being exported locally? */
+    else
+    {
+        /* Export appliance: */
+        UINotificationProgressApplianceExport *pNotification = new UINotificationProgressApplianceExport(comAppliance,
+                                                                                                         format(),
+                                                                                                         options,
+                                                                                                         uri());
+        gpNotificationCenter->append(pNotification);
+    }
+
+    /* Success finally: */
+    return true;
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.h ¶

@@ -143 +143 @@
         void setVsdExportForm(const CVirtualSystemDescriptionForm &comForm);
 
+        /** Returns virtual system description launch form object. */
+        CVirtualSystemDescriptionForm vsdLaunchForm();
+        /** Defines virtual system description launch @a comForm object. */
+        void setVsdLaunchForm(const CVirtualSystemDescriptionForm &comForm);
+
         /** Returns cloud export mode. */
         CloudExportMode cloudExportMode() const;
@@ -154 +159 @@
         void goForward();
 
+        /** Disables basic/expert and next/back buttons. */
+        void disableButtons();
+
         /** Composes universal resource identifier.
           * @param  fWithFile  Brings whether uri should include file name as well. */
@@ -160 +168 @@
         /** Exports Appliance. */
         bool exportAppliance();
+
+        /** Creates VSD Form. */
+        bool createVsdLaunchForm();
+
+        /** Creates New Cloud VM. */
+        bool createCloudVM();
     /** @} */
 
@@ -228 +242 @@
         /** Returns virtual system description export form object. */
         CVirtualSystemDescriptionForm  m_comVsdExportForm;
+        /** Returns virtual system description launch form object. */
+        CVirtualSystemDescriptionForm  m_comVsdLaunchForm;
         /** Returns cloud export mode. */
         CloudExportMode                m_enmCloudExportMode;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp ¶

@@ -116 +116 @@
     , m_pApplianceWidget(0)
     , m_pFormEditor(0)
+    , m_fLaunching(false)
 {
     /* Create main layout: */
@@ -228 +229 @@
         m_pFormEditor->makeSureEditorDataCommitted();
 
+        /* Init VSD form: */
+        CVirtualSystemDescriptionForm comForm;
         /* Check whether we have proper VSD form: */
-        CVirtualSystemDescriptionForm comForm = wizard()->vsdExportForm();
-        fResult = comForm.isNotNull();
-        Assert(fResult);
-
-        /* Give changed VSD back to appliance: */
+        if (!m_fLaunching)
+        {
+            /* We are going to upload image: */
+            comForm = wizard()->vsdExportForm();
+            fResult = comForm.isNotNull();
+        }
+        else
+        {
+            /* We are going to launch VM: */
+            comForm = wizard()->vsdLaunchForm();
+            fResult = comForm.isNotNull();
+        }
+        /* Give changed VSD back: */
         if (fResult)
         {
@@ -240 +251 @@
             if (!fResult)
                 msgCenter().cannotAcquireVirtualSystemDescriptionFormProperty(comForm);
+        }
+
+        /* Final stage? */
+        if (fResult)
+        {
+            if (!m_fLaunching)
+            {
+                /* For modes other than AskThenExport, try to export appliance first: */
+                if (wizard()->cloudExportMode() != CloudExportMode_AskThenExport)
+                    fResult = wizard()->exportAppliance();
+
+                /* For modes other than DoNotAsk, switch from uploading image to launching VM: */
+                if (   fResult
+                    && wizard()->cloudExportMode() != CloudExportMode_DoNotAsk)
+                {
+                    /* Invert flags: */
+                    fResult = false;
+                    m_fLaunching = true;
+
+                    /* Disable wizard buttons: */
+                    wizard()->disableButtons();
+
+                    /* Refresh corresponding widgets: */
+                    wizard()->createVsdLaunchForm();
+                    refreshFormPropertiesTable(m_pFormEditor, wizard()->vsdLaunchForm(), wizard()->isFormatCloudOne());
+                }
+            }
+            else
+            {
+                /* For AskThenExport mode, try to export appliance in the end: */
+                if (wizard()->cloudExportMode() == CloudExportMode_AskThenExport)
+                    fResult = wizard()->exportAppliance();
+
+                /* Try to create cloud VM: */
+                if (fResult)
+                    fResult = wizard()->createCloudVM();
+            }
         }
     }
@@ -248 +296 @@
         m_pApplianceWidget->prepareExport();
         wizard()->setLocalAppliance(*m_pApplianceWidget->appliance());
+
+        /* Try to export appliance: */
+        if (fResult)
+            fResult = wizard()->exportAppliance();
     }
-
-    /* Try to export appliance: */
-    if (fResult)
-        fResult = wizard()->exportAppliance();
 
     /* Return result: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h ¶

@@ -94 +94 @@
     /** Holds the Form Editor widget instance. */
     UIFormEditorWidget            *m_pFormEditor;
+
+    /** Holds whether cloud exporting is at launching stage. */
+    bool  m_fLaunching;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp ¶

@@ -85 +85 @@
     , m_pApplianceWidget(0)
     , m_pFormEditor(0)
+    , m_fLaunching(0)
 {
     /* Create widgets: */
@@ -582 +583 @@
         m_pFormEditor->makeSureEditorDataCommitted();
 
+        /* Init VSD form: */
+        CVirtualSystemDescriptionForm comForm;
         /* Check whether we have proper VSD form: */
-        CVirtualSystemDescriptionForm comForm = wizard()->vsdExportForm();
-        fResult = comForm.isNotNull();
-        Assert(fResult);
-
-        /* Give changed VSD back to appliance: */
+        if (!m_fLaunching)
+        {
+            /* We are going to upload image: */
+            comForm = wizard()->vsdExportForm();
+            fResult = comForm.isNotNull();
+        }
+        else
+        {
+            /* We are going to launch VM: */
+            comForm = wizard()->vsdLaunchForm();
+            fResult = comForm.isNotNull();
+        }
+        /* Give changed VSD back: */
         if (fResult)
         {
@@ -594 +605 @@
             if (!fResult)
                 msgCenter().cannotAcquireVirtualSystemDescriptionFormProperty(comForm);
+        }
+
+        /* Final stage? */
+        if (fResult)
+        {
+            if (!m_fLaunching)
+            {
+                /* For modes other than AskThenExport, try to export appliance first: */
+                if (wizard()->cloudExportMode() != CloudExportMode_AskThenExport)
+                    fResult = wizard()->exportAppliance();
+
+                /* For modes other than DoNotAsk, switch from uploading image to launching VM: */
+                if (   fResult
+                    && wizard()->cloudExportMode() != CloudExportMode_DoNotAsk)
+                {
+                    /* Invert flags: */
+                    fResult = false;
+                    m_fLaunching = true;
+
+                    /* Disable wizard buttons: */
+                    wizard()->disableButtons();
+
+                    /* Disable unrelated widgets: */
+                    m_pToolBox->setCurrentPage(2);
+                    m_pToolBox->setPageEnabled(0, false);
+                    m_pToolBox->setPageEnabled(1, false);
+
+                    /* Refresh corresponding widgets: */
+                    wizard()->createVsdLaunchForm();
+                    refreshFormPropertiesTable(m_pFormEditor, wizard()->vsdLaunchForm(), wizard()->isFormatCloudOne());
+                }
+            }
+            else
+            {
+                /* For AskThenExport mode, try to export appliance in the end: */
+                if (wizard()->cloudExportMode() == CloudExportMode_AskThenExport)
+                    fResult = wizard()->exportAppliance();
+
+                /* Try to create cloud VM: */
+                if (fResult)
+                    fResult = wizard()->createCloudVM();
+            }
         }
     }
@@ -611 +664 @@
             wizard()->setLocalAppliance(*m_pApplianceWidget->appliance());
         }
+
+        /* Try to export appliance: */
+        if (fResult)
+            fResult = wizard()->exportAppliance();
     }
-
-    /* Try to export appliance: */
-    if (fResult)
-        fResult = wizard()->exportAppliance();
 
     /* Return result: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h ¶

@@ -194 +194 @@
     /** Holds the Form Editor widget instance. */
     UIFormEditorWidget            *m_pFormEditor;
+
+    /** Holds whether cloud exporting is at launching stage. */
+    bool  m_fLaunching;
 };