Changeset 1015 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 21, 2007 7:47:10 PM (18 years ago)

Author:

vboxsync

Message:

Storage/Main/GUI: Implemented preliminary support of VMDK images version 3 and 4 (no separate Disk DescriptionFile support).

File:

• trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h

@@ -658 +658 @@
          it != (*aDroppedList).end(); ++it)
     {
-        // Checking dropped media type
+        QString src = *it;
+        /* Check dropped media type */
+        /// @todo On OS/2 and windows (and mac?) extension checks should be case
+        /// insensitive, as OPPOSED to linux and the rest where case matters.
         VBoxDefs::DiskType type = VBoxDefs::InvalidType;
-        if      ((*it).endsWith ("iso", false))
+        if      (src.endsWith (".iso", false))
         {
             if (currentList == cdsView) type = VBoxDefs::CD;
         }
-        else if ((*it).endsWith ("img", false))
+        else if (src.endsWith (".img", false))
         {
             if (currentList == fdsView) type = VBoxDefs::FD;
         }
-        else if ((*it).endsWith ("vdi", false))
+        else if (src.endsWith (".vdi", false) ||
+                 src.endsWith (".vmdk", false))
         {
             if (currentList == hdsView) type = VBoxDefs::HD;
         }
-        // If media type has been determined - attach this device
-        if (type) addImageToList (*it, type);
+        /* If media type has been determined - attach this device */
+        if (type)
+        {
+            addImageToList (*it, type);
+            if (!vbox.isOk())
+                vboxProblem().cannotRegisterMedia (this, vbox, type, src);
+        }
     }
     delete aDroppedList;
@@ -691 +700 @@
         case VBoxDefs::HD:
         {
-            CVirtualDiskImage vdi = vbox.OpenVirtualDiskImage (aSource);
+            CHardDisk hd = vbox.OpenHardDisk (aSource);
             if (vbox.isOk())
             {
-                CHardDisk hd = CUnknown (vdi);
                 vbox.RegisterHardDisk (hd);
                 if (vbox.isOk())
@@ -1713 +1721 @@
     DiskImageItem *item =
         currentList->currentItem() && currentList->currentItem()->rtti() == 1001 ?
-        static_cast<DiskImageItem*> (currentList->currentItem()) : 0;
+        static_cast <DiskImageItem*> (currentList->currentItem()) : 0;
 
     QString dir;
@@ -1729 +1737 @@
     VBoxDefs::DiskType type = VBoxDefs::InvalidType;
 
-    if (currentList == hdsView) {
-        filter = tr( "Hard disk images (*.vdi)" );
-        title = tr( "Select a hard disk image file" );
+    if (currentList == hdsView)
+    {
+        filter = tr ("All hard disk images (*.vdi; *.vmdk);;"
+                     "Virtual Disk images (*.vdi);;"
+                     "VMDK images (*.vmdk);;"
+                     "All files (*)");
+        title = tr ("Select a hard disk image file");
         type = VBoxDefs::HD;
-    } else if (currentList == cdsView) {
-        filter = tr( "CDROM images (*.iso)" );
-        title = tr( "Select a DVD/CD-ROM disk image file" );
+    }
+    else if (currentList == cdsView)
+    {
+        filter = tr( "CD/DVD-ROM images (*.iso)");
+        title = tr( "Select a CD/DVD-ROM disk image file" );
         type = VBoxDefs::CD;
-    } else if (currentList == fdsView) {
+    }
+    else if (currentList == fdsView)
+    {
         filter = tr( "Floppy images (*.img)" );
         title = tr( "Select a floppy disk image file" );
         type = VBoxDefs::FD;
-    } else {
+    } else
+    {
         AssertMsgFailed (("Root list should be equal to hdsView, cdsView or fdsView"));
     }
@@ -1748 +1765 @@
                                                 this, "AddDiskImageDialog",
                                                 title);
+    src =  QDir::convertSeparators (src);
 
     addImageToList (src, type);
@@ -1771 +1789 @@
         type = VBoxDefs::HD;
         int deleteImage;
+        /// @todo When creation of VMDK is implemented, we should
+        /// enable image deletion for  them as well (use
+        /// GetStorageType() to define the correct cast).
         if (vbox.GetHardDisk (uuid).GetStorageType() == CEnums::VirtualDiskImage &&
             item->getStatus() == VBoxMedia::Ok)
-        {
             deleteImage = vboxProblem().confirmHardDiskImageDeletion (this, src);
-        }
         else
-        {
             deleteImage = vboxProblem().confirmHardDiskUnregister (this, src);
-        }
         if (deleteImage == QIMessageBox::Cancel)
             return;
@@ -1785 +1802 @@
         if (vbox.isOk() && deleteImage == QIMessageBox::Yes)
         {
-            /// @todo (dmik) later, change wrappers so that converting
-            //  to CUnknown is not necessary for cross-assignments
+            /// @todo When creation of VMDK is implemented, we should
+            /// enable image deletion for  them as well (use
+            /// GetStorageType() to define the correct cast).
             CVirtualDiskImage vdi = CUnknown (hd);
             if (vdi.isOk())