Changeset 84434 in vbox

Timestamp:

May 21, 2020 2:44:56 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: A bit of cleanup in extra-data options code for global/group nodes; Some refactoring and separate handling for particular group type.

Location:

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

Files:

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

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

@@ -70 +70 @@
         /* Create global node: */
         new UIChooserNodeGlobal(invisibleRoot() /* parent */,
-                                isGlobalNodeFavorite(invisibleRoot()),
+                                shouldGlobalNodeBeFavorite(invisibleRoot()),
                                 0 /* position */,
                                 QString() /* tip */);
@@ -141 +141 @@
                                        UIChooserNodeGroupType_Provider,
                                        shouldGroupNodeBeOpened(invisibleRoot(),
+                                                               UIChooserNodeDataPrefixType_Provider,
                                                                strProviderShortName));
 
@@ -165 +166 @@
                                            UIChooserNodeGroupType_Profile,
                                            shouldGroupNodeBeOpened(pProviderNode,
+                                                                   UIChooserNodeDataPrefixType_Profile,
                                                                    strProfileName));
 
@@ -697 +699 @@
                                strSecondSubName,
                                UIChooserNodeGroupType_Local,
-                               fAllGroupsOpened || shouldGroupNodeBeOpened(pParentNode, strSecondSubName));
+                               fAllGroupsOpened || shouldGroupNodeBeOpened(pParentNode,
+                                                                           UIChooserNodeDataPrefixType_Local,
+                                                                           strSecondSubName));
     return strSecondSuffix.isEmpty() ? pNewGroupNode : getLocalGroupNode(strFirstSuffix, pNewGroupNode, fAllGroupsOpened);
 }
@@ -740 +744 @@
 }
 
-bool UIChooserAbstractModel::shouldGroupNodeBeOpened(UIChooserNode *pParentNode, const QString &strName)
+bool UIChooserAbstractModel::shouldGroupNodeBeOpened(UIChooserNode *pParentNode,
+                                                     UIChooserNodeDataPrefixType enmDataType,
+                                                     const QString &strName) const
 {
     /* Read group definitions: */
@@ -749 +755 @@
 
     /* Prepare required group definition reg-exp: */
-    const QString strNodePrefixLocal = prefixToString(UIChooserNodeDataPrefixType_Local);
-    const QString strNodePrefixProvider = prefixToString(UIChooserNodeDataPrefixType_Provider);
-    const QString strNodePrefixProfile = prefixToString(UIChooserNodeDataPrefixType_Profile);
+    const QString strNodePrefix = prefixToString(enmDataType);
     const QString strNodeOptionOpened = optionToString(UIChooserNodeDataOptionType_GroupOpened);
-    const QString strDefinitionTemplate = QString("[%1%2%3](\\S)*=%4").arg(strNodePrefixLocal,
-                                                                           strNodePrefixProvider,
-                                                                           strNodePrefixProfile,
-                                                                           strName);
+    const QString strDefinitionTemplate = QString("%1(\\S)*=%2").arg(strNodePrefix, strName);
     const QRegExp definitionRegExp(strDefinitionTemplate);
     /* For each the group definition: */
@@ -775 +776 @@
 }
 
-void UIChooserAbstractModel::wipeOutEmptyGroupsStartingFrom(UIChooserNode *pParent)
-{
-    /* Cleanup all the group-items recursively first: */
-    foreach (UIChooserNode *pNode, pParent->nodes(UIChooserNodeType_Group))
-        wipeOutEmptyGroupsStartingFrom(pNode);
-    /* If parent has no nodes: */
-    if (!pParent->hasNodes())
-    {
-        /* If that is non-root item: */
-        if (!pParent->isRoot())
-        {
-            /* Delete parent node and item: */
-            delete pParent;
-        }
-    }
-}
-
-bool UIChooserAbstractModel::isGlobalNodeFavorite(UIChooserNode *pParentNode) const
+bool UIChooserAbstractModel::shouldGlobalNodeBeFavorite(UIChooserNode *pParentNode) const
 {
     /* Read group definitions: */
@@ -821 +805 @@
     /* Return 'false' by default: */
     return false;
+}
+
+void UIChooserAbstractModel::wipeOutEmptyGroupsStartingFrom(UIChooserNode *pParent)
+{
+    /* Cleanup all the group-items recursively first: */
+    foreach (UIChooserNode *pNode, pParent->nodes(UIChooserNodeType_Group))
+        wipeOutEmptyGroupsStartingFrom(pNode);
+    /* If parent has no nodes: */
+    if (!pParent->hasNodes())
+    {
+        /* If that is non-root item: */
+        if (!pParent->isRoot())
+        {
+            /* Delete parent node and item: */
+            delete pParent;
+        }
+    }
 }
 

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

@@ -203 +203 @@
         UIChooserNode *getCloudGroupNode(const QString &strName, UIChooserNode *pParentNode, bool fAllGroupsOpened);
 
-        /** Returns whether group node with certain @a strName should be opened, searching starting from the passed @a pParentItem. */
-        bool shouldGroupNodeBeOpened(UIChooserNode *pParentNode, const QString &strName);
+        /** Returns whether group node * with specified @a enmDataType and @a strName should be opened,
+          * searching starting from the passed @a pParentNode. */
+        bool shouldGroupNodeBeOpened(UIChooserNode *pParentNode,
+                                     UIChooserNodeDataPrefixType enmDataType,
+                                     const QString &strName) const;
+        /** Returns whether global node should be favorite,
+          * searching starting from the passed @a pParentNode. */
+        bool shouldGlobalNodeBeFavorite(UIChooserNode *pParentNode) const;
 
         /** Wipes out empty groups starting from @a pParentItem. */
         void wipeOutEmptyGroupsStartingFrom(UIChooserNode *pParentNode);
-
-        /** Returns whether global node within the @a pParentNode is favorite. */
-        bool isGlobalNodeFavorite(UIChooserNode *pParentNode) const;
 
         /** Acquires desired position for a child of @a pParentNode with specified @a enmDataType and @a strName. */