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

bugfix 2641,2656

Browse Source
This commit is contained in:
2008-06-14 02:25:29 +00:00
parent 6a8992a954
commit 3468c34403
3 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/RuleOptionsDialog.cpp
-17
View File
@@ -83,23 +83,6 @@ void RuleOptionsDialog::loadFWObject(FWObject *o)
Rule *rule = dynamic_cast<Rule*>(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())
src/gui/RuleSetView.cpp
+2 -1
View File
@@ -2289,7 +2289,8 @@ void RuleSetView::mousePressEvent( QMouseEvent* ev )
int row=rowAt(ev->y());
int col=columnAt(ev->x());
if (row==-1)
return ;
if (col==0)
{
if (row<rowsInfo.size()&&row>=0)
src/gui/ruleoptionsdialog_q.ui
+5 -5
View File
@@ -117,16 +117,16 @@
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
<number>2</number>
</property>
<property name="topMargin" >
<number>0</number>
<number>2</number>
</property>
<property name="rightMargin" >
<number>0</number>
<number>2</number>
</property>
<property name="bottomMargin" >
<number>0</number>
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
@@ -162,7 +162,7 @@
<string/>
</property>
<property name="pixmap" >
<pixmap resource="MainRes.qrc" >:/Icons/Log</pixmap>
<pixmap resource="MainRes.qrc" >:/Icons/Options</pixmap>
</property>
</widget>
</item>