Changeset 91261 in vbox for trunk/src

Timestamp:

Sep 15, 2021 7:03:33 PM (4 years ago)

Author:

vboxsync

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

146920

Message:

FE/Qt: bugref:9996: Export Appliance wizard: Rename appliance field to cloudAppliance since there will be separate localAppliance field for local needs; It's initialized on another page.

Location:

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

Files:

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

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

@@ -64 +64 @@
     {
         /* Get appliance: */
-        CAppliance comAppliance = field("appliance").value<CAppliance>();
+        CAppliance comAppliance = field("cloudAppliance").value<CAppliance>();
+        AssertReturn(comAppliance.isNotNull(), false);
 
         /* Export the VMs, on success we are finished: */

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

@@ -517 +517 @@
 }
 
-CAppliance UIWizardExportAppPage2::appliance() const
+CAppliance UIWizardExportAppPage2::cloudAppliance() const
 {
     return m_comAppliance;
@@ -846 +846 @@
     registerField("includeISOsSelected", this, "includeISOsSelected");
     registerField("providerShortName", this, "providerShortName");
-    registerField("appliance", this, "appliance");
+    registerField("cloudAppliance", this, "cloudAppliance");
     registerField("client", this, "client");
     registerField("vsd", this, "vsd");
@@ -1011 +1011 @@
         populateFormProperties();
         /* Which are required to continue to the next page: */
-        fResult =    field("appliance").value<CAppliance>().isNotNull()
+        fResult =    field("cloudAppliance").value<CAppliance>().isNotNull()
                   && field("client").value<CCloudClient>().isNotNull()
                   && field("vsd").value<CVirtualSystemDescription>().isNotNull()

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

@@ -162 +162 @@
     /** Returns profile name. */
     QString profileName() const;
-    /** Returns Appliance object. */
-    CAppliance appliance() const;
+    /** Returns Cloud Appliance object. */
+    CAppliance cloudAppliance() const;
     /** Returns Cloud Client object. */
     CCloudClient client() const;
@@ -260 +260 @@
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
     Q_PROPERTY(QString providerShortName READ providerShortName);
-    Q_PROPERTY(CAppliance appliance READ appliance);
+    Q_PROPERTY(CAppliance cloudAppliance READ cloudAppliance);
     Q_PROPERTY(CCloudClient client READ client);
     Q_PROPERTY(CVirtualSystemDescription vsd READ vsd);

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

@@ -436 +436 @@
     registerField("includeISOsSelected", this, "includeISOsSelected");
     registerField("providerShortName", this, "providerShortName");
-    registerField("appliance", this, "appliance");
+    registerField("cloudAppliance", this, "cloudAppliance");
     registerField("client", this, "client");
     registerField("vsd", this, "vsd");
@@ -596 +596 @@
                       && UICommon::hasAllowedExtension(path().toLower(), OVFFileExts))
                   || (   fCSP
-                      && field("appliance").value<CAppliance>().isNotNull()
+                      && field("cloudAppliance").value<CAppliance>().isNotNull()
                       && field("client").value<CCloudClient>().isNotNull()
                       && field("vsd").value<CVirtualSystemDescription>().isNotNull()

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

@@ -46 +46 @@
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
     Q_PROPERTY(QString providerShortName READ providerShortName);
-    Q_PROPERTY(CAppliance appliance READ appliance);
+    Q_PROPERTY(CAppliance cloudAppliance READ cloudAppliance);
     Q_PROPERTY(CCloudClient client READ client);
     Q_PROPERTY(CVirtualSystemDescription vsd READ vsd);