Changeset 83317 in vbox

Timestamp:

Mar 18, 2020 12:55:34 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136501

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Possibility to search item by id.

Location:

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

Files:

• UIChooserDefs.h (modified) (1 diff)
• UIChooserItemGlobal.cpp (modified) (1 diff)
• UIChooserItemGroup.cpp (modified) (1 diff)
• UIChooserItemMachine.cpp (modified) (1 diff)

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

@@ -45 +45 @@
     UIChooserItemSearchFlag_Global    = RT_BIT(1),
     UIChooserItemSearchFlag_Group     = RT_BIT(2),
-    UIChooserItemSearchFlag_ExactName = RT_BIT(3)
+    UIChooserItemSearchFlag_ExactId   = RT_BIT(3),
+    UIChooserItemSearchFlag_ExactName = RT_BIT(4)
 };
 

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

@@ -207 +207 @@
 UIChooserItem *UIChooserItemGlobal::searchForItem(const QString &, int iItemSearchFlags)
 {
-    /* Ignoring if we are not searching for the global-item? */
+    /* Ignore if we are not searching for the global-item: */
     if (!(iItemSearchFlags & UIChooserItemSearchFlag_Global))
         return 0;

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

@@ -483 +483 @@
     if (iItemSearchFlags & UIChooserItemSearchFlag_Group)
     {
+        /* Are we searching by the exact ID? */
+        if (iItemSearchFlags & UIChooserItemSearchFlag_ExactId)
+        {
+            // Groups doesn't have IDs, but we should prevent
+            // search procedure from going to 'else' path..
+        }
         /* Are we searching by the exact name? */
-        if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
+        else if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
         {
             /* Exact name matches? */

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

@@ -241 +241 @@
 UIChooserItem* UIChooserItemMachine::searchForItem(const QString &strSearchTag, int iItemSearchFlags)
 {
-    /* Ignoring if we are not searching for the machine-item? */
+    /* Ignore if we are not searching for the machine-item: */
     if (!(iItemSearchFlags & UIChooserItemSearchFlag_Machine))
         return 0;
 
+    /* Are we searching by the exact ID? */
+    if (iItemSearchFlags & UIChooserItemSearchFlag_ExactId)
+    {
+        /* Exact ID doesn't match? */
+        if (id() != QUuid(strSearchTag))
+            return 0;
+    }
     /* Are we searching by the exact name? */
-    if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
+    else if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
     {
         /* Exact name doesn't match? */