mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-09-13 00:19:55 +02:00
see #2478 always draw rule sets on top of interfaces in the tree
This commit is contained in:
@@ -279,9 +279,6 @@ void ObjectManipulator::insertSubtree(ObjectTreeViewItem *itm, FWObject *obj)
|
|||||||
|
|
||||||
if (Cluster::isA(obj) || Firewall::isA(obj))
|
if (Cluster::isA(obj) || Firewall::isA(obj))
|
||||||
{
|
{
|
||||||
for (FWObjectTypedChildIterator it = obj->findByType(Interface::TYPENAME);
|
|
||||||
it != it.end(); ++it) insertSubtree( nitm, *it );
|
|
||||||
|
|
||||||
for (FWObjectTypedChildIterator it = obj->findByType(Policy::TYPENAME);
|
for (FWObjectTypedChildIterator it = obj->findByType(Policy::TYPENAME);
|
||||||
it != it.end(); ++it) insertSubtree( nitm, *it );
|
it != it.end(); ++it) insertSubtree( nitm, *it );
|
||||||
|
|
||||||
@@ -291,6 +288,9 @@ void ObjectManipulator::insertSubtree(ObjectTreeViewItem *itm, FWObject *obj)
|
|||||||
for (FWObjectTypedChildIterator it = obj->findByType(Routing::TYPENAME);
|
for (FWObjectTypedChildIterator it = obj->findByType(Routing::TYPENAME);
|
||||||
it != it.end(); ++it) insertSubtree( nitm, *it );
|
it != it.end(); ++it) insertSubtree( nitm, *it );
|
||||||
|
|
||||||
|
for (FWObjectTypedChildIterator it = obj->findByType(Interface::TYPENAME);
|
||||||
|
it != it.end(); ++it) insertSubtree( nitm, *it );
|
||||||
|
|
||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -88,7 +88,12 @@ ObjectTreeView::ObjectTreeView(ProjectPanel* project,
|
|||||||
|
|
||||||
QPalette updated_palette = palette();
|
QPalette updated_palette = palette();
|
||||||
updated_palette.setColor(
|
updated_palette.setColor(
|
||||||
QPalette::Inactive, QPalette::Highlight, QColor("silver"));
|
QPalette::Inactive,
|
||||||
|
QPalette::Highlight,
|
||||||
|
QColor("silver"));
|
||||||
|
|
||||||
|
// palette().color(QPalette::Highlight).lighter(300));
|
||||||
|
|
||||||
setPalette(updated_palette);
|
setPalette(updated_palette);
|
||||||
|
|
||||||
setExpandsOnDoubleClick(false);
|
setExpandsOnDoubleClick(false);
|
||||||
@@ -162,7 +167,10 @@ ObjectTreeView::ObjectTreeView(ProjectPanel* project,
|
|||||||
// QT 4.3.4 (discovered on Ubuntu Hardy). Crash happened when
|
// QT 4.3.4 (discovered on Ubuntu Hardy). Crash happened when
|
||||||
// second object was added to any branch of the tree.
|
// second object was added to any branch of the tree.
|
||||||
//
|
//
|
||||||
|
// This causes crash with Qt 4.6 as well
|
||||||
|
//
|
||||||
// setSortingEnabled(true);
|
// setSortingEnabled(true);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ObjectTreeView::paintEvent(QPaintEvent *ev)
|
void ObjectTreeView::paintEvent(QPaintEvent *ev)
|
||||||
|
|||||||
Reference in New Issue
Block a user