Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp	(revision 79589)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp	(revision 79590)
@@ -24,4 +24,5 @@
 #include "UIAddDiskEncryptionPasswordDialog.h"
 #include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
 #include "UIWizardExportApp.h"
 #include "UIWizardExportAppDefs.h"
@@ -30,4 +31,5 @@
 #include "UIWizardExportAppPageBasic3.h"
 #include "UIWizardExportAppPageExpert.h"
+#include "UIWizardNewCloudVM.h"
 
 /* COM includes: */
@@ -318,4 +320,20 @@
         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
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp	(revision 79589)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp	(revision 79590)
@@ -634,4 +634,13 @@
 {
     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,6 +902,4 @@
                     if (m_pRadioExportThenAsk)
                     {
-                        m_pRadioExportThenAsk->setEnabled(false);
-
                         /* Add into layout: */
                         m_pSettingsLayout2->addWidget(m_pRadioExportThenAsk, 2, 1);
@@ -902,4 +909,6 @@
                     if (m_pRadioAskThenExport)
                     {
+                        m_pRadioAskThenExport->setEnabled(false);
+
                         /* Add into layout: */
                         m_pSettingsLayout2->addWidget(m_pRadioAskThenExport, 3, 1);
@@ -909,6 +918,4 @@
                     if (m_pRadioDoNotAsk)
                     {
-                        m_pRadioDoNotAsk->setEnabled(false);
-
                         /* Add into layout: */
                         m_pSettingsLayout2->addWidget(m_pRadioDoNotAsk, 4, 1);
@@ -961,4 +968,5 @@
     registerField("vsd", this, "vsd");
     registerField("vsdExportForm", this, "vsdExportForm");
+    registerField("cloudExportMode", this, "cloudExportMode");
 }
 
@@ -1097,5 +1105,5 @@
 
     /* Choose default cloud export option: */
-    m_pRadioAskThenExport->setChecked(true);
+    m_pRadioExportThenAsk->setChecked(true);
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h	(revision 79589)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h	(revision 79590)
@@ -77,4 +77,14 @@
     AccountData_ProfileName = Qt::UserRole + 1
 };
+
+/** Cloud export option modes. */
+enum CloudExportMode
+{
+    CloudExportMode_Invalid,
+    CloudExportMode_AskThenExport,
+    CloudExportMode_ExportThenAsk,
+    CloudExportMode_DoNotAsk
+};
+Q_DECLARE_METATYPE(CloudExportMode);
 
 
@@ -164,4 +174,6 @@
     /** 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,4 +270,5 @@
     Q_PROPERTY(CVirtualSystemDescription vsd READ vsd);
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdExportForm READ vsdExportForm);
+    Q_PROPERTY(CloudExportMode cloudExportMode READ cloudExportMode);
 
 public:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp	(revision 79589)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp	(revision 79590)
@@ -384,6 +384,4 @@
                             if (m_pRadioExportThenAsk)
                             {
-                                m_pRadioExportThenAsk->setEnabled(false);
-
                                 /* Add into layout: */
                                 m_pSettingsLayout2->addWidget(m_pRadioExportThenAsk, 2, 1);
@@ -393,4 +391,6 @@
                             if (m_pRadioAskThenExport)
                             {
+                                m_pRadioAskThenExport->setEnabled(false);
+
                                 /* Add into layout: */
                                 m_pSettingsLayout2->addWidget(m_pRadioAskThenExport, 3, 1);
@@ -400,6 +400,4 @@
                             if (m_pRadioDoNotAsk)
                             {
-                                m_pRadioDoNotAsk->setEnabled(false);
-
                                 /* Add into layout: */
                                 m_pSettingsLayout2->addWidget(m_pRadioDoNotAsk, 4, 1);
@@ -461,4 +459,5 @@
     registerField("vsd", this, "vsd");
     registerField("vsdExportForm", this, "vsdExportForm");
+    registerField("cloudExportMode", this, "cloudExportMode");
     registerField("applianceWidget", this, "applianceWidget");
 }
@@ -584,5 +583,5 @@
 
     /* Choose default cloud export option: */
-    m_pRadioAskThenExport->setChecked(true);
+    m_pRadioExportThenAsk->setChecked(true);
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h	(revision 79589)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h	(revision 79590)
@@ -50,4 +50,5 @@
     Q_PROPERTY(CVirtualSystemDescription vsd READ vsd);
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdExportForm READ vsdExportForm);
+    Q_PROPERTY(CloudExportMode cloudExportMode READ cloudExportMode);
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);