diff --git a/src/gui/RuleOptionsDialog.cpp b/src/gui/RuleOptionsDialog.cpp index e47ae0532..97953b147 100644 --- a/src/gui/RuleOptionsDialog.cpp +++ b/src/gui/RuleOptionsDialog.cpp @@ -83,7 +83,23 @@ void RuleOptionsDialog::loadFWObject(FWObject *o) Rule *rule = dynamic_cast(o); FWOptions *ropt = rule->getOptionsObject(); - + m_dialog->icon->setVisible(false); + PolicyRule *policyRule = PolicyRule::cast( rule ); + NATRule *natRule = NATRule::cast( rule ); + RoutingRule *routingRule = RoutingRule::cast( rule ); + if (policyRule && policyRule->getLogging()) + { + + m_dialog->icon->setVisible(true); + m_dialog->icon->setPixmap (QIcon(":/Icons/Log").pixmap (25,25)); + } + if ((policyRule && ! isDefaultPolicyRuleOptions( rule->getOptionsObject())) || + (routingRule && ! isDefaultRoutingRuleOptions( rule->getOptionsObject())) || + (natRule && ! isDefaultNATRuleOptions( rule->getOptionsObject()))) + { + m_dialog->icon->setVisible(true); + m_dialog->icon->setPixmap (QIcon(":/Icons/Options").pixmap (25,25)); + } m_dialog->editorTitle->setText(QString("%1 / %2 / %3 ") .arg(QString::fromUtf8(p->getName().c_str())) .arg(rule->getTypeName().c_str()) diff --git a/src/gui/RuleSetView.cpp b/src/gui/RuleSetView.cpp index 2222dc71c..b8729cf9b 100644 --- a/src/gui/RuleSetView.cpp +++ b/src/gui/RuleSetView.cpp @@ -1592,7 +1592,7 @@ void RuleSetView::paintCell(QPainter *pntr, p.setPen( cg.highlightedText().color() ); } else { - p.fillRect(rect, cg.brush( QPalette::Base ));//cg.brush( crole )); + p.fillRect(rect, cg.brush( QPalette::Mid ));//cg.brush( crole )); p.setPen( cg.text().color() ); } } else diff --git a/src/gui/ruleoptionsdialog_q.ui b/src/gui/ruleoptionsdialog_q.ui index a4032ed9d..6eb57de61 100644 --- a/src/gui/ruleoptionsdialog_q.ui +++ b/src/gui/ruleoptionsdialog_q.ui @@ -39,9 +39,76 @@ 16 - 20 + 35 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 254 + 253 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 254 + 253 + + + + + + + + + 255 + 254 + 253 + + + + + + + 255 + 254 + 253 + + + + + + + + true + QFrame::Box @@ -67,7 +134,7 @@ 2 - + @@ -83,6 +150,22 @@ + + + + + 0 + 0 + + + + + + + :/Icons/Log + + + @@ -2342,7 +2425,9 @@ ipfw_stateless pf_logPrefix - + + + pf_max_src_states