Changeset 84587 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 28, 2020 12:31:13 PM (5 years ago)

Author:

vboxsync

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

138317

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Rework search functionality a bit; First of all, make sure search widget line-edit directly receives focus; Besides that, repeat search if chooser item tree was rebuilt.

Location:

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

Files:

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

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

@@ -1571 +1571 @@
         makeSureAtLeastOneItemSelected();
     }
+
+    /* Repeat search if search widget is visible: */
+    if (view() && view()->isSearchWidgetVisible())
+        view()->redoSearch();
 }
 

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

@@ -64 +64 @@
 }
 
+void UIChooserSearchWidget::redoSearch()
+{
+    if (!m_pLineEdit)
+        return;
+    sltHandleSearchTermChange(m_pLineEdit->text());
+}
+
 void UIChooserSearchWidget::prepareWidgets()
 {
@@ -93 +100 @@
         m_pMainLayout->addWidget(m_pLineEdit);
         m_pLineEdit->installEventFilter(this);
+        setFocusProxy(m_pLineEdit);
     }
 
@@ -116 +124 @@
 {
     if (m_pLineEdit)
-    {
-        connect(m_pLineEdit, &QILineEdit::textChanged,
-                this, &UIChooserSearchWidget::sltHandleSearchTermChange);
-    }
+        connect(m_pLineEdit, &QILineEdit::textChanged, this, &UIChooserSearchWidget::sltHandleSearchTermChange);
     if (m_pCloseButton)
         connect(m_pCloseButton, &QIToolButton::clicked, this, &UIChooserSearchWidget::sltHandleCloseButtonClick);

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

@@ -57 +57 @@
     /** Appends the @a strSearchText to the current (if any) search text. */
     void appendToSearchString(const QString &strSearchText);
+    /** Repeats the last search again. */
+    void redoSearch();
 
 protected:

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

@@ -169 +169 @@
 }
 
+void UIChooserView::redoSearch()
+{
+    /* Make sure search widget exists: */
+    AssertPtrReturnVoid(m_pSearchWidget);
+
+    /* Pass request to search widget: */
+    m_pSearchWidget->redoSearch();
+}
+
 void UIChooserView::sltMinimumWidthHintChanged(int iHint)
 {

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

@@ -70 +70 @@
           * turn appends it to the current (if any) search term. */
         void appendToSearchString(const QString &strSearchText);
+        /** Repeats the last search again. */
+        void redoSearch();
     /** @} */