onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-13 16:39:48 +02:00
Code Issues Releases Wiki Activity

fixed #1768 Add title and subheaders to all pages of the new firewall wizard; subtitles on pages are difficult to formulate since some pages already have explanations that are sufficient

Browse Source
This commit is contained in:
Vadim Kurland
2010-10-04 21:57:21 +00:00
parent 15818d1837
commit 20a3ae73bf
3 changed files with 139 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 3309
#define BUILD_NUM 3310
src/gui/newfirewalldialog_q.ui
+99 -92
View File
@@ -13,6 +13,13 @@
<height>592</height>
</rect>
</property>
<property name="windowTitle">
<string>Creating new firewall object</string>
</property>
<property name="windowIcon">
<iconset resource="MainRes.qrc">
<normaloff>:/Icons/Firewall/icon-tree</normaloff>:/Icons/Firewall/icon-tree</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="titleLabel">
@@ -45,6 +52,92 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>50</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout">
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>161</width>
<height>37</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="backButton">
<property name="text">
<string>&lt; &amp;Back</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="nextButton">
<property name="text">
<string>&amp;Next &gt;</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="finishButton">
<property name="text">
<string>&amp;Finish</string>
</property>
<property name="default">
<bool>true</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QStackedWidget" name="stackedWidget">
<property name="minimumSize">
@@ -370,8 +463,8 @@
</layout>
</widget>
<widget class="QWidget" name="page3">
<layout class="QVBoxLayout">
<item>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QLabel" name="label632">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -390,7 +483,7 @@
</property>
</widget>
</item>
<item>
<item row="1" column="0">
<widget class="InterfacesTabWidget" name="interfaceEditor1">
<property name="currentIndex">
<number>0</number>
@@ -752,8 +845,8 @@ You can change interface names and their IP addresses on the next page. Templat
</layout>
</widget>
<widget class="QWidget" name="page6">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>'Name' corresponds to the name of the physical interface, such as 'eth0', 'fxp0', 'ethernet0' etc. 'Label' is used to mark interface to reflect network topology, e.g. 'outside' or 'inside'. Label is mandatory for PIX firewall.</string>
@@ -763,7 +856,7 @@ You can change interface names and their IP addresses on the next page. Templat
</property>
</widget>
</item>
<item>
<item row="1" column="0">
<widget class="InterfacesTabWidget" name="interfaceEditor2">
<property name="currentIndex">
<number>0</number>
@@ -779,92 +872,6 @@ You can change interface names and their IP addresses on the next page. Templat
</widget>
</widget>
</item>
<item row="2" column="0">
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>50</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout">
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>161</width>
<height>37</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="backButton">
<property name="text">
<string>&lt; &amp;Back</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="nextButton">
<property name="text">
<string>&amp;Next &gt;</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="finishButton">
<property name="text">
<string>&amp;Finish</string>
</property>
<property name="default">
<bool>true</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
src/gui/newhostdialog_q.ui
+39 -6
View File
@@ -13,6 +13,13 @@
<height>621</height>
</rect>
</property>
<property name="windowTitle">
<string>Creating new host object</string>
</property>
<property name="windowIcon">
<iconset resource="MainRes.qrc">
<normaloff>:/Icons/Host/icon-tree</normaloff>:/Icons/Host/icon-tree</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="titleLabel">
@@ -64,7 +71,33 @@
</property>
<widget class="QWidget" name="page0">
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>The Host object in Firewall Builder is designed to represent real hosts in the network: workstations, servers, and any other network node with one or several addresses. Host object is useful when it has more than one IP address because then you can just use it in any rule and have Firewall Builder generate firewall configuration to match all of its addresses. If the host object you are going to create has just one IP address, you may want to consider an Address object instead which is simpler. </string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label631">
<property name="text">
<string>Name of the new host object:</string>
@@ -77,10 +110,10 @@
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<item row="2" column="1">
<widget class="QLineEdit" name="obj_name"/>
</item>
<item row="1" column="0" colspan="3">
<item row="3" column="0" colspan="2">
<widget class="Line" name="line1">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -105,14 +138,14 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="useTemplate">
<property name="text">
<string>Use preconfigured template host objects</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<item row="5" column="0" colspan="2">
<widget class="QFrame" name="templateFrame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
@@ -172,7 +205,7 @@
</layout>
</widget>
</item>
<item row="4" column="2">
<item row="6" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>