Changeset 50715 in vbox

Timestamp:

Mar 6, 2014 2:26:26 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Medium Manager rework/cleanup: Properly update tab-icons after inaccessible medium collision resolved.

Location:

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

Files:

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

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

@@ -1239 +1239 @@
             {
                 /* Find the first KMediumState_Inaccessible item to be in charge: */
-                UIMediumItem *pInaccessibleMediumItem =
-                    searchItem(pMediumItem->treeWidget(), CheckIfSuitableByState(KMediumState_Inaccessible));
+                CheckIfSuitableByState lookForState(KMediumState_Inaccessible);
+                CheckIfSuitableByID ignoreID(pMediumItem->id());
+                UIMediumItem *pInaccessibleMediumItem = searchItem(pMediumItem->treeWidget(), lookForState, &ignoreID);
                 *pfInaccessible = !!pInaccessibleMediumItem;
             }
@@ -1798 +1799 @@
 }
 
-UIMediumItem* UIMediumManager::searchItem(QTreeWidget *pTree, const CheckIfSuitableBy &functor) const
+UIMediumItem* UIMediumManager::searchItem(QTreeWidget *pTree, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException) const
 {
     /* Make sure argument is valid: */
@@ -1805 +1806 @@
 
     /* Return wrapper: */
-    return searchItem(pTree->invisibleRootItem(), functor);
-}
-
-UIMediumItem* UIMediumManager::searchItem(QTreeWidgetItem *pParentItem, const CheckIfSuitableBy &functor) const
+    return searchItem(pTree->invisibleRootItem(), condition, pException);
+}
+
+UIMediumItem* UIMediumManager::searchItem(QTreeWidgetItem *pParentItem, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException) const
 {
     /* Make sure argument is valid: */
@@ -1816 +1817 @@
     /* Verify passed item if it is of 'medium' type too: */
     if (UIMediumItem *pMediumParentItem = toMediumItem(pParentItem))
-        if (functor.isItSuitable(pMediumParentItem))
+        if (   condition.isItSuitable(pMediumParentItem)
+            && (!pException || !pException->isItSuitable(pMediumParentItem)))
             return pMediumParentItem;
 
@@ -1822 +1824 @@
     for (int iChildIndex = 0; iChildIndex < pParentItem->childCount(); ++iChildIndex)
         if (UIMediumItem *pMediumChildItem = toMediumItem(pParentItem->child(iChildIndex)))
-            if (UIMediumItem *pRequiredMediumChildItem = searchItem(pMediumChildItem, functor))
+            if (UIMediumItem *pRequiredMediumChildItem = searchItem(pMediumChildItem, condition, pException))
                 return pRequiredMediumChildItem;
 

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

@@ -189 +189 @@
     void setCurrentItem(QTreeWidget *pTreeWidget, QTreeWidgetItem *pItem);
 
-    UIMediumItem* searchItem(QTreeWidget *pTree, const CheckIfSuitableBy &functor) const;
-    UIMediumItem* searchItem(QTreeWidgetItem *pParentItem, const CheckIfSuitableBy &functor) const;
+    UIMediumItem* searchItem(QTreeWidget *pTree, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException = 0) const;
+    UIMediumItem* searchItem(QTreeWidgetItem *pParentItem, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException = 0) const;
     UIMediumItem* createHardDiskItem(QTreeWidget *pTree, const UIMedium &medium) const;