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

* RuleSetView.cpp (showToolTip): Added text to the tooltips shown

Browse Source 
for the "Direction" and "Action" rule elements to remind user that
to change these rule parameters they need to click right mouse
button to open list of possible settings
This commit is contained in:
Vadim Kurland 2010-09-27 23:03:59 +00:00
parent 54b592eadf
commit 12de1663a8
4 changed files with 72 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 3270
#define BUILD_NUM 3271

5
doc/ChangeLog
View File

@ -1,5 +1,10 @@
2010-09-27 Vadim Kurland <vadim@vk.crocodile.org>
* RuleSetView.cpp (showToolTip): Added text to the tooltips shown
for the "Direction" and "Action" rule elements to remind user that
to change these rule parameters they need to click right mouse
button to open list of possible settings
* RuleSetView.cpp (showToolTip): fixed #1744 "Add tooltip to the
rule number". The column in the RuleSetView? where rule number is
shown now has a tooltip to remind the user that they can click

89
src/gui/FWObjectPropertiesFactory.cpp
View File

@ -1017,15 +1017,17 @@ QString FWObjectPropertiesFactory::getPolicyRuleOptions(Rule *rule)
if (!ropt->getStr("log_level").empty())
{
options << qMakePair(QObject::tr("Log Level:"),
QString(getScreenName(ropt->getStr("log_level").c_str(),
getLogLevels(platform.c_str()))));
options << qMakePair(
QObject::tr("Log Level:"),
QString(getScreenName(ropt->getStr("log_level").c_str(),
getLogLevels(platform.c_str()))));
}
if (ropt->getInt("ulog_nlgroup")>1)
{
options << qMakePair(QObject::tr("Netlink group:"),
QString(ropt->getStr("ulog_nlgroup").c_str()));
options << qMakePair(
QObject::tr("Netlink group:"),
QString(ropt->getStr("ulog_nlgroup").c_str()));
}
if (ropt->getInt("limit_value")>0)
@ -1068,14 +1070,16 @@ QString FWObjectPropertiesFactory::getPolicyRuleOptions(Rule *rule)
getLimitSuffixes(platform.c_str()));
}
options << qMakePair(QString("hashlimit name:"),
QString(ropt->getStr("hashlimit_name").c_str()));
options << qMakePair(
QString("hashlimit name:"),
QString(ropt->getStr("hashlimit_name").c_str()));
options << qMakePair(QString("hashlimit value:"), arg);
if (ropt->getInt("hashlimit_burst")>0)
{
options << qMakePair(QString("haslimit burst:"),
QString(ropt->getStr("hashlimit_burst").c_str()));
options << qMakePair(
QString("haslimit burst:"),
QString(ropt->getStr("hashlimit_burst").c_str()));
}
}
@ -1089,26 +1093,31 @@ QString FWObjectPropertiesFactory::getPolicyRuleOptions(Rule *rule)
{
if (!ropt->getStr("ipf_log_facility").empty())
{
options << qMakePair(QObject::tr("Log facility:"),
QString(getScreenName(ropt->getStr("ipf_log_facility").c_str(),
getLogFacilities(platform.c_str()))));
options << qMakePair(
QObject::tr("Log facility:"),
QString(getScreenName(ropt->getStr("ipf_log_facility").c_str(),
getLogFacilities(platform.c_str()))));
}
if (!ropt->getStr("log_level").empty())
{
options << qMakePair(QObject::tr("Log level:"),
QString(getScreenName(ropt->getStr("log_level").c_str(),
getLogLevels(platform.c_str()))));
options << qMakePair(
QObject::tr("Log level:"),
QString(getScreenName(ropt->getStr("log_level").c_str(),
getLogLevels(platform.c_str()))));
}
if (ropt->getBool("ipf_return_icmp_as_dest"))
{
options << qMakePair(QObject::tr("Send 'unreachable'"), QString(""));
options << qMakePair(
QObject::tr("Send 'unreachable'"), QString(""));
}
if (ropt->getBool("ipf_keep_frags"))
{
options << qMakePair(QObject::tr("Keep information on fragmented packets"), QString(""));
options << qMakePair(
QObject::tr("Keep information on fragmented packets"),
QString(""));
}
}else if (platform=="pf")
@ -1122,13 +1131,15 @@ QString FWObjectPropertiesFactory::getPolicyRuleOptions(Rule *rule)
if (ropt->getInt("pf_rule_max_state")>0)
{
options << qMakePair(QObject::tr("Max state:"),
QString(ropt->getStr("pf_rule_max_state").c_str()));
options << qMakePair(
QObject::tr("Max state:"),
QString(ropt->getStr("pf_rule_max_state").c_str()));
}
if (ropt->getBool("pf_keep_state"))
{
options << qMakePair(QObject::tr("Force 'keep-state'"), QString(""));
options << qMakePair(
QObject::tr("Force 'keep-state'"), QString(""));
}
if (ropt->getBool("pf_no_sync"))
{
@ -1145,13 +1156,16 @@ QString FWObjectPropertiesFactory::getPolicyRuleOptions(Rule *rule)
if (ropt->getBool("pf_source_tracking"))
{
options << qMakePair(QObject::tr("Source tracking"), QString(""));
options << qMakePair(
QObject::tr("Source tracking"), QString(""));
options << qMakePair(QObject::tr("Max src nodes:"),
QString(ropt->getStr("pf_max_src_nodes").c_str()));
options << qMakePair(
QObject::tr("Max src nodes:"),
QString(ropt->getStr("pf_max_src_nodes").c_str()));
options << qMakePair(QObject::tr("Max src states:"),
QString(ropt->getStr("pf_max_src_states").c_str()));
options << qMakePair(
QObject::tr("Max src states:"),
QString(ropt->getStr("pf_max_src_states").c_str()));
}
if (ropt->getBool("pf_synproxy"))
@ -1171,7 +1185,8 @@ QString FWObjectPropertiesFactory::getPolicyRuleOptions(Rule *rule)
{
if (ropt->getBool("iosacl_add_mirror_rule"))
{
options << qMakePair(QObject::tr("Add mirrored rule"), QString(""));
options << qMakePair(
QObject::tr("Add mirrored rule"), QString(""));
}
}else if (platform=="pix" || platform=="fwsm")
@ -1186,26 +1201,34 @@ QString FWObjectPropertiesFactory::getPolicyRuleOptions(Rule *rule)
if (!ropt->getStr("log_level").empty())
{
options << qMakePair(QObject::tr("Log level:"),
QString(getScreenName(ropt->getStr("log_level").c_str(),
getLogLevels(platform.c_str()))));
options << qMakePair(
QObject::tr("Log level:"),
QString(getScreenName(ropt->getStr("log_level").c_str(),
getLogLevels(platform.c_str()))));
}
if (ropt->getInt("log_interval")>0)
{
options << qMakePair(QObject::tr("Log interval:"),
QString(ropt->getStr("log_interval").c_str()));
options << qMakePair(
QObject::tr("Log interval:"),
QString(ropt->getStr("log_interval").c_str()));
}
if (ropt->getBool("disable_logging_for_this_rule"))
{
options << qMakePair(QObject::tr("Disable logging for this rule"), QString(""));
options << qMakePair(
QObject::tr("Disable logging for this rule"), QString(""));
}
}
}
}
PolicyRule *prule = PolicyRule::cast(rule);
if (prule)
options << qMakePair(
QObject::tr("Logging: "),
(prule->getLogging()) ? QObject::tr("on") : QObject::tr("off"));
QStringList res;
res << "<table>";
QList<QPair<QString,QString> >::iterator it;

