diff --git a/VERSION b/VERSION index 59e8efd79..228db0a48 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3493" +BUILD_NUM="3494" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 6c504d9ea..73fbf91bd 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3493" +#define VERSION "4.2.0.3494" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index 3c5ef1275..7e3c80d12 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,10 @@ +2011-03-05 vadim + + * 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 * IC_NetworkZonesPage.cpp (setNetworkZones): see #2161 policy diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 7d78d951c..a93ceb36b 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.0.3493 +%define version 4.2.0.3494 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 3c2ff93d5..5042e21db 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall 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 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index acd0df9b7..6ebf6efa5 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3493 +%define version 4.2.0.3494 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/libgui/FWBMainWindow_q.ui b/src/libgui/FWBMainWindow_q.ui index 05e8df96b..622938458 100644 --- a/src/libgui/FWBMainWindow_q.ui +++ b/src/libgui/FWBMainWindow_q.ui @@ -742,7 +742,7 @@ 0 0 1144 - 27 + 26 @@ -1304,7 +1304,7 @@ - Import Po&licy + Import &Firewall Import Policy diff --git a/src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.cpp b/src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.cpp index ccc5f4f41..7a9502b54 100644 --- a/src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.cpp +++ b/src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.cpp @@ -93,6 +93,12 @@ bool IC_ProgressPage::validatePage() return true; } +bool IC_ProgressPage::isComplete() const +{ + if (importer != NULL && importer->isRunning()) return false; + return true; +} + void IC_ProgressPage::importerDestroyed(QObject *obj) { if (fwbdebug_ic) qDebug() << "ND_ProgressPage::importerDestroyed() obj=" << obj; diff --git a/src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.h b/src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.h index c9c61ef41..1d5302554 100644 --- a/src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.h +++ b/src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.h @@ -48,7 +48,7 @@ public: virtual void initializePage(); virtual void cleanupPage(); virtual bool validatePage(); - + virtual bool isComplete() const; virtual int nextId () const;