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

Timestamp:

Mar 12, 2007 11:17:52 AM (18 years ago)

Author:

vboxsync

Message:

VBoxMedia data member integrated into DiskImageItem class allowing access to related disk image through particular list-view item. Used for releasing&removing media.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxDiskImageManagerDlg.ui (modified) (1 diff)
• VBoxDiskImageManagerDlg.ui.h (modified) (15 diffs)

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

@@ -613 +613 @@
     <function access="private">addDroppedImages( QStringList* )</function>
     <function access="private">addImageToList( const QString &amp; aSource, VBoxDefs::DiskType aDiskType )</function>
-    <function access="private" returnType="DiskImageItem*">createImageNode( QListView *aList, DiskImageItem *aRoot )</function>
+    <function access="private" returnType="DiskImageItem*">createImageNode( QListView *aList, DiskImageItem *aRoot, const VBoxMedia &amp; )</function>
     <function access="private">updateHdItem( DiskImageItem*, const VBoxMedia &amp; )</function>
     <function access="private">updateCdItem( DiskImageItem*, const VBoxMedia &amp; )</function>

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

@@ -43 +43 @@
         QListViewItem (parent), mStatus (VBoxMedia::Unknown) {}
 
+    void setMedia (const VBoxMedia &aMedia) { mMedia = aMedia; }
+    VBoxMedia &getMedia() { return mMedia; }
+
     QString getName() { return mName; }
 
@@ -126 +129 @@
 
 protected:
+
+    VBoxMedia mMedia;
 
     QString mName;
@@ -787 +792 @@
 
 DiskImageItem* VBoxDiskImageManagerDlg::createImageNode (QListView *aList,
-                                                         DiskImageItem *aRoot)
+                                                         DiskImageItem *aRoot,
+                                                         const VBoxMedia &aMedia)
 {
     DiskImageItem *item = 0;
@@ -797 +803 @@
     else
         Assert (0);
+
+    item->setMedia (aMedia);
 
     return item;
@@ -1185 +1193 @@
     QUuid rootId = hd.GetParent().isNull() ? QUuid() : hd.GetParent().GetId();
     DiskImageItem *root = searchItem (aList, rootId);
-    DiskImageItem *item = createImageNode (aList, root);
+    DiskImageItem *item = createImageNode (aList, root, aMedia);
     updateHdItem (item, aMedia);
     return item;
@@ -1193 +1201 @@
                                                       const VBoxMedia &aMedia)
 {
-    DiskImageItem *item = createImageNode (aList, 0);
+    DiskImageItem *item = createImageNode (aList, 0, aMedia);
     updateCdItem (item, aMedia);
     return item;
@@ -1201 +1209 @@
                                                       const VBoxMedia &aMedia)
 {
-    DiskImageItem *item = createImageNode (aList, 0);
+    DiskImageItem *item = createImageNode (aList, 0, aMedia);
     updateFdItem (item, aMedia);
     return item;
@@ -1572 +1580 @@
     if (parentList == hdsView)
     {
-        QUuid machineId = vbox.GetHardDisk (itemId).GetMachineId();
+        CHardDisk hd = aItem->getMedia().disk;
+        QUuid machineId = hd.GetMachineId();
         if (machineId.isNull() ||
             vbox.GetMachine (machineId).GetState() != CEnums::PoweredOff &&
@@ -1795 +1804 @@
         title = tr( "Select a floppy disk image file" );
         type = VBoxDefs::FD;
-    } else
+    }
+    else
     {
         AssertMsgFailed (("Root list should be equal to hdsView, cdsView or fdsView"));
@@ -1820 +1830 @@
     AssertMsg (item, ("Current item must not be null"));
 
+    QUuid uuid = QUuid (item->getUuid());
+    AssertMsg (!uuid.isNull(), ("Current item must have uuid"));
+
     QString src = item->getPath().stripWhiteSpace();
-    QUuid uuid = QUuid (item->getUuid());
     VBoxDefs::DiskType type = VBoxDefs::InvalidType;
 
@@ -1831 +1843 @@
         /// enable image deletion for  them as well (use
         /// GetStorageType() to define the correct cast).
-        if (vbox.GetHardDisk (uuid).GetStorageType() == CEnums::VirtualDiskImage &&
+        CHardDisk disk = item->getMedia().disk;
+        if (disk.GetStorageType() == CEnums::VirtualDiskImage &&
             item->getStatus() == VBoxMedia::Ok)
             deleteImage = vboxProblem().confirmHardDiskImageDeletion (this, src);
@@ -1881 +1894 @@
     AssertMsg (!itemId.isNull(), ("Current item must have uuid"));
 
-    VBoxMedia media;
-    QUuid machineId;
     /* if it is a hard disk sub-item: */
     if (currentList == hdsView)
     {
-        machineId = vbox.GetHardDisk (itemId).GetMachineId();
+        CHardDisk hd = item->getMedia().disk;
+        QUuid machineId = hd.GetMachineId();
         if (vboxProblem().confirmReleaseImage (this,
-                           vbox.GetMachine(machineId).GetName()))
+            vbox.GetMachine (machineId).GetName()))
         {
             releaseDisk (machineId, itemId, VBoxDefs::HD);
-            CHardDisk hd = vboxGlobal().virtualBox().GetHardDisk (itemId);
-            media = VBoxMedia (CUnknown (hd), VBoxDefs::HD, item->getStatus());
+            vboxGlobal().updateMedia (item->getMedia());
         }
     }
@@ -1909 +1920 @@
                 releaseDisk (QUuid (*it), itemId, VBoxDefs::CD);
 
-            CDVDImage cd = vboxGlobal().virtualBox().GetDVDImage (itemId);
-            media = VBoxMedia (CUnknown (cd), VBoxDefs::CD, item->getStatus());
+            CDVDImage cd = vbox.GetDVDImage (itemId);
+            vboxGlobal().updateMedia (item->getMedia());
         }
     }
@@ -1927 +1938 @@
                 releaseDisk (QUuid (*it), itemId, VBoxDefs::FD);
 
-            CFloppyImage fd = vboxGlobal().virtualBox().GetFloppyImage (itemId);
-            media = VBoxMedia (CUnknown (fd), VBoxDefs::FD, item->getStatus());
-        }
-    }
-    if (media.type != VBoxDefs::InvalidType)
-        vboxGlobal().updateMedia (media);
+            CFloppyImage fd = vbox.GetFloppyImage (itemId);
+            vboxGlobal().updateMedia (item->getMedia());
+        }
+    }
 }
 
@@ -1990 +1999 @@
         }
         default:
-            AssertFailed();
+            AssertMsgFailed (("Incorrect disk type."));
     }
     /* save all setting changes: */