Changeset 77948 in vbox

Timestamp:

Mar 29, 2019 10:46:10 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: A bit of cleanup for search functionality, split it and move abstract part from UIChooserModel to UIChooserAbstractModel.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (1 diff)
• UIChooserAbstractModel.h (modified) (2 diffs)
• UIChooserModel.cpp (modified) (3 diffs)
• UIChooserModel.h (modified) (2 diffs)
• UIChooserView.cpp (modified) (1 diff)

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

@@ -108 +108 @@
         strResult += " " + QString::number(iMinimumPossibleNumber);
     return strResult;
+}
+
+void UIChooserAbstractModel::performSearch(const QString &strSearchTerm, int iItemSearchFlags)
+{
+    /* Make sure invisible root exists: */
+    AssertPtrReturnVoid(invisibleRoot());
+
+    /* Currently we perform the search only for machines, when this to be changed make
+     * sure the disabled flags of the other item types are also managed correctly. */
+
+    /* Reset the search first to erase the disabled flag,
+     * this also returns a full list of all machine nodes: */
+    const QList<UIChooserNode*> nodes = resetSearch();
+
+    /* Stop here if no search conditions specified: */
+    if (strSearchTerm.isEmpty())
+        return;
+
+    /* Search for all the nodes matching required condition: */
+    invisibleRoot()->searchForNodes(strSearchTerm, iItemSearchFlags, m_searchResults);
+
+    /* Assign/reset the disabled flag for required nodes: */
+    foreach (UIChooserNode *pNode, nodes)
+    {
+        if (!pNode)
+            continue;
+        pNode->setDisabled(!m_searchResults.contains(pNode));
+    }
+}
+
+QList<UIChooserNode*> UIChooserAbstractModel::resetSearch()
+{
+    /* Prepare resulting nodes: */
+    QList<UIChooserNode*> nodes;
+
+    /* Make sure invisible root exists: */
+    AssertPtrReturn(invisibleRoot(), nodes);
+
+    /* Calling UIChooserNode::searchForNodes with an empty search string
+     * returns a list all nodes (of the whole tree) of the required type: */
+    invisibleRoot()->searchForNodes(QString(), UIChooserItemSearchFlag_Machine, nodes);
+
+    /* Reset the disabled flag of the nodes first: */
+    foreach (UIChooserNode *pNode, nodes)
+    {
+        if (!pNode)
+            continue;
+        pNode->setDisabled(false);
+    }
+
+    /* Reset the search result related data: */
+    m_searchResults.clear();
+
+    /* Return  nodes: */
+    return nodes;
+}
+
+QList<UIChooserNode*> UIChooserAbstractModel::searchResult() const
+{
+    return m_searchResults;
 }
 

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

@@ -80 +80 @@
     /** @} */
 
+    /** @name Search stuff.
+      * @{ */
+        /** Performs a search starting from the m_pInvisibleRootNode. */
+        virtual void performSearch(const QString &strSearchTerm, int iItemSearchFlags);
+        /** Cleans the search result data members and disables item's visual effects.
+          * Also returns a list of all nodes which may be utilized by the calling code. */
+        virtual QList<UIChooserNode*> resetSearch();
+        /** Returns search result. */
+        QList<UIChooserNode*> searchResult() const;
+    /** @} */
+
     /** @name Group saving stuff.
       * @{ */
@@ -195 +206 @@
     /** @} */
 
+    /** @name Search stuff.
+      * @{ */
+        /** Stores the results of the current search. */
+        QList<UIChooserNode*>  m_searchResults;
+    /** @} */
+
     /** @name Group saving stuff.
       * @{ */

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

@@ -63 +63 @@
     , m_pContextMenuGroup(0)
     , m_pContextMenuMachine(0)
-    , m_iCurrentScrolledIndex(-1)
+    , m_iCurrentSearchResultIndex(-1)
     , m_iScrollingTokenSize(30)
     , m_fIsScrollingInProgress(false)
