Changeset 53265 in vbox for trunk/src

Timestamp:

Nov 7, 2014 3:15:49 PM (10 years ago)

Author:

vboxsync

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

96833

Message:

FE/Qt: Selector UI: Chooser pane: Lookup mechanism optimization.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -560 +560 @@
     /* Restart timer to reset lookup-string: */
     m_pLookupTimer->start();
-    /* Look for item which is starting from the lookup-string: */
-    UIGChooserItem *pItem = mainRoot()->searchForItem(m_strLookupString + strLookupSymbol,
-                                                      UIGChooserItemSearchFlag_Machine |
-                                                      UIGChooserItemSearchFlag_Group);
-    /* If item found: */
+
+    /* Prepare item: */
+    UIGChooserItem *pItem = 0;
+
+    /* We are starting to look from the current position: */
+    int iCurrentIndex = navigationList().indexOf(currentItem());
+
+    /* Are we looking for the 1. same symbol or for the 2. composed word? */
+    const QString strLookupString = m_strLookupString.isEmpty() || m_strLookupString == strLookupSymbol ?
+                                    strLookupSymbol : m_strLookupString + strLookupSymbol;
+    /* Are we looking from the 1. subsequent position or from the 2. same one? */
+    const int     iFirstIndex     = m_strLookupString.isEmpty() || m_strLookupString == strLookupSymbol ?
+                                    iCurrentIndex + 1 : iCurrentIndex;
+
+    /* If first position feats the bounds: */
+    if (iFirstIndex < navigationList().size())
+    {
+        /* We have to look starting from the first position: */
+        for (int iIndex = iFirstIndex; iIndex < navigationList().size(); ++iIndex)
+        {
+            UIGChooserItem *pIteratedItem = navigationList().at(iIndex);
+            if (pIteratedItem->name().startsWith(strLookupString, Qt::CaseInsensitive))
+            {
+                pItem = pIteratedItem;
+                break;
+            }
+        }
+    }
+
+    /* If the item was not found: */
+    if (!pItem && iFirstIndex > 0)
+    {
+        /* We have to try to look from the beginning of the list: */
+        for (int iIndex = 0; iIndex < iFirstIndex; ++iIndex)
+        {
+            UIGChooserItem *pIteratedItem = navigationList().at(iIndex);
+            if (pIteratedItem->name().startsWith(strLookupString, Qt::CaseInsensitive))
+            {
+                pItem = pIteratedItem;
+                break;
+            }
+        }
+    }
+
+    /* If that item was found: */
     if (pItem)
     {
@@ -571 +611 @@
         setCurrentItem(pItem);
         /* Append lookup symbol: */
-        m_strLookupString += strLookupSymbol;
+        if (m_strLookupString != strLookupSymbol)
+            m_strLookupString += strLookupSymbol;
     }
 }