Thread: [fwbuilder-commits] r3301 - in branches/v4_1: . doc src/gui src/res/help/en_US
Brought to you by:
mikehorn
From: <va...@in...> - 2010-10-01 02:21:28
|
Author: vadim Date: 2010-09-30 19:21:20 -0700 (Thu, 30 Sep 2010) New Revision: 3301 Modified: branches/v4_1/build_num branches/v4_1/doc/ChangeLog branches/v4_1/src/gui/FindObjectWidget.cpp branches/v4_1/src/gui/FindObjectWidget.h branches/v4_1/src/gui/ObjectTreeView.cpp branches/v4_1/src/gui/findobjectwidget_q.ui branches/v4_1/src/res/help/en_US/release_notes_4.1.2.html Log: fixed #1755 "hitting enter after editing search attribute in the Find panel should trigger search" Modified: branches/v4_1/build_num =================================================================== --- branches/v4_1/build_num 2010-10-01 02:02:30 UTC (rev 3300) +++ branches/v4_1/build_num 2010-10-01 02:21:20 UTC (rev 3301) @@ -1 +1 @@ -#define BUILD_NUM 3299 +#define BUILD_NUM 3300 Modified: branches/v4_1/doc/ChangeLog =================================================================== --- branches/v4_1/doc/ChangeLog 2010-10-01 02:02:30 UTC (rev 3300) +++ branches/v4_1/doc/ChangeLog 2010-10-01 02:21:20 UTC (rev 3301) @@ -1,5 +1,9 @@ 2010-09-30 Vadim Kurland <va...@vk...> + * 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'. Modified: branches/v4_1/src/gui/FindObjectWidget.cpp =================================================================== --- branches/v4_1/src/gui/FindObjectWidget.cpp 2010-10-01 02:02:30 UTC (rev 3300) +++ branches/v4_1/src/gui/FindObjectWidget.cpp 2010-10-01 02:21:20 UTC (rev 3301) @@ -94,6 +94,18 @@ 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"); Modified: branches/v4_1/src/gui/FindObjectWidget.h =================================================================== --- branches/v4_1/src/gui/FindObjectWidget.h 2010-10-01 02:02:30 UTC (rev 3300) +++ branches/v4_1/src/gui/FindObjectWidget.h 2010-10-01 02:21:20 UTC (rev 3301) @@ -61,6 +61,8 @@ bool matchAttr(libfwbuilder::FWObject* obj); bool validateReplaceObject(); bool inSelectedFirewall( libfwbuilder::RuleElement* r); + + virtual void keyPressEvent( QKeyEvent* ev ); public: Ui::findObjectWidget_q *m_widget; Modified: branches/v4_1/src/gui/ObjectTreeView.cpp =================================================================== --- branches/v4_1/src/gui/ObjectTreeView.cpp 2010-10-01 02:02:30 UTC (rev 3300) +++ branches/v4_1/src/gui/ObjectTreeView.cpp 2010-10-01 02:21:20 UTC (rev 3301) @@ -640,6 +640,8 @@ { if (ev->key()==Qt::Key_Enter || ev->key()==Qt::Key_Return) { + if (fwbdebug) + qDebug() << "ObjectTreeView::keyPressEvent Qt::Key_Enter"; editCurrentObject(); ev->accept(); return; Modified: branches/v4_1/src/gui/findobjectwidget_q.ui =================================================================== --- branches/v4_1/src/gui/findobjectwidget_q.ui 2010-10-01 02:02:30 UTC (rev 3300) +++ branches/v4_1/src/gui/findobjectwidget_q.ui 2010-10-01 02:21:20 UTC (rev 3301) @@ -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> Modified: branches/v4_1/src/res/help/en_US/release_notes_4.1.2.html =================================================================== --- branches/v4_1/src/res/help/en_US/release_notes_4.1.2.html 2010-10-01 02:02:30 UTC (rev 3300) +++ branches/v4_1/src/res/help/en_US/release_notes_4.1.2.html 2010-10-01 02:21:20 UTC (rev 3301) @@ -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> |