onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-24 04:07:55 +01:00
Code Issues Releases Wiki Activity

scrolling help panel to the appropriate location

Browse Source
This commit is contained in:
Vadim Kurland 2008-08-06 15:50:49 +00:00
parent 92be538944
commit 09555f9c78
24 changed files with 141 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/Help.cpp
View File

@ -66,6 +66,10 @@ Help::Help(QWidget *parent, const QString &help_file, const QString &title) :
};
void Help::scrollToAnchor(const QString &anchor)
{
m_dialog->textview->scrollToAnchor(anchor);
}

1
src/gui/Help.h
View File

@ -41,6 +41,7 @@ public:
virtual ~Help() {};
void scrollToAnchor(const QString &anchor);
};
#endif

4
src/gui/freebsdadvanceddialog_q.ui
View File

@ -96,7 +96,7 @@
</layout>
</item>
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget5" >
<widget class="QTabWidget" name="tabWidget" >
<property name="tabShape" >
<enum>QTabWidget::Rounded</enum>
</property>
@ -504,7 +504,7 @@
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>tabWidget5</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>freebsd_ip_forward</tabstop>
<tabstop>freebsd_ip_sourceroute</tabstop>
<tabstop>freebsd_ip_redirect</tabstop>

4
src/gui/iosacladvanceddialog_q.ui
View File

@ -116,7 +116,7 @@
</layout>
</item>
<item row="0" column="0" >
<widget class="QTabWidget" name="notebook304" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
@ -1270,7 +1270,7 @@ First, create temporary access list to permit connections from the management su
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>notebook304</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>outputFileName</tabstop>
<tabstop>iosacl_ignore_empty_groups</tabstop>
<tabstop>iosacl_check_shadowing</tabstop>

2
src/gui/ipfAdvancedDialog.cpp
View File

