onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-14 09:00:01 +02:00
Code Issues Releases Wiki Activity

icons on win and mac, bugfix

Browse Source
This commit is contained in:
Vadim Kurland
2008-07-16 15:29:05 +00:00
parent 347619cd0e
commit 40f5ba726b
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 366 #define BUILD_NUM 368
doc/ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2008-07-16 vadim <vadim@vk.crocodile.org>
* RuleSetView.cpp (RuleSetView::addToGroupAbove): Additional check
for a bug where adding very long list of rules to a rule group
caused crash once. Bug is hard to reproduce.
2008-07-15 vadim <vadim@vk.crocodile.org> 2008-07-15 vadim <vadim@vk.crocodile.org>
* testing and bug fixes with QT 4.4. * testing and bug fixes with QT 4.4.
src/gui/RuleSetView.cpp
+20 -9
View File
@@ -2524,20 +2524,26 @@ void RuleSetView::addToGroupAbove ()
RuleRowInfo *ru = rowsInfo[top]; RuleRowInfo *ru = rowsInfo[top];
if (fwbdebug) if (fwbdebug)
qDebug("RuleSetView::addToGroupAbove row=%d", row); qDebug("RuleSetView::addToGroupAbove row=%d count=%d", row, count);
if (!ru->isBeginRow) if (!ru->isBeginRow)
{ {
top = getUpNullRuleIndex(top-1); top = getUpNullRuleIndex(top-1);
ru = rowsInfo[top]; ru = rowsInfo[top];
} }
for (int i = 0; i< count ; i++) for (int i = 0; i< count ; i++)
{ {
Rule *r = Rule::cast(ruleIndex[row+i]); Rule *r = Rule::cast(ruleIndex[row+i]);
r->setRuleGroupName (ru->groupName.toAscii().data()); if (r)
//ruleIndex[row+i] =r ; {
if (ru->collapsedGroup) showHideRuleGroup( r->setRuleGroupName (ru->groupName.toAscii().data());
dynamic_cast<RuleGroupPanel*>(indexWidget(model()->index(top,1)))); //ruleIndex[row+i] =r ;
if (ru->collapsedGroup)
showHideRuleGroup(
dynamic_cast<RuleGroupPanel*>(
indexWidget(model()->index(top,1))));
}
} }
updateGroups(); updateGroups();
} }
@@ -2555,10 +2561,15 @@ void RuleSetView::addToGroupBelow()
for (int i = 0; i< count ; i++) for (int i = 0; i< count ; i++)
{ {
Rule *r = Rule::cast(ruleIndex[row+i]); Rule *r = Rule::cast(ruleIndex[row+i]);
r->setRuleGroupName (ru->groupName.toAscii().data()); if (r)
//ruleIndex[row+i] =r ; {
if (ru->collapsedGroup) showHideRuleGroup( r->setRuleGroupName (ru->groupName.toAscii().data());
dynamic_cast<RuleGroupPanel*>(indexWidget(model()->index(bottom,1)))); //ruleIndex[row+i] =r ;
if (ru->collapsedGroup)
showHideRuleGroup(
dynamic_cast<RuleGroupPanel*>(
indexWidget(model()->index(bottom,1))));
}
} }
updateGroups(); updateGroups();
} }