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

Timestamp:

Feb 10, 2020 5:22:07 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Do not save definitions and orders for cloud items for now.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserAbstractModel.cpp (modified) (4 diffs)
• UIChooserAbstractModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -781 +781 @@
     foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserItemType_Machine))
         if (UIChooserNodeMachine *pMachineNode = pNode->toMachineNode())
-            if (pMachineNode->cache()->accessible())
+            if (   pMachineNode->cache()->itemType() == UIVirtualMachineItem::ItemType_Local
+                && pMachineNode->cache()->accessible())
                 definitions[toOldStyleUuid(pMachineNode->cache()->id())] << pParentGroup->fullName();
     /* Iterate over all the group-nodes: */
@@ -789 +790 @@
 
 void UIChooserAbstractModel::gatherGroupOrders(QMap<QString, QStringList> &orders,
-                                               UIChooserNode *pParentItem)
+                                               UIChooserNode *pParentGroup)
 {
     /* Prepare extra-data key for current group: */
-    const QString strExtraDataKey = pParentItem->fullName();
+    const QString strExtraDataKey = pParentGroup->fullName();
     /* Iterate over all the global-nodes: */
-    foreach (UIChooserNode *pNode, pParentItem->nodes(UIChooserItemType_Global))
+    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserItemType_Global))
     {
         const QString strGlobalDescriptor(pNode->isFavorite() ? "nf" : "n");
@@ -800 +801 @@
     }
     /* Iterate over all the group-nodes: */
-    foreach (UIChooserNode *pNode, pParentItem->nodes(UIChooserItemType_Group))
+    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserItemType_Group))
     {
         const QString strGroupDescriptor(pNode->toGroupNode()->isOpened() ? "go" : "gc");
@@ -807 +808 @@
     }
     /* Iterate over all the machine-nodes: */
-    foreach (UIChooserNode *pNode, pParentItem->nodes(UIChooserItemType_Machine))
-        orders[strExtraDataKey] << QString("m=%1").arg(toOldStyleUuid(pNode->toMachineNode()->cache()->id()));
+    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserItemType_Machine))
+        if (UIChooserNodeMachine *pMachineNode = pNode->toMachineNode())
+            if (pMachineNode->cache()->itemType() == UIVirtualMachineItem::ItemType_Local)
+                orders[strExtraDataKey] << QString("m=%1").arg(toOldStyleUuid(pMachineNode->cache()->id()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.h

@@ -199 +199 @@
         void gatherGroupDefinitions(QMap<QString, QStringList> &definitions, UIChooserNode *pParentGroup);
         /** Gathers group @a orders of @a pParentGroup. */
-        void gatherGroupOrders(QMap<QString, QStringList> &orders, UIChooserNode *pParentItem);
+        void gatherGroupOrders(QMap<QString, QStringList> &orders, UIChooserNode *pParentGroup);
 
         /** Makes sure group definitions saving is finished. */