@ -79,7 +79,7 @@ ipfAdvancedDialog::ipfAdvancedDialog(QWidget *parent,FWObject *o)
fwopt->setStr("firewall_dir","");
}
m_dialog->tabWidget3->setTabEnabled(6,false); //Disable tab
m_dialog->tabWidget->setTabEnabled(6,false); //Disable tab
data.registerOption(m_dialog->ipv4before_2, fwopt, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first" );
data.registerOption( m_dialog->ipf_log_or_block ,fwopt, "ipf_log_or_block" );
data.registerOption( m_dialog->ipf_log_body ,fwopt, "ipf_log_body" );

6
src/gui/ipfadvanceddialog_q.ui
View File

@ -99,9 +99,9 @@
</layout>
</item>
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget3" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>6</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab0" >
<attribute name="title" >
@ -1413,7 +1413,7 @@ with this address:</string>
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>tabWidget3</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>ipf_nat_ftp_proxy</tabstop>
<tabstop>ipf_nat_rcmd_proxy</tabstop>
<tabstop>ipf_nat_raudio_proxy</tabstop>

2
src/gui/ipfwAdvancedDialog.cpp
View File

@ -80,7 +80,7 @@ ipfwAdvancedDialog::ipfwAdvancedDialog(QWidget *parent,FWObject *o)
if (fwopt->getStr("add_check_state_rule").empty())
fwopt->setBool("add_check_state_rule",true);
m_dialog->tabWidget3->setTabEnabled(4,false); //Disable tab
m_dialog->tabWidget->setTabEnabled(4,false); //Disable tab
data.registerOption(m_dialog->ipv4before_2, fwopt, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first" );
data.registerOption( m_dialog->ipfw_add_check_state_rule ,fwopt, "add_check_state_rule");

4
src/gui/ipfwadvanceddialog_q.ui
View File

@ -99,7 +99,7 @@
</layout>
</item>
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget3" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
@ -936,7 +936,7 @@ with this address:</string>
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>tabWidget3</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>compiler</tabstop>
<tabstop>compilerArgs</tabstop>
<tabstop>outputFileName</tabstop>

3
src/gui/iptAdvancedDialog.cpp
View File

@ -233,6 +233,9 @@ void iptAdvancedDialog::help()
{
Help *h = new Help(this, "iptAdvancedDialog", "Firewall platform: iptables");
h->show();
QString tab_title = m_dialog->tabWidget->tabText(
m_dialog->tabWidget->currentIndex());
h->scrollToAnchor(tab_title.replace('/', '-').replace(' ', '-').toLower());
}

6
src/gui/iptadvanceddialog_q.ui
View File

@ -26,7 +26,7 @@
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget2" >
<widget class="QTabWidget" name="tabWidget" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
@ -34,7 +34,7 @@
</sizepolicy>
</property>
<property name="currentIndex" >
<number>3</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab0" >
<attribute name="title" >
@ -1456,7 +1456,7 @@ with this address:</string>
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>tabWidget2</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>compiler</tabstop>
<tabstop>compilerArgs</tabstop>
<tabstop>outputFileName</tabstop>

2
src/gui/linksysAdvancedDialog.cpp
View File

@ -67,7 +67,7 @@ linksysAdvancedDialog::linksysAdvancedDialog(QWidget *parent,FWObject *o)
* since v2.0.3 we do not need to know shell prompt on linksys. Will
* remove the page completely when code becomes stable.
*/
m_dialog->tabWidget3->removeTab( 1 );
m_dialog->tabWidget->removeTab( 1 );
QStringList threeStateMapping;

4
src/gui/linksysadvanceddialog_q.ui
View File

@ -96,7 +96,7 @@
</layout>
</item>
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget3" >
<widget class="QTabWidget" name="tabWidget" >
<property name="tabShape" >
<enum>QTabWidget::Rounded</enum>
</property>
@ -447,7 +447,7 @@ The default strings work for Sveasoft Alchemy pre-5.1 and pre-5.2</string>
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>tabWidget3</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>linksys_path_iptables</tabstop>
<tabstop>linksys_path_ip</tabstop>
<tabstop>linksys_path_logger</tabstop>

3
src/gui/linux24AdvancedDialog.cpp
View File

@ -186,6 +186,9 @@ void linux24AdvancedDialog::help()
{
Help *h = new Help(this, "linux24AdvancedDialog", "Host type Linux 2.4/2.6");
h->show();
QString tab_title = m_dialog->tabWidget->tabText(
m_dialog->tabWidget->currentIndex());
h->scrollToAnchor(tab_title.replace('/', '-').replace(' ', '-').toLower());
}

4
src/gui/linux24advanceddialog_q.ui
View File

@ -14,7 +14,7 @@
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget3" >
<widget class="QTabWidget" name="tabWidget" >
<property name="tabShape" >
<enum>QTabWidget::Rounded</enum>
</property>
@ -1041,7 +1041,7 @@
<tabstop>linux24_path_lsmod</tabstop>
<tabstop>linux24_path_iptables_restore</tabstop>
<tabstop>linux24_path_ip6tables_restore</tabstop>
<tabstop>tabWidget3</tabstop>
<tabstop>tabWidget</tabstop>
</tabstops>
<resources/>
<connections>

4
src/gui/macosxadvanceddialog_q.ui
View File

@ -78,7 +78,7 @@
</layout>
</item>
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget7" >
<widget class="QTabWidget" name="tabWidget" >
<property name="tabShape" >
<enum>QTabWidget::Rounded</enum>
</property>
@ -408,7 +408,7 @@
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>tabWidget7</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>macosx_ip_forward</tabstop>
<tabstop>macosx_ip_sourceroute</tabstop>
<tabstop>macosx_ip_redirect</tabstop>

4
src/gui/openbsdadvanceddialog_q.ui
View File

@ -96,7 +96,7 @@
</layout>
</item>
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget9" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
@ -475,7 +475,7 @@
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>tabWidget9</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>openbsd_ip_forward</tabstop>
<tabstop>openbsd_ipv6_forward</tabstop>
<tabstop>openbsd_ip_directed_broadcast</tabstop>

3
src/gui/pfAdvancedDialog.cpp
View File

@ -301,6 +301,9 @@ void pfAdvancedDialog::help()
{
Help *h = new Help(this, "pfAdvancedDialog", "Firewall platform: pf");
h->show();
QString tab_title = m_dialog->tabWidget->tabText(
m_dialog->tabWidget->currentIndex());
h->scrollToAnchor(tab_title.replace('/', '-').replace(' ', '-').toLower());
}

4
src/gui/pfadvanceddialog_q.ui
View File

@ -17,7 +17,7 @@
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget3" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
@ -2428,7 +2428,7 @@ with this address:</string>
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>tabWidget3</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>compiler</tabstop>
<tabstop>compilerArgs</tabstop>
<tabstop>outputFileName</tabstop>

2
src/gui/pixAdvancedDialog.cpp
View File

@ -242,7 +242,7 @@ pixAdvancedDialog::pixAdvancedDialog(QWidget*, FWObject *o)//(parent)
else
m_dialog->pix_generate_out_acl->hide();
m_dialog->notebook304->setTabEnabled(8,false); //Disable tab
m_dialog->tabWidget->setTabEnabled(8,false); //Disable tab
data.registerOption(m_dialog->ipv4before_2, fwoptions, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first" );

4
src/gui/pixadvanceddialog_q.ui
View File

@ -80,7 +80,7 @@
</layout>
</item>
<item row="0" column="0" >
<widget class="QTabWidget" name="notebook304" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
@ -4563,7 +4563,7 @@ the packet should go to, and which is the next hop
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>notebook304</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>outputFileName</tabstop>
<tabstop>pix_assume_fw_part_of_any</tabstop>
<tabstop>pix_replace_natted_objects</tabstop>

4
src/gui/pixosadvanceddialog_q.ui
View File

@ -35,7 +35,7 @@
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QTabWidget" name="notebook305" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
@ -606,7 +606,7 @@
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>notebook305</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>pix_set_host_name</tabstop>
<tabstop>pix_ip_address</tabstop>
<tabstop>ntp1</tabstop>

4
src/gui/solarisadvanceddialog_q.ui
View File

@ -96,7 +96,7 @@
</layout>
</item>
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget11" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
@ -487,7 +487,7 @@
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>tabWidget11</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>solaris_ip_forward</tabstop>
<tabstop>solaris_ip_forward_src_routed</tabstop>
<tabstop>solaris_ip_forward_directed_broadcasts</tabstop>

7
src/res/help/iptAdvancedDialog_en_US.html
View File

@ -4,7 +4,7 @@
Most of the iptables options can be found in the man page iptables(1) or
online on the project web site at <a href="http://www.netfilter.org">http://www.netfilter.org</a>
<a name="compiler">
<hr>
<h2>Tab Compiler</h2>
<p>
@ -185,6 +185,7 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
<a name="installer">
<hr>
<h2>Tab Installer</h2>
<p>
@ -238,6 +239,7 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
<a name="prolog-epilog">
<hr>
<h2>Tab Prolog/Epilog</h2>
<p>
@ -279,6 +281,7 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
<a name="logging">
<hr>
<h3>Tab Logging</h3>
<p>
@ -386,6 +389,7 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
<a name="script-options">
<hr>
<h3>Tab Script Options</h3>
<p>
@ -450,6 +454,7 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
<a name="ipv6">
<hr>
<h3>Tab IPv6</h3>
<p>

103
src/res/help/pfAdvancedDialog_en_US.html
View File

@ -2,9 +2,9 @@
<h2>pf settings</h2>
Most of the pf options can be found in the man page pf.conf(5) or
online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&sektion=0&manpath=OpenBSD+Current&arch=i386&format=html">http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&sektion=0&manpath=OpenBSD+Current&arch=i386&format=html</a>
online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf">http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf</a>
<a name="compiler">
<hr>
<h2>Tab Compiler</h2>
<p>
@ -157,6 +157,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<a name="scrub-rule-options">
<hr>
<h2>Tab Scrub rule options</h2>
<p>
@ -167,7 +168,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Clear DF bit</h3>
<p>
Translates into option <b>"no-df"</b>
Translates into <b>"scrub out all no-df"</b>
<p>
From man pf.conf(5):
<p>
@ -196,7 +197,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Use random ID</h3>
<p>
Translates into option <b>"random-id"</b>
Translates into <b>"scrub out all random-id"</b>
<p>
From man pf.conf(5):
<p>
@ -217,7 +218,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Enforce Minimum TTL</h3>
<p>
Translates into option <b>"min-ttl"</b>
Translates into <b>"scrub out all min-ttl"</b>
<p>
From man pf.conf(5):
<p>
@ -234,7 +235,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Enforce Maximum MSS</h3>
<p>
Translates into option <b>"max-mss"</b>
Translates into <b>"scrub out all max-mss"</b>
<p>
From man pf.conf(5):
<p>
@ -258,7 +259,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Buffer and reassemble fragments</h3>
<p>
Translates into option <b>"fragment reassemble"</b>
Translates into <b>"scrub in all fragment reassemble"</b>
<p>
From man pf.conf(5):
<p>
@ -281,7 +282,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Drop duplicate fragments, do not buffer and reassemble</h3>
<p>
Translates into option <b>"fragment crop"</b>
Translates into <b>"scrub in all fragment crop"</b>
<p>
From man pf.conf(5):
<p>
@ -304,7 +305,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Drop duplicate and subsequent fragments</h3>
<p>
Translates into option <b>"fragment drop-ovl"</b>
Translates into <b>"scrub in all fragment drop-ovl"</b>
<p>
From man pf.conf(5):
<p>
@ -319,6 +320,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<a name="limits">
<hr>
<h2>Tab Limits</h2>
<p>
@ -330,7 +332,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Reassembly pool</h3>
<p>
Translates into option <b>"frags"</b>
Translates into <b>"set limit frags NNN"</b>
<p>
From man pf.conf(5):
<p>
@ -344,11 +346,14 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>State table size</h3>
<p>
Translates into option <b>"states"</b>
Translates into <b>"set limit states"</b>
<p>
From man pf.conf(5):
<p>
<blockquote>
Sets the maximum number of entries in the memory pool used by
state table entries (generated by pass rules which do not specify
no state).
</blockquote>
</p>
@ -356,7 +361,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Src-nodes</h3>
<p>
Translates into option <b>"src-nodes"</b>
Translates into <b>"set limit src-nodes"</b>
<p>
From man pf.conf(5):
<p>
@ -371,7 +376,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Tables</h3>
<p>
Translates into option <b>"tables"</b>
Translates into <b>"set limit tables"</b>
<p>
From man pf.conf(5):
<p>
@ -385,7 +390,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<h3>Table-entries</h3>
<p>
Translates into option <b>"table-entries"</b>
Translates into <b>"set limit table-entries"</b>
<p>
From man pf.conf(5):
<p>
@ -399,6 +404,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<a name="timeouts">
<hr>
<h2>Tab Timeouts</h2>
<p>
@ -408,6 +414,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<a name="installer">
<hr>
<h2>Tab Installer</h2>
<p>
@ -461,6 +468,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<a name="prolog-epilog">
<hr>
<h2>Tab Prolog/Epilog</h2>
<p>
@ -518,3 +526,70 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf&apropos=0&s
<a name="logging">
<hr>
<h2>Tab Logging</h2>
<p>
<h3>Log Prefix:</h3>
<p>
this translates into "label <text>" option in pf rules that request
logging.
<h3>Fallback "deny all" rule should log blocked packets</h3>
<p>
Compiler adds policy rule at the bottom of the pf rule set that just
denies all packets in and out. This is just a fallback rule that
follows best practices in firewall policy design. Normally this rule
blocks but does not log packets. This option makes it log.
<a name="script-options">
<hr>
<h2>Tab Script Options</h2>
<p>
<h3>Turn debugging on in generated script</h3>
<p>
This option makes the generated firewall script print all commands
when it is executed. To do this, compiler adds "-x" to the shell
command line at the top of the script. Command <i>pfctlc/ used to
load PF rules into the kernel will also be given command line flag
"-v".
<h3>Configure interfaces of the firewall machine</h3>
<p>
This option makes compiler add commands to configure ip addresses of
the interfaces of the firewall according to the "Address" objects
added to interfaces in the Firewall Builder GUI.
<h3>Add virtual addresses for NAT</h3>
<p>
The compiler can generate commands to add a virtual address to one
of the interfaces of the firewall machine if this option is turned
on. This is needed if a NAT rule uses an IP address that does not
belong to any interface of the firewall. The firewall either needs
the static ’published’ ARP entry for this address, or it should be
added to one of the interfaces as an ’alias’ or virtual address.
The policy compiler adds code to add an ’alias’ address to the
interface on top of the firewall activation script.
<a name="ipv6">
<hr>
<h2>Tab IPv6</h2>
<p>
<h3>Order in which IPv4 and IPv6 rules should be generated</h3>
<p>
Compiler can place ipv6 policies before or after ipv4 rules. This
option controls the order.