Changeset 79590 in vbox

Timestamp:

Jul 8, 2019 12:01:17 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9484: Export Appliance wizard: 2nd basic and expert pages: Initial implementation for 2 phase'd export requested by bugref:9489.

Location:

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

Files:

• UIWizardExportApp.cpp (modified) (3 diffs)
• UIWizardExportAppPageBasic2.cpp (modified) (6 diffs)
• UIWizardExportAppPageBasic2.h (modified) (3 diffs)
• UIWizardExportAppPageExpert.cpp (modified) (5 diffs)
• UIWizardExportAppPageExpert.h (modified) (1 diff)

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

@@ -24 +24 @@
 #include "UIAddDiskEncryptionPasswordDialog.h"
 #include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
 #include "UIWizardExportApp.h"
 #include "UIWizardExportAppDefs.h"
@@ -30 +31 @@
 #include "UIWizardExportAppPageBasic3.h"
 #include "UIWizardExportAppPageExpert.h"
+#include "UIWizardNewCloudVM.h"
 
 /* COM includes: */
@@ -318 +320 @@
         if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
             return msgCenter().cannotExportAppliance(comProgress, comAppliance.GetPath(), this);
+
+        /* For Export-then-ask mode we should popup the New Cloud VM wizard in short mode now: */
+        if (   field("isFormatCloudOne").toBool()
+            && field("cloudExportMode").value<CloudExportMode>() == CloudExportMode_ExportThenAsk)
+        {
+            /* Get the required parameters to init short wizard mode: */
+            CCloudClient comClient = field("client").value<CCloudClient>();
+            CVirtualSystemDescription comDescription = field("vsd").value<CVirtualSystemDescription>();
+            /* Create and run wizard as modal dialog: */
+            QWidget *pWizardParent = windowManager().realParentWindow(this);
+            UISafePointerWizardNewCloudVM pWizard = new UIWizardNewCloudVM(pWizardParent, comClient, comDescription);
+            windowManager().registerNewParent(pWizard, pWizardParent);
+            pWizard->prepare();
+            pWizard->exec();
+            delete pWizard;
+        }
     }
     else

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp

@@ -634 +634 @@
 {
     return m_comVSDExportForm;
+}
+
+CloudExportMode UIWizardExportAppPage2::cloudExportMode() const
+{
+    if (m_pRadioAskThenExport->isChecked())
+        return CloudExportMode_AskThenExport;
+    else if (m_pRadioExportThenAsk->isChecked())
+        return CloudExportMode_ExportThenAsk;
+    return CloudExportMode_DoNotAsk;
 }
 
@@ -893 +902 @@
                     if (m_pRadioExportThenAsk)
                     {
-                        m_pRadioExportThenAsk->setEnabled(false);
-
                         /* Add into layout: */
                         m_pSettingsLayout2->addWidget(m_pRadioExportThenAsk, 2, 1);
@@ -902 +909 @@
                     if (m_pRadioAskThenExport)
                     {
+                        m_pRadioAskThenExport->setEnabled(false);
+
                         /* Add into layout: */
                         m_pSettingsLayout2->addWidget(m_pRadioAskThenExport, 3, 1);
@@ -909 +918 @@
                     if (m_pRadioDoNotAsk)
                     {
-                        m_pRadioDoNotAsk->setEnabled(false);
-
                         /* Add into layout: */
                         m_pSettingsLayout2->addWidget(m_pRadioDoNotAsk, 4, 1);
@@ -961 +968 @@
     registerField("vsd", this, "vsd");
     registerField("vsdExportForm", this, "vsdExportForm");
+    registerField("cloudExportMode", this, "cloudExportMode");
 }
 
@@ -1097 +1105 @@
 
     /* Choose default cloud export option: */
-    m_pRadioAskThenExport->setChecked(true);
+    m_pRadioExportThenAsk->setChecked(true);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h

@@ -77 +77 @@
     AccountData_ProfileName = Qt::UserRole + 1
 };
+
+/** Cloud export option modes. */
+enum CloudExportMode
+{
+    CloudExportMode_Invalid,
+    CloudExportMode_AskThenExport,
+    CloudExportMode_ExportThenAsk,
+    CloudExportMode_DoNotAsk
+};
+Q_DECLARE_METATYPE(CloudExportMode);
 
 
@@ -164 +174 @@
     /** Returns Virtual System Description Export Form object. */
     CVirtualSystemDescriptionForm vsdExportForm() const;
+    /** Returns cloud export mode. */
+    CloudExportMode cloudExportMode() const;
 
     /** Holds whether default format should be Export to OCI. */
@@ -258 +270 @@
     Q_PROPERTY(CVirtualSystemDescription vsd READ vsd);
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdExportForm READ vsdExportForm);
+    Q_PROPERTY(CloudExportMode cloudExportMode READ cloudExportMode);
 
 public:

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

@@ -384 +384 @@
                             if (m_pRadioExportThenAsk)
                             {
-                                m_pRadioExportThenAsk->setEnabled(false);
-
                                 /* Add into layout: */
                                 m_pSettingsLayout2->addWidget(m_pRadioExportThenAsk, 2, 1);
@@ -393 +391 @@
                             if (m_pRadioAskThenExport)
                             {
+                                m_pRadioAskThenExport->setEnabled(false);
+
                                 /* Add into layout: */
                                 m_pSettingsLayout2->addWidget(m_pRadioAskThenExport, 3, 1);
@@ -400 +400 @@
                             if (m_pRadioDoNotAsk)
                             {
-                                m_pRadioDoNotAsk->setEnabled(false);
-
                                 /* Add into layout: */
                                 m_pSettingsLayout2->addWidget(m_pRadioDoNotAsk, 4, 1);
@@ -461 +459 @@
     registerField("vsd", this, "vsd");
     registerField("vsdExportForm", this, "vsdExportForm");
+    registerField("cloudExportMode", this, "cloudExportMode");
     registerField("applianceWidget", this, "applianceWidget");
 }
@@ -584 +583 @@
 
     /* Choose default cloud export option: */
-    m_pRadioAskThenExport->setChecked(true);
+    m_pRadioExportThenAsk->setChecked(true);
 }
 

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

@@ -50 +50 @@
     Q_PROPERTY(CVirtualSystemDescription vsd READ vsd);
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdExportForm READ vsdExportForm);
+    Q_PROPERTY(CloudExportMode cloudExportMode READ cloudExportMode);
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);