Changeset 38343 in vbox

Timestamp:

Aug 8, 2011 10:11:12 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt4: fix exporting of additional infos

Location:

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

Files:

• UIExportApplianceWzd.cpp (modified) (5 diffs)
• UIExportApplianceWzd.h (modified) (1 diff)
• UIExportApplianceWzdPage4.ui (modified) (1 diff)

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

@@ -454 +454 @@
         m_pFileSelector->setPath(strName);
     }
-    AssertMsg(!field("applianceWidget").value<ExportAppliancePointer>().isNull(),
-              ("Appliance Widget Pointer is not set!\n"));
-    field("applianceWidget").value<ExportAppliancePointer>()->prepareExport();
 }
 
@@ -490 +487 @@
     /* Register 'applianceWidget' field! */
     registerField("applianceWidget", this, "applianceWidget");
-    m_pApplianceWidget = m_pSettingsCnt;
 }
 
@@ -527 +523 @@
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    CAppliance *appliance = m_pSettingsCnt->init();
+    CAppliance *appliance = m_pApplianceWidget->init();
     bool fResult = appliance->isOk();
     if (fResult)
@@ -560 +556 @@
         }
         /* Make sure the settings widget get the new descriptions */
-        m_pSettingsCnt->populate();
+        m_pApplianceWidget->populate();
     }
     if (!fResult)
@@ -569 +565 @@
 bool UIExportApplianceWzdPage4::exportAppliance()
 {
-    AssertMsg(!field("applianceWidget").value<ExportAppliancePointer>().isNull(),
-              ("Appliance Widget Pointer is not set!\n"));
-    CAppliance *appliance = field("applianceWidget").value<ExportAppliancePointer>()->appliance();
+    /* Fetch all settings from the appliance editor. */
+    m_pApplianceWidget->prepareExport();
+    /* Get the appliance. */
+    CAppliance *appliance = m_pApplianceWidget->appliance();
     /* We need to know every filename which will be created, so that we can
      * ask the user for confirmation of overwriting. For that we iterating

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

@@ -193 +193 @@
     ExportAppliancePointer applianceWidget() const { return m_pApplianceWidget; }
     void setApplianceWidget(const ExportAppliancePointer &pApplianceWidget) { m_pApplianceWidget = pApplianceWidget; }
-    ExportAppliancePointer m_pApplianceWidget;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage4.ui

@@ -45 +45 @@
    </item>
    <item>
-    <widget class="VBoxExportApplianceWgt" name="m_pSettingsCnt" native="true">
+    <widget class="VBoxExportApplianceWgt" name="m_pApplianceWidget" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">