Changeset 86740 in vbox for trunk/src

Timestamp:

Oct 28, 2020 4:08:53 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Advanced search logic, allowing to find any kind of cloud entity, like provider, profile and machine.

Location:

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

Files:

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

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

@@ -1715 +1715 @@
 }
 
-UIChooserNode *UIChooserAbstractModel::searchProfileNode(const QString &strProviderShortName, const QString &strProfileName)
-{
-    /* Compose profile node ID: */
-    const QString strProfileNodeId = QString("/%1/%2").arg(strProviderShortName, strProfileName);
-
-    /* Search for a list of nodes matching required ID: */
+UIChooserNode *UIChooserAbstractModel::searchProviderNode(const QString &strProviderShortName)
+{
+    /* Search for a list of nodes matching passed name: */
+    QList<UIChooserNode*> providerNodes;
+    invisibleRoot()->searchForNodes(strProviderShortName,
+                                    UIChooserItemSearchFlag_CloudProvider | UIChooserItemSearchFlag_ExactName,
+                                    providerNodes);
+
+    /* Return 1st node if any: */
+    return providerNodes.value(0);
+}
+
+UIChooserNode *UIChooserAbstractModel::searchProfileNode(UIChooserNode *pProviderNode, const QString &strProfileName)
+{
+    AssertPtrReturn(pProviderNode, 0);
+
+    /* Search for a list of nodes matching passed name: */
     QList<UIChooserNode*> profileNodes;
-    invisibleRoot()->searchForNodes(strProfileNodeId, UIChooserItemSearchFlag_CloudProfile | UIChooserItemSearchFlag_ExactId, profileNodes);
+    pProviderNode->searchForNodes(strProfileName,
+                                  UIChooserItemSearchFlag_CloudProfile | UIChooserItemSearchFlag_ExactName,
+                                  profileNodes);
 
     /* Return 1st node if any: */
@@ -1728 +1741 @@
 }
 
+UIChooserNode *UIChooserAbstractModel::searchProfileNode(const QString &strProviderShortName, const QString &strProfileName)
+{
+    /* Wrap method above: */
+    return searchProfileNode(searchProviderNode(strProviderShortName), strProfileName);
+}
+
+UIChooserNode *UIChooserAbstractModel::searchMachineNode(UIChooserNode *pProfileNode, const QUuid &uMachineId)
+{
+    AssertPtrReturn(pProfileNode, 0);
+
+    /* Search for a list of nodes matching passed ID: */
+    QList<UIChooserNode*> machineNodes;
+    pProfileNode->searchForNodes(uMachineId.toString(),
+                                 UIChooserItemSearchFlag_Machine | UIChooserItemSearchFlag_ExactId,
+                                 machineNodes);
+
+    /* Return 1st node if any: */
+    return machineNodes.value(0);
+}
+
+UIChooserNode *UIChooserAbstractModel::searchMachineNode(const QString &strProviderShortName, const QString &strProfileName, const QUuid &uMachineId)
+{
+    /* Wrap method above: */
+    return searchMachineNode(searchProfileNode(strProviderShortName, strProfileName), uMachineId);
+}
+
 UIChooserNode *UIChooserAbstractModel::searchFakeNode(UIChooserNode *pProfileNode)
 {
-    /* Search for a list of nodes matching null ID: */
-    QList<UIChooserNode*> fakeNodes;
-    pProfileNode->searchForNodes(QUuid().toString(), UIChooserItemSearchFlag_Machine | UIChooserItemSearchFlag_ExactId, fakeNodes);
-
-    /* Return 1st node if any: */
-    return fakeNodes.value(0);
+    /* Wrap method above: */
+    return searchMachineNode(pProfileNode, QUuid());
+}
+
+UIChooserNode *UIChooserAbstractModel::searchFakeNode(const QString &strProviderShortName, const QString &strProfileName)
+{
+    /* Wrap method above: */
+    return searchMachineNode(strProviderShortName, strProfileName, QUuid());
 }
 

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

@@ -345 +345 @@
     /** @name Cloud stuff.
       * @{ */
+        /** Searches for provider node with passed @a strProviderShortName. */
+        UIChooserNode *searchProviderNode(const QString &strProviderShortName);
+
+        /** Searches for profile node with passed @a strProfileName under passed @a pProviderNode. */
+        UIChooserNode *searchProfileNode(UIChooserNode *pProviderNode, const QString &strProfileName);
         /** Searches for profile node with passed @a strProviderShortName and @a strProfileName. */
         UIChooserNode *searchProfileNode(const QString &strProviderShortName, const QString &strProfileName);
+
+        /** Searches for machine node with passed @a uMachineId under passed @a pProfileNode. */
+        UIChooserNode *searchMachineNode(UIChooserNode *pProfileNode, const QUuid &uMachineId);
+        /** Searches for machine with passed @a strProviderShortName, @a strProfileName and @a uMachineId. */
+        UIChooserNode *searchMachineNode(const QString &strProviderShortName, const QString &strProfileName, const QUuid &uMachineId);
+
         /** Searches for fake node under passed @a pProfileNode. */
         UIChooserNode *searchFakeNode(UIChooserNode *pProfileNode);
+        /** Searches for fake with passed @a strProviderShortName and @a strProfileName. */
+        UIChooserNode *searchFakeNode(const QString &strProviderShortName, const QString &strProfileName);
     /** @} */