Changeset 86744 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 28, 2020 5:35:28 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Separate search possibility by id and full-name; Previously search by id for groups was checking full-names.

Location:

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

Files:

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

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

@@ -473 +473 @@
     QList<UIChooserNode*> groupNodes;
     invisibleRoot()->searchForNodes(strFullName,
-                                    UIChooserItemSearchFlag_LocalGroup | UIChooserItemSearchFlag_ExactId,
+                                    UIChooserItemSearchFlag_LocalGroup | UIChooserItemSearchFlag_FullName,
                                     groupNodes);
 

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

@@ -84 +84 @@
     UIChooserItemSearchFlag_CloudProfile  = RT_BIT(4),
     UIChooserItemSearchFlag_ExactId       = RT_BIT(5),
-    UIChooserItemSearchFlag_ExactName     = RT_BIT(6)
+    UIChooserItemSearchFlag_ExactName     = RT_BIT(6),
+    UIChooserItemSearchFlag_FullName      = RT_BIT(7),
 };
 

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

@@ -522 +522 @@
         if (iSearchFlags & UIChooserItemSearchFlag_ExactId)
         {
-            /* Exact full-name matches? */
-            if (fullName() == strSearchTag)
+            /* Exact ID matches? */
+            if (id().toString() == strSearchTag)
                 return this;
         }
@@ -531 +531 @@
             /* Exact name matches? */
             if (name() == strSearchTag)
+                return this;
+        }
+        /* Are we searching by the full name? */
+        else if (iSearchFlags & UIChooserItemSearchFlag_FullName)
+        {
+            /* Full name matches? */
+            if (fullName() == strSearchTag)
                 return this;
         }

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

@@ -481 +481 @@
         pItem = root()->searchForItem(strItemDescriptor,
                                       UIChooserItemSearchFlag_LocalGroup |
-                                      UIChooserItemSearchFlag_ExactId);
+                                      UIChooserItemSearchFlag_FullName);
     }
     /* Its a provider group-item definition? */
@@ -489 +489 @@
         pItem = root()->searchForItem(strItemDescriptor,
                                       UIChooserItemSearchFlag_CloudProvider |
-                                      UIChooserItemSearchFlag_ExactId);
+                                      UIChooserItemSearchFlag_FullName);
     }
     /* Its a profile group-item definition? */
@@ -497 +497 @@
         pItem = root()->searchForItem(strItemDescriptor,
                                       UIChooserItemSearchFlag_CloudProfile |
-                                      UIChooserItemSearchFlag_ExactId);
+                                      UIChooserItemSearchFlag_FullName);
     }
     /* Its a global-item definition? */
@@ -802 +802 @@
         UIChooserItem *pTargetItem = root()->searchForItem(strName,
                                                            UIChooserItemSearchFlag_LocalGroup |
-                                                           UIChooserItemSearchFlag_ExactId);
+                                                           UIChooserItemSearchFlag_FullName);
         AssertPtrReturnVoid(pTargetItem);
         pTargetGroupItem = pTargetItem->toGroupItem();

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

@@ -242 +242 @@
         else
         {
-            /* If exact ID flag specified => check full node name: */
+            /* If exact ID flag specified => check node ID: */
             if (iSearchFlags & UIChooserItemSearchFlag_ExactId)
             {
-                if (fullName() == strSearchTerm)
+                if (id().toString() == strSearchTerm)
                     matchedItems << this;
             }
@@ -252 +252 @@
             {
                 if (name() == strSearchTerm)
+                    matchedItems << this;
+            }
+            /* If full name flag specified => check full node name: */
+            else if (iSearchFlags & UIChooserItemSearchFlag_FullName)
+            {
+                if (fullName() == strSearchTerm)
                     matchedItems << this;
             }