onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-18 17:27:20 +01:00
Code Issues Releases Wiki Activity

fixes #2566, #2618 Fix for the regression introduced when I worked on

Browse Source 
empty editor pane".  Double click on the rule number should not do
anything, but double click on rule options, comment and other fields
should open the editor. Change done for #2566 broke this.
This commit is contained in:
Vadim Kurland 2011-07-20 23:39:11 -07:00
parent 8a47a44a3e
commit ddd45fb426
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/ChangeLog
View File

@ -1,3 +1,12 @@
2011-07-20 vadim <vadim@netcitadel.com>
* RuleSetView.cpp (itemDoubleClicked): fixes #2566, #2618 Fix for
the regression introduced when I worked on #2566 "Double-clicking
on rule when program first starts results in empty editor pane".
Double click on the rule number should not do anything, but double
click on rule options, comment and other fields should open the
editor. Change done for #2566 broke this.
2011-07-20 Vadim Kurland <vadim@netcitadel.com> 2011-07-20 Vadim Kurland <vadim@netcitadel.com>
* ObjectMatcher.cpp (dispatch): removed optimization in * ObjectMatcher.cpp (dispatch): removed optimization in

3
src/libgui/RuleSetView.cpp
View File

@ -880,6 +880,7 @@ void RuleSetView::itemDoubleClicked(const QModelIndex& index)
{ {
if (!index.isValid()) return; if (!index.isValid()) return;
if (index.row() < 0) return; if (index.row() < 0) return;
if (index.column() == 0) return; // double click on rule number does nothing
// ColDesc colDesc = index.data(Qt::UserRole).value<ColDesc>(); // ColDesc colDesc = index.data(Qt::UserRole).value<ColDesc>();
// if (fwosm->selectedObject!=NULL) // if (fwosm->selectedObject!=NULL)
@ -909,11 +910,11 @@ void RuleSetView::editSelected(const QModelIndex& index)
mw, mw,
new showObjectInTreeEvent( new showObjectInTreeEvent(
project->getFileName(), fwosm->selectedObject->getId())); project->getFileName(), fwosm->selectedObject->getId()));
}
if (!mw->isEditorVisible()) mw->showEditor(); if (!mw->isEditorVisible()) mw->showEditor();
switchObjectInEditor(index); switchObjectInEditor(index);
} }
}
void RuleSetView::editSelected() void RuleSetView::editSelected()
{ {