Changeset 24417 in vbox

Timestamp:

Nov 5, 2009 10:38:36 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Storage Settings UI: Update to unique medium selection mechanism, taking into account snapshot's diff-disks (excluding for "don't show diffs" mode).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsHD.cpp (modified) (4 diffs)

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

@@ -65 +65 @@
 
 
-KDeviceType typeToGlobal (VBoxDefs::MediumType aType)
-{
-    KDeviceType result = KDeviceType_Null;
-    switch (aType)
-    {
-        case VBoxDefs::MediumType_HardDisk:
-            result = KDeviceType_HardDisk;
-            break;
-        case VBoxDefs::MediumType_DVD:
-            result = KDeviceType_DVD;
-            break;
-        case VBoxDefs::MediumType_Floppy:
-            result = KDeviceType_Floppy;
-            break;
-        default:
-            AssertMsgFailed (("Incorrect device type!\n"));
-            break;
-    }
-    return result;
-}
-
 QString compressText (const QString &aText)
 {
@@ -323 +302 @@
 }
 
-void AbstractItem::setMachineId (const QString &aMchineId)
-{
-    mMachineId = aMchineId;
+void AbstractItem::setMachineId (const QString &aMachineId)
+{
+    mMachineId = aMachineId;
 }
 
@@ -498 +477 @@
 QStringList ControllerItem::ctrAllMediumIds (bool aShowDiffs) const
 {
-    QStringList allImages;
-    for (VBoxMediaList::const_iterator it = vboxGlobal().currentMediaList().begin();
-         it != vboxGlobal().currentMediaList().end(); ++ it)
-    {
-         foreach (KDeviceType deviceType, mCtrType->deviceTypeList())
+    QStringList allMediums;
+    foreach (const VBoxMedium &medium, vboxGlobal().currentMediaList())
+    {
+         foreach (const KDeviceType &deviceType, mCtrType->deviceTypeList())
          {
-             if ((*it).isNull() || typeToGlobal ((*it).type()) == deviceType)
+             if (medium.isNull() || medium.medium().GetDeviceType() == deviceType)
              {
-                 /* We should filter out the base hard-disk of diff-disks,
-                  * as we want to insert here a diff-disks and want
-                  * to avoid duplicates in !aShowDiffs mode. */
-                 if (!aShowDiffs && (*it).parent() && !parent()->machineId().isNull() &&
-                     (*it).isAttachedInCurStateTo (parent()->machineId()))
-                     allImages.removeAll ((*it).root().id());
-                 allImages << (*it).id();
+                 /* In 'don't show diffs' mode we should filter out all the mediums
+                  * which are already attached to some snapshot of current VM. */
+                 if (!aShowDiffs && medium.type() == VBoxDefs::MediumType_HardDisk)
+                 {
+                     if (!medium.medium().GetMachineIds().contains (parent()->machineId()) ||
+                         medium.isAttachedInCurStateTo (parent()->machineId()))
+                         allMediums << medium.id();
+                 }
+                 else allMediums << medium.id();
                  break;
              }
          }
     }
-    return allImages;
+    return allMediums;
 }
 
@@ -665 +645 @@
         VBoxMedium medium = vboxGlobal().findMedium (mediumId);
         if ((medium.isNull() && mAttDeviceType != KDeviceType_HardDisk) ||
-            (!medium.isNull() && typeToGlobal (medium.type()) == mAttDeviceType))
+            (!medium.isNull() && medium.medium().GetDeviceType() == mAttDeviceType))
             allMediumIds << mediumId;
     }