Changeset 91262 in vbox

Timestamp:

Sep 15, 2021 7:24:39 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: Export Appliance wizard: Get rid of UIWizardExportAppDefs.h; Moving UIApplianceExportEditorWidget include directly to required place; This also means no more applianceWidget field blinking around, new localAppliance field is used instead of it for consistency with cloud stuff.

Location:

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

Files:

• UIWizardExportApp.cpp (modified) (6 diffs)
• UIWizardExportAppDefs.h (deleted)
• UIWizardExportAppPageBasic2.cpp (modified) (1 diff)
• UIWizardExportAppPageBasic3.cpp (modified) (7 diffs)
• UIWizardExportAppPageBasic3.h (modified) (4 diffs)
• UIWizardExportAppPageExpert.cpp (modified) (4 diffs)
• UIWizardExportAppPageExpert.h (modified) (1 diff)

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

@@ -27 +27 @@
 #include "UINotificationCenter.h"
 #include "UIWizardExportApp.h"
-#include "UIWizardExportAppDefs.h"
 #include "UIWizardExportAppPageBasic1.h"
 #include "UIWizardExportAppPageBasic2.h"
@@ -72 +71 @@
     else
     {
-        /* Get export appliance widget & fetch all settings from the appliance editor: */
-        UIApplianceExportEditorWidget *pExportApplianceWidget = field("applianceWidget").value<ExportAppliancePointer>();
-        AssertPtrReturn(pExportApplianceWidget, false);
-        pExportApplianceWidget->prepareExport();
-
-        /* Acquire the appliance: */
-        CAppliance *pComAppliance = pExportApplianceWidget->appliance();
-        AssertPtrReturn(pComAppliance, false);
+        /* Get appliance: */
+        CAppliance comAppliance = field("localAppliance").value<CAppliance>();
+        AssertReturn(comAppliance.isNotNull(), false);
 
         /* We need to know every filename which will be created, so that we can ask the user for confirmation of overwriting.
@@ -100 +94 @@
 
             /* Add all hard disk images: */
-            CVirtualSystemDescriptionVector vsds = pComAppliance->GetVirtualSystemDescriptions();
+            CVirtualSystemDescriptionVector vsds = comAppliance.GetVirtualSystemDescriptions();
             for (int i = 0; i < vsds.size(); ++i)
             {
@@ -113 +107 @@
 
         /* Initialize VFS explorer: */
-        CVFSExplorer comExplorer = pComAppliance->CreateVFSExplorer(uri(false /* fWithFile */));
+        CVFSExplorer comExplorer = comAppliance.CreateVFSExplorer(uri(false /* fWithFile */));
         if (comExplorer.isNotNull())
         {
@@ -130 +124 @@
         }
         else
-            return msgCenter().cannotCheckFiles(*pComAppliance, this);
+            return msgCenter().cannotCheckFiles(comAppliance, this);
 
         /* Confirm overwriting for existing files: */
@@ -155 +149 @@
 
         /* Export the VMs, on success we are finished: */
-        return exportVMs(*pComAppliance);
+        return exportVMs(comAppliance);
     }
 }

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

@@ -40 +40 @@
 #include "UIVirtualBoxManager.h"
 #include "UIWizardExportApp.h"
-#include "UIWizardExportAppDefs.h"
 #include "UIWizardExportAppPageBasic2.h"
 

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

@@ -23 +23 @@
 #include "QILabelSeparator.h"
 #include "QIRichTextLabel.h"
+#include "UIApplianceExportEditorWidget.h"
 #include "UICommon.h"
 #include "UIMessageCenter.h"
@@ -29 +30 @@
 
 /* COM includes: */
-#include "CAppliance.h"
 #include "CMachine.h"
 #include "CVirtualSystemDescriptionForm.h"
@@ -40 +40 @@
 UIWizardExportAppPage3::UIWizardExportAppPage3()
     : m_pSettingsCntLayout(0)
+    , m_pApplianceWidget(0)
 {
 }
@@ -98 +99 @@
 }
 
+CAppliance UIWizardExportAppPage3::localAppliance() const
+{
+    CAppliance *pAppliance = m_pApplianceWidget->appliance();
+    return pAppliance ? *pAppliance : CAppliance();
+}
+
 
 /*********************************************************************************************************************************
@@ -174 +181 @@
     }
 
-    /* Register classes: */
-    qRegisterMetaType<ExportAppliancePointer>();
-
     /* Register fields: */
-    registerField("applianceWidget", this, "applianceWidget");
+    registerField("localAppliance", this, "localAppliance");
 }
 
@@ -247 +251 @@
         }
     }
+    /* Otherwise if there was local target selected: */
+    else
+    {
+        /* Prepare export: */
+        m_pApplianceWidget->prepareExport();
+    }
 
     /* Try to export appliance: */
@@ -287 +297 @@
     {
         /* Reset widget to default: */
-        AssertPtrReturnVoid(m_pApplianceWidget.data());
         m_pApplianceWidget->restoreDefaults();
     }

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

@@ -29 +29 @@
 #include "UIExtraDataDefs.h"
 #include "UIFormEditorWidget.h"
-#include "UIWizardExportAppDefs.h"
 #include "UIWizardPage.h"
+
+/* COM includes: */
+#include "CAppliance.h"
 
 /* Forward declarations: */
 class QStackedLayout;
 class QIRichTextLabel;
+class UIApplianceExportEditorWidget;
 class UIWizardExportApp;
 
@@ -54 +57 @@
     void refreshFormPropertiesTable();
 
-    /** Returns the appliance widget reference. */
-    ExportAppliancePointer applianceWidget() const { return m_pApplianceWidget; }
+    /** Returns Local Appliance object. */
+    CAppliance localAppliance() const;
 
     /** Holds the settings container layout instance. */
@@ -61 +64 @@
 
     /** Holds the appliance widget reference. */
-    ExportAppliancePointer     m_pApplianceWidget;
+    UIApplianceExportEditorWidget *m_pApplianceWidget;
     /** Holds the Form Editor widget instance. */
-    UIFormEditorWidgetPointer  m_pFormEditor;
+    UIFormEditorWidgetPointer      m_pFormEditor;
 };
 
@@ -71 +74 @@
 {
     Q_OBJECT;
-    Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);
+    Q_PROPERTY(CAppliance localAppliance READ localAppliance);
 
 public:

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

@@ -41 +41 @@
 #include "UIVirtualBoxManager.h"
 #include "UIWizardExportApp.h"
-#include "UIWizardExportAppDefs.h"
 #include "UIWizardExportAppPageExpert.h"
 
@@ -423 +422 @@
             this, &UIWizardExportAppPageExpert::sltHandleProfileButtonClick);
 
-    /* Register classes: */
-    qRegisterMetaType<ExportAppliancePointer>();
-
     /* Register fields: */
     registerField("machineNames", this, "machineNames");
@@ -441 +437 @@
     registerField("vsdExportForm", this, "vsdExportForm");
     registerField("cloudExportMode", this, "cloudExportMode");
-    registerField("applianceWidget", this, "applianceWidget");
+    registerField("localAppliance", this, "localAppliance");
 }
 
@@ -634 +630 @@
         }
     }
+    /* Otherwise if there was local target selected: */
+    else
+    {
+        /* Prepare export: */
+        m_pApplianceWidget->prepareExport();
+    }
 
     /* Try to export appliance: */

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

@@ -51 +51 @@
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdExportForm READ vsdExportForm);
     Q_PROPERTY(CloudExportMode cloudExportMode READ cloudExportMode);
-    Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);
+    Q_PROPERTY(CAppliance localAppliance READ localAppliance);
 
 public: