[fwbuilder-commits] r1825 - branches/v3_1/src/gui
Brought to you by:
mikehorn
From: <a2...@in...> - 2009-11-19 22:26:44
|
Author: a2k Date: 2009-11-19 13:07:30 -0800 (Thu, 19 Nov 2009) New Revision: 1825 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/newFirewallDialog.cpp Log: Fixed #654 Modified: branches/v3_1/src/gui/InterfaceEditorWidget.cpp =================================================================== --- branches/v3_1/src/gui/InterfaceEditorWidget.cpp 2009-11-19 20:32:49 UTC (rev 1824) +++ branches/v3_1/src/gui/InterfaceEditorWidget.cpp 2009-11-19 21:07:30 UTC (rev 1825) @@ -55,7 +55,6 @@ rows[row].first->setText(addr->getAddressPtr()->toString().c_str()); rows[row].second->setText(addr->getNetmaskPtr()->toString().c_str()); } - updateColumnsSizes(); } void InterfaceEditorWidget::setData(InterfaceData *data) @@ -70,6 +69,8 @@ this->m_ui->type->setCurrentIndex(2); else this->m_ui->type->setCurrentIndex(0); + foreach(QPushButton *btn, this->buttons.keys()) + btn->click(); if ( !data->isDyn && !data->isUnnumbered ) { foreach( InetAddrMask* addr, data->addr_mask ) @@ -93,7 +94,6 @@ this->m_ui->label->clear(); this->m_ui->comment->clear(); addNewAddress(); - updateColumnsSizes(); } void InterfaceEditorWidget::deleteAddress() @@ -291,12 +291,8 @@ void InterfaceEditorWidget::resizeEvent ( QResizeEvent * ) { - updateColumnsSizes(); -} - -void InterfaceEditorWidget::updateColumnsSizes() -{ int total = this->m_ui->addresses->viewport()->width(); + if (total < 100) total = this->m_ui->addresses->width() * 0.95; int controls; if ( total/4 > 130 ) controls = 130; else controls = total/4; this->m_ui->addresses->setColumnWidth(0, (total - controls*2)/2); Modified: branches/v3_1/src/gui/InterfaceEditorWidget.h =================================================================== --- branches/v3_1/src/gui/InterfaceEditorWidget.h 2009-11-19 20:32:49 UTC (rev 1824) +++ branches/v3_1/src/gui/InterfaceEditorWidget.h 2009-11-19 21:07:30 UTC (rev 1825) @@ -69,6 +69,7 @@ libfwbuilder::Interface* getInterface(); EditedInterfaceData getInterfaceData(); bool isValid(); + void updateColumnsSizes(); protected: void changeEvent(QEvent *e); @@ -83,8 +84,8 @@ QMap<int, QComboBox*> types; QMap<int, libfwbuilder::Address*> fwaddrs; bool validateAddress(const QString &addr, const QString &netm, bool regular, bool ipv4); - void updateColumnsSizes(); + public slots: int addNewAddress(); void deleteAddress(); Modified: branches/v3_1/src/gui/InterfacesTabWidget.cpp =================================================================== --- branches/v3_1/src/gui/InterfacesTabWidget.cpp 2009-11-19 20:32:49 UTC (rev 1824) +++ branches/v3_1/src/gui/InterfacesTabWidget.cpp 2009-11-19 21:07:30 UTC (rev 1825) @@ -116,7 +116,7 @@ void InterfacesTabWidget::clear() { while ( this->count() ) this->removeTab(0); - this->addNewInterface(); + //this->addNewInterface(); } void InterfacesTabWidget::closeTab() @@ -130,7 +130,6 @@ delete w; } - bool InterfacesTabWidget::isValid() { for (int i = 0; i< this->count(); i++) Modified: branches/v3_1/src/gui/newFirewallDialog.cpp =================================================================== --- branches/v3_1/src/gui/newFirewallDialog.cpp 2009-11-19 20:32:49 UTC (rev 1824) +++ branches/v3_1/src/gui/newFirewallDialog.cpp 2009-11-19 21:07:30 UTC (rev 1825) @@ -149,7 +149,6 @@ 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); @@ -249,6 +248,7 @@ map<int, InterfaceData>* intf = q->getInterfaces(); map<int, InterfaceData>::iterator i; + this->m_dialog->interfaceEditor1->clear(); for (i=intf->begin(); i!=intf->end(); ++i) { InterfaceData* idata = &(i->second); @@ -259,6 +259,8 @@ this->m_dialog->interfaceEditor1->addInterfaceFromData(idata); } } + if ( this->m_dialog->interfaceEditor1->count() == 0 ) + this->m_dialog->interfaceEditor1->addNewInterface(); delete q; q=NULL; |