Changeset 72423 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 4, 2018 8:01:05 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:9183 Showing the differencing disks as children of the mard drives in medium selection widget

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumSelector.cpp (modified) (5 diffs)
• UIMediumSelector.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

@@ -198 +198 @@
         case UIMediumType_Floppy:
             return new UIMediumItemFD(medium, pParent);
-
             break;
         case UIMediumType_HardDisk:
@@ -204 +203 @@
         case UIMediumType_Invalid:
         default:
-            return new UIMediumItemHD(medium, pParent);
+            return createHardDiskItem(medium);
             break;
     }
+}
+
+UIMediumItem* UIMediumSelector::createHardDiskItem(const UIMedium &medium)
+{
+    if (medium.medium().isNull())
+        return 0;
+    if (!m_pTreeWidget)
+        return 0;
+    printf("%s\n", qPrintable(medium.id()));
+    /* Search the tree to see if we already have the item: */
+    UIMediumItem *pMediumItem = searchItem(0, medium.id());
+    if (pMediumItem)
+        return pMediumItem;
+    /* Check if the corresponding medium has a parent */
+    if (medium.parentID() != UIMedium::nullID())
+    {
+        UIMediumItem *pParentMediumItem = searchItem(0, medium.parentID());
+        /* If parent medium-item was not found we create it: */
+        if (!pParentMediumItem)
+        {
+            /* Make sure corresponding parent medium is already cached! */
+            UIMedium parentMedium = vboxGlobal().medium(medium.parentID());
+            if (parentMedium.isNull())
+                AssertMsgFailed(("Parent medium with ID={%s} was not found!\n", medium.parentID().toUtf8().constData()));
+            /* Try to create parent medium-item: */
+            else
+                pParentMediumItem = createHardDiskItem(parentMedium);
+            /* If parent medium-item was found: */
+            if (pParentMediumItem)
+            {
+                pMediumItem = new UIMediumItemHD(medium, pParentMediumItem);
+                LogRel2(("UIMediumManager: Child hard-disk medium-item with ID={%s} created.\n", medium.id().toUtf8().constData()));
+            }
+            else
+                AssertMsgFailed(("Parent medium with ID={%s} could not be created!\n", medium.parentID().toUtf8().constData()));
+
+        }
+    }
+    /* Else just create item as top-level one: */
+    else
+    {
+        pMediumItem = new UIMediumItemHD(medium, m_pTreeWidget);
+        LogRel2(("UIMediumManager: Root hard-disk medium-item with ID={%s} created.\n", medium.id().toUtf8().constData()));
+    }
+    return pMediumItem;
 }
 
@@ -397 +441 @@
     m_pAttachedSubTreeRoot = 0;
     m_pNotAttachedSubTreeRoot = 0;
-    QVector<UIMediumItem*> menuItemList;
+    QVector<UIMediumItem*> menuItemVector;
 
     foreach (const QString &strMediumID, vboxGlobal().mediumIDs())
@@ -428 +472 @@
                 pParent = m_pNotAttachedSubTreeRoot;
             }
-            menuItemList.push_back(addTreeItem(medium, pParent));
+            menuItemVector.push_back(addTreeItem(medium, pParent));
         }
     }
-    restoreSelection(selectedMediums, menuItemList);
+    restoreSelection(selectedMediums, menuItemVector);
 
     updateOkButton();
@@ -439 +483 @@
     if (m_pNotAttachedSubTreeRoot)
         m_pTreeWidget->expandItem(m_pNotAttachedSubTreeRoot);
-
-}
+}
+
+UIMediumItem* UIMediumSelector::searchItem(const QTreeWidgetItem *pParent, const QString &mediumId)
+{
+    if (!m_pTreeWidget)
+        return 0;
+    if (!pParent)
+    {
+        pParent = m_pTreeWidget->invisibleRootItem();
+    }
+    if (!pParent)
+        return 0;
+
+    for (int i = 0; i < pParent->childCount(); ++i)
+    {
+        QTreeWidgetItem *pChild = pParent->child(i);
+        if (!pChild)
+            continue;
+        UIMediumItem *mediumItem = dynamic_cast<UIMediumItem*>(pChild);
+        if (mediumItem)
+        {
+            if (mediumItem->id() == mediumId)
+                return mediumItem;
+        }
+        searchItem(pChild, mediumId);
+    }
+    return 0;
+}

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.h

@@ -88 +88 @@
     UIMediumItem* addTreeItem(const UIMedium &medium, QITreeWidgetItem *pParent);
     void restoreSelection(const QStringList &selectedMediums, QVector<UIMediumItem*> &mediumList);
+    UIMediumItem* createHardDiskItem(const UIMedium &medium);
+    UIMediumItem* searchItem(const QTreeWidgetItem *pParent, const QString &mediumId);
 
     QVBoxLayout       *m_pMainLayout;