Changeset 77750 in vbox for trunk/src/VBox

Timestamp:

Mar 18, 2019 11:51:29 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9378. Handling showing/hiding serch widget a bit better.

Location:

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

Files:

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

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

@@ -580 +580 @@
 void UIChooserModel::lookFor(const QString &strLookupSymbol)
 {
-    /* Restart timer to reset lookup-string: */
-    m_pLookupTimer->start();
-
-    /* Prepare item: */
-    UIChooserItem *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)
-        {
-            UIChooserItem *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)
-        {
-            UIChooserItem *pIteratedItem = navigationList().at(iIndex);
-            if (pIteratedItem->name().startsWith(strLookupString, Qt::CaseInsensitive))
-            {
-                pItem = pIteratedItem;
-                break;
-            }
-        }
-    }
-
-    /* If that item was found: */
-    if (pItem)
-    {
-        /* Choose it: */
-        pItem->makeSureItsVisible();
-        setCurrentItem(pItem);
-        /* Append lookup symbol: */
-        if (m_strLookupString != strLookupSymbol)
-            m_strLookupString += strLookupSymbol;
+    if (view())
+    {
+        view()->setSearchWidgetVisible(true);
+        view()->appendToSearchString(strLookupSymbol);
     }
 }

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

@@ -50 +50 @@
         return;
     m_pLineEdit->setScroolToIndex(iScrollToIndex);
+}
+
+void UIChooserSearchWidget::appendToSearchString(const QString &strSearchText)
+{
+    if (!m_pLineEdit)
+        return;
+    m_pLineEdit->setText(m_pLineEdit->text().append(strSearchText));
 }
 

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

@@ -53 +53 @@
     void setMatchCount(int iMatchCount);
     void setScroolToIndex(int iScrollToIndex);
+    /** Appends the @a strSearchText to the current (if any) search text. */
+    void appendToSearchString(const QString &strSearchText);
 
 protected:

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

@@ -106 +106 @@
     if (!m_pSearchWidget)
         return;
-    m_pSearchWidget->setVisible(!m_pSearchWidget->isVisible());
+    bool fVisible = m_pSearchWidget->isVisible();
+    setSearchWidgetVisible(!fVisible);
+}
+
+void UIChooserView::setSearchWidgetVisible(bool fVisible)
+{
+    if (!m_pSearchWidget)
+        return;
+    if (m_pSearchWidget->isVisible() == fVisible)
+        return;
+    m_pSearchWidget->setVisible(fVisible);
     if (m_pSearchWidget->isVisible())
         updateSearchWidgetGeometry();
+
+    UIChooserModel *pModel =  m_pChooser->model();
+    if (!pModel)
+        return;
+    pModel->resetSearch();
 }
 
@@ -119 +134 @@
 }
 
+void UIChooserView::appendToSearchString(const QString &strSearchText)
+{
+    if (m_pSearchWidget)
+        m_pSearchWidget->appendToSearchString(strSearchText);
+}
+
 void UIChooserView::sltMinimumWidthHintChanged(int iHint)
 {
@@ -156 +177 @@
 void UIChooserView::sltHandleSearchWidgetVisibilityToggle(bool fIsVisible)
 {
-    if (!m_pSearchWidget)
-        return;
-    if (m_pSearchWidget->isVisible() == fIsVisible)
-        return;
-    m_pSearchWidget->setVisible(fIsVisible);
-    UIChooserModel *pModel =  m_pChooser->model();
-    if (!pModel)
-        return;
-    pModel->resetSearch();
+    setSearchWidgetVisible(fIsVisible);
 }
 

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

@@ -56 +56 @@
         /** Shows/hides machine search widget. */
         void toggleSearchWidget();
+        /** Shows/hides machine search widget. */
+        void setSearchWidgetVisible(bool fVisible);
         /** Updates the search widget's counts. */
         void setSearchResultsCount(int iTotalMacthCount, int iCurrentlyScrolledItemIndex);
+        /** Forwards @a strSearchText to the search widget which in turn appends it to the current (if any) search term. */
+        void appendToSearchString(const QString &strSearchText);
     /** @} */