diff --git a/doc/ChangeLog b/doc/ChangeLog index 1e296e1e6..2c17045cb 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -50,6 +50,13 @@ * RuleOptionsDialog.cpp (RuleOptionsDialog::loadFWObject): (from 2.1) fixed bug #1938985: Rate in hashlimit in local language +2008-04-28 Vadim Kurland + + * 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 * NATCompiler_PrintRule.cpp (PrintRule::_printAddr): fixed bug (no @@ -82,6 +89,12 @@ Compiler.cpp (emptyGroupsInRE::countChildren): (libfwbuilder) fixed bug #1905718: "Group of DNS Name objects considered empty" +2008-03-06 vadim + + * 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 * VERSION: started v2.1.18 diff --git a/src/gui/ProjectPanel.cpp b/src/gui/ProjectPanel.cpp index 577d7ef26..01b596d26 100644 --- a/src/gui/ProjectPanel.cpp +++ b/src/gui/ProjectPanel.cpp @@ -2,7 +2,7 @@ Firewall Builder - Copyright (C) 2003 NetCitadel, LLC + Copyright (C) 2008 NetCitadel, LLC Author: Vadim Kurland vadim@fwbuilder.org diff --git a/src/gui/ProjectPanel.h b/src/gui/ProjectPanel.h index 2b3264f1a..a36ff7520 100644 --- a/src/gui/ProjectPanel.h +++ b/src/gui/ProjectPanel.h @@ -2,7 +2,7 @@ Firewall Builder - Copyright (C) 2003 NetCitadel, LLC + Copyright (C) 2008 NetCitadel, LLC Author: Vadim Kurland vadim@fwbuilder.org diff --git a/src/gui/StartWizard.cpp b/src/gui/StartWizard.cpp deleted file mode 100644 index 54856f030..000000000 --- a/src/gui/StartWizard.cpp +++ /dev/null @@ -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 -#include -#include -#include -#include -#include - -#include -#include - -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("Firewall Builder %1").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(); -} - diff --git a/src/gui/StartWizard.h b/src/gui/StartWizard.h deleted file mode 100644 index f1a010d18..000000000 --- a/src/gui/StartWizard.h +++ /dev/null @@ -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 -#include "RCS.h" -#include "fakeWizard.h" -#include - -#include - -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 diff --git a/src/gui/fwbuilder_ru.ts b/src/gui/fwbuilder_ru.ts index 369b48dc2..f6057bf6a 100644 --- a/src/gui/fwbuilder_ru.ts +++ b/src/gui/fwbuilder_ru.ts @@ -11873,32 +11873,6 @@ Logged in Закрыть - - StartWizard - - - Choose name and location for the new file - Выберите имя и каталог для нового файла - - - - File %1 is read-only, you can not save changes to it. - Файл %1 доступен только для чтения, изменения не будут сохранены в нём. - - - - Error adding file to RCS: -%1 - Ошибка при добавлении файла %1 в систему контроля версий - - - - Error opening file: -%1 - Ошибка при открытии файла: -%1 - - TCPServiceDialog_q @@ -17641,66 +17615,4 @@ First, create temporary access list to permit connections from the management su Укажите полный путь к перечисленным утилитам в операционной системе этого межсетевого экрана. Для незаполненных полей будут использованы значения по-умолчанию. - - startWizard_q - - - Welcome to Firewall Builder - Добро пожаловать в программу Firewall Builder - - - - <b>Firewall Builder 2.0.3</b> - <b>Firewall Builder 2.0.3</b> - - - - Do you want to open existing project file or create a new one? - Хотите открыть существующий проект или создать новый? - - - - Create new project file - Создать новый проект - - - - Open existing file - Открыть существующий проект - - - - File name: %1 - Имя файла: %1 - - - - Activate Revision Control System for this file -(if you do not do this now, you can always activate it later) - Активизировать систему контроля версий для этого файла -(это всегда можно сделать позже) - - - - Let the program automatically open this file when I start it next time -(you can activate this option later using Preferences dialog) - Открывать этот файл при старте программы -(это всегда можно сделать позже) - - - - <b>Firewall Builder 2.0.4</b> - <b>Firewall Builder 2.0.4</b> - - - - <b>Firewall Builder 2.0.5</b> - <b>Firewall Builder 2.0.5</b> - - - - <b>Firewall Builder N.N.N</b> - <b> Firewall Builder N.N.N</b> - -