Changeset 24419 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2009 11:32:59 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Storage Settings UI: More correct verbose attribute processing when adding new attachment (including adding when loading).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMSettingsHD.h (modified) (1 diff)
• src/VBoxVMSettingsHD.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsHD.h

@@ -467 +467 @@
     void delController (const QUuid &aCtrId);
 
-    QModelIndex addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType);
+    QModelIndex addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType, bool aVerbose);
     void delAttachment (const QUuid &aCtrId, const QUuid &aAttId);
 

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

@@ -504 +504 @@
     QStringList usedImages;
     for (int i = 0; i < mAttachments.size(); ++ i)
-        usedImages << static_cast <AttachmentItem*> (mAttachments [i])->attMediumId();
+    {
+        QString usedMediumId = static_cast <AttachmentItem*> (mAttachments [i])->attMediumId();
+        if (!vboxGlobal().findMedium (usedMediumId).isNull())
+            usedImages << usedMediumId;
+    }
     return usedImages;
 }
@@ -1352 +1356 @@
 }
 
-QModelIndex StorageModel::addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType)
+QModelIndex StorageModel::addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType, bool aVerbose)
 {
     if (AbstractItem *parent = mRootItem->childById (aCtrId))
@@ -1359 +1363 @@
         QModelIndex parentIndex = index (parentPosition, 0, root());
         beginInsertRows (parentIndex, parent->childCount(), parent->childCount());
-        new AttachmentItem (parent, aDeviceType, qobject_cast <QWidget*> (QObject::parent())->isVisible());
+        new AttachmentItem (parent, aDeviceType, aVerbose);
         endInsertRows();
         return index (parent->childCount() - 1, 0, parentIndex);
@@ -1673 +1677 @@
         foreach (const CMediumAttachment &attachment, attachments)
         {
-            QModelIndex attIndex = mStorageModel->addAttachment (ctrId, attachment.GetType());
+            QModelIndex attIndex = mStorageModel->addAttachment (ctrId, attachment.GetType(), false);
             mStorageModel->setData (attIndex, QVariant::fromValue (StorageSlot (controller.GetBus(), attachment.GetPort(), attachment.GetDevice())), StorageModel::R_AttSlot);
             CMedium medium (attachment.GetMedium());
@@ -2468 +2472 @@
     Assert (mStorageModel->data (index, StorageModel::R_IsMoreAttachmentsPossible).toBool());
 
-    mStorageModel->addAttachment (QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()), aDevice);
+    mStorageModel->addAttachment (QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()), aDevice, true);
     emit storageChanged();
     if (mValidator) mValidator->revalidate();