[fwbuilder-commits] r1824 - branches/v3_1/src/gui
Brought to you by:
mikehorn
From: <a2...@in...> - 2009-11-19 20:33:51
|
Author: a2k Date: 2009-11-19 12:32:49 -0800 (Thu, 19 Nov 2009) New Revision: 1824 Modified: branches/v3_1/src/gui/InterfaceEditorWidget.cpp branches/v3_1/src/gui/InterfaceEditorWidget.h branches/v3_1/src/gui/InterfacesTabWidget.cpp branches/v3_1/src/gui/InterfacesTabWidget.h branches/v3_1/src/gui/newFirewallDialog.cpp branches/v3_1/src/gui/newFirewallDialog.h Log: SNMP interfaces discovery is now working again Modified: branches/v3_1/src/gui/InterfaceEditorWidget.cpp =================================================================== --- branches/v3_1/src/gui/InterfaceEditorWidget.cpp 2009-11-19 18:56:28 UTC (rev 1823) +++ branches/v3_1/src/gui/InterfaceEditorWidget.cpp 2009-11-19 20:32:49 UTC (rev 1824) @@ -55,14 +55,11 @@ rows[row].first->setText(addr->getAddressPtr()->toString().c_str()); rows[row].second->setText(addr->getNetmaskPtr()->toString().c_str()); } - doNotCheckNext = false; + updateColumnsSizes(); } -InterfaceEditorWidget::InterfaceEditorWidget(QWidget *parent, InterfaceData* data) +void InterfaceEditorWidget::setData(InterfaceData *data) { - tabw = dynamic_cast<QTabWidget*>(parent); - this->interface = NULL; - m_ui->setupUi(this); this->m_ui->name->setText(data->name.c_str()); this->m_ui->label->setText(data->label.c_str()); this->m_ui->mac->setText(data->mac_addr.c_str()); @@ -78,11 +75,11 @@ foreach( InetAddrMask* addr, data->addr_mask ) { int row = addNewAddress(); + types[row]->setCurrentIndex(addr->getAddressPtr()->isV6()); rows[row].first->setText(addr->getAddressPtr()->toString().c_str()); rows[row].second->setText(addr->getNetmaskPtr()->toString().c_str()); } } - doNotCheckNext = false; } InterfaceEditorWidget::InterfaceEditorWidget(QWidget *parent) : @@ -95,8 +92,8 @@ this->m_ui->name->setText(tr("New interface")); this->m_ui->label->clear(); this->m_ui->comment->clear(); - doNotCheckNext = false; addNewAddress(); + updateColumnsSizes(); } void InterfaceEditorWidget::deleteAddress() @@ -294,6 +291,11 @@ void InterfaceEditorWidget::resizeEvent ( QResizeEvent * ) { + updateColumnsSizes(); +} + +void InterfaceEditorWidget::updateColumnsSizes() +{ int total = this->m_ui->addresses->viewport()->width(); int controls; if ( total/4 > 130 ) controls = 130; else controls = total/4; Modified: branches/v3_1/src/gui/InterfaceEditorWidget.h =================================================================== --- branches/v3_1/src/gui/InterfaceEditorWidget.h 2009-11-19 18:56:28 UTC (rev 1823) +++ branches/v3_1/src/gui/InterfaceEditorWidget.h 2009-11-19 20:32:49 UTC (rev 1824) @@ -61,10 +61,11 @@ class InterfaceEditorWidget : public QWidget { Q_OBJECT public: + InterfaceEditorWidget(QWidget *parent, libfwbuilder::InterfaceData* data, int v); InterfaceEditorWidget(QWidget *parent, libfwbuilder::Interface *interface); - InterfaceEditorWidget(QWidget *parent, libfwbuilder::InterfaceData* data); InterfaceEditorWidget(QWidget *parent); ~InterfaceEditorWidget(); + void setData(libfwbuilder::InterfaceData *data); libfwbuilder::Interface* getInterface(); EditedInterfaceData getInterfaceData(); bool isValid(); @@ -82,7 +83,7 @@ QMap<int, QComboBox*> types; QMap<int, libfwbuilder::Address*> fwaddrs; bool validateAddress(const QString &addr, const QString &netm, bool regular, bool ipv4); - bool doNotCheckNext; + void updateColumnsSizes(); public slots: int addNewAddress(); Modified: branches/v3_1/src/gui/InterfacesTabWidget.cpp =================================================================== --- branches/v3_1/src/gui/InterfacesTabWidget.cpp 2009-11-19 18:56:28 UTC (rev 1823) +++ branches/v3_1/src/gui/InterfacesTabWidget.cpp 2009-11-19 20:32:49 UTC (rev 1824) @@ -147,7 +147,9 @@ this->cornerWidget(Qt::TopLeftCorner)->setVisible(st); } -void InterfacesTabWidget::addInterface(InterfaceData* idata) +void InterfacesTabWidget::addInterfaceFromData(InterfaceData* idata) { - addTab(new InterfaceEditorWidget(this, idata), idata->name.c_str()); + InterfaceEditorWidget *w = new InterfaceEditorWidget(this); + w->setData(idata); + addTab(w, idata->name.c_str()); } Modified: branches/v3_1/src/gui/InterfacesTabWidget.h =================================================================== --- branches/v3_1/src/gui/InterfacesTabWidget.h 2009-11-19 18:56:28 UTC (rev 1823) +++ branches/v3_1/src/gui/InterfacesTabWidget.h 2009-11-19 20:32:49 UTC (rev 1824) @@ -86,7 +86,7 @@ void addNewInterface(); void setTemplate(libfwbuilder::FWObject*); void closeTab(); - void addInterface(libfwbuilder::InterfaceData*); + void addInterfaceFromData(libfwbuilder::InterfaceData*); }; Modified: branches/v3_1/src/gui/newFirewallDialog.cpp =================================================================== --- branches/v3_1/src/gui/newFirewallDialog.cpp 2009-11-19 18:56:28 UTC (rev 1823) +++ branches/v3_1/src/gui/newFirewallDialog.cpp 2009-11-19 20:32:49 UTC (rev 1824) @@ -149,6 +149,7 @@ this->m_dialog->interfaceEditor1->clear(); + this->connect(this, SIGNAL(addSNMPInterface(libfwbuilder::InterfaceData*)), this->m_dialog->interfaceEditor1, SLOT(addInterfaceFromData(libfwbuilder::InterfaceData*))); this->m_dialog->interfaceEditor2->clear(); this->m_dialog->interfaceEditor2->removeTab(0); @@ -255,28 +256,7 @@ if ( idata->ostatus ) { idata->guessLabel(readPlatform(m_dialog->platform).toStdString()); - - this->m_dialog->interfaceEditor1->addInterface(idata); - - /* - QString dn; - if (idata->isDyn) dn+="dyn"; - if (idata->isUnnumbered) dn+="unn"; - - QStringList qsl; - qsl << idata->name.c_str() << idata->label.c_str(); - // TODO: redesign the way we pass information from the - // snmp crawler down the line so that multiple ip - // addresses per interface can be processed. - if (idata->addr_mask.size()) - qsl << idata->addr_mask.front()->getAddressPtr()->toString().c_str() - << idata->addr_mask.front()->getNetmaskPtr()->toString().c_str(); - else - qsl << "" << ""; - - qsl << dn << idata->mac_addr.c_str(); - new QTreeWidgetItem(m_dialog->iface_list, qsl); - */ + this->m_dialog->interfaceEditor1->addInterfaceFromData(idata); } } Modified: branches/v3_1/src/gui/newFirewallDialog.h =================================================================== --- branches/v3_1/src/gui/newFirewallDialog.h 2009-11-19 18:56:28 UTC (rev 1823) +++ branches/v3_1/src/gui/newFirewallDialog.h 2009-11-19 20:32:49 UTC (rev 1824) @@ -95,7 +95,7 @@ void replaceReferencesToObject(libfwbuilder::Firewall *fw, libfwbuilder::FWObject *old_obj, libfwbuilder::FWObject *new_obj); - + public: newFirewallDialog(libfwbuilder::FWObject *parent); virtual ~newFirewallDialog(); @@ -124,7 +124,7 @@ void cancelClicked(); void nextClicked(); void backClicked(); - + }; #endif // __NEWFIREWALLDIALOG_H |