Changeset 91539 in vbox for trunk

Timestamp:

Oct 4, 2021 10:57:58 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: UIWizardExportApp: Move local appliance creation logic from UIApplianceExportEditorWidget to UIWizardExportAppPageBasic2 where it belongs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIApplianceExportEditorWidget.cpp (modified) (5 diffs)
• widgets/UIApplianceExportEditorWidget.h (modified) (2 diffs)
• wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (modified) (3 diffs)
• wizards/exportappliance/UIWizardExportAppPageBasic2.h (modified) (2 diffs)
• wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (modified) (5 diffs)
• wizards/exportappliance/UIWizardExportAppPageBasic3.h (modified) (1 diff)
• wizards/exportappliance/UIWizardExportAppPageExpert.cpp (modified) (5 diffs)
• wizards/exportappliance/UIWizardExportAppPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp

@@ -22 +22 @@
 #include "QITreeView.h"
 #include "UIApplianceExportEditorWidget.h"
-#include "UICommon.h"
 #include "UIMessageCenter.h"
-
-/* COM includes: */
-#include "CAppliance.h"
 
 
@@ -67 +63 @@
 }
 
-CAppliance *UIApplianceExportEditorWidget::init()
+void UIApplianceExportEditorWidget::setAppliance(const CAppliance &comAppliance)
 {
-    if (m_pAppliance)
-        delete m_pAppliance;
-    CVirtualBox comVBox = uiCommon().virtualBox();
-    /* Create a appliance object: */
-    m_pAppliance = new CAppliance(comVBox.CreateAppliance());
-    return m_pAppliance;
-}
+    /* Cache newly passed appliance: */
+    m_comAppliance = comAppliance;
 
-void UIApplianceExportEditorWidget::populate()
-{
     /* Cleanup previous stuff: */
     if (m_pModel)
@@ -84 +73 @@
 
     /* Prepare model: */
-    QVector<CVirtualSystemDescription> vsds = m_pAppliance->GetVirtualSystemDescriptions();
+    QVector<CVirtualSystemDescription> vsds = m_comAppliance.GetVirtualSystemDescriptions();
     m_pModel = new UIApplianceModel(vsds, m_pTreeViewSettings);
     if (m_pModel)
@@ -114 +103 @@
 
     /* Check for warnings & if there are one display them: */
-    const QVector<QString> warnings = m_pAppliance->GetWarnings();
+    const QVector<QString> warnings = m_comAppliance.GetWarnings();
     const bool fWarningsEnabled = warnings.size() > 0;
     foreach (const QString &strText, warnings)
@@ -123 +112 @@
 void UIApplianceExportEditorWidget::prepareExport()
 {
-    if (m_pAppliance)
+    if (m_comAppliance.isNotNull())
         m_pModel->putBack();
 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.h

@@ -25 +25 @@
 #include "UIApplianceEditorWidget.h"
 
-/* Forward declarations: */
-class CAppliance;
+/* COM includes: */
+#include "CAppliance.h"
 
 /** UIApplianceEditorWidget subclass for Export Appliance wizard. */
@@ -38 +38 @@
     UIApplianceExportEditorWidget(QWidget *pParent = 0);
 
-    /** Inits the widget by creating appliance instance. */
-    CAppliance *init();
-
-    /** Populates widget contents. */
-    void populate();
+    /** Assigns @a comAppliance and populates widget contents. */
+    void setAppliance(const CAppliance &comAppliance);
 
     /** Prepares export by pushing edited data back to appliance. */
     void prepareExport();
+
+private:
+
+    /** Holds the appliance wrapper instance. */
+    CAppliance  m_comAppliance;
 };
 

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

@@ -318 +318 @@
         /* Enable include ISO check-box: */
         pCheckBox->setEnabled(true);
+    }
+}
+
+void UIWizardExportAppPage2::refreshLocalStuff(CAppliance &comLocalAppliance,
+                                               const QList<QUuid> &machineIDs,
+                                               const QString &strUri)
+{
+    /* Clear stuff: */
+    comLocalAppliance = CAppliance();
+
+    /* Create appliance: */
+    CVirtualBox comVBox = uiCommon().virtualBox();
+    CAppliance comAppliance = comVBox.CreateAppliance();
+    if (!comVBox.isOk())
+    {
+        msgCenter().cannotCreateAppliance(comVBox);
+        return;
+    }
+
+    /* Remember appliance: */
+    comLocalAppliance = comAppliance;
+
+    /* Iterate over all the selected machine uuids: */
+    foreach (const QUuid &uMachineId, machineIDs)
+    {
+        /* Get the machine with the uMachineId: */
+        CVirtualBox comVBox = uiCommon().virtualBox();
+        CMachine comMachine = comVBox.FindMachine(uMachineId.toString());
+        if (!comVBox.isOk())
+            return msgCenter().cannotFindMachineById(comVBox, uMachineId);
+        /* Add the export description to our appliance object: */
+        CVirtualSystemDescription comVsd = comMachine.ExportTo(comLocalAppliance, strUri);
+        if (!comMachine.isOk())
+            return msgCenter().cannotExportAppliance(comMachine, comLocalAppliance.GetPath());
+        /* Add some additional fields the user may change: */
+        comVsd.AddDescription(KVirtualSystemDescriptionType_Product, "", "");
+        comVsd.AddDescription(KVirtualSystemDescriptionType_ProductUrl, "", "");
+        comVsd.AddDescription(KVirtualSystemDescriptionType_Vendor, "", "");
+        comVsd.AddDescription(KVirtualSystemDescriptionType_VendorUrl, "", "");
+        comVsd.AddDescription(KVirtualSystemDescriptionType_Version, "", "");
+        comVsd.AddDescription(KVirtualSystemDescriptionType_License, "", "");
     }
 }
