fixed #1755 "hitting enter after editing search attribute in the

Find panel should trigger search"

build_num

@@ -1 +1 @@
-#define BUILD_NUM 3299
+#define BUILD_NUM 3300

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'.
 

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");

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;

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;

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>

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>