onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-13 20:45:48 +02:00
Code Issues Releases Wiki Activity

Fixed #622 and #625 again

Browse Source
This commit is contained in:
Roman Bovsunivskiy
2009-11-17 16:59:31 +00:00
parent f12fa76e0e
commit a760aa3892
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/InterfaceEditorWidget.cpp
View File

@@ -2,7 +2,7 @@
Firewall Builder Firewall Builder
Copyright (C) 2003 NetCitadel, LLC Copyright (C) 2009 NetCitadel, LLC
Author: Roman Bovsunivkiy a2k0001@gmail.com Author: Roman Bovsunivkiy a2k0001@gmail.com
@@ -27,6 +27,8 @@
#include "ui_InterfaceEditorWidget.h" #include "ui_InterfaceEditorWidget.h"
#include "fwbuilder/IPv4.h" #include "fwbuilder/IPv4.h"
using namespace libfwbuilder;
InterfaceEditorWidget::InterfaceEditorWidget(QWidget *parent, Interface *interface) : InterfaceEditorWidget::InterfaceEditorWidget(QWidget *parent, Interface *interface) :
QWidget(parent), QWidget(parent),
m_ui(new Ui::InterfaceEditorWidget) m_ui(new Ui::InterfaceEditorWidget)

14
src/gui/InterfaceEditorWidget.h
View File

@@ -2,7 +2,7 @@
Firewall Builder Firewall Builder
Copyright (C) 2003 NetCitadel, LLC Copyright (C) 2009 NetCitadel, LLC
Author: Roman Bovsunivkiy a2k0001@gmail.com Author: Roman Bovsunivkiy a2k0001@gmail.com
@@ -45,8 +45,6 @@
#include "fwbuilder/Interface.h" #include "fwbuilder/Interface.h"
using namespace libfwbuilder;
namespace Ui { namespace Ui {
class InterfaceEditorWidget; class InterfaceEditorWidget;
} }
@@ -63,11 +61,11 @@ struct AddressInfo
class InterfaceEditorWidget : public QWidget { class InterfaceEditorWidget : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
InterfaceEditorWidget(QWidget *parent, Interface *interface); InterfaceEditorWidget(QWidget *parent, libfwbuilder::Interface *interface);
InterfaceEditorWidget(QWidget *parent, InterfaceData* data); InterfaceEditorWidget(QWidget *parent, libfwbuilder::InterfaceData* data);
InterfaceEditorWidget(QWidget *parent); InterfaceEditorWidget(QWidget *parent);
~InterfaceEditorWidget(); ~InterfaceEditorWidget();
Interface* getInterface(); libfwbuilder::Interface* getInterface();
EditedInterfaceData getInterfaceData(); EditedInterfaceData getInterfaceData();
bool isValid(); bool isValid();
@@ -77,12 +75,12 @@ protected:
private: private:
QTabWidget *tabw; QTabWidget *tabw;
QToolButton *addAddr, *delAddr; QToolButton *addAddr, *delAddr;
Interface *interface; libfwbuilder::Interface *interface;
Ui::InterfaceEditorWidget *m_ui; Ui::InterfaceEditorWidget *m_ui;
QMap<QPushButton*, QPair<QTableWidgetItem*, QTableWidgetItem*> > buttons; QMap<QPushButton*, QPair<QTableWidgetItem*, QTableWidgetItem*> > buttons;
QMap<int, QPair<QTableWidgetItem*, QTableWidgetItem*> > rows; QMap<int, QPair<QTableWidgetItem*, QTableWidgetItem*> > rows;
QMap<int, QComboBox*> types; QMap<int, QComboBox*> types;
QMap<int, Address*> fwaddrs; QMap<int, libfwbuilder::Address*> fwaddrs;
bool validateAddress(const QString &addr, const QString &netm, bool regular); bool validateAddress(const QString &addr, const QString &netm, bool regular);
public slots: public slots:

4
src/gui/InterfacesTabWidget.cpp
View File

@@ -2,7 +2,7 @@
Firewall Builder Firewall Builder
Copyright (C) 2003 NetCitadel, LLC Copyright (C) 2009 NetCitadel, LLC
Author: Roman Bovsunivkiy a2k0001@gmail.com Author: Roman Bovsunivkiy a2k0001@gmail.com
@@ -26,6 +26,8 @@
#include "InterfacesTabWidget.h" #include "InterfacesTabWidget.h"
#include "ui_InterfacesTabWidget.h" #include "ui_InterfacesTabWidget.h"
using namespace libfwbuilder;
InterfacesTabWidget::InterfacesTabWidget(QWidget *parent) : InterfacesTabWidget::InterfacesTabWidget(QWidget *parent) :
QTabWidget(parent), QTabWidget(parent),
m_ui(new Ui::InterfacesTabWidget) m_ui(new Ui::InterfacesTabWidget)

20
src/gui/InterfacesTabWidget.h
View File

@@ -2,7 +2,7 @@
Firewall Builder Firewall Builder
Copyright (C) 2003 NetCitadel, LLC Copyright (C) 2009 NetCitadel, LLC
Author: Roman Bovsunivkiy a2k0001@gmail.com Author: Roman Bovsunivkiy a2k0001@gmail.com
@@ -40,8 +40,6 @@
#include "fwbuilder/FWObjectDatabase.h" #include "fwbuilder/FWObjectDatabase.h"
#include "InterfaceEditorWidget.h" #include "InterfaceEditorWidget.h"
using namespace libfwbuilder;
namespace Ui { namespace Ui {
class InterfacesTabWidget; class InterfacesTabWidget;
} }
@@ -56,7 +54,7 @@ struct EditedInterfaceData
QString comment; QString comment;
QString mac; QString mac;
int type; // 0 - regular, 1 - dynamic, 2 - unnumbered int type; // 0 - regular, 1 - dynamic, 2 - unnumbered
QMultiMap<Address*, AddressInfo > addresses; QMultiMap<libfwbuilder::Address*, AddressInfo > addresses;
}; };
class InterfacesTabWidget : public QTabWidget { class InterfacesTabWidget : public QTabWidget {
@@ -64,9 +62,9 @@ class InterfacesTabWidget : public QTabWidget {
public: public:
InterfacesTabWidget(QWidget *parent = 0); InterfacesTabWidget(QWidget *parent = 0);
~InterfacesTabWidget(); ~InterfacesTabWidget();
QMap<Interface*, EditedInterfaceData> getData(); QMap<libfwbuilder::Interface*, EditedInterfaceData> getData();
QList<EditedInterfaceData> getNewData(); QList<EditedInterfaceData> getNewData();
QList<Interface*> getDeletedInterfaces(); QList<libfwbuilder::Interface*> getDeletedInterfaces();
bool isValid(); bool isValid();
void setCornerWidgetsVisible(bool); void setCornerWidgetsVisible(bool);
@@ -79,16 +77,16 @@ private:
QToolButton *delInterface; QToolButton *delInterface;
QWidget newInterfaceWidget; QWidget newInterfaceWidget;
QHBoxLayout newInterfaceLayout; QHBoxLayout newInterfaceLayout;
FWObject *currentTemplate; libfwbuilder::FWObject *currentTemplate;
QList<Interface*> deleted; QList<libfwbuilder::Interface*> deleted;
public slots: public slots:
void addInterface(Interface*); void addInterface(libfwbuilder::Interface*);
void clear(); void clear();
void addNewInterface(); void addNewInterface();
void setTemplate(FWObject*); void setTemplate(libfwbuilder::FWObject*);
void closeTab(); void closeTab();
void addInterface(InterfaceData*); void addInterface(libfwbuilder::InterfaceData*);
}; };