From 57e3c5b0d3c38a906e4c6fe94df2cc86a03118bc Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 6 Jun 2011 15:23:46 -0700 Subject: [PATCH] see #2478 always draw rule sets on top of interfaces in the tree --- src/libgui/ObjectManipulator_tree_ops.cpp | 6 +++--- src/libgui/ObjectTreeView.cpp | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/libgui/ObjectManipulator_tree_ops.cpp b/src/libgui/ObjectManipulator_tree_ops.cpp index 613f8adaa..b5c3a0a64 100644 --- a/src/libgui/ObjectManipulator_tree_ops.cpp +++ b/src/libgui/ObjectManipulator_tree_ops.cpp @@ -279,9 +279,6 @@ void ObjectManipulator::insertSubtree(ObjectTreeViewItem *itm, FWObject *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); 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); it != it.end(); ++it) insertSubtree( nitm, *it ); + for (FWObjectTypedChildIterator it = obj->findByType(Interface::TYPENAME); + it != it.end(); ++it) insertSubtree( nitm, *it ); + return ; } diff --git a/src/libgui/ObjectTreeView.cpp b/src/libgui/ObjectTreeView.cpp index b69ec9ef7..dd0281193 100644 --- a/src/libgui/ObjectTreeView.cpp +++ b/src/libgui/ObjectTreeView.cpp @@ -88,7 +88,12 @@ ObjectTreeView::ObjectTreeView(ProjectPanel* project, QPalette updated_palette = palette(); updated_palette.setColor( - QPalette::Inactive, QPalette::Highlight, QColor("silver")); + QPalette::Inactive, + QPalette::Highlight, + QColor("silver")); + +// palette().color(QPalette::Highlight).lighter(300)); + setPalette(updated_palette); setExpandsOnDoubleClick(false); @@ -162,7 +167,10 @@ ObjectTreeView::ObjectTreeView(ProjectPanel* project, // QT 4.3.4 (discovered on Ubuntu Hardy). Crash happened when // second object was added to any branch of the tree. // +// This causes crash with Qt 4.6 as well +// // setSortingEnabled(true); + } void ObjectTreeView::paintEvent(QPaintEvent *ev)