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

Timestamp:

Apr 22, 2020 11:27:59 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Add/remove fake profile nodes when (un)registering cloud machines to make sure profile is never empty.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (3 diffs)
• UIChooserModel.cpp (modified) (2 diffs)

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

@@ -409 +409 @@
                                                        const QUuid &uMachineId, const bool fRegistered)
 {
+    /* Compose full group name: */
+    const QString strGroupName = QString("/%1/%2").arg(strProviderShortName, strProfileName);
+
     /* Existing VM unregistered? */
     if (!fRegistered)
@@ -414 +417 @@
         /* Remove machine-items with passed id: */
         invisibleRoot()->removeAllNodes(uMachineId);
-        /// @todo make sure there is fake item if no real item exist, never wipe out empty groups ..
     }
     /* New VM registered? */
@@ -420 +422 @@
     {
         /* Add new machine-item: */
-        const QString strGroupName = QString("/%1/%2").arg(strProviderShortName, strProfileName);
         const CCloudMachine comMachine = cloudMachineById(strProviderShortName, strProfileName, uMachineId);
         addCloudMachineIntoTheTree(strGroupName, comMachine, true /* make it visible */);
-        /// @todo make sure there is no fake item if at least one real item exists ..
+    }
+
+    /* Search for corresponding profile node: */
+    QList<UIChooserNode*> profileNodes;
+    invisibleRoot()->searchForNodes(strGroupName, UIChooserItemSearchFlag_Group | UIChooserItemSearchFlag_ExactId, profileNodes);
+    if (!profileNodes.isEmpty())
+    {
+        /* Acquire corresponding profile node: */
+        UIChooserNodeGroup *pProfileNode = profileNodes.first()->toGroupNode();
+        if (pProfileNode)
+        {
+            /* Add fake cloud VM item if necessary: */
+            if (!fRegistered && pProfileNode->nodes(UIChooserNodeType_Machine).isEmpty())
+            {
+                UIChooserNodeMachine *pFakeNode = new UIChooserNodeMachine(pProfileNode /* parent */,
+                                                                           false /* favorite */,
+                                                                           0 /* position */);
+                pFakeNode->toMachineNode()->cache()->toCloud()->setFakeCloudItemState(UIVirtualMachineItemCloud::FakeCloudItemState_Done);
+                pFakeNode->toMachineNode()->cache()->toCloud()->recache();
+            }
+            /* Remove fake cloud VM item otherwise: */
+            else if (fRegistered && !pProfileNode->nodes(UIChooserNodeType_Machine).isEmpty())
+            {
+                /* Search for corresponding fake node: */
+                QList<UIChooserNode*> fakeNodes;
+                pProfileNode->searchForNodes(toOldStyleUuid(QUuid()), UIChooserItemSearchFlag_Machine | UIChooserItemSearchFlag_ExactId, fakeNodes);
+                if (!fakeNodes.isEmpty())
+                    delete fakeNodes.first();
+            }
+        }
     }
 }

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

@@ -686 +686 @@
     if (!fRegistered)
     {
-        /* Update tree for main root: */
-        updateTreeForMainRoot();
+        /* Rebuild tree for main root: */
+        buildTreeForMainRoot();
     }
     /* New VM registered? */
@@ -1735 +1735 @@
         // Hehey! Now we have to remove deleted VM nodes and then update tree for the main root node
         // ourselves cause there is no corresponding event yet. So we are calling actual handler to do that.
-        sltCloudMachineRegistered(QString() /* provider name */,
-                                  QString() /* profile name */,
+        UIChooserItem *pItem = root()->searchForItem(uId.toString(),
+                                                     UIChooserItemSearchFlag_Machine |
+                                                     UIChooserItemSearchFlag_ExactId);
+        AssertPtrReturnVoid(pItem);
+        AssertReturnVoid(pItem->node()->toMachineNode()->cache()->itemType() == UIVirtualMachineItem::ItemType_CloudReal);
+        AssertPtrReturnVoid(pItem->parentItem());
+        AssertPtrReturnVoid(pItem->parentItem()->parentItem());
+        const QString strProviderShortName = pItem->parentItem()->parentItem()->name();
+        const QString strProfileName = pItem->parentItem()->name();
+        sltCloudMachineRegistered(strProviderShortName,
+                                  strProfileName,
                                   uId /* machine ID */,
                                   false /* registered? */);