Changeset 84401 in vbox for trunk/src/VBox

Timestamp:

May 20, 2020 1:54:41 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Reuse stuff implemented in r138071; That's missed part allowing to restore local, provider and profile groups.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp (modified) (1 diff)

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

@@ -856 +856 @@
     {
         case UIChooserNodeType_Group:
-            strDefinitionTemplateShort = QString("^g(\\S)*=");
-            strDefinitionTemplateFull = QString("^g(\\S)*=%1$").arg(strName);
+        {
+            const QString strNodePrefixLocal = definitionOption(NodeDef_GroupPrefixLocal);
+            const QString strNodePrefixProvider = definitionOption(NodeDef_GroupPrefixProvider);
+            const QString strNodePrefixProfile = definitionOption(NodeDef_GroupPrefixProfile);
+            strDefinitionTemplateShort = QString("^[%1%2%3](\\S)*=").arg(strNodePrefixLocal, strNodePrefixProvider, strNodePrefixProfile);
+            strDefinitionTemplateFull = QString("^[%1%2%3](\\S)*=%4$").arg(strNodePrefixLocal, strNodePrefixProvider, strNodePrefixProfile, strName);
             break;
+        }
         case UIChooserNodeType_Machine:
-            strDefinitionTemplateShort = QString("^m=");
-            strDefinitionTemplateFull = QString("^m=%1$").arg(strName);
+        {
+            const QString strNodePrefix = definitionOption(NodeDef_MachinePrefix);
+            strDefinitionTemplateShort = QString("^%1=").arg(strNodePrefix);
+            strDefinitionTemplateFull = QString("^%1=%2$").arg(strNodePrefix, strName);
             break;
-        default: return -1;
+        }
+        default:
+            return -1;
     }
     QRegExp definitionRegExpShort(strDefinitionTemplateShort);