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

fixed bugs 2645, 2648, 2601,2602

Browse Source
This commit is contained in:
Vadim Kurland
2008-06-12 00:56:13 +00:00
parent 39725bad29
commit 44247d6a73
2 changed files with 236 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/ActionsDialog.cpp
+48 -51
View File
@@ -66,49 +66,40 @@ ActionsDialog::ActionsDialog(QWidget *parent) : QWidget(parent)
m_dialog = new Ui::ActionsDialog_q; m_dialog = new Ui::ActionsDialog_q;
m_dialog->setupUi(this); m_dialog->setupUi(this);
BranchChainArea = new FWObjectDropArea(m_dialog->branchChainNameFrame); m_dialog->iptBranchDropArea->addAcceptedTypes("Policy");
BranchChainArea->addAcceptedTypes("Policy"); m_dialog->iptBranchDropArea->addAcceptedTypes("NAT");
BranchChainArea->addAcceptedTypes("NAT"); m_dialog->iptBranchDropArea->addAcceptedTypes("Routing");
BranchChainArea->addAcceptedTypes("Routing"); m_dialog->iptBranchDropArea->setHelperText("Drop rule set object here");
BranchChainArea->setHelperText("Drop rule set object here"); connect (m_dialog->iptBranchDropArea,
m_dialog->gridLayout17->addWidget(BranchChainArea); SIGNAL(objectDeleted()),this,SLOT(changed()));
connect (BranchChainArea,SIGNAL(objectDeleted()),this,SLOT(changed())); connect (m_dialog->iptBranchDropArea,
connect (BranchChainArea,SIGNAL(objectInserted()),this,SLOT(changed())); SIGNAL(objectInserted()),this,SLOT(changed()));
m_dialog->pfBranchDropArea->addAcceptedTypes("Policy");
m_dialog->pfBranchDropArea->addAcceptedTypes("NAT");
m_dialog->pfBranchDropArea->addAcceptedTypes("Routing");
m_dialog->pfBranchDropArea->setHelperText("Drop rule set object here");
connect (m_dialog->pfBranchDropArea,
SIGNAL(objectDeleted()),this,SLOT(changed()));
connect (m_dialog->pfBranchDropArea,
SIGNAL(objectInserted()),this,SLOT(changed()));
BranchAnchorArea = new FWObjectDropArea(m_dialog->BranchAnchorPageFrame); m_dialog->pfTagDropArea->addAcceptedTypes("TagService");
BranchAnchorArea->addAcceptedTypes("Policy"); connect (m_dialog->pfTagDropArea,
BranchAnchorArea->addAcceptedTypes("NAT"); SIGNAL(objectDeleted()),this,SLOT(changed()));
BranchAnchorArea->addAcceptedTypes("Routing"); connect (m_dialog->pfTagDropArea,
BranchAnchorArea->setHelperText("Drop rule set object here"); SIGNAL(objectInserted()),this,SLOT(changed()));
m_dialog->gridLayout20->addWidget(BranchAnchorArea);
connect (BranchAnchorArea,SIGNAL(objectDeleted()),this,SLOT(changed()));
connect (BranchAnchorArea,SIGNAL(objectInserted()),this,SLOT(changed()));
TagStrArea = new FWObjectDropArea(m_dialog->TagStrFrame);
TagStrArea->addAcceptedTypes("TagService");
m_dialog->gridLayout4->addWidget(TagStrArea);
connect (TagStrArea,SIGNAL(objectDeleted()),this,SLOT(changed()));
connect (TagStrArea,SIGNAL(objectInserted()),this,SLOT(changed()));
TagIntArea = new FWObjectDropArea(m_dialog->TagIntFrame);
TagIntArea->addAcceptedTypes("TagService");
m_dialog->gridLayout9->addWidget(TagIntArea);
connect (TagIntArea,SIGNAL(objectDeleted()),this,SLOT(changed()));
connect (TagIntArea,SIGNAL(objectInserted()),this,SLOT(changed()));
// FWObjectDropArea * fwoda = new FWObjectDropArea(m_dialog->TagIntFrame);
m_dialog->iptTagDropArea->addAcceptedTypes("TagService");
connect (m_dialog->iptTagDropArea,
SIGNAL(objectDeleted()),this,SLOT(changed()));
connect (m_dialog->iptTagDropArea,
SIGNAL(objectInserted()),this,SLOT(changed()));
}; };
ActionsDialog::~ActionsDialog() ActionsDialog::~ActionsDialog()
{ {
delete m_dialog; delete m_dialog;
delete TagIntArea;
delete TagStrArea;
delete BranchChainArea;
delete BranchAnchorArea;
} }
void ActionsDialog::loadFWObject(FWObject *o) void ActionsDialog::loadFWObject(FWObject *o)
@@ -185,28 +176,28 @@ void ActionsDialog::applyChanges()
if (editor=="TagInt") if (editor=="TagInt")
{ {
FWObject *tag_object = TagIntArea->getObject(); FWObject *tag_object = m_dialog->iptTagDropArea->getObject();
// if tag_object==NULL, setTagObject clears setting in the rule // if tag_object==NULL, setTagObject clears setting in the rule
rule->setTagObject(tag_object); rule->setTagObject(tag_object);
} }
if (editor=="TagStr") if (editor=="TagStr")
{ {
FWObject *tag_object = TagStrArea->getObject(); FWObject *tag_object = m_dialog->pfTagDropArea->getObject();
// if tag_object==NULL, setTagObject clears setting in the rule // if tag_object==NULL, setTagObject clears setting in the rule
rule->setTagObject(tag_object); rule->setTagObject(tag_object);
} }
if (editor=="BranchChain") if (editor=="BranchChain")
{ {
RuleSet *ruleset = RuleSet::cast(BranchChainArea->getObject()); RuleSet *ruleset = RuleSet::cast(m_dialog->iptBranchDropArea->getObject());
// if ruleset==NULL, setBranch clears setting in the rule // if ruleset==NULL, setBranch clears setting in the rule
rule->setBranch(ruleset); rule->setBranch(ruleset);
} }
if (editor=="BranchAnchor") if (editor=="BranchAnchor")
{ {
RuleSet *ruleset = RuleSet::cast(BranchAnchorArea->getObject()); RuleSet *ruleset = RuleSet::cast(m_dialog->pfBranchDropArea->getObject());
// if ruleset==NULL, setBranch clears setting in the rule // if ruleset==NULL, setBranch clears setting in the rule
rule->setBranch(ruleset); rule->setBranch(ruleset);
} }
@@ -284,26 +275,32 @@ void ActionsDialog::setRule(PolicyRule *r )
if (platform=="iptables") if (platform=="iptables")
{ {
m_dialog->classify_txt_1->show(); //m_dialog->classify_txt_1->show();
m_dialog->classify_terminating->show(); m_dialog->classify_terminating->show();
m_dialog->tag_txt_1->show(); //m_dialog->tag_txt_1->show();
m_dialog->tag_terminating->show(); m_dialog->tag_terminating->show();
// Keep both variants of this text separate to simplify localization
QString emu_state;
if (firewall->getOptionsObject()->getBool ("classify_mark_terminating")) if (firewall->getOptionsObject()->getBool ("classify_mark_terminating"))
{ {
m_dialog->classify_terminating->setText(tr("Emulation is currently ON, rule will be terminating") ); emu_state =
m_dialog->tag_terminating->setText(tr("Emulation is currently ON, rule will be terminating") ); tr("Emulation of terminating behavior for MARK and CLASSIFY "
"targets is currently ON, rule will be terminating");
} else } else
{ {
m_dialog->classify_terminating->setText(tr("Emulation is currently OFF, rule will be non-terminating") ); emu_state =
m_dialog->tag_terminating->setText(tr("Emulation is currently OFF, rule will be non-terminating") ); tr("Emulation of terminating behavior for MARK and CLASSIFY "
"targets is currently OFF, rule will not be terminating");
} }
m_dialog->classify_terminating->setText(emu_state);
m_dialog->tag_terminating->setText(emu_state);
} else } else
{ {
m_dialog->classify_txt_1->hide(); //m_dialog->classify_txt_1->hide();
m_dialog->classify_terminating->hide(); m_dialog->classify_terminating->hide();
m_dialog->tag_txt_1->hide(); //m_dialog->tag_txt_1->hide();
m_dialog->tag_terminating->hide(); m_dialog->tag_terminating->hide();
} }
@@ -356,13 +353,13 @@ void ActionsDialog::setRule(PolicyRule *r )
{ {
w=m_dialog->TagIntPage; w=m_dialog->TagIntPage;
FWObject *o = rule->getTagObject(); FWObject *o = rule->getTagObject();
TagIntArea->setObject(o); m_dialog->iptTagDropArea->setObject(o);
} }
else if (editor=="TagStr") else if (editor=="TagStr")
{ {
w=m_dialog->TagStrPage; w=m_dialog->TagStrPage;
FWObject *o = rule->getTagObject(); FWObject *o = rule->getTagObject();
TagStrArea->setObject(o); m_dialog->pfTagDropArea->setObject(o);
} }
else if (editor=="AccountingStr") else if (editor=="AccountingStr")
{ {
@@ -388,7 +385,7 @@ void ActionsDialog::setRule(PolicyRule *r )
{ {
w=m_dialog->BranchChainPage; w=m_dialog->BranchChainPage;
RuleSet *ruleset = r->getBranch(); RuleSet *ruleset = r->getBranch();
BranchChainArea->setObject(ruleset); m_dialog->iptBranchDropArea->setObject(ruleset);
data.registerOption( data.registerOption(
m_dialog->ipt_branch_in_mangle, ropt , "ipt_branch_in_mangle" ); m_dialog->ipt_branch_in_mangle, ropt , "ipt_branch_in_mangle" );
@@ -397,7 +394,7 @@ void ActionsDialog::setRule(PolicyRule *r )
{ {
w=m_dialog->BranchAnchorPage; w=m_dialog->BranchAnchorPage;
RuleSet *ruleset = r->getBranch(); RuleSet *ruleset = r->getBranch();
BranchChainArea->setObject(ruleset); m_dialog->iptBranchDropArea->setObject(ruleset);
} }
else if (editor=="RouteIPT") else if (editor=="RouteIPT")
{ {
src/gui/actionsdialog_q.ui
+188 -511
View File
@@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>635</width> <width>852</width>
<height>211</height> <height>212</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@@ -106,24 +106,6 @@
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" >
<number>8</number>
</property>
<property name="topMargin" >
<number>8</number>
</property>
<property name="rightMargin" >
<number>8</number>
</property>
<property name="bottomMargin" >
<number>8</number>
</property>
<property name="horizontalSpacing" >
<number>8</number>
</property>
<property name="verticalSpacing" >
<number>8</number>
</property>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QStackedWidget" name="widgetStack" > <widget class="QStackedWidget" name="widgetStack" >
<property name="minimumSize" > <property name="minimumSize" >
@@ -139,124 +121,66 @@
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<property name="currentIndex" > <property name="currentIndex" >
<number>0</number> <number>3</number>
</property> </property>
<widget class="QWidget" name="TagStrPage" > <widget class="QWidget" name="TagStrPage" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <item row="0" column="0" colspan="2" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel4" > <widget class="QLabel" name="textLabel4" >
<property name="text" > <property name="text" >
<string>Tag string:</string> <string>Tag service object:</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="1" column="0" >
<spacer> <widget class="FWObjectDropArea" native="1" name="pfTagDropArea" >
<property name="orientation" > <property name="sizePolicy" >
<enum>Qt::Vertical</enum> <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QFrame" name="TagStrFrame" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>200</width> <width>100</width>
<height>80</height> <height>80</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="font" >
<size> <font>
<width>80</width> <pointsize>9</pointsize>
<height>16777215</height> </font>
</size>
</property> </property>
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="0" >
<layout class="QGridLayout" />
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="1" column="1" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" >
<size> <size>
<width>40</width> <width>691</width>
<height>20</height> <height>58</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@@ -283,22 +207,6 @@
<property name="verticalSpacing" > <property name="verticalSpacing" >
<number>2</number> <number>2</number>
</property> </property>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="3" > <item row="1" column="0" colspan="3" >
<widget class="QLabel" name="textLabel3" > <widget class="QLabel" name="textLabel3" >
<property name="text" > <property name="text" >
@@ -403,94 +311,54 @@
</widget> </widget>
<widget class="QWidget" name="TagIntPage" > <widget class="QWidget" name="TagIntPage" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <item row="0" column="0" colspan="2" >
<number>0</number> <widget class="QLabel" name="textLabel4_2" >
</property> <property name="text" >
<property name="topMargin" > <string>Tag service object:</string>
<number>0</number> </property>
</property> <property name="wordWrap" >
<property name="rightMargin" > <bool>false</bool>
<number>0</number> </property>
</property> </widget>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="textLabel4_2" >
<property name="text" >
<string>Tag value:</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="TagIntFrame" >
<property name="minimumSize" >
<size>
<width>100</width>
<height>50</height>
</size>
</property>
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="0" >
<layout class="QGridLayout" />
</item>
</layout>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
<item row="1" column="0" > <item rowspan="3" row="0" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>201</width>
<height>81</height>
</size>
</property>
</spacer>
</item>
<item rowspan="3" row="1" column="0" >
<widget class="FWObjectDropArea" native="1" name="iptTagDropArea" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>100</width>
<height>80</height>
</size>
</property>
<property name="font" >
<font>
<pointsize>9</pointsize>
</font>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QCheckBox" name="ipt_mark_connections" > <widget class="QCheckBox" name="ipt_mark_connections" >
<property name="toolTip" > <property name="toolTip" >
<string>Requires CONNMARK target</string> <string>Requires CONNMARK target</string>
@@ -500,7 +368,28 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" > <item row="2" column="1" >
<widget class="QLabel" name="tag_terminating" >
<property name="toolTip" >
<string>Note: this action translates into MARK target for iptables.
Normally this target is non-terminating, that is, other rules
with Classify or Tag actions below this one will process
the same packet. However, Firewall Builder can emulate
terminating behavior for this action. Option in the "compiler"
tab of the firewall object properties dialog activates emulation.</string>
</property>
<property name="text" >
<string>Emulation of terminating behavior for MARK target is currently ON, the rule will be terminating</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@@ -510,38 +399,12 @@
</property> </property>
<property name="sizeHint" > <property name="sizeHint" >
<size> <size>
<width>20</width> <width>609</width>
<height>0</height> <height>21</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="0" >
<widget class="QLabel" name="tag_txt_1" >
<property name="text" >
<string>Note: this action translates into MARK target for iptables. Normally this target is non-terminating, that is, other rules with Classify or Tag actions below this one will process the same packet. However, Firewall Builder can emulate terminating behavior for this action. Option in the "compiler" tab of the firewall object properties dialog activates emulation.</string>
</property>
<property name="alignment" >
<set>Qt::AlignVCenter</set>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="tag_terminating" >
<property name="text" >
<string>Emulation is currently ON, the rule will be terminating</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="AccountingStrPage" > <widget class="QWidget" name="AccountingStrPage" >
@@ -574,22 +437,6 @@
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLineEdit" name="accountingvalue_str" /> <widget class="QLineEdit" name="accountingvalue_str" />
</item> </item>
<item row="0" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" > <item row="3" column="0" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
@@ -756,22 +603,6 @@
<property name="bottomMargin" > <property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QLabel" name="textLabel1_2" > <widget class="QLabel" name="textLabel1_2" >
<property name="text" > <property name="text" >
@@ -830,19 +661,6 @@
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QLineEdit" name="classify_str" /> <widget class="QLineEdit" name="classify_str" />
</item> </item>
<item row="2" column="0" >
<widget class="QLabel" name="classify_txt_1" >
<property name="text" >
<string>Note: CLASSIFY target in iptables is non-terminating, that is other rules with Classify or Mark target below this will process the same packet. However, Firewall Builder can emulate terminating behavior for this action. Emulation is activated by an option in the "compiler" tab of the firewall object properties dialog.</string>
</property>
<property name="alignment" >
<set>Qt::AlignVCenter</set>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0" > <item row="4" column="0" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
@@ -861,6 +679,15 @@
</item> </item>
<item row="3" column="0" > <item row="3" column="0" >
<widget class="QLabel" name="classify_terminating" > <widget class="QLabel" name="classify_terminating" >
<property name="toolTip" >
<string>Note: CLASSIFY target in iptables is non-terminating,
that is other rules with Classify or Mark
target below this will process the same packet.
However, Firewall Builder can emulate terminating
behavior for this action. Emulation is activated
by an option in the "compiler" tab of the firewall
object properties dialog.</string>
</property>
<property name="text" > <property name="text" >
<string>Emulation is currently ON, rule will be terminating</string> <string>Emulation is currently ON, rule will be terminating</string>
</property> </property>
@@ -927,22 +754,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" > <item row="2" column="0" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
@@ -963,110 +774,58 @@
</widget> </widget>
<widget class="QWidget" name="BranchChainPage" > <widget class="QWidget" name="BranchChainPage" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <item row="0" column="0" colspan="2" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="1" colspan="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>589</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="3" >
<widget class="QLabel" name="textLabel1_3" > <widget class="QLabel" name="textLabel1_3" >
<property name="text" > <property name="text" >
<string>User-defined chain name:</string> <string>Policy ruleset object:</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2" > <item row="1" column="0" >
<widget class="QFrame" name="branchChainNameFrame" > <widget class="FWObjectDropArea" native="1" name="iptBranchDropArea" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>80</width> <width>100</width>
<height>80</height> <height>80</height>
</size> </size>
</property> </property>
<property name="frameShape" > <property name="font" >
<enum>QFrame::StyledPanel</enum> <font>
<pointsize>9</pointsize>
</font>
</property> </property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="0" >
<layout class="QGridLayout" />
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="2" column="2" > <item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>531</width>
<height>30</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" colspan="3" >
<widget class="QCheckBox" name="ipt_branch_in_mangle" > <widget class="QCheckBox" name="ipt_branch_in_mangle" >
<property name="text" > <property name="text" >
<string>In addition to 'filter', create branching rule in 'mangle' table as well</string> <string>In addition to 'filter', create branching rule in 'mangle' table as well</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" > <item row="1" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>41</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@@ -1086,120 +845,62 @@
</widget> </widget>
<widget class="QWidget" name="BranchAnchorPage" > <widget class="QWidget" name="BranchAnchorPage" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <item row="0" column="0" colspan="2" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel2_4" > <widget class="QLabel" name="textLabel2_4" >
<property name="text" > <property name="text" >
<string>Anchor name: </string> <string>Policy rule set object:</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="1" column="0" >
<spacer> <widget class="FWObjectDropArea" native="1" name="pfBranchDropArea" >
<property name="orientation" > <property name="sizePolicy" >
<enum>Qt::Vertical</enum> <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QFrame" name="BranchAnchorPageFrame" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>200</width> <width>100</width>
<height>64</height> <height>80</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="font" >
<size> <font>
<width>64</width> <pointsize>9</pointsize>
<height>10000</height> </font>
</size>
</property> </property>
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="0" >
<layout class="QGridLayout" />
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="4" column="0" > <item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" >
<size> <size>
<width>40</width> <width>701</width>
<height>20</height> <height>64</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@@ -1291,42 +992,10 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="RoutePFPage" > <widget class="QWidget" name="RoutePFPage" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" colspan="5" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="5" > <item row="1" column="0" colspan="5" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<item> <item>
@@ -1567,6 +1236,14 @@
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11" />
<customwidgets>
<customwidget>
<class>FWObjectDropArea</class>
<extends>QWidget</extends>
<header>FWObjectDropArea.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>