17
src/gui/RuleSetView.cpp
View File

@ -2524,24 +2524,27 @@ Policy, NAT and routing rules are shown here.\
Rule* rule = node->rule;
if (PolicyRule::cast(rule)!=NULL )
{
if (!isDefaultPolicyRuleOptions(rule->getOptionsObject())) {
toolTip = FWObjectPropertiesFactory::getPolicyRuleOptions(rule);
}
// if (!isDefaultPolicyRuleOptions(rule->getOptionsObject()))
toolTip =
FWObjectPropertiesFactory::getPolicyRuleOptions(rule);
}
if (NATRule::cast(rule)!=NULL )
{
if (!isDefaultNATRuleOptions( rule->getOptionsObject()))
toolTip = FWObjectPropertiesFactory::getNATRuleOptions(rule);
// if (!isDefaultNATRuleOptions( rule->getOptionsObject()))
toolTip =
FWObjectPropertiesFactory::getNATRuleOptions(rule);
}
}
break;
case ColDesc::Direction:
toolTip = v.value<QString>();
toolTip = "<b>Direction:</b> " + v.value<QString>() +
"<br><b>To change the direction</b>, click right mouse button to open the list of possible settings";
break;
case ColDesc::Action:
toolTip = v.value<ActionDesc>().tooltip;
toolTip = v.value<ActionDesc>().tooltip +
"<b>To change the action</b>, click right mouse button to open the list of possible settings";
break;
default: