cleanup: remived obsolete module, set correct copyright date, added changelog entries

This commit is contained in:
Vadim Kurland
2008-05-10 23:38:30 +00:00
parent 9817848911
commit 7871c11b0a
6 changed files with 15 additions and 361 deletions
+13
View File
@@ -50,6 +50,13 @@
* RuleOptionsDialog.cpp (RuleOptionsDialog::loadFWObject): (from * RuleOptionsDialog.cpp (RuleOptionsDialog::loadFWObject): (from
2.1) fixed bug #1938985: Rate in hashlimit in local language 2.1) fixed bug #1938985: Rate in hashlimit in local language
2008-04-28 Vadim Kurland <vadim@vk.crocodile.org>
* v3 feature: rules can be grouped in Policy, NAT and
Routing. Group of rules can have a name and color and can be
collapsed or expanded. Collapsed rule groups take room equivalent
to one rule in the ruleset panel.
2008-04-13 Vadim Kurland <vadim@vk.crocodile.org> 2008-04-13 Vadim Kurland <vadim@vk.crocodile.org>
* NATCompiler_PrintRule.cpp (PrintRule::_printAddr): fixed bug (no * NATCompiler_PrintRule.cpp (PrintRule::_printAddr): fixed bug (no
@@ -82,6 +89,12 @@
Compiler.cpp (emptyGroupsInRE::countChildren): (libfwbuilder) Compiler.cpp (emptyGroupsInRE::countChildren): (libfwbuilder)
fixed bug #1905718: "Group of DNS Name objects considered empty" fixed bug #1905718: "Group of DNS Name objects considered empty"
2008-03-06 vadim <vadim@vk.crocodile.org>
* v3 feature: Firewall Builder v3 GUI redesigned as MDI
interfaces. Several data files can be opened simultaneously and
objects dragged and dropped from one file to another.
2008-03-05 vadim <vadim@vk.crocodile.org> 2008-03-05 vadim <vadim@vk.crocodile.org>
* VERSION: started v2.1.18 * VERSION: started v2.1.18
+1 -1
View File
@@ -2,7 +2,7 @@
Firewall Builder Firewall Builder
Copyright (C) 2003 NetCitadel, LLC Copyright (C) 2008 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org Author: Vadim Kurland vadim@fwbuilder.org
+1 -1
View File
@@ -2,7 +2,7 @@
Firewall Builder Firewall Builder
Copyright (C) 2003 NetCitadel, LLC Copyright (C) 2008 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org Author: Vadim Kurland vadim@fwbuilder.org
-207
View File
@@ -1,207 +0,0 @@
/*
Firewall Builder
Copyright (C) 2004 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org
$Id: StartWizard.cpp,v 1.12 2005/01/03 01:43:50 vkurland Exp $
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
To get a copy of the GNU General Public License, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "fwbuilder_ph.h"
#include "../../config.h"
#include "global.h"
#include "StartWizard.h"
#include "RCSFileDialog.h"
#include "FWWindow.h"
#include "FWBSettings.h"
#include "VERSION.h"
#include <qfileinfo.h>
#include <qmessagebox.h>
#include <qlabel.h>
#include <qcheckbox.h>
#include <qpushbutton.h>
#include <qfile.h>
#include <errno.h>
#include <iostream>
using namespace std;
using namespace libfwbuilder;
StartWizard::~StartWizard()
{
delete m_dialog;
}
StartWizard::StartWizard()
{
m_dialog = new Ui::startWizard_q;
m_dialog->setupUi(this);
setControlWidgets(this, m_dialog->stackedWidget,
m_dialog->nextButton,
m_dialog->finishButton,
m_dialog->backButton,
m_dialog->cancelButton,
m_dialog->titleLabel);
/*connect( m_dialog->nextButton, SIGNAL( clicked() ),
this, SLOT( nextClicked() ));
connect( m_dialog->backButton, SIGNAL( clicked() ),
this, SLOT( backClicked() ));
connect( m_dialog->finishButton, SIGNAL( clicked() ),
this, SLOT( finishClicked() ));
connect( m_dialog->cancelButton, SIGNAL( clicked() ),
this, SLOT( cancelClicked() ));*/
wantRCS=false;
oldfile=false;
newfile=false;
cancelButton->hide();
m_dialog->programName->setText( QString("<b>Firewall Builder %1</b>").arg(VERSION) );
setNextEnabled( 0, false );
}
void StartWizard::openFile()
{
RCSFileDialog fd(this, 0, true);
if ( fd.exec()== QDialog::Accepted )
{
RCS *rcs = fd.getSelectedRev();
if (rcs==NULL) return;
try
{
rcs->co();
} catch (FWException &ex)
{
/* if there was an exception, abort operation. */
return;
}
/***********************************************************************/
mw->load( this, rcs );
mw->showFirewalls();
if (rcs->isTemp()) QFile(rcs->getFileName()).remove();
setFinishEnabled( 0, true );
oldfile=true;
finishClicked();
}
}
void StartWizard::newFile()
{
fname=mw->chooseNewFileName(st->getWDir(),true,
tr("Choose name and location for the new file"));
if (fname.isEmpty()) return;
if (QFileInfo(fname).exists() && ! QFileInfo(fname).isWritable() )
{
QMessageBox::warning(
this,"Firewall Builder",
tr("File %1 is read-only, you can not save changes to it.")
.arg(fname),
"&Continue", QString::null, QString::null,
0, 1 );
return;
}
mw->load(this);
mw->setFileName(fname);
// save blank data into the new file ("initialize" it)
mw->save();
mw->fileClose();
setNextEnabled( 0, true );
newfile=true;
}
void StartWizard::selected(const QString &title)
{
int p = currentPage();
if (p==1 && newfile && !fname.isEmpty())
{
m_dialog->fileLbl->setText( m_dialog->fileLbl->text().arg(fname) );
setFinishEnabled( 1, true );
}
}
void StartWizard::finishClicked()
{
if (newfile && !fname.isEmpty())
{
if (m_dialog->autoopenBtn->isChecked())
{
st->setStartupAction(1);
st->setLastEdited(fname);
}
RCS *rcs=new RCS(fname);
if (m_dialog->rcsBtn->isChecked())
{
try
{
rcs->add();
}
catch (FWException &ex)
{
QMessageBox::warning(
this,"Firewall Builder",
tr("Error adding file to RCS:\n%1").arg(ex.toString().c_str()),
"&Continue", QString::null,QString::null,
0, 1 );
}
}
try
{
rcs->co();
mw->load( this, rcs );
}
catch (FWException &ex)
{
QMessageBox::warning(
this,"Firewall Builder",
tr("Error opening file:\n%1").arg(ex.toString().c_str()),
"&Continue", QString::null,QString::null,
0, 1 );
}
}
QDialog::accept();
}
void StartWizard::cancelClicked()
{
QDialog::reject();
}
-64
View File
@@ -1,64 +0,0 @@
/*
Firewall Builder
Copyright (C) 2004 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org
$Id: StartWizard.h,v 1.1 2004/04/03 23:21:39 vkurland Exp $
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
To get a copy of the GNU General Public License, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __STARTWIZARD_H_
#define __STARTWIZARD_H_
#include <ui_startwizard_q.h>
#include "RCS.h"
#include "fakeWizard.h"
#include <QDialog>
#include <qstring.h>
class StartWizard : public QDialog, public FakeWizard
{
Q_OBJECT
bool wantRCS;
bool oldfile;
bool newfile;
QString fname;
Ui::startWizard_q *m_dialog;
public:
StartWizard();
~StartWizard();
public slots:
virtual void openFile();
virtual void newFile();
virtual void selected(const QString &title);
virtual void finishClicked();
virtual void cancelClicked();
};
#endif
-88
View File
@@ -11873,32 +11873,6 @@ Logged in
<translation>Закрыть</translation> <translation>Закрыть</translation>
</message> </message>
</context> </context>
<context>
<name>StartWizard</name>
<message>
<location filename="" line="1651992111"/>
<source>Choose name and location for the new file</source>
<translation type="obsolete">Выберите имя и каталог для нового файла</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>File %1 is read-only, you can not save changes to it.</source>
<translation type="obsolete">Файл %1 доступен только для чтения, изменения не будут сохранены в нём.</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>Error adding file to RCS:
%1</source>
<translation type="obsolete">Ошибка при добавлении файла %1 в систему контроля версий</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>Error opening file:
%1</source>
<translation type="obsolete">Ошибка при открытии файла:
%1</translation>
</message>
</context>
<context> <context>
<name>TCPServiceDialog_q</name> <name>TCPServiceDialog_q</name>
<message> <message>
@@ -17641,66 +17615,4 @@ First, create temporary access list to permit connections from the management su
<translation>Укажите полный путь к перечисленным утилитам в операционной системе этого межсетевого экрана. Для незаполненных полей будут использованы значения по-умолчанию.</translation> <translation>Укажите полный путь к перечисленным утилитам в операционной системе этого межсетевого экрана. Для незаполненных полей будут использованы значения по-умолчанию.</translation>
</message> </message>
</context> </context>
<context>
<name>startWizard_q</name>
<message>
<location filename="" line="1651992111"/>
<source>Welcome to Firewall Builder</source>
<translation type="obsolete">Добро пожаловать в программу Firewall Builder</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>&lt;b&gt;Firewall Builder 2.0.3&lt;/b&gt;</source>
<translation type="obsolete">&lt;b&gt;Firewall Builder 2.0.3&lt;/b&gt;</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>Do you want to open existing project file or create a new one?</source>
<translation type="obsolete">Хотите открыть существующий проект или создать новый?</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>Create new project file</source>
<translation type="obsolete">Создать новый проект</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>Open existing file</source>
<translation type="obsolete">Открыть существующий проект</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>File name: %1</source>
<translation type="obsolete">Имя файла: %1</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>Activate Revision Control System for this file
(if you do not do this now, you can always activate it later)</source>
<translation type="obsolete">Активизировать систему контроля версий для этого файла
(это всегда можно сделать позже)</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>Let the program automatically open this file when I start it next time
(you can activate this option later using Preferences dialog)</source>
<translation type="obsolete">Открывать этот файл при старте программы
(это всегда можно сделать позже)</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>&lt;b&gt;Firewall Builder 2.0.4&lt;/b&gt;</source>
<translation type="obsolete">&lt;b&gt;Firewall Builder 2.0.4&lt;/b&gt;</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>&lt;b&gt;Firewall Builder 2.0.5&lt;/b&gt;</source>
<translation type="obsolete">&lt;b&gt;Firewall Builder 2.0.5&lt;/b&gt;</translation>
</message>
<message>
<location filename="" line="1651992111"/>
<source>&lt;b&gt;Firewall Builder N.N.N&lt;/b&gt;</source>
<translation type="obsolete">&lt;b&gt; Firewall Builder N.N.N&lt;/b&gt;</translation>
</message>
</context>
</TS> </TS>