Changeset 102970 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 19, 2024 1:50:38 PM (16 months ago)

Author:

vboxsync

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

161198

Message:

FE/Qt: bugref:10513: VM settings / Storage page: Ensure that a new attachment can be added when another attachment item is currently selected; This function was limited to a controller item before.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp

@@ -1950 +1950 @@
             if (AbstractItem *pItem = static_cast<AbstractItem*>(specifiedIndex.internalPointer()))
             {
+                if (pItem->rtti() == AbstractItem::Type_AttachmentItem)
+                    pItem = pItem->parent();
                 if (pItem->rtti() == AbstractItem::Type_ControllerItem)
                 {
@@ -3485 +3487 @@
     const QAbstractItemModel *pModel = m_pTreeViewStorage->model();
     AssertPtrReturnVoid(pModel);
-    const QModelIndex index = m_pTreeViewStorage->currentIndex();
+    QModelIndex index = m_pTreeViewStorage->currentIndex();
+    if (pModel->data(index, StorageModel::R_IsAttachment).toBool())
+        index = index.parent();
     AssertReturnVoid(pModel->data(index, StorageModel::R_IsController).toBool());
 
@@ -3993 +3997 @@
 
     /* Configure "add attachment" actions: */
-    m_pActionAddAttachment->setEnabled(fController && fAttachmentsPossible);
-    m_pActionAddAttachmentHD->setEnabled(fController && fAttachmentsPossible);
-    m_pActionAddAttachmentCD->setEnabled(fController && fAttachmentsPossible);
-    m_pActionAddAttachmentFD->setEnabled(fController && fAttachmentsPossible);
+    m_pActionAddAttachment->setEnabled(fAttachmentsPossible);
+    m_pActionAddAttachmentHD->setEnabled(fAttachmentsPossible);
+    m_pActionAddAttachmentCD->setEnabled(fAttachmentsPossible);
+    m_pActionAddAttachmentFD->setEnabled(fAttachmentsPossible);
 
     /* Configure "delete controller" action: */
@@ -5231 +5235 @@
     const QAbstractItemModel *pModel = m_pTreeViewStorage->model();
     AssertPtrReturnVoid(pModel);
-    const QModelIndex index = m_pTreeViewStorage->currentIndex();
+    QModelIndex index = m_pTreeViewStorage->currentIndex();
+    if (pModel->data(index, StorageModel::R_IsAttachment).toBool())
+        index = index.parent();
     Assert(pModel->data(index, StorageModel::R_IsController).toBool());
     Assert(pModel->data(index, StorageModel::R_IsMoreAttachmentsPossible).toBool());