25 files changed, 130 insertions, 250 deletions
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h index 4dd508d..57ff95e 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h @@ -21,3 +21,3 @@ public : RuntimeInfo * runtime( void ) - { if( RT ) + { if( RT == 0 ) RT = new BluetoothRFCOMMRun( this, Data ); diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h index ee346f0..705201c 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h +++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "bluetooth"; } + { return "Devices/bluetooth"; } @@ -48,3 +48,3 @@ public: virtual const QString pixmapName() - { return "bluetooth"; } + { return "Devices/bluetooth"; } diff --git a/noncore/settings/networksettings2/cable/cable_NN.h b/noncore/settings/networksettings2/cable/cable_NN.h index 401317b..da99c1c 100644 --- a/noncore/settings/networksettings2/cable/cable_NN.h +++ b/noncore/settings/networksettings2/cable/cable_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "cable"; } + { return "Devices/cable"; } diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp index d4b2bb3..ce13573 100644 --- a/noncore/settings/networksettings2/editconnection.cpp +++ b/noncore/settings/networksettings2/editconnection.cpp @@ -291,3 +291,3 @@ void EditConnection::buildFullTree( void ) { QCheckListItem::RadioButton ); - it->setPixmap( 0, NSResources->getPixmap( "commprofile" ) ); + it->setPixmap( 0, NSResources->getPixmap( "Devices/commprofile" ) ); // remember that this node maps to this listitem diff --git a/noncore/settings/networksettings2/irda/irda_NN.h b/noncore/settings/networksettings2/irda/irda_NN.h index 82811a4..6574c17 100644 --- a/noncore/settings/networksettings2/irda/irda_NN.h +++ b/noncore/settings/networksettings2/irda/irda_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "irda"; } + { return "Devices/irda"; } diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.h b/noncore/settings/networksettings2/lancard/lancard_NN.h index 576a6e0..71b49d0 100644 --- a/noncore/settings/networksettings2/lancard/lancard_NN.h +++ b/noncore/settings/networksettings2/lancard/lancard_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "card"; } + { return "Devices/card"; } diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp index 1e1270e..7ec26a7 100644 --- a/noncore/settings/networksettings2/main.cpp +++ b/noncore/settings/networksettings2/main.cpp @@ -90,5 +90,5 @@ int main( int argc, char * argv[] ) { if( AP.exec() == QDialog::Accepted ) { - printf( "%s-c%d-allowed", AP.selectedProfile() ); + printf( "%s-c%ld-allowed", argv[1], AP.selectedProfile() ); } else { - printf( "%s-cNN-disallowed" ); + printf( "%s-cNN-disallowed", argv[1] ); } diff --git a/noncore/settings/networksettings2/modem/modem_NN.h b/noncore/settings/networksettings2/modem/modem_NN.h index 0f4c124..5eceed2 100644 --- a/noncore/settings/networksettings2/modem/modem_NN.h +++ b/noncore/settings/networksettings2/modem/modem_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "modem"; } + { return "Devices/modem"; } diff --git a/noncore/settings/networksettings2/network/network_NN.h b/noncore/settings/networksettings2/network/network_NN.h index 3b0cd64..220e00f 100644 --- a/noncore/settings/networksettings2/network/network_NN.h +++ b/noncore/settings/networksettings2/network/network_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "tcpip"; } + { return "Devices/tcpip"; } diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp index e732bfa..8deca14 100644 --- a/noncore/settings/networksettings2/network/networkrun.cpp +++ b/noncore/settings/networksettings2/network/networkrun.cpp @@ -28,3 +28,3 @@ bool NetworkRun::setState( NodeCollection * NC, Action_t A ) { QString S; - S.sprintf( "ifup %s=manual", II->Name.latin1() ); + S.sprintf( "ifup %s", II->Name.latin1() ); NSResources->system().execute( S ); diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp index f72fa8e..e1110e2 100644 --- a/noncore/settings/networksettings2/networksettings.cpp +++ b/noncore/settings/networksettings2/networksettings.cpp @@ -3,3 +3,3 @@ #include <qpe/qpeapplication.h> -#include <qiconset.h> +#include <qlistbox.h> #include <qgroupbox.h> @@ -37,7 +37,5 @@ NetworkSettings::NetworkSettings( QWidget *parent, // populate main Listbox - Profiles_IV->clear(); + Profiles_LB->clear(); { Name2Connection_t & M = NSResources->connections(); NodeCollection * NC; - QIconViewItem * IVI; - // for all connections @@ -47,5 +45,4 @@ NetworkSettings::NetworkSettings( QWidget *parent, NC = it.current(); - IVI = new QIconViewItem( Profiles_IV, - NC->name(), - NC->devicePixmap() ); + Profiles_LB->insertItem( NC->devicePixmap(), + NC->name() ); } @@ -53,4 +50,4 @@ NetworkSettings::NetworkSettings( QWidget *parent, - if( Profiles_IV->count() ) { - Profiles_IV->setSelected( Profiles_IV->firstItem(), TRUE ); + if( Profiles_LB->count() ) { + Profiles_LB->setSelected( 0, TRUE ); } @@ -93,5 +90,5 @@ NetworkSettings::~NetworkSettings() { void NetworkSettings::SLOT_RefreshStates( void ) { - QIconViewItem * IVI = Profiles_IV->currentItem(); // remeber + QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); // remember - if( IVI ) { + if( LBI ) { NodeCollection * NC; @@ -99,3 +96,3 @@ void NetworkSettings::SLOT_RefreshStates( void ) { // update current selection only - NC = NSResources->findConnection( IVI->text() ); + NC = NSResources->findConnection( LBI->text() ); if( NC ) { @@ -104,3 +101,3 @@ void NetworkSettings::SLOT_RefreshStates( void ) { if( OldS != NewS ) { - updateProfileState( IVI ); + updateProfileState( LBI ); } @@ -140,5 +137,5 @@ void NetworkSettings::SLOT_AddNode( void ) { void NetworkSettings::SLOT_DeleteNode( void ) { - QIconViewItem * IVI = Profiles_IV->currentItem(); + QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); - if ( ! IVI ) + if ( ! LBI ) return; @@ -150,4 +147,4 @@ void NetworkSettings::SLOT_DeleteNode( void ) { 1, 0 ) == 1 ) { - NSResources->removeConnection( IVI->text() ); - delete IVI; + NSResources->removeConnection( LBI->text() ); + delete LBI; setModified( 1 ); @@ -157,3 +154,3 @@ void NetworkSettings::SLOT_DeleteNode( void ) { -void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { +void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { QString OldName = ""; @@ -161,4 +158,4 @@ void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { - if( IVI ) { - NodeCollection * NC = NSResources->findConnection( IVI->text() ); + if( LBI ) { + NodeCollection * NC = NSResources->findConnection( LBI->text() ); if( ! NC ) { @@ -178,3 +175,3 @@ void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { setModified( 1 ); - if( IVI ) { + if( LBI ) { // new name -> remove item @@ -183,15 +180,15 @@ void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { NSResources->addConnection( NC ); - IVI->setText( NC->name() ); - IVI->setPixmap( NC->devicePixmap() ); + Profiles_LB->changeItem( NC->devicePixmap(), + NC->name(), + Profiles_LB->index( LBI ) + ); } else { // new item + int ci = Profiles_LB->count(); NSResources->addConnection( NC ); NC->setNumber( NC->maxConnectionNumber()+1 ); - IVI = new QIconViewItem( Profiles_IV, - NC->name(), - NC->devicePixmap() - ); - Profiles_IV->setSelected( IVI, TRUE ); + Profiles_LB->insertItem( NC->devicePixmap(), NC->name() ); + Profiles_LB->setSelected( ci, TRUE ); } - updateProfileState( IVI ); + updateProfileState( LBI ); } @@ -199,4 +196,4 @@ void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { // cancelled : reset connection - if( IVI ) { - NodeCollection * NC = NSResources->findConnection( IVI->text() ); + if( LBI ) { + NodeCollection * NC = NSResources->findConnection( LBI->text() ); NC->reassign(); @@ -208,7 +205,7 @@ void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { -void NetworkSettings::SLOT_ShowNode( QIconViewItem * IVI ) { - if( IVI == 0 ) +void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) { + if( LBI == 0 ) return; - NodeCollection * NC = NSResources->findConnection( IVI->text() ); + NodeCollection * NC = NSResources->findConnection( LBI->text() ); @@ -263,3 +260,3 @@ void NetworkSettings::SLOT_ShowNode( QIconViewItem * IVI ) { - CurProfile_GB->setTitle( IVI->text() ); + CurProfile_GB->setTitle( LBI->text() ); State_LBL->setText( NC->stateName() ); @@ -268,11 +265,11 @@ void NetworkSettings::SLOT_ShowNode( QIconViewItem * IVI ) { void NetworkSettings::SLOT_CheckState( void ) { - QIconViewItem * IVI = Profiles_IV->currentItem(); - if ( ! IVI ) + QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); + if ( ! LBI ) return; - updateProfileState( IVI ); + updateProfileState( LBI ); } -void NetworkSettings::updateProfileState( QIconViewItem * IVI ) { - if( IVI == Profiles_IV->currentItem() ) { - SLOT_ShowNode( IVI ); +void NetworkSettings::updateProfileState( QListBoxItem * LBI ) { + if( LBI == Profiles_LB->item( Profiles_LB->currentItem() ) ) { + SLOT_ShowNode( LBI ); } @@ -293,5 +290,5 @@ void NetworkSettings::SLOT_GenerateConfig( void ) { void NetworkSettings::SLOT_Enable( void ) { - QIconViewItem * IVI = Profiles_IV->currentItem(); + QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); QString Msg; - if ( ! IVI ) + if ( ! LBI ) return; @@ -299,3 +296,3 @@ void NetworkSettings::SLOT_Enable( void ) { NodeCollection * NC = - NSResources->findConnection( IVI->text() ); + NSResources->findConnection( LBI->text() ); @@ -320,3 +317,3 @@ void NetworkSettings::SLOT_Enable( void ) { } - updateProfileState( IVI ); + updateProfileState( LBI ); } @@ -324,5 +321,5 @@ void NetworkSettings::SLOT_Enable( void ) { void NetworkSettings::SLOT_On( void ) { - QIconViewItem * IVI = Profiles_IV->currentItem(); + QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); - if ( ! IVI ) + if ( ! LBI ) return; @@ -330,3 +327,3 @@ void NetworkSettings::SLOT_On( void ) { NodeCollection * NC = - NSResources->findConnection( IVI->text() ); + NSResources->findConnection( LBI->text() ); @@ -359,3 +356,3 @@ void NetworkSettings::SLOT_On( void ) { } - updateProfileState( IVI ); + updateProfileState( LBI ); } @@ -363,5 +360,5 @@ void NetworkSettings::SLOT_On( void ) { void NetworkSettings::SLOT_Connect( void ) { - QIconViewItem * IVI = Profiles_IV->currentItem(); + QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); - if ( ! IVI ) + if ( ! LBI ) return; @@ -369,3 +366,3 @@ void NetworkSettings::SLOT_Connect( void ) { NodeCollection * NC = - NSResources->findConnection( IVI->text() ); + NSResources->findConnection( LBI->text() ); diff --git a/noncore/settings/networksettings2/networksettings.h b/noncore/settings/networksettings2/networksettings.h index fadf81b..d9ea5d4 100644 --- a/noncore/settings/networksettings2/networksettings.h +++ b/noncore/settings/networksettings2/networksettings.h @@ -7,3 +7,3 @@ class ANetNodeInstance; class QTimer; -class QIconViewItem; +class QListBoxItem; @@ -32,4 +32,4 @@ public slots : void SLOT_DeleteNode( void ); - void SLOT_ShowNode( QIconViewItem * ); - void SLOT_EditNode( QIconViewItem * ); + void SLOT_ShowNode( QListBoxItem * ); + void SLOT_EditNode( QListBoxItem * ); void SLOT_CheckState( void ); @@ -44,3 +44,3 @@ private : - void updateProfileState( QIconViewItem * it ); + void updateProfileState( QListBoxItem * it ); QTimer * UpdateTimer; diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp index d36a1e5..f040c99 100644 --- a/noncore/settings/networksettings2/networksettings2/netnode.cpp +++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp @@ -234,4 +234,4 @@ static char * State2PixmapTbl[] = { QPixmap NodeCollection::devicePixmap( void ) { - return NSResources->getPixmap( - device()->netNode()->pixmapName()+"-large" ); + return NSResources->getPixmap( + device()->netNode()->pixmapName()+"-large" ); } diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp index 15e1b64..0301361 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.cpp +++ b/noncore/settings/networksettings2/networksettings2/resources.cpp @@ -170,3 +170,6 @@ bool TheNSResources::loadNetNode( QPixmap TheNSResources::getPixmap( const QString & QS ) { - return Resource::loadPixmap( QString("networksettings2")+QS ); + QString S("networksettings2/"); + S += QS; + printf( " pixmap %s\n", S.latin1() ); + return Resource::loadPixmap( QString("networksettings2/")+QS ); } diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp index 99f642e..85dcd7d 100644 --- a/noncore/settings/networksettings2/networksettings2/system.cpp +++ b/noncore/settings/networksettings2/networksettings2/system.cpp @@ -316,2 +316,3 @@ void System::probeInterfaces( void ) { } + fprintf( stderr, "NIC %s UP %d\n", NicName.latin1(), IFI->IsUp ); } diff --git a/noncore/settings/networksettings2/networksettingsGUI.ui b/noncore/settings/networksettings2/networksettingsGUI.ui index d457c35..1d79123 100644 --- a/noncore/settings/networksettings2/networksettingsGUI.ui +++ b/noncore/settings/networksettings2/networksettingsGUI.ui @@ -13,3 +13,3 @@ <y>0</y> - <width>403</width> + <width>399</width> <height>502</height> @@ -34,3 +34,3 @@ <name>spacing</name> - <number>2</number> + <number>0</number> </property> @@ -246,148 +246,6 @@ <widget> - <class>QIconView</class> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> - <item> - <property> - <name>text</name> - <string>New Item</string> - </property> - <property> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - </item> + <class>QListBox</class> <property stdset="1"> <name>name</name> - <cstring>Profiles_IV</cstring> - </property> - <property stdset="1"> - <name>spacing</name> - <number>5</number> - </property> - <property stdset="1"> - <name>itemsMovable</name> - <bool>false</bool> - </property> - <property stdset="1"> - <name>showToolTips</name> - <bool>false</bool> + <cstring>Profiles_LB</cstring> </property> @@ -401,2 +259,9 @@ <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>1</vsizetype> + </sizepolicy> + </property> + <property stdset="1"> <name>title</name> @@ -520,8 +385,2 @@ </widget> -<images> - <image> - <name>image0</name> - <data format="XPM.GZ" length="1347">789c7dd3c14ac4301405d07dbf22f4ed8a743ace0882f8098a4b415ca4c92475310a3a2e44fc777393a64df2dabed7452e1c6eb368778d787e7a10cdaefabac8cb9b126a909fa2d1dfe7f3cfcbebfd6f551fae857bf69dd8d75755dd0a251e3fde4f38933b53e707b10f518df18478e8b08803e271c21af1e6168b681165e7f688681055874594211a13a242347efc95da9688dad58946ca75e58d6be9e5ba0a46e92d351a952aa2d3b2495459989849f949546632b5688c32c65aeadde428ed0132da23306e4c5863f1ba017042738f6fc138a5fdbd0a135b2203ec7bca7b723022e23d19628601cb0d6f59e8612dce0c2b2641658fb5650b375a0795a2c2b8afcaaba4859ba852c4cda4364da9964daed64caa60c2475d9a590503c54d54d1d0a2096abb67541bf79955fc0debbfbbea1f81b84f0e</data> - </image> -</images> <connections> @@ -570,18 +429,18 @@ <connection> - <sender>Profiles_IV</sender> - <signal>selectionChanged(QIconViewItem*)</signal> + <sender>Profiles_LB</sender> + <signal>clicked(QListBoxItem*)</signal> <receiver>NetworkSettingsGUI</receiver> - <slot>SLOT_ShowNode( QIconViewItem*)</slot> + <slot>SLOT_ShowNode( QListBoxItem*)</slot> </connection> <connection> - <sender>Profiles_IV</sender> - <signal>doubleClicked(QIconViewItem*)</signal> + <sender>Profiles_LB</sender> + <signal>currentChanged(QListBoxItem*)</signal> <receiver>NetworkSettingsGUI</receiver> - <slot>SLOT_EditNode( QIconViewItem*)</slot> + <slot>SLOT_ShowNode( QListBoxItem*)</slot> </connection> <connection> - <sender>Profiles_IV</sender> - <signal>currentChanged(QIconViewItem*)</signal> + <sender>Profiles_LB</sender> + <signal>doubleClicked(QListBoxItem*)</signal> <receiver>NetworkSettingsGUI</receiver> - <slot>SLOT_ShowNode( QIconViewItem*)</slot> + <slot>SLOT_EditNode( QListBoxItem *)</slot> </connection> @@ -591,3 +450,3 @@ <slot access="public">SLOT_DeleteNode()</slot> - <slot access="public">SLOT_EditNode( QIconViewItem*)</slot> + <slot access="public">SLOT_EditNode( QListBoxItem *)</slot> <slot access="public">SLOT_Enable()</slot> @@ -595,3 +454,3 @@ <slot access="public">SLOT_On()</slot> - <slot access="public">SLOT_ShowNode( QIconViewItem*)</slot> + <slot access="public">SLOT_ShowNode( QListBoxItem*)</slot> </connections> diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp index 9b2ad3a..3f5e958 100644 --- a/noncore/settings/networksettings2/nsdata.cpp +++ b/noncore/settings/networksettings2/nsdata.cpp @@ -21,2 +21,3 @@ NetworkSettingsData::NetworkSettingsData( void ) { Force = 0; + IsModified = 0; loadSettings(); diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.h b/noncore/settings/networksettings2/ppp/ppp_NN.h index a933523..3f9a338 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NN.h +++ b/noncore/settings/networksettings2/ppp/ppp_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "ppp"; } + { return "Devices/ppp"; } diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.h b/noncore/settings/networksettings2/ppp/ppp_NNI.h index 08dca1d..a17721a 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NNI.h +++ b/noncore/settings/networksettings2/ppp/ppp_NNI.h @@ -23,3 +23,3 @@ public : RT = new PPPRun( this, Data ); - return RT; + return RT->runtimeInfo(); } diff --git a/noncore/settings/networksettings2/ppp/ppprun.cpp b/noncore/settings/networksettings2/ppp/ppprun.cpp index 8933f85..4ac0c5a 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.cpp +++ b/noncore/settings/networksettings2/ppp/ppprun.cpp @@ -3,2 +3,7 @@ +PPPRun::PPPRun( ANetNodeInstance * NNI, PPPData & Data ) : + AsConnection( NNI ), AsDevice( NNI ), Pat( "eth[0-9]" ) { + D = &Data; +} + void PPPRun::detectState( NodeCollection * NC ) { @@ -13,3 +18,11 @@ void PPPRun::detectState( NodeCollection * NC ) { // but could also be unavailable - netNode()->nextNode()->runtime()->detectState( NC ); + ANetNodeInstance * NNI; + RuntimeInfo * RI; + NNI = AsDevice::netNode(); + printf( "%p\n", NNI ); + NNI = NNI->nextNode(); + printf( "%p\n", NNI ); + RI = NNI->runtime(); + printf( "%p\n", RI ); + RI->detectState( NC ); } @@ -54,3 +67,3 @@ bool PPPRun::isMyPPPUp( void ) { System & S = NSResources->system(); - InterfaceInfo * best = 0, * Run; + InterfaceInfo * Run; QRegExp R( "ppp[0-9]" ); @@ -65,3 +78,3 @@ bool PPPRun::isMyPPPUp( void ) { // this is a LAN card - if( Run->assignedNode() == netNode() ) { + if( Run->assignedNode() == AsDevice::netNode() ) { // assigned to us diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h index 76a05be..abb9176 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.h +++ b/noncore/settings/networksettings2/ppp/ppprun.h @@ -5,5 +5,6 @@ #include <asconnection.h> +#include <asdevice.h> #include "pppdata.h" -class PPPRun : public AsConnection { +class PPPRun : public AsConnection, public AsDevice { @@ -12,8 +13,12 @@ public : PPPRun( ANetNodeInstance * NNI, - PPPData & Data ) : - AsConnection( NNI ), - Pat( "eth[0-9]" ) - { D = &Data; } + PPPData & Data ); + virtual QString genNic( long NicNr ) + { QString S; return S.sprintf( "ppp%ld", NicNr ); } -protected : + virtual AsDevice * device( void ) + { return AsDevice::asDevice(); } + virtual RuntimeInfo * runtimeInfo( void ) + { return ( AsConnection *)this; } + + protected : @@ -22,3 +27,4 @@ protected : bool canSetState( State_t S, Action_t A ) - { return connection()->findNext( netNode() )->runtime()->canSetState( S,A ); } + { return AsDevice::connection()->findNext( + AsDevice::netNode() )->runtime()->canSetState( S,A ); } diff --git a/noncore/settings/networksettings2/profile/profile_NN.h b/noncore/settings/networksettings2/profile/profile_NN.h index 2b469c7..3c06947 100644 --- a/noncore/settings/networksettings2/profile/profile_NN.h +++ b/noncore/settings/networksettings2/profile/profile_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "commprofile"; } + { return "Devices/commprofile"; } diff --git a/noncore/settings/networksettings2/usb/usb_NN.h b/noncore/settings/networksettings2/usb/usb_NN.h index 3871afc..8b97452 100644 --- a/noncore/settings/networksettings2/usb/usb_NN.h +++ b/noncore/settings/networksettings2/usb/usb_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "usb"; } + { return "Devices/usb"; } diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.h b/noncore/settings/networksettings2/vpn/vpn_NN.h index 5718961..a113ab9 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NN.h +++ b/noncore/settings/networksettings2/vpn/vpn_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "vpn"; } + { return "Devices/vpn"; } diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.h b/noncore/settings/networksettings2/wlan/wlan_NN.h index d1d6ded..0728a79 100644 --- a/noncore/settings/networksettings2/wlan/wlan_NN.h +++ b/noncore/settings/networksettings2/wlan/wlan_NN.h @@ -17,3 +17,3 @@ public: virtual const QString pixmapName() - { return "wlan"; } + { return "Devices/wlan"; } |