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

Timestamp:

Sep 18, 2023 3:45:32 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: UIAdvancedSettingsDialog: Extending filter editor with filter clear button.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp

@@ -115 +115 @@
     virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
 
+private slots:
+
+    /** Handles editor @a strText change. */
+    void sltHandleEditorTextChanged(const QString &strText);
+    /** Handles button click. */
+    void sltHandleButtonClicked();
+
 private:
 
@@ -136 +143 @@
     /** Holds the filter editor instance. */
     QILineEdit   *m_pLineEdit;
-#if 0
     /** Holds the filter reset button instance. */
     QIToolButton *m_pToolButton;
-#endif
 
     /** Holds whether filter editor focused. */
@@ -179 +184 @@
     : QWidget(pParent)
     , m_pLineEdit(0)
-#if 0
     , m_pToolButton(0)
-#endif
     , m_fFocused(false)
     , m_iUnfocusedEditorWidth(0)
@@ -242 +245 @@
 }
 
+void UIFilterEditor::sltHandleEditorTextChanged(const QString &strText)
+{
+    m_pToolButton->setHidden(m_pLineEdit->text().isEmpty());
+    emit sigTextChanged(strText);
+}
+
+void UIFilterEditor::sltHandleButtonClicked()
+{
+    m_pLineEdit->clear();
+}
+
 void UIFilterEditor::prepare()
 {
@@ -250 +264 @@
         m_pLineEdit->installEventFilter(this);
         connect(m_pLineEdit, &QILineEdit::textChanged,
-                this, &UIFilterEditor::sigTextChanged);
-    }
-
-#if 0
+                this, &UIFilterEditor::sltHandleEditorTextChanged);
+    }
+
     /* Prepare filter reset button: */
     m_pToolButton = new QIToolButton(this);
     if (m_pToolButton)
-        m_pToolButton->setIcon(UIIconPool::iconSet(":/search_16px.png"));
-#endif
+    {
+        m_pToolButton->hide();
+        m_pToolButton->setIconSize(QSize(10, 10));
+        m_pToolButton->setIcon(UIIconPool::iconSet(":/close_16px.png"));
+        connect(m_pToolButton, &QIToolButton::clicked,
+                this, &UIFilterEditor::sltHandleButtonClicked);
+    }
 
     /* Install 'unfocus/focus' animation to 'editorWidth' property: */
@@ -279 +297 @@
 void UIFilterEditor::adjustEditorGeometry()
 {
+    /* Acquire maximum widget width: */
+    const int iWidth = width();
+
+    /* Update filter editor geometry: */
+    const QSize esh = m_pLineEdit->minimumSizeHint();
+    const int iMinimumEditorWidth = esh.width();
+    const int iMinimumEditorHeight = esh.height();
     /* Update minimum/maximum filter editor width: */
-    const int iWidth = width();
-    const int iMinimumWidth = m_pLineEdit->minimumSizeHint().width();
-    m_iUnfocusedEditorWidth = qMax(iWidth / 2, iMinimumWidth);
-    m_iFocusedEditorWidth = qMax(iWidth, iMinimumWidth);;
+    m_iUnfocusedEditorWidth = qMax(iWidth / 2, iMinimumEditorWidth);
+    m_iFocusedEditorWidth = qMax(iWidth, iMinimumEditorWidth);
     m_pAnimation->update();
-
-    /* Update filter editor geometry: */
     setEditorWidth(m_fFocused ? m_iFocusedEditorWidth : m_iUnfocusedEditorWidth);
+
+    /* Update filter button geometry: */
+    const QSize bsh = m_pToolButton->minimumSizeHint();
+    const int iMinimumButtonWidth = bsh.width();
+    const int iMinimumButtonHeight = bsh.height();
+    const int iButtonY = iMinimumEditorHeight > iMinimumButtonHeight
+                       ? (iMinimumEditorHeight - iMinimumButtonHeight) / 2
+                       : 0;
+    m_pToolButton->setGeometry(iWidth - iMinimumButtonWidth, iButtonY, iMinimumButtonWidth, iMinimumButtonHeight);
 }