Changeset 81297 in vbox

Timestamp:

Oct 16, 2019 5:03:57 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6248: VM settings / Storage page: Make sure attachment is of allowed device type while trying to d&d it to another controller.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -791 +791 @@
     /** Moves attachment with certain @a uAttId from controller with certain @a uCtrOldId to one with another @a uCtrNewId. */
     void moveAttachment(const QUuid &uAttId, const QUuid &uCtrOldId, const QUuid &uCtrNewId);
+
+    /** Returns device type of attachment with certain @a uAttId from controller with certain @a uCtrId. */
+    KDeviceType attachmentDeviceType(const QUuid &uCtrId, const QUuid &uAttId) const;
 
     /** Defines @a uMachineId for reference. */
@@ -2614 +2617 @@
 }
 
+KDeviceType StorageModel::attachmentDeviceType(const QUuid &uCtrId, const QUuid &uAttId) const
+{
+    /* First of all we are looking for top-level (controller) item: */
+    AbstractItem *pTopLevelItem = m_pRootItem->childItemById(uCtrId);
+    if (pTopLevelItem)
+    {
+        /* Then we are looking for sub-level (attachment) item: */
+        AbstractItem *pSubLevelItem = pTopLevelItem->childItemById(uAttId);
+        if (pSubLevelItem)
+        {
+            /* And make sure this is really an attachment: */
+            AttachmentItem *pAttachmentItem = qobject_cast<AttachmentItem*>(pSubLevelItem);
+            if (pAttachmentItem)
+            {
+                /* This way we can acquire actual attachment device type: */
+                return pAttachmentItem->deviceType();
+            }
+        }
+    }
+
+    /* Null by default: */
+    return KDeviceType_Null;
+}
+
 void StorageModel::setMachineId(const QUuid &uMachineId)
 {
@@ -4339 +4366 @@
         return;
 
-    /* Get controller id: */
+    /* Get controller/attachment ids: */
     const QString strControllerId = pMimeData->data(UIMachineSettingsStorage::s_strControllerMimeType);
+    const QString strAttachmentId = pMimeData->data(UIMachineSettingsStorage::s_strAttachmentMimeType);
 
     /* Check what item we are hovering currently: */
@@ -4348 +4376 @@
     ControllerItem *pItemController = qobject_cast<ControllerItem*>(pItem);
     if (!pItemController || pItemController->id().toString() == strControllerId)
+        return;
+    /* Then make sure we support such attachment device type: */
+    const DeviceTypeList devicesList(m_pModelStorage->data(index, StorageModel::R_CtrDevices).value<DeviceTypeList>());
+    if (!devicesList.contains(m_pModelStorage->attachmentDeviceType(strControllerId, strAttachmentId)))
         return;
     /* Also make sure there is enough place for new attachment: */