Changeset 16703 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 12, 2009 10:44:07 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OVF: Added some description. Improved error handling.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/VBoxImportAppliance.cpp (modified) (1 diff)
• ui/VBoxImportApplianceDlg.ui (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxImportAppliance.cpp

@@ -956 +956 @@
     {
         CVirtualBox vbox = vboxGlobal().virtualBox();
-        /* Open the appliance */
+        /* Create a appliance object */
         CAppliance appliance = vbox.CreateAppliance();
-        if (appliance.isOk())
+        bool fResult = appliance.isOk();
+        if (fResult)
         {
-            appliance.Read(file); // @todo error handling
-            /* Now we have to interpret that stuff */
-            appliance.Interpret();
-            if (appliance.isOk())
-            {
-                /* Let the user do some tuning */
-                VBoxImportApplianceDlg settingsDlg (&appliance, aParent);
-                if (settingsDlg.exec() == QDialog::Accepted)
-                {
-                    /* Start the import asynchronously */
-                    CProgress progress;
-                    progress = appliance.ImportMachines();
-                    if (!appliance.isOk())
+            /* Read the appliance */
+            appliance.Read (file);
+            fResult = appliance.isOk();
+            if (fResult)
+            {
+                /* Now we have to interpret that stuff */
+                appliance.Interpret();
+                fResult = appliance.isOk();
+                if (fResult)
+                {
+                    /* Let the user do some tuning */
+                    VBoxImportApplianceDlg settingsDlg (&appliance, aParent);
+                    if (settingsDlg.exec() == QDialog::Accepted)
                     {
-                        vboxProblem().cannotImportAppliance (appliance);
-                        return;
+                        /* Start the import asynchronously */
+                        CProgress progress;
+                        progress = appliance.ImportMachines();
+                        fResult = appliance.isOk();
+                        if (fResult)
+                        {
+                            /* Show some progress, so the user know whats going on */
+                            vboxProblem().showModalProgressDialog (progress, VBoxImportApplianceDlg::tr ("Importing Appliance ..."), aParent);
+                            if (!progress.isOk() || progress.GetResultCode() != 0)
+                            {
+                                vboxProblem().cannotImportAppliance (progress, appliance);
+                                return;
+                            }
+                        }
                     }
-                    /* Show some progress, so the user know whats going on */
-                    vboxProblem().showModalProgressDialog (progress, VBoxImportApplianceDlg::tr ("Importing Appliance ..."), aParent);
-                    if (!progress.isOk() || progress.GetResultCode() != 0)
-                    {
-                        vboxProblem().cannotImportAppliance (progress, appliance);
-                        return;
-                    }
-                }
-            }
-            else
-            {
-                vboxProblem().cannotImportAppliance (appliance);
-                return;
+                }
             }
         }
-        else
-        {
+        if (!fResult)
             vboxProblem().cannotImportAppliance (appliance);
-            return;
-        }
     }
 }

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxImportApplianceDlg.ui

@@ -6 +6 @@
     <x>0</x>
     <y>0</y>
-    <width>627</width>
-    <height>401</height>
+    <width>573</width>
+    <height>476</height>
    </rect>
   </property>
@@ -21 +21 @@
   <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" >
+    <widget class="QLabel" name="mInfoText" >
+     <property name="text" >
+      <string>These are the Virtual Machines as described in the Appliance. VirtualBox has done some initial mapping of the various values. You can change most of the shown properties by double clicking on the items. To disable some of them use the check box near the values.</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
     <widget class="QTreeView" name="mTvSettings" >
      <property name="sizePolicy" >
@@ -30 +43 @@
     </widget>
    </item>
-   <item row="1" column="0" >
+   <item row="2" column="0" >
     <widget class="QWidget" native="1" name="mWarningWidget" >
      <property name="sizePolicy" >
@@ -71 +84 @@
     </widget>
    </item>
-   <item row="2" column="0" >
+   <item row="3" column="0" >
     <widget class="QIDialogButtonBox" name="mButtonBox" >
      <property name="orientation" >
@@ -88 +101 @@
    <extends>QDialog</extends>
    <header>QIDialog.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>