Changeset 84378 in vbox for trunk

Timestamp:

May 19, 2020 6:23:26 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Finally we can save local, provider and profile group items to be able to collisions on restoring their definitions; This should help us to distinguish local groups from provider and profiles with similar names.

Location:

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

Files:

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

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

@@ -328 +328 @@
         case NodeDef_MachinePrefix:        return "m";
         /* Group nodes: */
-        case NodeDef_GroupPrefix:          return "g";
+        case NodeDef_GroupPrefixLocal:     return "g";
+        case NodeDef_GroupPrefixProvider:  return "p";
+        case NodeDef_GroupPrefixProfile:   return "a";
         case NodeDef_GroupOptionOpened:    return "o";
     }
@@ -717 +719 @@
 
     /* Prepare required group definition reg-exp: */
-    const QString strNodePrefix = definitionOption(NodeDef_GroupPrefix);
+    const QString strNodePrefixLocal = definitionOption(NodeDef_GroupPrefixLocal);
+    const QString strNodePrefixProvider = definitionOption(NodeDef_GroupPrefixProvider);
+    const QString strNodePrefixProfile = definitionOption(NodeDef_GroupPrefixProfile);
     const QString strNodeOptionOpened = definitionOption(NodeDef_GroupOptionOpened);
-    const QString strDefinitionTemplate = QString("%1(\\S)*=%2").arg(strNodePrefix, strName);
+    const QString strDefinitionTemplate = QString("[%1%2%3](\\S)*=%4").arg(strNodePrefixLocal,
+                                                                           strNodePrefixProvider,
+                                                                           strNodePrefixProfile,
+                                                                           strName);
     const QRegExp definitionRegExp(strDefinitionTemplate);
     /* For each the group definition: */

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

@@ -72 +72 @@
         NodeDef_GlobalValueDefault,
         NodeDef_MachinePrefix,
-        NodeDef_GroupPrefix,
+        NodeDef_GroupPrefixLocal,
+        NodeDef_GroupPrefixProvider,
+        NodeDef_GroupPrefixProfile,
         NodeDef_GroupOptionOpened,
     };

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

@@ -221 +221 @@
     const QString strItemType = strDefinition.section('=', 0, 0);
     const QString strItemDescriptor = strDefinition.section('=', 1, -1);
-    /* Its a group-item definition? */
-    if (strItemType == definitionOption(NodeDef_GroupPrefix))
+    /* Its a local group-item definition? */
+    if (strItemType == definitionOption(NodeDef_GroupPrefixLocal))
     {
         /* Search for group-item with passed descriptor (name): */
         pItem = root()->searchForItem(strItemDescriptor,
                                       UIChooserItemSearchFlag_LocalGroup |
+                                      UIChooserItemSearchFlag_ExactId);
+    }
+    /* Its a provider group-item definition? */
+    else if (strItemType == definitionOption(NodeDef_GroupPrefixProvider))
+    {
+        /* Search for group-item with passed descriptor (name): */
+        pItem = root()->searchForItem(strItemDescriptor,
                                       UIChooserItemSearchFlag_CloudProvider |
+                                      UIChooserItemSearchFlag_ExactId);
+    }
+    /* Its a profile group-item definition? */
+    else if (strItemType == definitionOption(NodeDef_GroupPrefixProfile))
+    {
+        /* Search for group-item with passed descriptor (name): */
+        pItem = root()->searchForItem(strItemDescriptor,
                                       UIChooserItemSearchFlag_CloudProfile |
                                       UIChooserItemSearchFlag_ExactId);

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

@@ -108 +108 @@
 QString UIChooserNodeGroup::definition(bool fFull /* = false */) const
 {
-    const QString strNodePrefix = UIChooserAbstractModel::definitionOption(UIChooserAbstractModel::NodeDef_GroupPrefix);
+    QString strNodePrefix;
+    switch (groupType())
+    {
+        case UIChooserNodeGroupType_Local:
+            strNodePrefix = UIChooserAbstractModel::definitionOption(UIChooserAbstractModel::NodeDef_GroupPrefixLocal);
+            break;
+        case UIChooserNodeGroupType_Provider:
+            strNodePrefix = UIChooserAbstractModel::definitionOption(UIChooserAbstractModel::NodeDef_GroupPrefixProvider);
+            break;
+        case UIChooserNodeGroupType_Profile:
+            strNodePrefix = UIChooserAbstractModel::definitionOption(UIChooserAbstractModel::NodeDef_GroupPrefixProfile);
+            break;
+    }
     const QString strNodeOptionOpened = UIChooserAbstractModel::definitionOption(UIChooserAbstractModel::NodeDef_GroupOptionOpened);
     return   fFull