@@ -1006 +1047 @@
                   && wizard()->vsdExportForm().isNotNull();
     }
+    else
+    {
+        /* Update local stuff: */
+        updateLocalStuff();
+        /* Which is required to continue to the next page: */
+        fResult = wizard()->localAppliance().isNotNull();
+    }
 
     /* Return result: */
@@ -1093 +1141 @@
     /* Update profile: */
     updateProfile();
+}
+
+void UIWizardExportAppPageBasic2::updateLocalStuff()
+{
+    /* Create appliance: */
+    CAppliance comAppliance;
+    refreshLocalStuff(comAppliance, wizard()->machineIDs(), wizard()->uri());
+    wizard()->setLocalAppliance(comAppliance);
 }
 

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

@@ -97 +97 @@
     void refreshIncludeISOsCheckBoxAccess(QCheckBox *pCheckBox,
                                           bool fIsFormatCloudOne);
+    /** Refresh local stuff. */
+    void refreshLocalStuff(CAppliance &comLocalAppliance,
+                           const QList<QUuid> &machineIDs,
+                           const QString &strUri);
 
     /** Refresh profile combo. */
@@ -189 +193 @@
     /** Updates format. */
     void updateFormat();
+
+    /** Update local stuff. */
+    void updateLocalStuff();
+
     /** Updates profile. */
     void updateProfile();

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

@@ -50 +50 @@
 
 void UIWizardExportAppPage3::refreshApplianceSettingsWidget(UIApplianceExportEditorWidget *pApplianceWidget,
-                                                            const QList<QUuid> &machineIDs,
-                                                            const QString &strUri,
+                                                            const CAppliance &comAppliance,
                                                             bool fIsFormatCloudOne)
 {
@@ -58 +57 @@
         return;
 
-    /* Acquire appliance: */
-    CAppliance *pAppliance = pApplianceWidget->init();
-    if (pAppliance->isOk())
-    {
-        /* Iterate over all the selected machine uuids: */
-        foreach (const QUuid &uMachineId, machineIDs)
-        {
-            /* Get the machine with the uMachineId: */
-            CVirtualBox comVBox = uiCommon().virtualBox();
-            CMachine comMachine = comVBox.FindMachine(uMachineId.toString());
-            if (comVBox.isOk() && comMachine.isNotNull())
-            {
-                /* Add the export description to our appliance object: */
-                CVirtualSystemDescription comVsd = comMachine.ExportTo(*pAppliance, strUri);
-                if (comMachine.isOk() && comVsd.isNotNull())
-                {
-                    /* Add some additional fields the user may change: */
-                    comVsd.AddDescription(KVirtualSystemDescriptionType_Product, "", "");
-                    comVsd.AddDescription(KVirtualSystemDescriptionType_ProductUrl, "", "");
-                    comVsd.AddDescription(KVirtualSystemDescriptionType_Vendor, "", "");
-                    comVsd.AddDescription(KVirtualSystemDescriptionType_VendorUrl, "", "");
-                    comVsd.AddDescription(KVirtualSystemDescriptionType_Version, "", "");
-                    comVsd.AddDescription(KVirtualSystemDescriptionType_License, "", "");
-                }
-                else
-                    return msgCenter().cannotExportAppliance(comMachine, pAppliance->GetPath());
-            }
-            else
-                return msgCenter().cannotFindMachineById(comVBox, uMachineId);
-        }
-        /* Make sure the settings widget get the new descriptions: */
-        pApplianceWidget->populate();
-    }
+    /* Sanity check: */
+    AssertReturnVoid(comAppliance.isNotNull());
+
+    /* Make sure the settings widget get the new appliance: */
+    pApplianceWidget->setAppliance(comAppliance);
 }
 