@@ -441 +441 @@
 void UIChooserModel::performSearch(const QString &strSearchTerm, int iItemSearchFlags)
 {
-    /* Invisible root always exists: */
-    AssertPtrReturnVoid(invisibleRoot());
-
-    /* Currently we perform the search only for machines, when this to be changed make
-     * sure the disabled flags of the other item types are also managed correctly. */
-
-    /* Reset the search first to erase the disabled flag: */
-    const QList<UIChooserNode*> nodes = resetSearch();
-
-    /* Stop here if no search conditions specified: */
-    if (strSearchTerm.isEmpty())
-        return;
-
-    /* Search for all the nodes matching required condition: */
-    invisibleRoot()->searchForNodes(strSearchTerm, iItemSearchFlags, m_searchResults);
-
-    /* Assign/reset the disabled flag for required nodes: */
-    foreach (UIChooserNode* pNode, nodes)
-    {
-        if (!pNode)
-            continue;
-        pNode->setDisabled(!m_searchResults.contains(pNode));
-    }
-
-    /* Make sure 1st item visible: */
-    scrollToSearchResult(true);
+    /* Call to base-class: */
+    UIChooserAbstractModel::performSearch(strSearchTerm, iItemSearchFlags);
+
+    /* Select 1st found item: */
+    selectSearchResult(true);
 }
 
 QList<UIChooserNode*> UIChooserModel::resetSearch()
 {
-    QList<UIChooserNode*> nodes;
-
-    /* Invisible root always exists: */
-    AssertPtrReturn(invisibleRoot(), nodes);
-
-    /* Calling UIChooserNode::searchForNodes with an empty search string
-     * returns a list all nodes (of the whole tree) of the required type: */
-    invisibleRoot()->searchForNodes(QString(), UIChooserItemSearchFlag_Machine, nodes);
-
-    /* Reset the disabled flag of the nodes first: */
-    foreach (UIChooserNode *pNode, nodes)
-    {
-        if (!pNode)
-            continue;
-        pNode->setDisabled(false);
-    }
-
-    /* Reset the search result related data: */
-    m_searchResults.clear();
-    m_iCurrentScrolledIndex = -1;
-    return nodes;
-}
-
-void UIChooserModel::scrollToSearchResult(bool fIsNext)
+    /* Reset search result index: */
+    m_iCurrentSearchResultIndex = -1;
+
+    /* Call to base-class: */
+    return UIChooserAbstractModel::resetSearch();
+}
+
+void UIChooserModel::selectSearchResult(bool fIsNext)
 {
     /* If nothing was found: */
-    if (m_searchResults.isEmpty())
-    {
-        /* Clear the search widget's match count(s): */
-        m_iCurrentScrolledIndex = -1;
-        if (view())
-            view()->setSearchResultsCount(m_searchResults.size(), m_iCurrentScrolledIndex);
-        return;
-    }
-
-    if (fIsNext)
-    {
-        if (++m_iCurrentScrolledIndex >= m_searchResults.size())
-            m_iCurrentScrolledIndex = 0;
-    }
+    if (searchResult().isEmpty())
+    {
+        /* Reset search result index: */
+        m_iCurrentSearchResultIndex = -1;
+    }
+    /* If something was found: */
     else
     {
-        if (--m_iCurrentScrolledIndex < 0)
-            m_iCurrentScrolledIndex = m_searchResults.size() - 1;
-    }
-
-    if (m_searchResults.at(m_iCurrentScrolledIndex))
-    {
-        UIChooserItem *pItem = m_searchResults.at(m_iCurrentScrolledIndex)->item();
-        if (pItem)
-        {
-            pItem->makeSureItsVisible();
-            setSelectedItem(pItem);
+        /* Advance index forward: */
+        if (fIsNext)
+        {
+            if (++m_iCurrentSearchResultIndex >= searchResult().size())
+                m_iCurrentSearchResultIndex = 0;
+        }
+        /* Advance index backward: */
+        else
+        {
+            if (--m_iCurrentSearchResultIndex < 0)
+                m_iCurrentSearchResultIndex = searchResult().size() - 1;
+        }
+
+        /* If found item exists: */
+        if (searchResult().at(m_iCurrentSearchResultIndex))
+        {
+            /* Select curresponding found item, make sure it's visible, scroll if necessary: */
+            UIChooserItem *pItem = searchResult().at(m_iCurrentSearchResultIndex)->item();
+            if (pItem)
+            {
+                pItem->makeSureItsVisible();
+                setSelectedItem(pItem);
+            }
         }
     }
@@ -529 +496 @@
     /* Update the search widget's match count(s): */
     if (view())
-        view()->setSearchResultsCount(m_searchResults.size(), m_iCurrentScrolledIndex);
+        view()->setSearchResultsCount(searchResult().size(), m_iCurrentSearchResultIndex);
 }
 

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

@@ -178 +178 @@
     /** @} */
 
-    /** @name Virtual Machine/Group search stuff.
+    /** @name Search stuff.
       * @{ */
         /** Performs a search starting from the m_pInvisibleRootNode. */
-        void performSearch(const QString &strSearchTerm, int iItemSearchFlags);
+        virtual void performSearch(const QString &strSearchTerm, int iItemSearchFlags) /* override */;
         /** Cleans the search result data members and disables item's visual effects.
           * Also returns a list of all nodes which may be utilized by the calling code. */
-        QList<UIChooserNode*> resetSearch();
-        /** Scrolls to next/prev (wrt. @a fIsNext) search result. */
-        void scrollToSearchResult(bool fIsNext);
+        virtual QList<UIChooserNode*> resetSearch() /* override */;
+
+        /** Selects next/prev (wrt. @a fIsNext) search result. */
+        void selectSearchResult(bool fIsNext);
         /** Shows/hides machine search widget. */
         void setSearchWidgetVisible(bool fVisible);
@@ -377 +378 @@
     /** @} */
 
-    /** @name Virtual Machine/Group search stuff.
-      * @{ */
-        /** Stores the results of the current search. */
-        QList<UIChooserNode*> m_searchResults;
-        /** Stores the index (within the m_searchResults) of the currently scrolled item. */
-        int m_iCurrentScrolledIndex;
+    /** @name Search stuff.
+      * @{ */
+        /** Stores the index (within the m_searchResults) of the currently selected found item. */
+        int  m_iCurrentSearchResultIndex;
     /** @} */
 

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

@@ -177 +177 @@
     if (!pModel)
         return;
-    pModel->scrollToSearchResult(fIsNext);
+    pModel->selectSearchResult(fIsNext);
 }