Changeset 77765 in vbox

Timestamp:

Mar 18, 2019 4:22:11 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9378. Adding a tool button for hiding the search widget. Mostly for accessibility.

Location:

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

Files:

• UIChooserSearchWidget.cpp (modified) (8 diffs)
• UIChooserSearchWidget.h (modified) (3 diffs)

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

@@ -33 +33 @@
     , m_pScrollToNextMatchButton(0)
     , m_pScrollToPreviousMatchButton(0)
+    , m_pCloseButton(0)
 {
     /** Have a background. In some cases having no background causes strange artefacts in Cinnamon themes. */
@@ -38 +39 @@
     prepareWidgets();
     prepareConnections();
+    retranslateUi();
 }
 
@@ -68 +70 @@
     m_pMainLayout->setSpacing(2);
     m_pMainLayout->setContentsMargins(0, 0, 0, 0);
+
+    m_pCloseButton = new QIToolButton;
+    if (m_pCloseButton)
+    {
+        m_pCloseButton->setIcon(UIIconPool::iconSet(":/close_16px.png"));
+        m_pMainLayout->addWidget(m_pCloseButton, 0, Qt::AlignLeft);
+    }
+
     m_pLineEdit = new UISearchLineEdit;
     if (m_pLineEdit)
@@ -78 +88 @@
     if (m_pScrollToPreviousMatchButton)
     {
-        m_pScrollToPreviousMatchButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_backward_16px.png", ":/log_viewer_search_backward_disabled_16px.png"));
+        m_pScrollToPreviousMatchButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_backward_16px.png",
+                                                                    ":/log_viewer_search_backward_disabled_16px.png"));
         m_pMainLayout->addWidget(m_pScrollToPreviousMatchButton);
     }
@@ -84 +95 @@
     if (m_pScrollToNextMatchButton)
     {
-        m_pScrollToNextMatchButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_forward_16px.png", ":/log_viewer_search_forward_disabled_16px.png"));
+        m_pScrollToNextMatchButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_forward_16px.png",
+                                                                ":/log_viewer_search_forward_disabled_16px.png"));
         m_pMainLayout->addWidget(m_pScrollToNextMatchButton);
     }
@@ -98 +110 @@
                 this, &UIChooserSearchWidget::sltHandleSearchTermChange);
     }
+    if (m_pCloseButton)
+        connect(m_pCloseButton, &QIToolButton::clicked, this, &UIChooserSearchWidget::sltHandleCloseButtonClick);
     if (m_pScrollToPreviousMatchButton)
         connect(m_pScrollToPreviousMatchButton, &QIToolButton::clicked, this, &UIChooserSearchWidget::sltHandleScroolToButtonClick);
@@ -120 +134 @@
 void UIChooserSearchWidget::retranslateUi()
 {
+    if (m_pScrollToNextMatchButton)
+        m_pScrollToNextMatchButton->setToolTip(tr("Navigate to the next item among the search results"));
+    if (m_pScrollToPreviousMatchButton)
+        m_pScrollToPreviousMatchButton->setToolTip(tr("Navigate to the previous item among the search results"));
+    if (m_pLineEdit)
+        m_pLineEdit->setToolTip(tr("Enter a search term to be used during virtual machine search"));
+    if (m_pCloseButton)
+        m_pCloseButton->setToolTip(tr("Close the search widget"));
 }
 
@@ -149 +171 @@
         emit sigScrollToMatch(false);
 }
+
+void UIChooserSearchWidget::sltHandleCloseButtonClick()
+{
+    emit sigToggleVisibility(false);
+}

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

@@ -51 +51 @@
 
     UIChooserSearchWidget(QWidget *pParent);
+    /** Forward @a iMatchCount to UISearchLineEdit. */
     void setMatchCount(int iMatchCount);
+    /** Forward @a iScrollToIndex to UISearchLineEdit. */
     void setScroolToIndex(int iScrollToIndex);
     /** Appends the @a strSearchText to the current (if any) search text. */
@@ -67 +69 @@
 private slots:
 
+    /** Emits sigRedoSearch thuse causes a re-search. */
     void sltHandleSearchTermChange(const QString &strSearchTerm);
     void sltHandleScroolToButtonClick();
+    /** Emits sigToggleVisibility, */
+    void sltHandleCloseButtonClick();
 
 private:
@@ -75 +80 @@
     void prepareConnections();
 
-    UISearchLineEdit  *m_pLineEdit;
-    QHBoxLayout       *m_pMainLayout;
-    QIToolButton      *m_pScrollToNextMatchButton;
-    QIToolButton      *m_pScrollToPreviousMatchButton;
+    /** @name Member widgets.
+      * @{ */
+        UISearchLineEdit  *m_pLineEdit;
+        QHBoxLayout       *m_pMainLayout;
+        QIToolButton      *m_pScrollToNextMatchButton;
+        QIToolButton      *m_pScrollToPreviousMatchButton;
+        QIToolButton      *m_pCloseButton;
+    /** @} */
 };