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

Timestamp:

Jul 1, 2020 6:37:27 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Handle Cloud Profile Manager restriction changes at runtime now.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (5 diffs)
• UIChooserAbstractModel.h (modified) (1 diff)
• UIChooserModel.cpp (modified) (1 diff)
• UIChooserModel.h (modified) (1 diff)

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

@@ -724 +724 @@
     QList<UIChooserNode*> profileNodes;
     invisibleRoot()->searchForNodes(strProfileNodeName, UIChooserItemSearchFlag_CloudProfile | UIChooserItemSearchFlag_ExactId, profileNodes);
-    AssertReturnVoid(!profileNodes.isEmpty());
-    UIChooserNode *pProfileNode = profileNodes.first();
-    AssertPtrReturnVoid(pProfileNode);
+    UIChooserNode *pProfileNode = profileNodes.value(0);
+    if (!pProfileNode)
+        return;
 
     /* Search for fake node: */
@@ -732 +732 @@
     pProfileNode->searchForNodes(QUuid().toString(), UIChooserItemSearchFlag_Machine | UIChooserItemSearchFlag_ExactId, fakeNodes);
     UIChooserNode *pFakeNode = fakeNodes.value(0);
-    AssertPtrReturnVoid(pFakeNode);
+    if (!pFakeNode)
+        return;
 
     /* And if we have at least one cloud machine: */
@@ -755 +756 @@
         pFakeCloudMachineItem->setFakeCloudItemErrorMessage(pAcquiringTask->errorInfo());
     }
+}
+
+void UIChooserAbstractModel::sltHandleCloudProfileManagerRestrictionChange()
+{
+    /* Reload cloud tree: */
+    reloadCloudTree();
 }
 
@@ -796 +803 @@
             this, &UIChooserAbstractModel::sltStartGroupSaving,
             Qt::QueuedConnection);
+
+    /* Setup extra-data connections: */
+    connect(gEDataManager, &UIExtraDataManager::sigCloudProfileManagerRestrictionChange,
+            this, &UIChooserAbstractModel::sltHandleCloudProfileManagerRestrictionChange);
 }
 
@@ -848 +859 @@
 #ifdef VBOX_GUI_WITH_CLOUD_VMS
     LogRelFlow(("UIChooserAbstractModel: Loading cloud providers/profiles...\n"));
+
+    /* Wipe out existing cloud providers first.
+     * This is quite rude, in future we need to reimplement it more wise.. */
+    foreach (UIChooserNode *pNode, invisibleRoot()->nodes(UIChooserNodeType_Group))
+    {
+        AssertPtrReturnVoid(pNode);
+        UIChooserNodeGroup *pGroupNode = pNode->toGroupNode();
+        AssertPtrReturnVoid(pGroupNode);
+        if (pGroupNode->groupType() == UIChooserNodeGroupType_Provider)
+            delete pNode;
+    }
 
     /* Acquire Cloud Profile Manager restrictions: */

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

@@ -166 +166 @@
         /** Handles list cloud machines task complete signal. */
         virtual void sltHandleCloudListMachinesTaskComplete(UITask *pTask);
+        /** Handles Cloud Profile Manager restriction change. */
+        virtual void sltHandleCloudProfileManagerRestrictionChange();
     /** @} */
 

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

@@ -1157 +1157 @@
 
     /* Rebuild tree for main root: */
+    buildTreeForMainRoot(true /* preserve selection */);
+}
+
+void UIChooserModel::sltHandleCloudProfileManagerRestrictionChange()
+{
+    /* Call to base-class: */
+    UIChooserAbstractModel::sltHandleCloudProfileManagerRestrictionChange();
+
+    /* Build tree for main root: */
     buildTreeForMainRoot(true /* preserve selection */);
 }

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

@@ -278 +278 @@
         /** Handles list cloud machines task complete signal. */
         virtual void sltHandleCloudListMachinesTaskComplete(UITask *pTask) /* override */;
+        /** Handles Cloud Profile Manager restriction changes. */
+        virtual void sltHandleCloudProfileManagerRestrictionChange() /* override */;
     /** @} */