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

see #2162 renamed menu item File / Import Firewall; see #2179 button Finish should be disabled while importer is still running

Browse Source
This commit is contained in:
Vadim Kurland
2011-03-05 11:06:22 -08:00
parent 834dd22e25
commit 85afa6dc8e
9 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
# build number is like "nano" version number. I am incrementing build # build number is like "nano" version number. I am incrementing build
# number during development cycle # number during development cycle
# #
BUILD_NUM="3493" BUILD_NUM="3494"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
VERSION.h
+1 -1
View File
@@ -1,2 +1,2 @@
#define VERSION "4.2.0.3493" #define VERSION "4.2.0.3494"
#define GENERATION "4.2" #define GENERATION "4.2"
doc/ChangeLog
+7
View File
@@ -1,3 +1,10 @@
2011-03-05 vadim <vadim@netcitadel.com>
* FWBMainWindow_q.ui: see #2162 menu item "File / Import Policy"
renamed to "File / Import Firewall". This menu item launches
wizard that imports existing iptables, Cisco router IOS or
Cisco PIX/ASA config.
2011-03-04 vadim <vadim@netcitadel.com> 2011-03-04 vadim <vadim@netcitadel.com>
* IC_NetworkZonesPage.cpp (setNetworkZones): see #2161 policy * IC_NetworkZonesPage.cpp (setNetworkZones): see #2161 policy
packaging/fwbuilder-static-qt.spec
+1 -1
View File
@@ -3,7 +3,7 @@
%define name fwbuilder %define name fwbuilder
%define version 4.2.0.3493 %define version 4.2.0.3494
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"
packaging/fwbuilder.control
+1 -1
View File
@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra Priority: extra
Section: checkinstall Section: checkinstall
Maintainer: vadim@fwbuilder.org Maintainer: vadim@fwbuilder.org
Version: 4.2.0.3493-1 Version: 4.2.0.3494-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers Description: Firewall Builder GUI and policy compilers
packaging/fwbuilder.spec
+1 -1
View File
@@ -1,6 +1,6 @@
%define name fwbuilder %define name fwbuilder
%define version 4.2.0.3493 %define version 4.2.0.3494
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"
src/libgui/FWBMainWindow_q.ui
+2 -2
View File
@@ -742,7 +742,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1144</width> <width>1144</width>
<height>27</height> <height>26</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="editMenu"> <widget class="QMenu" name="editMenu">
@@ -1304,7 +1304,7 @@
</action> </action>
<action name="policyImportAction"> <action name="policyImportAction">
<property name="text"> <property name="text">
<string>Import Po&amp;licy</string> <string>Import &amp;Firewall</string>
</property> </property>
<property name="iconText"> <property name="iconText">
<string>Import Policy</string> <string>Import Policy</string>
src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.cpp
+6
View File
@@ -93,6 +93,12 @@ bool IC_ProgressPage::validatePage()
return true; return true;
} }
bool IC_ProgressPage::isComplete() const
{
if (importer != NULL && importer->isRunning()) return false;
return true;
}
void IC_ProgressPage::importerDestroyed(QObject *obj) void IC_ProgressPage::importerDestroyed(QObject *obj)
{ {
if (fwbdebug_ic) qDebug() << "ND_ProgressPage::importerDestroyed() obj=" << obj; if (fwbdebug_ic) qDebug() << "ND_ProgressPage::importerDestroyed() obj=" << obj;
src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.h
+1 -1
View File
@@ -48,7 +48,7 @@ public:
virtual void initializePage(); virtual void initializePage();
virtual void cleanupPage(); virtual void cleanupPage();
virtual bool validatePage(); virtual bool validatePage();
virtual bool isComplete() const;
virtual int nextId () const; virtual int nextId () const;