Changeset 91578 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp

Timestamp:

Oct 5, 2021 5:24:33 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: UIWizardImportApp: Moving appliance related code from UIApplianceImportEditorWidget to UIWizardImportApp itself where it belongs.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp

@@ -142 +142 @@
 
 UIWizardImportAppPageBasic2::UIWizardImportAppPageBasic2(const QString &strFileName)
-    : m_enmCertText(kCertText_Uninitialized)
+    : m_strFileName(strFileName)
+    , m_enmCertText(kCertText_Uninitialized)
 {
     /* Create main layout: */
@@ -174 +175 @@
                     {
                         m_pApplianceWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
-                        m_pApplianceWidget->setFile(strFileName);
                         pApplianceWidgetLayout->addWidget(m_pApplianceWidget, 0, 0, 1, 3);
                     }
@@ -370 +370 @@
     /* Update widget visibility: */
     updatePageAppearance();
-    /* Populate MAC address import combo: */
-    populateMACAddressImportPolicies();
 
     /* Check whether there was cloud source selected: */
     const bool fIsSourceCloudOne = field("isSourceCloudOne").toBool();
     if (fIsSourceCloudOne)
+    {
+        /* Refresh form properties table: */
         refreshFormPropertiesTable();
+    }
     else
     {
-        /* Acquire appliance: */
-        CAppliance *pAppliance = m_pApplianceWidget->appliance();
-
-        /* Check if pAppliance is alive. If not just return here.
-         * This prevents crashes when an invalid ova file is supllied: */
-        if (!pAppliance)
+        /* Populate MAC address import combo: */
+        populateMACAddressImportPolicies();
+
+        /* If we have file name passed,
+         * check if specified file contains valid appliance: */
+        if (   !m_strFileName.isEmpty()
+            && !qobject_cast<UIWizardImportApp*>(wizard())->setFile(m_strFileName))
         {
-            if (wizard())
-                wizard()->reject();
+            wizard()->reject();
             return;
         }
 
-        /* Make sure we initialize model items with correct base folder path: */
+        /* Acquire appliance: */
+        CAppliance comAppliance = qobject_cast<UIWizardImportApp*>(wizard())->appliance();
+
+        /* Initialize appliance widget: */
+        m_pApplianceWidget->setAppliance(comAppliance);
+        /* Make sure we initialize appliance widget model with correct base folder path: */
         if (m_pEditorImportFilePath)
             sltHandlePathChanged(m_pEditorImportFilePath->path());
 
         /* Acquire certificate: */
-        CCertificate comCertificate = pAppliance->GetCertificate();
+        CCertificate comCertificate = comAppliance.GetCertificate();
         if (comCertificate.isNull())
             m_enmCertText = kCertText_Unsigned;
@@ -421 +427 @@
 
                 /* Instantiate the dialog: */
-                QPointer<UIApplianceUnverifiedCertificateViewer> pDialog = new UIApplianceUnverifiedCertificateViewer(this, comCertificate);
-                AssertPtrReturnVoid(pDialog.data());
+                QPointer<UIApplianceUnverifiedCertificateViewer> pDialog =
+                    new UIApplianceUnverifiedCertificateViewer(this, comCertificate);
 
                 /* Show viewer in modal mode: */
@@ -481 +487 @@
         }
     }
+    else
+    {
+        /* Make sure widget has own data committed: */
+        m_pApplianceWidget->prepareImport();
+    }
 
     /* Try to import appliance: */