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

fixes #1992, #1993, see #1994

Browse Source
This commit is contained in:
Vadim Kurland 2011-01-26 21:49:31 -08:00
parent 959a10535d
commit cf543d7adf
9 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -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="3448"
BUILD_NUM="3449"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"

2
VERSION.h
View File

@ -1,2 +1,2 @@
#define VERSION "4.2.0.3448"
#define VERSION "4.2.0.3449"
#define GENERATION "4.2"

14
doc/ChangeLog
View File

@ -1,4 +1,16 @@
2011-01-26 Vadim Kurland <vadim@netcitadel.com>
2011-01-26 vadim <vadim@netcitadel.com>
* ProjectPanel_events.cpp (event): see #1994 "Crash when compiling
a firewall in an imported Library". To prevent crash, added check
to make sure firewall object is not read-only before an attempt to
update its "last compiled" or "last installed" timestamp.
* ProjectPanel_file_ops.cpp (fileExport): fixes #1993 "V4.2 on
Windows - export Library shows the file type as Firewall Builder
2"
* FWBSettings.h (SETTINGS_PATH_PREFIX): fixes #1992 " V4.2 on
Windows - installer error can't find Secure Shell utility"
* init.cpp (init): fixed #1989 "variables respath and librespath
are redundant and copy Constants::getTemplateDirectory()". Got rid

2
packaging/fwbuilder-static-qt.spec
View File

@ -3,7 +3,7 @@
%define name fwbuilder
%define version 4.2.0.3448
%define version 4.2.0.3449
%define release 1
%if "%_vendor" == "MandrakeSoft"

2
packaging/fwbuilder.control
View File

@ -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.3448-1
Version: 4.2.0.3449-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers

2
packaging/fwbuilder.spec
View File

@ -1,6 +1,6 @@
%define name fwbuilder
%define version 4.2.0.3448
%define version 4.2.0.3449
%define release 1
%if "%_vendor" == "MandrakeSoft"

4
src/libgui/FWBSettings.h
View File

@ -34,7 +34,7 @@
#include <set>
#define SETTINGS_PATH_PREFIX "/4.1"
#define SETTINGS_PATH_PREFIX "/4.2"
#include <fwbuilder/FWObject.h>
@ -68,7 +68,7 @@ class FWBSettings : public QSettings {
FWBSettings(bool testData = false);
~FWBSettings();
static QString getApplicationNameForSettings() { return "FirewallBuilder4.1"; }
static QString getApplicationNameForSettings() { return "FirewallBuilder4.2"; }
void init(bool force_first_time_run=false);
void save();

6
src/libgui/ProjectPanel_events.cpp
View File

@ -204,7 +204,8 @@ bool ProjectPanel::event(QEvent *event)
}
case UPDATE_LAST_COMPILED_TIMESTAMP_EVENT:
if (rcs && !rcs->isRO() && Firewall::cast(obj))
if (rcs && !rcs->isRO() &&
Firewall::cast(obj) && !obj->isReadOnly())
{
Firewall::cast(obj)->updateLastCompiledTimestamp();
QCoreApplication::postEvent(
@ -215,7 +216,8 @@ bool ProjectPanel::event(QEvent *event)
break;
case UPDATE_LAST_INSTALLED_TIMESTAMP_EVENT:
if (rcs && !rcs->isRO() && Firewall::cast(obj))
if (rcs && !rcs->isRO() &&
Firewall::cast(obj) && !obj->isReadOnly())
{
Firewall::cast(obj)->updateLastInstalledTimestamp();
QCoreApplication::postEvent(

16
src/libgui/ProjectPanel_file_ops.cpp
View File

@ -616,17 +616,18 @@ void ProjectPanel::fileExport()
} while (!exportLibraryTest(selectedLibs));
FWObject *selLib = ed.mapOfLibs[ lib_idx ];
path=st->getWDir()+QString::fromUtf8(selLib->getName().c_str())+".fwl";
path = st->getWDir() + QString::fromUtf8(selLib->getName().c_str()) + ".fwl";
resetFD();
QString fname;
fname = QFileDialog::getSaveFileName(
this,
"Choose a filename to save under",
path,
"Firewall Builder 2 files (*.fwl)");
QString fname = QFileDialog::getSaveFileName(
this,
"Choose a filename to save under",
path,
"Firewall Builder library files (*.fwl)");
if (fname.isEmpty()) return;
if (QFile::exists(fname) &&
QMessageBox::warning(
this,"Firewall Builder",
@ -634,6 +635,7 @@ void ProjectPanel::fileExport()
.arg(fname),
tr("&Yes"), tr("&No"), QString::null,
0, 1 )==1 ) return;
exportLibraryTo(fname,selectedLibs,ed.m_dialog->exportRO->isChecked());
}