Changeset 77683 in vbox for trunk/src/VBox

Timestamp:

Mar 13, 2019 4:22:23 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9378. Implementing a recursive search function.

Location:

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

Files:

• UIChooserModel.cpp (modified) (3 diffs)
• UIChooserModel.h (modified) (2 diffs)
• UIChooserNode.h (modified) (1 diff)
• UIChooserNodeGlobal.cpp (modified) (1 diff)
• UIChooserNodeGlobal.h (modified) (1 diff)
• UIChooserNodeGroup.cpp (modified) (1 diff)
• UIChooserNodeGroup.h (modified) (1 diff)
• UIChooserNodeMachine.cpp (modified) (1 diff)
• UIChooserNodeMachine.h (modified) (1 diff)
• UIChooserSearchWidget.cpp (modified) (3 diffs)
• UIChooserSearchWidget.h (modified) (2 diffs)
• UIChooserView.cpp (modified) (3 diffs)
• UIChooserView.h (modified) (1 diff)

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

@@ -452 +452 @@
 }
 
+void UIChooserModel::performSearch(const QString &strSearchTerm, int iItemSearchFlags)
+{
+    if (!m_pInvisibleRootNode || strSearchTerm.isEmpty())
+        return;
+
+    QList<UIChooserNode*> matchedItems;
+    m_pInvisibleRootNode->searchForNodes(strSearchTerm,  iItemSearchFlags, matchedItems);
+}
+
 UIChooserNode *UIChooserModel::invisibleRoot() const
 {
@@ -779 +788 @@
 }
 
-void UIChooserModel::sltMachineSearch()
+void UIChooserModel::sltShowHideSearchWidget()
 {
     UIChooserView *pChooserView = qobject_cast<UIChooserView*>(scene()->views()[0]);
@@ -1411 +1420 @@
             this, SLOT(sltSortGroup()));
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_Search), SIGNAL(triggered()),
-            this, SLOT(sltMachineSearch()));
+            this, SLOT(sltShowHideSearchWidget()));
 
     /* Setup group saving connections: */

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

@@ -187 +187 @@
     /** @} */
 
+    /** @name Virtual Machine/Group search stuff.
+      * @{ */
+        /** Performs a search starting from the m_pInvisibleRootNode. */
+        void performSearch(const QString &strSearchTerm, int iItemSearchFlags);
+    /** @} */
+
     /** @name Children stuff.
       * @{ */
@@ -277 +283 @@
         /** Handles group sort request. */
         void sltSortGroup();
-        /** Handles machine search request. */
-        void sltMachineSearch();
+        /** Handles machine search widget show/hide request. */
+        void sltShowHideSearchWidget();
         /** Handles group destroy request. */
         void sltUngroupSelectedGroup();

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

@@ -107 +107 @@
     UIChooserItem *item() const { return m_pItem.data(); }
 
+    /** Performs search wrt.  @a strSearchTerm and @a iItemSearchFlags and updates @a matchedItems. */
+    virtual void searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems) = 0;
+
 protected:
 

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

@@ -115 +115 @@
 }
 
+void UIChooserNodeGlobal::searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems)
+{
+    if (!(iItemSearchFlags & UIChooserItemSearchFlag_Global))
+        return;
+    if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
+    {
+        if (name() == strSearchTerm)
+            matchedItems << this;
+    }
+    else
+    {
+        if (name().contains(strSearchTerm, Qt::CaseInsensitive))
+            matchedItems << this;
+    }
+}
+
 void UIChooserNodeGlobal::retranslateUi()
 {

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

@@ -80 +80 @@
     virtual int positionOf(UIChooserNode *pNode) /* override */;
 
+    /** Updates the @a matchedItems wrt. @strSearchTerm and @a iItemSearchFlags. */
+    virtual void searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems) /* override */;
+
 protected:
 

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

@@ -188 +188 @@
 }
 
