38 files changed, 554 insertions, 172 deletions
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp index 4579e37..1d0a0f7 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp +++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp @@ -17,3 +17,4 @@ static const char * BluetoothBNEPNeeds[] = */ -BluetoothBNEPNetNode::BluetoothBNEPNetNode() : ANetNode() { +BluetoothBNEPNetNode::BluetoothBNEPNetNode() : + ANetNode(tr("Bluetooth PAN/NAP")) { InstanceCount = 7; // default @@ -90,3 +91,4 @@ static const char * BluetoothRFCOMMNeeds[] = -BluetoothRFCOMMNetNode::BluetoothRFCOMMNetNode() : ANetNode() { +BluetoothRFCOMMNetNode::BluetoothRFCOMMNetNode() : + ANetNode( tr("Bluetooth serial link") ) { } diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h index 882d2e3..2e5e1d2 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h +++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h @@ -19,5 +19,2 @@ public: - virtual const QString nodeName() - { return tr("Bluetooth PAN/NAP"); } - virtual const QString nodeDescription() ; @@ -60,5 +57,2 @@ public: - virtual const QString nodeName() - { return tr("Bluetooth serial link"); } - virtual const QString nodeDescription() ; diff --git a/noncore/settings/networksettings2/cable/cable_NN.cpp b/noncore/settings/networksettings2/cable/cable_NN.cpp index dd41c1f..e95b4f6 100644 --- a/noncore/settings/networksettings2/cable/cable_NN.cpp +++ b/noncore/settings/networksettings2/cable/cable_NN.cpp @@ -10,3 +10,3 @@ static const char * CableNeeds[] = */ -CableNetNode::CableNetNode() : ANetNode() { +CableNetNode::CableNetNode() : ANetNode(tr("Cable Connection")) { } diff --git a/noncore/settings/networksettings2/cable/cable_NN.h b/noncore/settings/networksettings2/cable/cable_NN.h index b37f31a..c48037a 100644 --- a/noncore/settings/networksettings2/cable/cable_NN.h +++ b/noncore/settings/networksettings2/cable/cable_NN.h @@ -19,5 +19,2 @@ public: - virtual const QString nodeName() - { return tr("Cable Connection"); } - virtual const QString nodeDescription() ; diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp index 4bbe502..77826d1 100644 --- a/noncore/settings/networksettings2/editconnection.cpp +++ b/noncore/settings/networksettings2/editconnection.cpp @@ -135,3 +135,3 @@ NodeCollection * EditConnection::getTmpCollection( void ) { NNI == 0 || - NNI->nodeClass()->nodeName() != it->text(0) ) { + it->text(0) != NNI->nodeClass()->name() ) { // new item not in previous collection @@ -198,3 +198,3 @@ void EditConnection::setConnection( NodeCollection * NC ) { while( it ) { - if( NNI && NNI->nodeClass()->nodeName() == it->text(0) ) { + if( NNI && it->text(0) == NNI->nodeClass()->name() ) { // this radio is part of the collection @@ -284,3 +284,3 @@ void EditConnection::buildFullTree( void ) { MyQCheckListItem * it = new MyQCheckListItem( TheTop, - NN->nodeName(), + NN->name(), QCheckListItem::RadioButton ); @@ -312,3 +312,3 @@ void EditConnection::buildSubTree( QListViewItem * it, ANetNode *NN ) { (QCheckListItem *)it, - NNL[i]->nodeName(), QCheckListItem::RadioButton ); + NNL[i]->name(), QCheckListItem::RadioButton ); // remember that this node maps to this listitem @@ -319,3 +319,3 @@ void EditConnection::buildSubTree( QListViewItem * it, ANetNode *NN ) { // Single item - CI = new MyQListViewItem( it, NNL[i]->nodeName() ); + CI = new MyQListViewItem( it, NNL[i]->name() ); // remember that this node maps to this listitem @@ -446,3 +446,3 @@ void EditConnection::SLOT_AlterTab( const QString & S ) { NSResources->getPixmap( NNI->nodeClass()->pixmapName() ), - NNI->nodeClass()->nodeName() + NNI->nodeClass()->name() ); diff --git a/noncore/settings/networksettings2/irda/irda_NN.cpp b/noncore/settings/networksettings2/irda/irda_NN.cpp index 49b7707..f2fda5c 100644 --- a/noncore/settings/networksettings2/irda/irda_NN.cpp +++ b/noncore/settings/networksettings2/irda/irda_NN.cpp @@ -10,3 +10,3 @@ static const char * IRDANeeds[] = */ -IRDANetNode::IRDANetNode() : ANetNode() { +IRDANetNode::IRDANetNode() : ANetNode(tr("Infrared link")) { } diff --git a/noncore/settings/networksettings2/irda/irda_NN.h b/noncore/settings/networksettings2/irda/irda_NN.h index 2dcef74..fa6408d 100644 --- a/noncore/settings/networksettings2/irda/irda_NN.h +++ b/noncore/settings/networksettings2/irda/irda_NN.h @@ -19,5 +19,2 @@ public: - virtual const QString nodeName() - { return tr("Infrared link"); } - virtual const QString nodeDescription() ; diff --git a/noncore/settings/networksettings2/lancard/lancardGUI.ui b/noncore/settings/networksettings2/lancard/lancardGUI.ui index 8d94816..c407175 100644 --- a/noncore/settings/networksettings2/lancard/lancardGUI.ui +++ b/noncore/settings/networksettings2/lancard/lancardGUI.ui @@ -13,3 +13,3 @@ <y>0</y> - <width>362</width> + <width>354</width> <height>359</height> @@ -71,3 +71,3 @@ <name>margin</name> - <number>11</number> + <number>5</number> </property> @@ -82,16 +82,2 @@ <name>text</name> - <string>Name</string> - </property> - <property> - <name>clickable</name> - <bool>true</bool> - </property> - <property> - <name>resizeable</name> - <bool>true</bool> - </property> - </column> - <column> - <property> - <name>text</name> <string>MACAddress</string> @@ -116,2 +102,62 @@ </widget> + <widget> + <class>QLayoutWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>Layout2</cstring> + </property> + <hbox> + <property stdset="1"> + <name>margin</name> + <number>0</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget> + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>RemoveUnknown_BUT</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Remove Unknown</string> + </property> + </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer1</cstring> + </property> + <property stdset="1"> + <name>orientation</name> + <enum>Horizontal</enum> + </property> + <property stdset="1"> + <name>sizeType</name> + <enum>Expanding</enum> + </property> + <property> + <name>sizeHint</name> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + <widget> + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>RescanCards_BUT</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Rescan</string> + </property> + </widget> + </hbox> + </widget> </vbox> @@ -127,2 +173,16 @@ </connection> + <connection> + <sender>RescanCards_BUT</sender> + <signal>clicked()</signal> + <receiver>Lancard_FRM</receiver> + <slot>SLOT_ScanCards()</slot> + </connection> + <connection> + <sender>RemoveUnknown_BUT</sender> + <signal>clicked()</signal> + <receiver>Lancard_FRM</receiver> + <slot>SLOT_RemoveUnknown()</slot> + </connection> + <slot access="public">SLOT_ScanCards()</slot> + <slot access="public">SLOT_RemoveUnknown()</slot> </connections> diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.cpp b/noncore/settings/networksettings2/lancard/lancard_NN.cpp index ba1c1f8..a4afab1 100644 --- a/noncore/settings/networksettings2/lancard/lancard_NN.cpp +++ b/noncore/settings/networksettings2/lancard/lancard_NN.cpp @@ -9,3 +9,3 @@ static const char * LanCardNeeds[] = */ -LanCardNetNode::LanCardNetNode() : ANetNode() { +LanCardNetNode::LanCardNetNode() : ANetNode(tr("LAN card")), NICMACAddresses() { InstanceCount = 2; @@ -71,2 +71,4 @@ void LanCardNetNode::setSpecificAttribute( QString & A, QString & V ) { InstanceCount = V.toLong(); + } else if ( A == "macaddress" ) { + NICMACAddresses.append( V ); } @@ -78,2 +80,9 @@ void LanCardNetNode::saveSpecificAttribute( QTextStream & TS) { << endl; + for( QStringList::Iterator it = NICMACAddresses.begin(); + it != NICMACAddresses.end(); + ++it ) { + TS << "macaddress=" + << (*it) + << endl; + } } diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.h b/noncore/settings/networksettings2/lancard/lancard_NN.h index 5f2b25d..d58823c 100644 --- a/noncore/settings/networksettings2/lancard/lancard_NN.h +++ b/noncore/settings/networksettings2/lancard/lancard_NN.h @@ -3,2 +3,3 @@ +#include <qstringlist.h> #include "netnode.h" @@ -19,5 +20,2 @@ public: - virtual const QString nodeName() - { return tr("LAN card"); } - virtual const QString nodeDescription() ; @@ -38,2 +36,4 @@ public: virtual QString genNic( long ); + virtual QStringList & addressesOfNIC( void ) + { return NICMACAddresses; } @@ -47,2 +47,4 @@ private: + QStringList NICMACAddresses; + }; diff --git a/noncore/settings/networksettings2/lancard/lancard_NNI.cpp b/noncore/settings/networksettings2/lancard/lancard_NNI.cpp index 5962d52..99c033e 100644 --- a/noncore/settings/networksettings2/lancard/lancard_NNI.cpp +++ b/noncore/settings/networksettings2/lancard/lancard_NNI.cpp @@ -32,3 +32,3 @@ QWidget * ALanCard::edit( QWidget * parent ) { GUI = new LanCardEdit( parent ); - GUI->showData( Data ); + GUI->showData( this ); return GUI; diff --git a/noncore/settings/networksettings2/lancard/lancardedit.cpp b/noncore/settings/networksettings2/lancard/lancardedit.cpp index fa7f6dc..ffe9bf6 100644 --- a/noncore/settings/networksettings2/lancard/lancardedit.cpp +++ b/noncore/settings/networksettings2/lancard/lancardedit.cpp @@ -2,2 +2,3 @@ #include <resources.h> +#include <qarray.h> #include <qlistview.h> @@ -6,23 +7,10 @@ #include <qregexp.h> + #include "lancardedit.h" +#include "lancard_NN.h" +#include "lancard_NNI.h" LanCardEdit::LanCardEdit( QWidget * Parent ) : LanCardGUI( Parent ){ - System & S = NSResources->system(); - QRegExp R( "eth[0-9]" ); - QCheckListItem * CLI; - LanCards_LV->header()->hide(); - // populate with all lancards in system - for( QDictIterator<InterfaceInfo> It(S.interfaces()); - It.current(); - ++It ) { - if( R.match( It.current()->Name ) >= 0 && - It.current()->CardType == ARPHRD_ETHER - ) { - CLI = new QCheckListItem( LanCards_LV, It.current()->Name, - QCheckListItem::CheckBox ); - CLI->setText( 1, It.current()->MACAddress ); - } - } } @@ -33,3 +21,2 @@ QString LanCardEdit::acceptable( void ) { - bool LanCardEdit::commit( LanCardData & Data ) { @@ -39,3 +26,7 @@ bool LanCardEdit::commit( LanCardData & Data ) { if( ! Data.AnyLanCard ) { - // collect set of lancards that match + // take copy for orig list + QStringList NewList( Data.HWAddresses ); + + // update HWAddresses to new state + // remove item also from NewList int idx; @@ -43,3 +34,3 @@ bool LanCardEdit::commit( LanCardData & Data ) { while( CLI ) { - idx = Data.HWAddresses.findIndex(CLI->text(1)); + idx = Data.HWAddresses.findIndex(CLI->text(0)); if( CLI->isOn() ) { @@ -47,3 +38,3 @@ bool LanCardEdit::commit( LanCardData & Data ) { // should be in list - Data.HWAddresses.append( CLI->text(1) ); + Data.HWAddresses.append( CLI->text(0) ); SM = 1; @@ -53,3 +44,4 @@ bool LanCardEdit::commit( LanCardData & Data ) { if( idx >= 0 ) { - Data.HWAddresses.remove( Data.HWAddresses.at(idx) ); + NewList.remove( CLI->text(0) ); + Data.HWAddresses.remove( CLI->text(0) ); SM = 1; @@ -59,29 +51,102 @@ bool LanCardEdit::commit( LanCardData & Data ) { } + + // if newlist still contains items. it were items + // that were checked but no longer are present in the system + SM |= ( NewList.count() > 0 ) ; } - return SM || ContainedObsoleteMAC ; + return SM; } -void LanCardEdit::showData( LanCardData & Data ) { +void LanCardEdit::showData( ALanCard * LC ) { + NNI = LC; + LanCardData & Data = *((LanCardData *)LC->data()); + AnyCard_CB->setChecked( Data.AnyLanCard ); + // load all cards + populateList(); + + // set checks QCheckListItem * CLI = (QCheckListItem *)LanCards_LV->firstChild(); + while( CLI ) { + CLI->setOn( Data.HWAddresses.findIndex(CLI->text(0)) >= 0 ); + CLI = (QCheckListItem *)CLI->nextSibling(); + } +} - ContainedObsoleteMAC = 0; - // remove obsolete address - for( QStringList::Iterator it=Data.HWAddresses.begin(); - it != Data.HWAddresses.end(); - ) { - CLI = (QCheckListItem *)LanCards_LV->firstChild(); - while( CLI ) { - if( CLI->text(1) == (*it) ) - // still valid +// load all known cards in list +void LanCardEdit::populateList( void ) { + LanCardNetNode *NN = (LanCardNetNode *)NNI->nodeClass(); + QCheckListItem * CLI; + bool Found; + + LanCards_LV->clear(); + + for( QStringList::Iterator it = NN->addressesOfNIC().begin(); + it != NN->addressesOfNIC().end(); + ++it ) { + CLI = new QCheckListItem( LanCards_LV, (*it), QCheckListItem::CheckBox ); + + // check interfaces and see if this card is present + Found = 0; + for( QDictIterator<InterfaceInfo> NIt(NSResources->system().interfaces()); + NIt.current(); + ++NIt ) { + if( NIt.current()->MACAddress == (*it) ) { + Found = 1; break; - CLI = (QCheckListItem *)CLI->nextSibling(); + } } - if( CLI == 0 ) { - // address not found -> remove - ContainedObsoleteMAC = 1; - Data.HWAddresses.remove( it ); - } else { - ++ it; + + CLI->setPixmap( 0, NSResources->getPixmap( + (Found) ? "add" : "remove" ) ); + } +} + +// rescan system for new cards +void LanCardEdit::SLOT_ScanCards( void ) { + LanCardNetNode *NN = (LanCardNetNode *)NNI->nodeClass(); + + // add any NIC that is new and matches our interfacename + System & S = NSResources->system(); + QRegExp R( "eth[0-9]" ); + // populate with all lancards in system + for( QDictIterator<InterfaceInfo> It(S.interfaces()); + It.current(); + ++It ) { + fprintf( stderr, "TEST %s %s\n", + It.current()->Name.latin1(), + It.current()->MACAddress.latin1() ); + if( R.match( It.current()->Name ) >= 0 && + ( It.current()->CardType == ARPHRD_ETHER +#ifdef ARPHRD_IEEE1394 + || It.current()->CardType == ARPHRD_IEEE1394 +#endif + ) + ) { + // old item ? + QCheckListItem * CLI = + (QCheckListItem *)LanCards_LV->firstChild(); + while( CLI ) { + if( CLI->text(0) == It.current()->MACAddress ) { + break; + } + CLI = (QCheckListItem *)CLI->nextSibling(); + } + + if( ! CLI ) { + // new item + CLI = new QCheckListItem( LanCards_LV, + It.current()->MACAddress, + QCheckListItem::CheckBox ); + } + + // mark present + CLI->setPixmap( 0, NSResources->getPixmap( + "add" ) ); + + if( NN->addressesOfNIC().findIndex( It.current()->MACAddress) < 0 ) { + // new + NN->addressesOfNIC().append( It.current()->MACAddress ); + } } @@ -89,7 +154,55 @@ void LanCardEdit::showData( LanCardData & Data ) { - // set checks +} + +// remove all cards that are not present -> flagged with 'remove' +// and unchecked +void LanCardEdit::SLOT_RemoveUnknown( void ) { + QArray<QCheckListItem *> AllItems; + + LanCardNetNode *NN = (LanCardNetNode *)NNI->nodeClass(); + + QCheckListItem * CLI = (QCheckListItem *)LanCards_LV->firstChild(); while( CLI ) { - CLI->setOn( Data.HWAddresses.findIndex(CLI->text(1)) >= 0 ); + AllItems.resize( AllItems.size()+1 ); + AllItems[ AllItems.size()-1 ] = CLI; CLI = (QCheckListItem *)CLI->nextSibling(); } + + // force update of system + System & S = NSResources->system(); + S.probeInterfaces(); + + // add any NIC that is new and matches our interfacename + QRegExp R( "eth[0-9]" ); + + + for( QDictIterator<InterfaceInfo> It(S.interfaces()); + It.current(); + ++It ) { + if( R.match( It.current()->Name ) >= 0 && + ( It.current()->CardType == ARPHRD_ETHER +#ifdef ARPHRD_IEEE1394 + || It.current()->CardType == ARPHRD_IEEE1394 +#endif + ) + ) { + + for ( unsigned i = 0; i< AllItems.size(); i++ ) { + if( AllItems[i] && + AllItems[i]->text(0) == It.current()->MACAddress ) { + AllItems[i] = 0; + break; + } + } + } + } + + // AllItems now contains all cards NOT present + // remove all items non null and not ON + for ( unsigned i = 0; i< AllItems.size(); i++ ) { + if( AllItems[i] && ! AllItems[i]->isOn() ) { + NN->addressesOfNIC().remove( AllItems[i]->text(0) ); + delete AllItems[i]; + } + } } diff --git a/noncore/settings/networksettings2/lancard/lancardedit.h b/noncore/settings/networksettings2/lancard/lancardedit.h index 8def789..282db1f 100644 --- a/noncore/settings/networksettings2/lancard/lancardedit.h +++ b/noncore/settings/networksettings2/lancard/lancardedit.h @@ -3,2 +3,4 @@ +class ALanCard; + class LanCardEdit : public LanCardGUI { @@ -10,3 +12,8 @@ public : bool commit( LanCardData & Data ); - void showData( LanCardData & Data ); + void showData( ALanCard * NNI ); + +public slots : + + void SLOT_ScanCards( void ); + void SLOT_RemoveUnknown( void ); @@ -14,3 +21,4 @@ private : - bool ContainedObsoleteMAC; + void populateList( void ); + ALanCard * NNI; }; diff --git a/noncore/settings/networksettings2/lancard/lancardrun.cpp b/noncore/settings/networksettings2/lancard/lancardrun.cpp index 951756d..2e4fc43 100644 --- a/noncore/settings/networksettings2/lancard/lancardrun.cpp +++ b/noncore/settings/networksettings2/lancard/lancardrun.cpp @@ -2,2 +2,3 @@ #include <qtextstream.h> +#include <qstringlist.h> #include <resources.h> @@ -55,4 +56,8 @@ void LanCardRun::detectState( NodeCollection * NC ) { Run = It.current(); - if( handlesInterface( Run->Name ) && - Run->CardType == ARPHRD_ETHER && + if( handlesInterface( *Run ) && + ( Run->CardType == ARPHRD_ETHER +#ifdef ARPHRD_IEEE1394 + || Run->CardType == ARPHRD_IEEE1394 +#endif + ) && ! Run->IsUp @@ -147,4 +152,8 @@ InterfaceInfo * LanCardRun::getInterface( void ) { Run = It.current(); - if( handlesInterface( Run->Name ) && - Run->CardType == ARPHRD_ETHER + if( handlesInterface( *Run ) && + ( Run->CardType == ARPHRD_ETHER +#ifdef ARPHRD_IEEE1394 + || Run->CardType == ARPHRD_IEEE1394 +#endif + ) ) { @@ -164,3 +173,20 @@ InterfaceInfo * LanCardRun::getInterface( void ) { bool LanCardRun::handlesInterface( const QString & S ) { + InterfaceInfo * II; + II = NSResources->system().interface( S ); + if( ( II = NSResources->system().interface( S ) ) ) { + return handlesInterface( *II ); + } return Pat.match( S ) >= 0; } + +bool LanCardRun::handlesInterface( const InterfaceInfo & II ) { + if( Pat.match( II.Name ) < 0 ) + return 0; + + if( Data->AnyLanCard ) { + return 1; + } + + // must also match hardware address + return ( Data->HWAddresses.findIndex( II.MACAddress ) >= 0 ); +} diff --git a/noncore/settings/networksettings2/lancard/lancardrun.h b/noncore/settings/networksettings2/lancard/lancardrun.h index 499b417..e8a535a 100644 --- a/noncore/settings/networksettings2/lancard/lancardrun.h +++ b/noncore/settings/networksettings2/lancard/lancardrun.h @@ -12,5 +12,5 @@ public : LanCardRun( ANetNodeInstance * NNI, - LanCardData & Data ) : AsDevice( NNI ), + LanCardData & D ) : AsDevice( NNI ), Pat( "eth[0-9]" ) - { } + { Data = &D; } @@ -29,2 +29,3 @@ protected : bool handlesInterface( const QString & I ); + bool handlesInterface( const InterfaceInfo & II ); @@ -34,2 +35,3 @@ private : QRegExp Pat; + LanCardData * Data; diff --git a/noncore/settings/networksettings2/modem/modem_NN.cpp b/noncore/settings/networksettings2/modem/modem_NN.cpp index 1cc8524..9d70d7a 100644 --- a/noncore/settings/networksettings2/modem/modem_NN.cpp +++ b/noncore/settings/networksettings2/modem/modem_NN.cpp @@ -10,3 +10,3 @@ static const char * ModemNeeds[] = */ -ModemNetNode::ModemNetNode() : ANetNode() { +ModemNetNode::ModemNetNode() : ANetNode(tr("Dialup modem")) { } diff --git a/noncore/settings/networksettings2/modem/modem_NN.h b/noncore/settings/networksettings2/modem/modem_NN.h index 849f928..2f496dd 100644 --- a/noncore/settings/networksettings2/modem/modem_NN.h +++ b/noncore/settings/networksettings2/modem/modem_NN.h @@ -19,5 +19,2 @@ public: - virtual const QString nodeName() - { return tr("Dialup modem"); } - virtual const QString nodeDescription() ; diff --git a/noncore/settings/networksettings2/network/networkGUI.ui b/noncore/settings/networksettings2/network/networkGUI.ui index 9115ec0..5f71f82 100644 --- a/noncore/settings/networksettings2/network/networkGUI.ui +++ b/noncore/settings/networksettings2/network/networkGUI.ui @@ -13,3 +13,3 @@ <y>0</y> - <width>293</width> + <width>289</width> <height>254</height> @@ -40,3 +40,3 @@ <name>name</name> - <cstring>TabWidget11</cstring> + <cstring>MainTab_TAB</cstring> </property> @@ -485,3 +485,3 @@ <name>name</name> - <cstring>Tab_TB</cstring> + <cstring>Tab_TAB</cstring> </property> @@ -1060,3 +1060,128 @@ </connection> + <connection> + <sender>AddPreUp_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Add()</slot> + </connection> + <connection> + <sender>DeletePreUp_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Remove()</slot> + </connection> + <connection> + <sender>UpPreUp_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Up()</slot> + </connection> + <connection> + <sender>DownPreUp_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Down()</slot> + </connection> + <connection> + <sender>AddPostUp_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Add()</slot> + </connection> + <connection> + <sender>DeletePostUp_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Remove()</slot> + </connection> + <connection> + <sender>UpPostUp_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Up()</slot> + </connection> + <connection> + <sender>DownPostUp_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Down()</slot> + </connection> + <connection> + <sender>AddPreDown_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Add()</slot> + </connection> + <connection> + <sender>DeletePreDown_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Remove()</slot> + </connection> + <connection> + <sender>UpPreDown_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Up()</slot> + </connection> + <connection> + <sender>DownPreDown_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Down()</slot> + </connection> + <connection> + <sender>AddPostDown_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Add()</slot> + </connection> + <connection> + <sender>DeletePostDown_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Remove()</slot> + </connection> + <connection> + <sender>UpPostDown_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Up()</slot> + </connection> + <connection> + <sender>DownPostDown_TB</sender> + <signal>clicked()</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_Down()</slot> + </connection> + <connection> + <sender>PreUp_LB</sender> + <signal>doubleClicked(QListBoxItem*)</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_ShowCommand( QListBoxItem *)</slot> + </connection> + <connection> + <sender>PreDown_LB</sender> + <signal>doubleClicked(QListBoxItem*)</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_ShowCommand( QListBoxItem *)</slot> + </connection> + <connection> + <sender>PostDown_LB</sender> + <signal>doubleClicked(QListBoxItem*)</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_ShowCommand( QListBoxItem *)</slot> + </connection> + <connection> + <sender>PostUp_LB</sender> + <signal>doubleClicked(QListBoxItem*)</signal> + <receiver>NetworkGUI</receiver> + <slot>SLOT_ShowCommand( QListBoxItem *)</slot> + </connection> + <slot access="public">SLOT_Add()</slot> + <slot access="public">SLOT_Down()</slot> <slot access="public">SLOT_NetmaskModified( const QString & )</slot> + <slot access="public">SLOT_Remove()</slot> + <slot access="public">SLOT_Up()</slot> + <slot access="public">SLOT_ShowCommand( QListBoxItem *)</slot> </connections> diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp index d27d54a..b5989df 100644 --- a/noncore/settings/networksettings2/network/network_NN.cpp +++ b/noncore/settings/networksettings2/network/network_NN.cpp @@ -11,3 +11,3 @@ static const char * NetworkNeeds[] = */ -NetworkNetNode::NetworkNetNode() : ANetNode() { +NetworkNetNode::NetworkNetNode() : ANetNode(tr("IP Configuration")) { } diff --git a/noncore/settings/networksettings2/network/network_NN.h b/noncore/settings/networksettings2/network/network_NN.h index 0f87e1b..6548c32 100644 --- a/noncore/settings/networksettings2/network/network_NN.h +++ b/noncore/settings/networksettings2/network/network_NN.h @@ -19,5 +19,2 @@ public: - virtual const QString nodeName() - { return tr("IP Configuration"); } - virtual const QString nodeDescription() ; diff --git a/noncore/settings/networksettings2/network/networkedit.cpp b/noncore/settings/networksettings2/network/networkedit.cpp index 182213b..05110d9 100644 --- a/noncore/settings/networksettings2/network/networkedit.cpp +++ b/noncore/settings/networksettings2/network/networkedit.cpp @@ -2,2 +2,3 @@ #include <qcheckbox.h> +#include <qtabwidget.h> #include <qlineedit.h> @@ -112,3 +113,9 @@ bool NetworkEdit::updateList( QStringList & SL, QListBox * LB ) { - // check if at least ONE item in new list is NEW + if( NewSL.count() != SL.count() ) { + // less or more items + SL= NewSL; + return 1; + } + + // Same size -> same content ? Changed = 0; @@ -160 +167,58 @@ void NetworkEdit::SLOT_NetmaskModified( const QString & ) { } + +QListBox * NetworkEdit::getActiveLB( void ) { + switch( Tab_TAB->currentPageIndex() ) { + case 0 : + return PreUp_LB; + case 1 : + return PostUp_LB; + case 2 : + return PreDown_LB; + } + return PostDown_LB; +} + +void NetworkEdit::SLOT_Add( void ) { + if( Command_LE->text().isEmpty() ) + return; + QListBox * LB = getActiveLB(); + + LB->insertItem( Command_LE->text() ); +} + +void NetworkEdit::SLOT_Remove( void ) { + QListBox * LB = getActiveLB(); + int i; + + if( ( i = LB->currentItem() ) >= 0 ) { + LB->removeItem( i ); + } +} + +void NetworkEdit::SLOT_Up( void ) { + QListBox * LB = getActiveLB(); + int i; + + if( ( i = LB->currentItem() ) > 0 ) { + QListBoxItem * LBI = LB->item(i); + LB->takeItem( LBI ); + LB->insertItem( LBI, --i ); + LB->setCurrentItem( i ); + } +} + +void NetworkEdit::SLOT_Down( void ) { + QListBox * LB = getActiveLB(); + int i; + + if( ( i = LB->currentItem() ) >= 0 && (unsigned)(i+1) != LB->count() ) { + QListBoxItem * LBI = LB->item(i); + LB->takeItem( LBI ); + LB->insertItem( LBI, ++i ); + LB->setCurrentItem( i ); + } +} + +void NetworkEdit::SLOT_ShowCommand( QListBoxItem * It ) { + Command_LE->setText( It->text() ); +} diff --git a/noncore/settings/networksettings2/network/networkedit.h b/noncore/settings/networksettings2/network/networkedit.h index 9ed4e84..adc20e0 100644 --- a/noncore/settings/networksettings2/network/networkedit.h +++ b/noncore/settings/networksettings2/network/networkedit.h @@ -3,2 +3,4 @@ +class QListBox; + class NetworkEdit : public NetworkGUI { @@ -15,2 +17,7 @@ public slots : void SLOT_NetmaskModified( const QString & S ); + void SLOT_ShowCommand( QListBoxItem * LBI ); + void SLOT_Add( void ); + void SLOT_Remove( void ); + void SLOT_Up( void ); + void SLOT_Down( void ); @@ -18,2 +25,3 @@ private : + QListBox * getActiveLB( void ); bool updateList( QStringList &SL, QListBox * LB ); diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp index 3691e5a..417fba8 100644 --- a/noncore/settings/networksettings2/networksettings2/netnode.cpp +++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp @@ -76,4 +76,4 @@ void ANetNodeInstance::initialize( void ) { N.sprintf( "-%ld", InstanceCounter++ ); - N.prepend( NodeType->nodeName() ); - setNodeName( N ); + N.prepend( NodeType->name() ); + setName( N.latin1() ); } @@ -82,3 +82,3 @@ void ANetNodeInstance::setAttribute( QString & Attr, QString & Value ){ if( Attr == "name" ) { - NodeName = Value; + setName( Value.latin1() ); } else { @@ -89,3 +89,3 @@ void ANetNodeInstance::setAttribute( QString & Attr, QString & Value ){ void ANetNodeInstance::saveAttributes( QTextStream & TS ) { - TS << "name=" << quote( NodeName ) << endl; + TS << "name=" << name() << endl; saveSpecificAttribute( TS ); @@ -182,3 +182,3 @@ void NodeCollection::save( QTextStream & TS ) { NNI = it.current(); - TS << "node=" << quote( NNI->nodeName() ) << endl; + TS << "node=" << NNI->name() << endl; } @@ -235,3 +235,3 @@ int NodeCollection::compareItems( QCollection::Item I1, NNI2 = (ANetNodeInstance *)I2; - return NNI1->nodeName().compare( NNI2->nodeName() ); + return strcmp( NNI1->name(), NNI2->name() ); } diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h index 6ec9ef6..27d54f8 100644 --- a/noncore/settings/networksettings2/networksettings2/netnode.h +++ b/noncore/settings/networksettings2/networksettings2/netnode.h @@ -74,3 +74,3 @@ public: - ANetNode(){}; + ANetNode( const char * Name ) : QObject( 0, Name ) {} virtual ~ANetNode(){}; @@ -80,5 +80,2 @@ public: - // name of this NetNode - virtual const QString nodeName() = 0; - // description for this NetNode @@ -186,7 +183,2 @@ public: - // return logical name of this instance - QString & nodeName( void ) - { return NodeName; } - void setNodeName( const QString & S ) - { NodeName = S; } // return description for this instance @@ -227,3 +219,2 @@ protected : NodeCollection * Connection; - QString NodeName; QString Description; @@ -258,2 +249,4 @@ public : { return 0; } + virtual bool handlesInterface( const InterfaceInfo & ) + { return 0; } virtual InterfaceInfo * assignedInterface( void ); diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp index e6ce2b7..4b7a62f 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.cpp +++ b/noncore/settings/networksettings2/networksettings2/resources.cpp @@ -169,3 +169,4 @@ bool TheNSResources::loadNetNode( // store mapping - AllNodeTypes.insert( NN->NetNode->nodeName(), NN ); + printf( "Store %s\n", NN->NetNode->name() ); + AllNodeTypes.insert( NN->NetNode->name(), NN ); } @@ -178,3 +179,2 @@ QPixmap TheNSResources::getPixmap( const QString & QS ) { S += QS; - printf( " pixmap %s\n", S.latin1() ); return Resource::loadPixmap( QString("networksettings2/")+QS ); @@ -202,3 +202,3 @@ void TheNSResources::addConnection( NodeCollection * NC ) { NNI = it.current(); - if( findNodeInstance( NNI->nodeName() ) == 0 ) { + if( findNodeInstance( NNI->name() ) == 0 ) { // new item @@ -217,3 +217,3 @@ void TheNSResources::removeConnection( const QString & N ) { for( NNI = NC->first(); NNI != 0; NNI = NC->next() ) { - removeNodeInstance( NNI->nodeName() ); + removeNodeInstance( NNI->name() ); } diff --git a/noncore/settings/networksettings2/networksettings2/resources.h b/noncore/settings/networksettings2/networksettings2/resources.h index 7050f10..3d6a44f 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.h +++ b/noncore/settings/networksettings2/networksettings2/resources.h @@ -81,3 +81,3 @@ public : void addNodeInstance( ANetNodeInstance * I ) - { AllNodes.insert( I->nodeName(), I ); } + { AllNodes.insert( I->name(), I ); } void removeNodeInstance( const QString & N ) diff --git a/noncore/settings/networksettings2/networksettings2/systemfile.cpp b/noncore/settings/networksettings2/networksettings2/systemfile.cpp index 62bb6af..b3fc1a5 100644 --- a/noncore/settings/networksettings2/networksettings2/systemfile.cpp +++ b/noncore/settings/networksettings2/networksettings2/systemfile.cpp @@ -126,3 +126,3 @@ bool SystemFile::preNodeSection( ANetNodeInstance * NNI, long ) { Out = S. - arg(NNI->nodeClass()->nodeName()); + arg(NNI->nodeClass()->name()); (*this) << Out << endl; @@ -144,3 +144,3 @@ bool SystemFile::postNodeSection( ANetNodeInstance * NNI, long ) { Out = S. - arg(NNI->nodeName()); + arg(NNI->name()); (*this) << Out << endl; @@ -161,3 +161,3 @@ bool SystemFile::preDeviceSection( ANetNode * NN ) { while( ! TX.eof() ) { - Out = S.arg(NN->nodeName()); + Out = S.arg(NN->name()); (*this) << Out << endl; @@ -178,3 +178,3 @@ bool SystemFile::postDeviceSection( ANetNode * NN ) { while( ! TX.eof() ) { - Out = S.arg(NN->nodeName()); + Out = S.arg(NN->name()); (*this) << Out << endl; diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp index 13979ce..64b83f7 100644 --- a/noncore/settings/networksettings2/nsdata.cpp +++ b/noncore/settings/networksettings2/nsdata.cpp @@ -17,3 +17,3 @@ NetworkSettingsData::NetworkSettingsData( void ) { - CfgFile.sprintf( "%s/NETCONFIG", + CfgFile.sprintf( "%s/Settings/NS2.conf", NSResources->currentUser().HomeDir.latin1() ); @@ -77,6 +77,7 @@ void NetworkSettingsData::loadSettings( void ) { if( S.startsWith( "nodetype " ) ) { - S = S.mid( 9, S.length()-9-1 ); - fprintf( stderr, "Node %s\n", S.latin1() ); + S = S.mid( 9, S.length()-9 ); + S = deQuote(S); // try to find netnode NN = NSResources->findNetNode( S ); + fprintf( stderr, "Node %s : %p\n", S.latin1(), NN ); } else { @@ -84,2 +85,7 @@ void NetworkSettingsData::loadSettings( void ) { NNI = NSResources->createNodeInstance( S ); + fprintf( stderr, "NodeInstance %s : %p\n", S.latin1(), NNI ); + } + + if( NN == 0 && NNI == 0 ) { + LeftOvers.append( Line ); } @@ -87,3 +93,3 @@ void NetworkSettingsData::loadSettings( void ) { do { - S = TS.readLine(); + S = Line = TS.readLine(); @@ -111,3 +117,3 @@ void NetworkSettingsData::loadSettings( void ) { // set the attribute - NNI->setAttribute( Attr, Value ); + NN->setAttribute( Attr, Value ); } else { @@ -125,2 +131,3 @@ void NetworkSettingsData::loadSettings( void ) { } while( 1 ); + if( NNI ) { @@ -168,3 +175,3 @@ QString NetworkSettingsData::saveSettings( void ) { TS << "[nodetype " - << it.current()->NetNode->name() + << quote( QString( it.current()->NetNode->name() ) ) << "]" @@ -173,2 +180,3 @@ QString NetworkSettingsData::saveSettings( void ) { it.current()->NetNode->saveAttributes( TS ); + TS << endl; } @@ -188,3 +196,6 @@ QString NetworkSettingsData::saveSettings( void ) { NNI = nit.current(); - TS << '[' <<NNI->nodeClass()->nodeName() << ']' << endl; + TS << '[' + << QString(NNI->nodeClass()->name()) + << ']' + << endl; NNI->saveAttributes( TS ); @@ -297,3 +308,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { "<p>Cannot generate files proper to \"%1\"</p>" ). - arg(NNI->nodeClass()->nodeName()) ; + arg(NNI->nodeClass()->name()) ; return S; @@ -392,3 +403,2 @@ QList<NodeCollection> NetworkSettingsData::collectPossible( const char * Interfa // check if this profile handles the requested interface - fprintf( stderr, "check %s\n", NC->name().latin1() ); if( NC->handlesInterface( Interface ) && // if different Intf. @@ -397,3 +407,3 @@ QList<NodeCollection> NetworkSettingsData::collectPossible( const char * Interfa ) { - fprintf( stderr, "Append %s\n", NC->name().latin1() ); + fprintf( stderr, "Append %s for %s\n", NC->name().latin1(), Interface); PossibleConnections.append( NC ); @@ -488,3 +498,3 @@ QString NetworkSettingsData::generateSystemFileNode( arg( SF.name() ). - arg( CurDevNN->nodeName() ); + arg( CurDevNN->name() ); return S; @@ -497,3 +507,3 @@ QString NetworkSettingsData::generateSystemFileNode( arg( SF.name() ). - arg( CurDevNN->nodeName() ); + arg( CurDevNN->name() ); return S; @@ -502,7 +512,2 @@ QString NetworkSettingsData::generateSystemFileNode( - if( CurDev ) - fprintf( stderr, "Cur %s\n", CurDevNN->nodeName().latin1() ); - else - fprintf( stderr, "Cur NO\n" ); - // now generate profile specific data for all @@ -519,3 +524,2 @@ QString NetworkSettingsData::generateSystemFileNode( - fprintf( stderr, "%s\n", Dev->netNode()->nodeName().latin1() ); if( CurDev ) { @@ -523,3 +527,2 @@ QString NetworkSettingsData::generateSystemFileNode( // other device type -> later - fprintf( stderr, "Other Dev type\n" ); continue; @@ -538,3 +541,3 @@ QString NetworkSettingsData::generateSystemFileNode( arg( SF.name() ). - arg( CurDevNN->nodeName() ); + arg( CurDevNN->name() ); return S; @@ -553,3 +556,3 @@ QString NetworkSettingsData::generateSystemFileNode( arg( SF.name() ). - arg( NNI->nodeClass()->nodeName() ); + arg( NNI->nodeClass()->name() ); return S; @@ -563,3 +566,3 @@ QString NetworkSettingsData::generateSystemFileNode( arg( SF.name() ). - arg( CurDevNN->nodeName() ); + arg( CurDevNN->name() ); return S; @@ -573,3 +576,3 @@ QString NetworkSettingsData::generateSystemFileNode( arg( SF.name() ). - arg( CurDevNN->nodeName() ); + arg( CurDevNN->name() ); return S; diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp index 0bf415b..208c7c2 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp +++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp @@ -12,3 +12,3 @@ static const char * PPPNeeds[] = */ -PPPNetNode::PPPNetNode() : ANetNode() { +PPPNetNode::PPPNetNode() : ANetNode(tr("PPP Connection")) { } diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.h b/noncore/settings/networksettings2/ppp/ppp_NN.h index fbbbbe1..b1483c4 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NN.h +++ b/noncore/settings/networksettings2/ppp/ppp_NN.h @@ -19,5 +19,2 @@ public: - virtual const QString nodeName() - { return tr("PPP Connection"); } - virtual const QString nodeDescription() ; diff --git a/noncore/settings/networksettings2/profile/profile_NN.cpp b/noncore/settings/networksettings2/profile/profile_NN.cpp index 0f71dc7..d06b7ef 100644 --- a/noncore/settings/networksettings2/profile/profile_NN.cpp +++ b/noncore/settings/networksettings2/profile/profile_NN.cpp @@ -11,3 +11,3 @@ static const char * ProfileNeeds[] = */ -ProfileNetNode::ProfileNetNode() : ANetNode() { +ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular profile")) { } diff --git a/noncore/settings/networksettings2/profile/profile_NN.h b/noncore/settings/networksettings2/profile/profile_NN.h index 1313ab2..e602bd7 100644 --- a/noncore/settings/networksettings2/profile/profile_NN.h +++ b/noncore/settings/networksettings2/profile/profile_NN.h @@ -19,5 +19,2 @@ public: - virtual const QString nodeName() - { return tr("Regular profile"); } - virtual const QString nodeDescription() ; diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp index d5971cf..9101490 100644 --- a/noncore/settings/networksettings2/usb/usb_NN.cpp +++ b/noncore/settings/networksettings2/usb/usb_NN.cpp @@ -10,3 +10,3 @@ static const char * USBNeeds[] = */ -USBNetNode::USBNetNode() : ANetNode() { +USBNetNode::USBNetNode() : ANetNode(tr("USB Cable Connect")) { } diff --git a/noncore/settings/networksettings2/usb/usb_NN.h b/noncore/settings/networksettings2/usb/usb_NN.h index 0b83ea6..fea89f0 100644 --- a/noncore/settings/networksettings2/usb/usb_NN.h +++ b/noncore/settings/networksettings2/usb/usb_NN.h @@ -19,5 +19,2 @@ public: - virtual const QString nodeName() - { return tr("USB Cable Connect"); } - virtual const QString nodeDescription() ; diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp index 307e9dd..bfc30f9 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp +++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp @@ -11,3 +11,3 @@ static const char * VPNNeeds[] = */ -VPNNetNode::VPNNetNode() : ANetNode() { +VPNNetNode::VPNNetNode() : ANetNode(tr("VPN Connection")) { } diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.h b/noncore/settings/networksettings2/vpn/vpn_NN.h index 1cd3fcc..5b6632e 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NN.h +++ b/noncore/settings/networksettings2/vpn/vpn_NN.h @@ -19,5 +19,2 @@ public: - virtual const QString nodeName() - { return tr("VPN Connection"); } - virtual const QString nodeDescription() ; diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.cpp b/noncore/settings/networksettings2/wlan/wlan_NN.cpp index e0c4db2..7a2c1a7 100644 --- a/noncore/settings/networksettings2/wlan/wlan_NN.cpp +++ b/noncore/settings/networksettings2/wlan/wlan_NN.cpp @@ -10,3 +10,3 @@ static const char * WLanNeeds[] = */ -WLanNetNode::WLanNetNode() : ANetNode() { +WLanNetNode::WLanNetNode() : ANetNode(tr("WLan Device")) { InstanceCount = 2; diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.h b/noncore/settings/networksettings2/wlan/wlan_NN.h index e93a89a..b5ff3fd 100644 --- a/noncore/settings/networksettings2/wlan/wlan_NN.h +++ b/noncore/settings/networksettings2/wlan/wlan_NN.h @@ -19,5 +19,2 @@ public: - virtual const QString nodeName() - { return tr("WLan Device"); } - virtual const QString nodeDescription() ; |