Changeset 2eb48c96 in OpenModelica

Timestamp:

2020-08-05T10:16:13+02:00 (4 years ago)

Author:

GitHub <noreply@…>

Branches:

Added-citation-metadata, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

c229655

Parents:

85cad8f

git-author:

Adeel Asghar <adeel.asghar@…> (08/05/20 10:16:13)

git-committer:

GitHub <noreply@…> (08/05/20 10:16:13)

Message:

Fixes ticket:5998 Reset the search filter when ESC is pressed (#6694)

Fixes ticket:5998 Reset the search filter when ESC is pressed

Use a local signal to call the QLineEdit signal

Location:

OMEdit/OMEditLIB/Util

Files:

• Utilities.cpp (modified) (3 diffs)
• Utilities.h (modified) (1 diff)

OMEdit/OMEditLIB/Util/Utilities.cpp

@@ -66 +66 @@
   mpFilterTextBox = new QLineEdit;
   mpFilterTextBox->installEventFilter(this);
+  connect(this, SIGNAL(clearFilter(QString)), mpFilterTextBox, SIGNAL(textEdited(QString)));
   // filter timer
   mpFilterTimer = new QTimer;
@@ -118 +119 @@
 /*!
  * \brief TreeSearchFilters::eventFilter
- * Handles the ESC key press for search text box
+ * Handles the ESC key press for filter text box
  * \param pObject
  * \param pEvent
@@ -126 +127 @@
 {
   /* Ticket #3987
-   * Clear contents of search field by clicking ESC key.
+   * Clear contents of filter field by clicking ESC key.
    */
-  QLineEdit *pSearchTextBox = qobject_cast<QLineEdit*>(pObject);
-  if (pSearchTextBox && pEvent->type() == QEvent::KeyPress) {
+  QLineEdit *pFilterTextBox = qobject_cast<QLineEdit*>(pObject);
+  if (pFilterTextBox && pEvent->type() == QEvent::KeyPress) {
     QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
     if (pKeyEvent && pKeyEvent->key() == Qt::Key_Escape) {
-      pSearchTextBox->clear();
+      pFilterTextBox->clear();
+      /* Ticket #5998
+       * Emit clearFilter signal which calls textEdited signal of mpFilterTextBox to reset filter.
+       */
+      emit clearFilter("");
       return true;
     }

OMEdit/OMEditLIB/Util/Utilities.h

@@ -124 +124 @@
 private slots:
   void showHideFilters(bool On);
+signals:
+  void clearFilter(const QString &);
 };