+
+void UIChooserNodeGroup::searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems)
+{
+
+    if (iItemSearchFlags & UIChooserItemSearchFlag_Group)
+    {
+        if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
+        {
+            if (name() == strSearchTerm)
+                matchedItems << this;
+        }
+        else
+        {
+            if (name().contains(strSearchTerm, Qt::CaseInsensitive))
+                matchedItems << this;
+        }
+    }
+
+    foreach (UIChooserNode* pNode, m_nodesGroup)
+        pNode->searchForNodes(strSearchTerm, iItemSearchFlags, matchedItems);
+
+    foreach (UIChooserNode* pNode, m_nodesGlobal)
+        pNode->searchForNodes(strSearchTerm, iItemSearchFlags, matchedItems);
+
+    foreach (UIChooserNode* pNode, m_nodesMachine)
+        pNode->searchForNodes(strSearchTerm, iItemSearchFlags, matchedItems);
+
+}
+
+
 void UIChooserNodeGroup::retranslateUi()
 {

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

@@ -95 +95 @@
     void close() { m_fOpened = false; }
 
+
+    /** Recursively searches for a children wrt.  @a strSearchTerm and @a iItemSearchFlags and updates the @a matchedItems. */
+    virtual void searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems) /* override */;
+
 protected:
 

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

@@ -131 +131 @@
 }
 
+void UIChooserNodeMachine::searchForNodes(const QString &strSearchTerm, int iItemSearchFlags,
+                                          QList<UIChooserNode*> &matchedItems)
+{
+    if (!(iItemSearchFlags & UIChooserItemSearchFlag_Machine))
+        return;
+    if (iItemSearchFlags & UIChooserItemSearchFlag_ExactName)
+    {
+        if (name() == strSearchTerm)
+            matchedItems << this;
+        return;
+    }
+    if (name().contains(strSearchTerm, Qt::CaseInsensitive))
+        matchedItems << this;
+}
+
 void UIChooserNodeMachine::retranslateUi()
 {

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

@@ -81 +81 @@
     virtual int positionOf(UIChooserNode *pNode) /* override */;
 
+    virtual void searchForNodes(const QString &strSearchTerm, int iItemSearchFlags, QList<UIChooserNode*> &matchedItems) /* override */;
+
 protected:
 

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

@@ -21 +21 @@
 /* GUI includes: */
 #include "QILineEdit.h"
+#include "UIChooserDefs.h"
 #include "UIChooserSearchWidget.h"
 
@@ -54 +55 @@
     {
         connect(m_pLineEdit, &QILineEdit::textEdited,
-                this, &UIChooserSearchWidget::sigSearchTermChanged);
+                this, &UIChooserSearchWidget::sltHandleSearchTermChange);
     }
 }
@@ -68 +69 @@
 {
 }
+
+void UIChooserSearchWidget::sltHandleSearchTermChange(const QString &strSearchTerm)
+{
+    emit sigRedoSearch(strSearchTerm, UIChooserItemSearchFlag_Machine);
+}

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

@@ -39 +39 @@
 signals:
 
-    void sigSearchTermChanged(const QString &strSearchTerm);
+    void sigRedoSearch(const QString &strSearchTerm, int iItemSearchFlags);
 
 public:
@@ -54 +54 @@
 private slots:
 
+    void sltHandleSearchTermChange(const QString &strSearchTerm);
+
 private:
 

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

@@ -127 +127 @@
 }
 
+void UIChooserView::sltRedoSearch(const QString &strSearchTerm, int iItemSearchFlags)
+{
+    if (!m_pChooser)
+        return;
+
+    UIChooserModel *pModel =  m_pChooser->model();
+    if (!pModel)
+        return;
+
+    pModel->performSearch(strSearchTerm, iItemSearchFlags);
+
+}
+
 void UIChooserView::retranslateUi()
 {
@@ -138 +151 @@
 {
     /* Install Chooser-view accessibility interface factory: */
-    QAccessible::installFactory(UIAccessibilityInterfaceForUIChooserView::pFactory);
+     QAccessible::installFactory(UIAccessibilityInterfaceForUIChooserView::pFactory);
 
     /* Prepare palette: */
@@ -155 +168 @@
     m_pSearchWidget = new UIChooserSearchWidget(this);
     m_pSearchWidget->hide();
+    connect(m_pSearchWidget, &UIChooserSearchWidget::sigRedoSearch,
+                this, &UIChooserView::sltRedoSearch);
 
     /* Update scene-rect: */

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

@@ -73 +73 @@
     /** @} */
 
+private slots:
+
+    void sltRedoSearch(const QString &strSearchTerm, int iItemSearchFlags);
+
 private: