Changeset 84415 in vbox for trunk/src

Timestamp:

May 20, 2020 3:28:43 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Finally we can restore local, provider and profile group items to be able to avoid name collisions; This a missed part of the r138073 commit.

Location:

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

Files:

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

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

@@ -136 +136 @@
                                        false /* favorite */,
                                        getDesiredNodePosition(invisibleRoot(),
-                                                              UIChooserNodeType_Group,
+                                                              UIChooserNodeDataPrefixType_Provider,
                                                               strProviderShortName),
                                        strProviderShortName,
@@ -160 +160 @@
                                            false /* favorite */,
                                            getDesiredNodePosition(pProviderNode,
-                                                                  UIChooserNodeType_Group,
+                                                                  UIChooserNodeDataPrefixType_Profile,
                                                                   strProfileName),
                                            strProfileName,
@@ -692 +692 @@
         new UIChooserNodeGroup(pParentNode,
                                false /* favorite */,
-                               getDesiredNodePosition(pParentNode, UIChooserNodeType_Group, strSecondSubName),
+                               getDesiredNodePosition(pParentNode,
+                                                      UIChooserNodeDataPrefixType_Local,
+                                                      strSecondSubName),
                                strSecondSubName,
                                UIChooserNodeGroupType_Local,
@@ -821 +823 @@
 }
 