@@ -101 +72 @@
         return;
 
+    /* Sanity check: */
+    AssertReturnVoid(comVsdForm.isNotNull());
+
     /* Make sure the properties table get the new description form: */
-    if (comVsdForm.isNotNull())
-        pFormEditor->setVirtualSystemDescriptionForm(comVsdForm);
+    pFormEditor->setVirtualSystemDescriptionForm(comVsdForm);
 }
 
@@ -208 +181 @@
     refreshStackedWidget(m_pSettingsWidget2, wizard()->isFormatCloudOne());
     /* Refresh corresponding widgets: */
-    refreshApplianceSettingsWidget(m_pApplianceWidget, wizard()->machineIDs(), wizard()->uri(), wizard()->isFormatCloudOne());
+    refreshApplianceSettingsWidget(m_pApplianceWidget, wizard()->localAppliance(), wizard()->isFormatCloudOne());
     refreshFormPropertiesTable(m_pFormEditor, wizard()->vsdExportForm(), wizard()->isFormatCloudOne());
 
@@ -295 +268 @@
         /* Prepare export: */
         m_pApplianceWidget->prepareExport();
-        wizard()->setLocalAppliance(*m_pApplianceWidget->appliance());
 
         /* Try to export appliance: */

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

@@ -48 +48 @@
     /** Refreshes appliance settings widget. */
     void refreshApplianceSettingsWidget(UIApplianceExportEditorWidget *pApplianceWidget,
-                                        const QList<QUuid> &machineIDs,
-                                        const QString &strUri,
+                                        const CAppliance &comAppliance,
                                         bool fIsFormatCloudOne);
     /** Refreshes form properties table. */

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

@@ -85 +85 @@
     , m_pApplianceWidget(0)
     , m_pFormEditor(0)
-    , m_fLaunching(0)
+    , m_fLaunching(false)
 {
     /* Create widgets: */
@@ -660 +660 @@
         /* Prepare export: */
         if (fResult)
-        {
             m_pApplianceWidget->prepareExport();
-            wizard()->setLocalAppliance(*m_pApplianceWidget->appliance());
-        }
 
         /* Try to export appliance: */
@@ -750 +747 @@
     refreshFileSelectorPath(m_pFileSelector, m_strFileSelectorName, m_strFileSelectorExt, wizard()->isFormatCloudOne());
 
+    /* Update local stuff: */
+    updateLocalStuff();
     /* Update cloud stuff: */
     updateCloudStuff();
@@ -775 +774 @@
     refreshCloudExportMode(m_exportModeButtons, wizard()->isFormatCloudOne());
 
+    /* Update local stuff: */
+    updateLocalStuff();
     /* Update profile: */
     updateProfile();
+}
+
+void UIWizardExportAppPageExpert::updateLocalStuff()
+{
+    /* Create appliance: */
+    CAppliance comAppliance;
+    refreshLocalStuff(comAppliance, wizard()->machineIDs(), wizard()->uri());
+    wizard()->setLocalAppliance(comAppliance);
 }
 
@@ -815 +824 @@
 
     /* Refresh corresponding widgets: */
-    refreshApplianceSettingsWidget(m_pApplianceWidget, wizard()->machineIDs(), wizard()->uri(), wizard()->isFormatCloudOne());
+    refreshApplianceSettingsWidget(m_pApplianceWidget, wizard()->localAppliance(), wizard()->isFormatCloudOne());
     refreshFormPropertiesTable(m_pFormEditor, wizard()->vsdExportForm(), wizard()->isFormatCloudOne());
 }

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

@@ -114 +114 @@
     /** Updates format. */
     void updateFormat();
+
+    /** Update local stuff. */
+    void updateLocalStuff();
+
     /** Updates profile. */
     void updateProfile();