From 46c10debda54f964a21c0b69674ffd544f44fd65 Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@netcitadel.com>
Date: Fri, 1 Oct 2010 02:21:20 +0000
Subject: [PATCH]       fixed #1755 "hitting enter after editing search
 attribute in the       Find panel should trigger search"

---
 build_num                                   |  2 +-
 doc/ChangeLog                               |  4 ++++
 src/gui/FindObjectWidget.cpp                | 12 ++++++++++++
 src/gui/FindObjectWidget.h                  |  2 ++
 src/gui/ObjectTreeView.cpp                  |  2 ++
 src/gui/findobjectwidget_q.ui               |  3 +++
 src/res/help/en_US/release_notes_4.1.2.html |  8 ++++++++
 7 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/build_num b/build_num
index 910abe304..0b35a495e 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 3299
+#define BUILD_NUM 3300
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 715f228c7..295434aa5 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-30  Vadim Kurland  <vadim@vk.crocodile.org>
 
+	* FindObjectWidget.cpp (keyPressEvent): fixed #1755 "hitting enter
+	after editing search attribute in the Find panel should trigger
+	search"
+
 	* FindObjectWidget.cpp (matchAttr): fixed #1760 'Search by
 	attribute "name" should search by name or label'.
 
diff --git a/src/gui/FindObjectWidget.cpp b/src/gui/FindObjectWidget.cpp
index afdf07896..64e1c4530 100644
--- a/src/gui/FindObjectWidget.cpp
+++ b/src/gui/FindObjectWidget.cpp
@@ -94,6 +94,18 @@ FindObjectWidget::FindObjectWidget(QWidget*p, ProjectPanel *pp,
         tr("Drop object for replacement here"));
 }
 
+void FindObjectWidget::keyPressEvent( QKeyEvent* ev )
+{
+    if (ev->key()==Qt::Key_Enter || ev->key()==Qt::Key_Return)
+    {
+        if (fwbdebug)
+            qDebug() << "FindObjectWidget::keyPressEvent Qt::Key_Enter";
+        ev->accept();
+        find();
+        return;
+    }
+}
+
 void FindObjectWidget::findObject(FWObject *o)
 {
     if (fwbdebug) qDebug("FindObjectWidget::findObject");
diff --git a/src/gui/FindObjectWidget.h b/src/gui/FindObjectWidget.h
index ae5db293e..009efaf5f 100644
--- a/src/gui/FindObjectWidget.h
+++ b/src/gui/FindObjectWidget.h
@@ -61,6 +61,8 @@ private:
     bool matchAttr(libfwbuilder::FWObject* obj);
     bool validateReplaceObject();
     bool inSelectedFirewall( libfwbuilder::RuleElement* r);
+
+    virtual void keyPressEvent( QKeyEvent* ev );
     
  public:
     Ui::findObjectWidget_q *m_widget;
diff --git a/src/gui/ObjectTreeView.cpp b/src/gui/ObjectTreeView.cpp
index a3109d189..aff24c523 100644
--- a/src/gui/ObjectTreeView.cpp
+++ b/src/gui/ObjectTreeView.cpp
@@ -640,6 +640,8 @@ void ObjectTreeView::keyPressEvent( QKeyEvent* ev )
     {
         if (ev->key()==Qt::Key_Enter || ev->key()==Qt::Key_Return)
         {
+            if (fwbdebug)
+                qDebug() << "ObjectTreeView::keyPressEvent Qt::Key_Enter";
             editCurrentObject();
             ev->accept();
             return;
diff --git a/src/gui/findobjectwidget_q.ui b/src/gui/findobjectwidget_q.ui
index 884430fe7..641362d0a 100644
--- a/src/gui/findobjectwidget_q.ui
+++ b/src/gui/findobjectwidget_q.ui
@@ -201,6 +201,9 @@
        <property name="text">
         <string>Find Next</string>
        </property>
+       <property name="autoDefault">
+        <bool>true</bool>
+       </property>
        <property name="default">
         <bool>true</bool>
        </property>
diff --git a/src/res/help/en_US/release_notes_4.1.2.html b/src/res/help/en_US/release_notes_4.1.2.html
index 95a344da4..cba338f85 100644
--- a/src/res/help/en_US/release_notes_4.1.2.html
+++ b/src/res/help/en_US/release_notes_4.1.2.html
@@ -299,6 +299,14 @@
     </p>
   </li>
 
+  <li>
+    <p>
+      fixed #1755 "hitting enter after editing search attribute in the
+      Find panel should trigger search"
+    </p>
+  </li>
+
+
 </ul>