diff --git a/doc/ChangeLog b/doc/ChangeLog index f8211b463..ad83f1adb 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,12 @@ +2011-06-04 vadim + + * RuleSetView.cpp (itemDoubleClicked): as part of the GUI + usability improvements, its behavior when user double clicks on + "any" in a rule has changed. Now the program opens object "any" in + the editor and shows prompt text that explains its behavior. The + editor stays read-only and should appear grayed-out if palette + is set up for that. This reverses the change made for #1731. See #2454. + 2011-06-03 vadim * applied patch to provide configure command line option to specify diff --git a/src/libgui/RuleSetView.cpp b/src/libgui/RuleSetView.cpp index 8c16fb9bb..ba908fb16 100644 --- a/src/libgui/RuleSetView.cpp +++ b/src/libgui/RuleSetView.cpp @@ -870,13 +870,6 @@ void RuleSetView::itemDoubleClicked(const QModelIndex& index) if (fwosm->selectedObject!=NULL) { - // #1731 do not open object "any" in the editor and in the tree - if ((colDesc.type == ColDesc::Object || colDesc.type == ColDesc::Time) && - (fwosm->selectedObject->getId() == FWObjectDatabase::ANY_ADDRESS_ID || - fwosm->selectedObject->getId() == FWObjectDatabase::ANY_SERVICE_ID || - fwosm->selectedObject->getId() == FWObjectDatabase::ANY_INTERVAL_ID)) - return; - QCoreApplication::postEvent( mw, new showObjectInTreeEvent( @@ -891,13 +884,6 @@ void RuleSetView::editSelected(const QModelIndex& index) ColDesc colDesc = index.data(Qt::UserRole).value(); FWObject *obj = fwosm->selectedObject; - // #1731 do not open object "any" in the editor and in the tree - // if ((colDesc.type == ColDesc::Object || colDesc.type == ColDesc::Time) && - // (obj->getId() == FWObjectDatabase::ANY_ADDRESS_ID || - // obj->getId() == FWObjectDatabase::ANY_SERVICE_ID || - // obj->getId() == FWObjectDatabase::ANY_INTERVAL_ID)) - // return; - if (!mw->isEditorVisible()) mw->showEditor(); switchObjectInEditor(index); }