-int UIChooserAbstractModel::getDesiredNodePosition(UIChooserNode *pParentNode, UIChooserNodeType enmType, const QString &strName)
+int UIChooserAbstractModel::getDesiredNodePosition(UIChooserNode *pParentNode,
+                                                   UIChooserNodeDataPrefixType enmDataType,
+                                                   const QString &strName)
 {
     /* End of list (by default)? */
     int iNewNodeDesiredPosition = -1;
     /* Which position should be new node placed by definitions: */
-    int iNewNodeDefinitionPosition = getDefinedNodePosition(pParentNode, enmType, strName);
+    const int iNewNodeDefinitionPosition = getDefinedNodePosition(pParentNode, enmDataType, strName);
 
     /* If some position wanted: */
@@ -834 +838 @@
         iNewNodeDesiredPosition = 0;
         /* We have to check all the existing node positions: */
-        QList<UIChooserNode*> nodes = pParentNode->nodes(enmType);
+        UIChooserNodeType enmType = UIChooserNodeType_Any;
+        switch (enmDataType)
+        {
+            case UIChooserNodeDataPrefixType_Global:   enmType = UIChooserNodeType_Global; break;
+            case UIChooserNodeDataPrefixType_Machine:  enmType = UIChooserNodeType_Machine; break;
+            case UIChooserNodeDataPrefixType_Local:
+            case UIChooserNodeDataPrefixType_Provider:
+            case UIChooserNodeDataPrefixType_Profile:  enmType = UIChooserNodeType_Group; break;
+        }
+        const QList<UIChooserNode*> nodes = pParentNode->nodes(enmType);
         for (int i = nodes.size() - 1; i >= 0; --i)
         {
@@ -841 +854 @@
             AssertPtrReturn(pNode, iNewNodeDesiredPosition);
             /* Which position should be current node placed by definitions? */
-            QString strDefinitionName = pNode->type() == UIChooserNodeType_Group ? pNode->name()
-                                      : pNode->type() == UIChooserNodeType_Machine ? toOldStyleUuid(pNode->toMachineNode()->id())
-                                      : QString();
-            AssertReturn(!strDefinitionName.isEmpty(), iNewNodeDesiredPosition);
-            int iNodeDefinitionPosition = getDefinedNodePosition(pParentNode, enmType, strDefinitionName);
+            UIChooserNodeDataPrefixType enmNodeDataType = UIChooserNodeDataPrefixType_Global;
+            QString strDefinitionName;
+            switch (pNode->type())
+            {
+                case UIChooserNodeType_Machine:
+                {
+                    enmNodeDataType = UIChooserNodeDataPrefixType_Machine;
+                    strDefinitionName = toOldStyleUuid(pNode->toMachineNode()->id());
+                    break;
+                }
+                case UIChooserNodeType_Group:
+                {
+                    /* Cast to group node: */
+                    UIChooserNodeGroup *pGroupNode = pNode->toGroupNode();
+                    AssertPtrReturn(pGroupNode, iNewNodeDesiredPosition);
+                    switch (pGroupNode->groupType())
+                    {
+                        case UIChooserNodeGroupType_Local:    enmNodeDataType = UIChooserNodeDataPrefixType_Local; break;
+                        case UIChooserNodeGroupType_Provider: enmNodeDataType = UIChooserNodeDataPrefixType_Provider; break;
+                        case UIChooserNodeGroupType_Profile:  enmNodeDataType = UIChooserNodeDataPrefixType_Profile; break;
+                        default: break;
+                    }
+                    strDefinitionName = pNode->name();
+                    break;
+                }
+                default:
+                    break;
+            }
+            const int iNodeDefinitionPosition = getDefinedNodePosition(pParentNode, enmNodeDataType, strDefinitionName);
             /* If some position wanted: */
             if (iNodeDefinitionPosition != -1)
@@ -863 +900 @@
 }
 
-int UIChooserAbstractModel::getDefinedNodePosition(UIChooserNode *pParentNode, UIChooserNodeType enmType, const QString &strName)
+int UIChooserAbstractModel::getDefinedNodePosition(UIChooserNode *pParentNode, UIChooserNodeDataPrefixType enmDataType, const QString &strName)
 {
     /* Read group definitions: */
@@ -874 +911 @@
     QString strDefinitionTemplateShort;
     QString strDefinitionTemplateFull;
-    switch (enmType)
-    {
-        case UIChooserNodeType_Group:
-        {
-            const QString strNodePrefixLocal = prefixToString(UIChooserNodeDataPrefixType_Local);
-            const QString strNodePrefixProvider = prefixToString(UIChooserNodeDataPrefixType_Provider);
-            const QString strNodePrefixProfile = prefixToString(UIChooserNodeDataPrefixType_Profile);
+    const QString strNodePrefixLocal = prefixToString(UIChooserNodeDataPrefixType_Local);
+    const QString strNodePrefixProvider = prefixToString(UIChooserNodeDataPrefixType_Provider);
+    const QString strNodePrefixProfile = prefixToString(UIChooserNodeDataPrefixType_Profile);
+    const QString strNodePrefixMachine = prefixToString(UIChooserNodeDataPrefixType_Machine);
+    switch (enmDataType)
+    {
+        case UIChooserNodeDataPrefixType_Local:
+        {
             strDefinitionTemplateShort = QString("^[%1%2%3](\\S)*=").arg(strNodePrefixLocal, strNodePrefixProvider, strNodePrefixProfile);
-            strDefinitionTemplateFull = QString("^[%1%2%3](\\S)*=%4$").arg(strNodePrefixLocal, strNodePrefixProvider, strNodePrefixProfile, strName);
+            strDefinitionTemplateFull = QString("^%1(\\S)*=%2$").arg(strNodePrefixLocal, strName);
             break;
         }
-        case UIChooserNodeType_Machine:
-        {
-            const QString strNodePrefix = prefixToString(UIChooserNodeDataPrefixType_Machine);
-            strDefinitionTemplateShort = QString("^%1=").arg(strNodePrefix);
-            strDefinitionTemplateFull = QString("^%1=%2$").arg(strNodePrefix, strName);
+        case UIChooserNodeDataPrefixType_Provider:
+        {
+            strDefinitionTemplateShort = QString("^[%1%2%3](\\S)*=").arg(strNodePrefixLocal, strNodePrefixProvider, strNodePrefixProfile);
+            strDefinitionTemplateFull = QString("^%1(\\S)*=%2$").arg(strNodePrefixProvider, strName);
+            break;
+        }
+        case UIChooserNodeDataPrefixType_Profile:
+        {
+            strDefinitionTemplateShort = QString("^[%1%2%3](\\S)*=").arg(strNodePrefixLocal, strNodePrefixProvider, strNodePrefixProfile);
+            strDefinitionTemplateFull = QString("^%1(\\S)*=%2$").arg(strNodePrefixProfile, strName);
+            break;
+        }
+        case UIChooserNodeDataPrefixType_Machine:
+        {
+            strDefinitionTemplateShort = QString("^%1=").arg(strNodePrefixMachine);
+            strDefinitionTemplateFull = QString("^%1=%2$").arg(strNodePrefixMachine, strName);
             break;
         }
@@ -921 +970 @@
                              false /* favorite */,
                              getDesiredNodePosition(pParentNode,
-                                                    UIChooserNodeType_Machine,
+                                                    UIChooserNodeDataPrefixType_Machine,
                                                     toOldStyleUuid(comMachine.GetId())),
                              comMachine);
@@ -931 +980 @@
                                                            false /* favorite */,
                                                            getDesiredNodePosition(pParentNode,
-                                                                                  UIChooserNodeType_Machine,
+                                                                                  UIChooserNodeDataPrefixType_Machine,
                                                                                   toOldStyleUuid(comMachine.GetId())),
                                                            comMachine);

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

@@ -212 +212 @@
         bool isGlobalNodeFavorite(UIChooserNode *pParentNode) const;
 
-        /** Acquires desired position for a child of @a pParentNode with specified @a enmType and @a strName. */
-        int getDesiredNodePosition(UIChooserNode *pParentNode, UIChooserNodeType enmType, const QString &strName);
-        /** Acquires defined position for a child of @a pParentNode with specified @a enmType and @a strName. */
-        int getDefinedNodePosition(UIChooserNode *pParentNode, UIChooserNodeType enmType, const QString &strName);
+        /** Acquires desired position for a child of @a pParentNode with specified @a enmDataType and @a strName. */
+        int getDesiredNodePosition(UIChooserNode *pParentNode, UIChooserNodeDataPrefixType enmDataType, const QString &strName);
+        /** Acquires defined position for a child of @a pParentNode with specified @a enmDataType and @a strName. */
+        int getDefinedNodePosition(UIChooserNode *pParentNode, UIChooserNodeDataPrefixType enmDataType, const QString &strName);
 
         /** Creates local machine node based on certain @a comMachine as a child of specified @a pParentNode. */