Changeset 78545 in vbox for trunk/src

Timestamp:

May 16, 2019 12:47:28 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

130591

Message:

FE/Qt: bugref:6247: VM Settings / Storage page: Make sure each of remaining attachments has valid storage slot according to new controller bus type.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsStorage.cpp (modified) (2 diffs)
• UIMachineSettingsStorage.h (modified) (1 diff)

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

@@ -1698 +1698 @@
                 if (pItem->rtti() == AbstractItem::Type_ControllerItem)
                 {
+                    /* Acquire controller item and requested storage bus type: */
                     ControllerItem *pItemController = static_cast<ControllerItem*>(pItem);
                     const KStorageBus enmNewCtrBusType = aValue.value<KStorageBus>();
@@ -1729 +1730 @@
                     }
 
+                    /* Push new controller type: */
                     pItemController->setCtrBusType(enmNewCtrBusType);
                     emit dataChanged(aIndex, aIndex);
+
+                    /* Make sure each of remaining attachments has valid slot: */
+                    foreach (AbstractItem *pChildItem, pItemController->attachments())
+                    {
+                        AttachmentItem *pChildItemAttachment = static_cast<AttachmentItem*>(pChildItem);
+                        const SlotsList availableSlots = pChildItemAttachment->attSlots();
+                        const StorageSlot currentSlot = pChildItemAttachment->attSlot();
+                        if (!availableSlots.isEmpty() && !availableSlots.contains(currentSlot))
+                            pChildItemAttachment->setAttSlot(availableSlots.first());
+                    }
+
+                    /* This means success: */
                     return true;
                 }

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

@@ -281 +281 @@
     QList<QUuid> attachmentIDs(KDeviceType enmType = KDeviceType_Null) const;
 
+    QList<AbstractItem*> attachments() const { return mAttachments; }
     void setAttachments(const QList<AbstractItem*> &attachments) { mAttachments = attachments; }