author | wimpie <wimpie> | 2004-04-10 13:06:13 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2004-04-10 13:06:13 (UTC) |
commit | db9f0e2a7fd93157d95f421534fcc3015abe53e0 (patch) (unidiff) | |
tree | 001918ca18d0d74f3e49597f766c070bea71e25c /noncore/settings/networksettings2 | |
parent | 6bcdc8cd41199dce849b800b4296011faf6281df (diff) | |
download | opie-db9f0e2a7fd93157d95f421534fcc3015abe53e0.zip opie-db9f0e2a7fd93157d95f421534fcc3015abe53e0.tar.gz opie-db9f0e2a7fd93157d95f421534fcc3015abe53e0.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'noncore/settings/networksettings2') (more/less context) (show whitespace changes)
34 files changed, 951 insertions, 287 deletions
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h index 4a773cd..c168429 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h | |||
@@ -20,7 +20,7 @@ protected : | |||
20 | void detectState( NodeCollection * ) | 20 | void detectState( NodeCollection * ) |
21 | { } | 21 | { } |
22 | 22 | ||
23 | bool setState( NodeCollection * , Action_t ) | 23 | bool setState( NodeCollection * , Action_t, bool ) |
24 | { return 0; } | 24 | { return 0; } |
25 | 25 | ||
26 | bool canSetState( State_t , Action_t ) | 26 | bool canSetState( State_t , Action_t ) |
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h index 6a7902a..aff1f59 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h | |||
@@ -17,7 +17,7 @@ protected : | |||
17 | void detectState( NodeCollection * ) | 17 | void detectState( NodeCollection * ) |
18 | { } | 18 | { } |
19 | 19 | ||
20 | bool setState( NodeCollection * , Action_t ) | 20 | bool setState( NodeCollection * , Action_t, bool ) |
21 | { return 0; } | 21 | { return 0; } |
22 | 22 | ||
23 | bool canSetState( State_t , Action_t ) | 23 | bool canSetState( State_t , Action_t ) |
diff --git a/noncore/settings/networksettings2/cable/cablerun.cpp b/noncore/settings/networksettings2/cable/cablerun.cpp index edb4b01..5e99237 100644 --- a/noncore/settings/networksettings2/cable/cablerun.cpp +++ b/noncore/settings/networksettings2/cable/cablerun.cpp | |||
@@ -13,7 +13,7 @@ void CableRun::detectState( NodeCollection * NC ) { | |||
13 | NC->setCurrentState( Available ); | 13 | NC->setCurrentState( Available ); |
14 | } | 14 | } |
15 | 15 | ||
16 | bool CableRun::setState( NodeCollection * NC, Action_t A ) { | 16 | bool CableRun::setState( NodeCollection * NC, Action_t A, bool ) { |
17 | if( A == Activate ) { | 17 | if( A == Activate ) { |
18 | detectState(NC); | 18 | detectState(NC); |
19 | return (NC->currentState() == Available); | 19 | return (NC->currentState() == Available); |
diff --git a/noncore/settings/networksettings2/cable/cablerun.h b/noncore/settings/networksettings2/cable/cablerun.h index 7b341c4..c5b59d5 100644 --- a/noncore/settings/networksettings2/cable/cablerun.h +++ b/noncore/settings/networksettings2/cable/cablerun.h | |||
@@ -15,7 +15,7 @@ public : | |||
15 | protected : | 15 | protected : |
16 | 16 | ||
17 | void detectState( NodeCollection * NC ); | 17 | void detectState( NodeCollection * NC ); |
18 | bool setState( NodeCollection * NC, Action_t A ); | 18 | bool setState( NodeCollection * NC, Action_t A, bool Force ); |
19 | bool canSetState( State_t Curr, Action_t A ); | 19 | bool canSetState( State_t Curr, Action_t A ); |
20 | 20 | ||
21 | private : | 21 | private : |
diff --git a/noncore/settings/networksettings2/irda/irdarun.h b/noncore/settings/networksettings2/irda/irdarun.h index d9fe5e8..4c903cc 100644 --- a/noncore/settings/networksettings2/irda/irdarun.h +++ b/noncore/settings/networksettings2/irda/irdarun.h | |||
@@ -17,7 +17,7 @@ protected : | |||
17 | void detectState( NodeCollection * ) | 17 | void detectState( NodeCollection * ) |
18 | { } | 18 | { } |
19 | 19 | ||
20 | bool setState( NodeCollection * , Action_t ) | 20 | bool setState( NodeCollection * , Action_t, bool ) |
21 | { return 0; } | 21 | { return 0; } |
22 | 22 | ||
23 | bool canSetState( State_t , Action_t ) | 23 | bool canSetState( State_t , Action_t ) |
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.cpp b/noncore/settings/networksettings2/lancard/lancardrun.cpp index 2e4fc43..1544ddc 100644 --- a/noncore/settings/networksettings2/lancard/lancardrun.cpp +++ b/noncore/settings/networksettings2/lancard/lancardrun.cpp | |||
@@ -73,7 +73,7 @@ void LanCardRun::detectState( NodeCollection * NC ) { | |||
73 | 73 | ||
74 | } | 74 | } |
75 | 75 | ||
76 | bool LanCardRun::setState( NodeCollection * NC, Action_t A ) { | 76 | bool LanCardRun::setState( NodeCollection * NC, Action_t A, bool ) { |
77 | 77 | ||
78 | // we only handle activate and deactivate | 78 | // we only handle activate and deactivate |
79 | switch( A ) { | 79 | switch( A ) { |
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.h b/noncore/settings/networksettings2/lancard/lancardrun.h index e8a535a..b28dda7 100644 --- a/noncore/settings/networksettings2/lancard/lancardrun.h +++ b/noncore/settings/networksettings2/lancard/lancardrun.h | |||
@@ -23,7 +23,7 @@ public : | |||
23 | protected : | 23 | protected : |
24 | 24 | ||
25 | void detectState( NodeCollection * NC ); | 25 | void detectState( NodeCollection * NC ); |
26 | bool setState( NodeCollection * NC, Action_t A ); | 26 | bool setState( NodeCollection * NC, Action_t A, bool Force ); |
27 | bool canSetState( State_t Curr, Action_t A ); | 27 | bool canSetState( State_t Curr, Action_t A ); |
28 | 28 | ||
29 | bool handlesInterface( const QString & I ); | 29 | bool handlesInterface( const QString & I ); |
diff --git a/noncore/settings/networksettings2/modem/modemrun.h b/noncore/settings/networksettings2/modem/modemrun.h index 6d1662b..336462e 100644 --- a/noncore/settings/networksettings2/modem/modemrun.h +++ b/noncore/settings/networksettings2/modem/modemrun.h | |||
@@ -17,7 +17,7 @@ protected : | |||
17 | void detectState( NodeCollection * ) | 17 | void detectState( NodeCollection * ) |
18 | { } | 18 | { } |
19 | 19 | ||
20 | bool setState( NodeCollection *, Action_t ) | 20 | bool setState( NodeCollection *, Action_t, bool ) |
21 | { return 0; } | 21 | { return 0; } |
22 | 22 | ||
23 | bool canSetState( State_t, Action_t ) | 23 | bool canSetState( State_t, Action_t ) |
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp index c19235a..41e1c53 100644 --- a/noncore/settings/networksettings2/network/networkrun.cpp +++ b/noncore/settings/networksettings2/network/networkrun.cpp | |||
@@ -17,7 +17,7 @@ void NetworkRun::detectState( NodeCollection * NC ) { | |||
17 | RI->detectState( NC ); | 17 | RI->detectState( NC ); |
18 | } | 18 | } |
19 | 19 | ||
20 | bool NetworkRun::setState( NodeCollection * NC, Action_t A ) { | 20 | bool NetworkRun::setState( NodeCollection * NC, Action_t A, bool Force ) { |
21 | // we handle UP and DOWN | 21 | // we handle UP and DOWN |
22 | RuntimeInfo * RI = netNode()->nextNode()->runtime(); | 22 | RuntimeInfo * RI = netNode()->nextNode()->runtime(); |
23 | AsDevice * Next = RI->asDevice(); | 23 | AsDevice * Next = RI->asDevice(); |
@@ -25,7 +25,7 @@ bool NetworkRun::setState( NodeCollection * NC, Action_t A ) { | |||
25 | 25 | ||
26 | if( A == Up ) { | 26 | if( A == Up ) { |
27 | // we can bring UP if lower level is available | 27 | // we can bring UP if lower level is available |
28 | if( NC->currentState() == Available ) { | 28 | if( NC->currentState() == Available || Force ) { |
29 | QString S; | 29 | QString S; |
30 | S.sprintf( "ifup %s=%s-c%d-allowed", | 30 | S.sprintf( "ifup %s=%s-c%d-allowed", |
31 | II->Name.latin1(), II->Name.latin1(), | 31 | II->Name.latin1(), II->Name.latin1(), |
@@ -34,7 +34,7 @@ bool NetworkRun::setState( NodeCollection * NC, Action_t A ) { | |||
34 | } | 34 | } |
35 | return 1; | 35 | return 1; |
36 | } else if( A == Down ) { | 36 | } else if( A == Down ) { |
37 | if( NC->currentState() == IsUp ) { | 37 | if( NC->currentState() == IsUp || Force ) { |
38 | QString S; | 38 | QString S; |
39 | S.sprintf( "ifdown %s=%s-c%d-allowed", | 39 | S.sprintf( "ifdown %s=%s-c%d-allowed", |
40 | II->Name.latin1(), II->Name.latin1(), | 40 | II->Name.latin1(), II->Name.latin1(), |
diff --git a/noncore/settings/networksettings2/network/networkrun.h b/noncore/settings/networksettings2/network/networkrun.h index fa16365..522a912 100644 --- a/noncore/settings/networksettings2/network/networkrun.h +++ b/noncore/settings/networksettings2/network/networkrun.h | |||
@@ -15,7 +15,7 @@ public : | |||
15 | protected : | 15 | protected : |
16 | 16 | ||
17 | void detectState( NodeCollection * ); | 17 | void detectState( NodeCollection * ); |
18 | bool setState( NodeCollection * ,Action_t A ); | 18 | bool setState( NodeCollection * ,Action_t A, bool ); |
19 | bool canSetState( State_t , Action_t A ); | 19 | bool canSetState( State_t , Action_t A ); |
20 | 20 | ||
21 | bool handlesInterface( const QString & I ); | 21 | bool handlesInterface( const QString & I ); |
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp index 3ddcbde..b36c7a0 100644 --- a/noncore/settings/networksettings2/networksettings.cpp +++ b/noncore/settings/networksettings2/networksettings.cpp | |||
@@ -23,6 +23,7 @@ NetworkSettings::NetworkSettings( QWidget *parent, | |||
23 | NSD() { | 23 | NSD() { |
24 | 24 | ||
25 | UpdateTimer = new QTimer( this ); | 25 | UpdateTimer = new QTimer( this ); |
26 | |||
26 | // set pixmaps | 27 | // set pixmaps |
27 | Add_TB->setPixmap( NSResources->getPixmap( "add" ) ); | 28 | Add_TB->setPixmap( NSResources->getPixmap( "add" ) ); |
28 | Delete_TB->setPixmap( NSResources->getPixmap( "remove" ) ); | 29 | Delete_TB->setPixmap( NSResources->getPixmap( "remove" ) ); |
@@ -31,9 +32,12 @@ NetworkSettings::NetworkSettings( QWidget *parent, | |||
31 | GenConfig_TB->setPixmap( NSResources->getPixmap( "configure" ) ); | 32 | GenConfig_TB->setPixmap( NSResources->getPixmap( "configure" ) ); |
32 | 33 | ||
33 | Connect_TB->setPixmap( NSResources->getPixmap( "connected" ) ); | 34 | Connect_TB->setPixmap( NSResources->getPixmap( "connected" ) ); |
35 | Disconnect_TB->setPixmap( NSResources->getPixmap( "disconnected" ) ); | ||
34 | 36 | ||
35 | On_TB->setPixmap( NSResources->getPixmap( "off" ) ); | 37 | On_TB->setPixmap( NSResources->getPixmap( "off" ) ); |
36 | 38 | ||
39 | SLOT_ToProfile(); | ||
40 | |||
37 | // populate main Listbox | 41 | // populate main Listbox |
38 | Profiles_LB->clear(); | 42 | Profiles_LB->clear(); |
39 | { Name2Connection_t & M = NSResources->connections(); | 43 | { Name2Connection_t & M = NSResources->connections(); |
@@ -276,7 +280,7 @@ void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) { | |||
276 | Description_LBL->setText( NC->description() ); | 280 | Description_LBL->setText( NC->description() ); |
277 | } | 281 | } |
278 | 282 | ||
279 | CurProfile_GB->setTitle( LBI->text() ); | 283 | Profile_GB->setTitle( LBI->text() ); |
280 | State_LBL->setText( NC->stateName() ); | 284 | State_LBL->setText( NC->stateName() ); |
281 | } | 285 | } |
282 | 286 | ||
@@ -409,6 +413,28 @@ void NetworkSettings::SLOT_Connect( void ) { | |||
409 | // we do not update the GUI but wait for the REAL upping of the device | 413 | // we do not update the GUI but wait for the REAL upping of the device |
410 | } | 414 | } |
411 | 415 | ||
416 | void NetworkSettings::SLOT_Disconnect( void ) { | ||
417 | QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); | ||
418 | |||
419 | if ( ! LBI ) | ||
420 | return; | ||
421 | |||
422 | NodeCollection * NC = | ||
423 | NSResources->findConnection( LBI->text() ); | ||
424 | |||
425 | NC->setState( Down, 1 ); | ||
426 | } | ||
427 | |||
428 | void NetworkSettings::SLOT_ToMessages( void ) { | ||
429 | Profile_GB->hide(); | ||
430 | Messages_GB->show(); | ||
431 | } | ||
432 | |||
433 | void NetworkSettings::SLOT_ToProfile( void ) { | ||
434 | Profile_GB->show(); | ||
435 | Messages_GB->hide(); | ||
436 | } | ||
437 | |||
412 | void NetworkSettings::SLOT_QCopMessage(const QCString &msg, const QByteArray &data) { | 438 | void NetworkSettings::SLOT_QCopMessage(const QCString &msg, const QByteArray &data) { |
413 | QDataStream stream( data, IO_ReadOnly ); | 439 | QDataStream stream( data, IO_ReadOnly ); |
414 | 440 | ||
diff --git a/noncore/settings/networksettings2/networksettings.h b/noncore/settings/networksettings2/networksettings.h index d9ea5d4..97852af 100644 --- a/noncore/settings/networksettings2/networksettings.h +++ b/noncore/settings/networksettings2/networksettings.h | |||
@@ -36,9 +36,12 @@ public slots : | |||
36 | void SLOT_Enable( void ); | 36 | void SLOT_Enable( void ); |
37 | void SLOT_On( void ); | 37 | void SLOT_On( void ); |
38 | void SLOT_Connect( void ); | 38 | void SLOT_Connect( void ); |
39 | void SLOT_Disconnect( void ); | ||
39 | void SLOT_GenerateConfig( void ); | 40 | void SLOT_GenerateConfig( void ); |
40 | void SLOT_RefreshStates( void ); | 41 | void SLOT_RefreshStates( void ); |
41 | void SLOT_QCopMessage( const QCString&,const QByteArray& ); | 42 | void SLOT_QCopMessage( const QCString&,const QByteArray& ); |
43 | void SLOT_ToProfile( void ); | ||
44 | void SLOT_ToMessages( void ); | ||
42 | 45 | ||
43 | private : | 46 | private : |
44 | 47 | ||
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp index dc66aff..1182543 100644 --- a/noncore/settings/networksettings2/networksettings2/netnode.cpp +++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp | |||
@@ -1,5 +1,7 @@ | |||
1 | #include <qpe/qpeapplication.h> | ||
2 | #include <time.h> | 1 | #include <time.h> |
2 | #include <qpe/qpeapplication.h> | ||
3 | #include <qpainter.h> | ||
4 | #include <qbitmap.h> | ||
3 | #include <qtextstream.h> | 5 | #include <qtextstream.h> |
4 | #include <qpixmap.h> | 6 | #include <qpixmap.h> |
5 | 7 | ||
@@ -247,8 +249,17 @@ static char * State2PixmapTbl[] = { | |||
247 | }; | 249 | }; |
248 | 250 | ||
249 | QPixmap NodeCollection::devicePixmap( void ) { | 251 | QPixmap NodeCollection::devicePixmap( void ) { |
250 | return NSResources->getPixmap( | 252 | QPixmap pm = NSResources->getPixmap( |
251 | device()->netNode()->pixmapName()+"-large" ); | 253 | getToplevel()->nextNode()->pixmapName()+"-large"); |
254 | |||
255 | QPixmap Mini = NSResources->getPixmap( device()->netNode()->pixmapName() ); | ||
256 | |||
257 | QPainter painter( &pm ); | ||
258 | painter.drawPixmap( pm.width()-Mini.width(), | ||
259 | pm.height()-Mini.height(), | ||
260 | Mini ); | ||
261 | pm.setMask( pm.createHeuristicMask( TRUE ) ); | ||
262 | return pm; | ||
252 | } | 263 | } |
253 | 264 | ||
254 | QPixmap NodeCollection::statePixmap( State_t S) { | 265 | QPixmap NodeCollection::statePixmap( State_t S) { |
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h index 27d54f8..5e36062 100644 --- a/noncore/settings/networksettings2/networksettings2/netnode.h +++ b/noncore/settings/networksettings2/networksettings2/netnode.h | |||
@@ -258,7 +258,7 @@ public : | |||
258 | { return NNI->connection(); } | 258 | { return NNI->connection(); } |
259 | 259 | ||
260 | virtual void detectState( NodeCollection * NC ) = 0; | 260 | virtual void detectState( NodeCollection * NC ) = 0; |
261 | virtual bool setState( NodeCollection * NC, Action_t A ) = 0; | 261 | virtual bool setState( NodeCollection * NC, Action_t A, bool Force = 0 ) = 0; |
262 | virtual bool canSetState( State_t Curr, Action_t A ) = 0; | 262 | virtual bool canSetState( State_t Curr, Action_t A ) = 0; |
263 | 263 | ||
264 | signals : | 264 | signals : |
@@ -322,8 +322,8 @@ public : | |||
322 | QString stateName( bool Update = 0 ) | 322 | QString stateName( bool Update = 0 ) |
323 | { return stateName( state(Update) ); } | 323 | { return stateName( state(Update) ); } |
324 | 324 | ||
325 | bool setState( Action_t A ) | 325 | bool setState( Action_t A, bool Force =0 ) |
326 | { return getToplevel()->runtime()->setState( this, A ); } | 326 | { return getToplevel()->runtime()->setState( this, A, Force ); } |
327 | bool canSetState( Action_t A ) | 327 | bool canSetState( Action_t A ) |
328 | { return getToplevel()->runtime()->canSetState( CurrentState, A ); } | 328 | { return getToplevel()->runtime()->canSetState( CurrentState, A ); } |
329 | 329 | ||
diff --git a/noncore/settings/networksettings2/networksettings2/networksettings2.pro b/noncore/settings/networksettings2/networksettings2/networksettings2.pro index 11b5f84..f97c93b 100644 --- a/noncore/settings/networksettings2/networksettings2/networksettings2.pro +++ b/noncore/settings/networksettings2/networksettings2/networksettings2.pro | |||
@@ -10,11 +10,13 @@ HEADERS = netnode.h \ | |||
10 | asconnection.h \ | 10 | asconnection.h \ |
11 | asfullsetup.h \ | 11 | asfullsetup.h \ |
12 | systemfile.h \ | 12 | systemfile.h \ |
13 | wextensions.h \ | ||
13 | asdevice.h | 14 | asdevice.h |
14 | SOURCES = netnode.cpp \ | 15 | SOURCES = netnode.cpp \ |
15 | GUIUtils.cpp \ | 16 | GUIUtils.cpp \ |
16 | system.cpp \ | 17 | system.cpp \ |
17 | systemfile.cpp \ | 18 | systemfile.cpp \ |
19 | wextensions.cpp \ | ||
18 | resources.cpp | 20 | resources.cpp |
19 | INCLUDEPATH+= $(OPIEDIR)/include ../networksettings2 | 21 | INCLUDEPATH+= $(OPIEDIR)/include ../networksettings2 |
20 | DEPENDPATH+= $(OPIEDIR)/include | 22 | DEPENDPATH+= $(OPIEDIR)/include |
diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp index 4b7a62f..c95ac7f 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.cpp +++ b/noncore/settings/networksettings2/networksettings2/resources.cpp | |||
@@ -177,7 +177,8 @@ bool TheNSResources::loadNetNode( | |||
177 | QPixmap TheNSResources::getPixmap( const QString & QS ) { | 177 | QPixmap TheNSResources::getPixmap( const QString & QS ) { |
178 | QString S("networksettings2/"); | 178 | QString S("networksettings2/"); |
179 | S += QS; | 179 | S += QS; |
180 | return Resource::loadPixmap( QString("networksettings2/")+QS ); | 180 | fprintf( stderr, "%s\n", S.latin1() ); |
181 | return Resource::loadPixmap( S ); | ||
181 | } | 182 | } |
182 | 183 | ||
183 | QString TheNSResources::tr( const char * s ) { | 184 | QString TheNSResources::tr( const char * s ) { |
diff --git a/noncore/settings/networksettings2/networksettingsGUI.ui b/noncore/settings/networksettings2/networksettingsGUI.ui index 1d79123..7ef2f64 100644 --- a/noncore/settings/networksettings2/networksettingsGUI.ui +++ b/noncore/settings/networksettings2/networksettingsGUI.ui | |||
@@ -11,8 +11,8 @@ | |||
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>399</width> | 14 | <width>160</width> |
15 | <height>502</height> | 15 | <height>260</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <property stdset="1"> | 18 | <property stdset="1"> |
@@ -32,7 +32,7 @@ | |||
32 | </property> | 32 | </property> |
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>spacing</name> | 34 | <name>spacing</name> |
35 | <number>0</number> | 35 | <number>2</number> |
36 | </property> | 36 | </property> |
37 | <widget> | 37 | <widget> |
38 | <class>QFrame</class> | 38 | <class>QFrame</class> |
@@ -167,7 +167,7 @@ | |||
167 | <class>QToolButton</class> | 167 | <class>QToolButton</class> |
168 | <property stdset="1"> | 168 | <property stdset="1"> |
169 | <name>name</name> | 169 | <name>name</name> |
170 | <cstring>On_TB</cstring> | 170 | <cstring>Enable_TB</cstring> |
171 | </property> | 171 | </property> |
172 | <property stdset="1"> | 172 | <property stdset="1"> |
173 | <name>sizePolicy</name> | 173 | <name>sizePolicy</name> |
@@ -193,7 +193,7 @@ | |||
193 | <class>QToolButton</class> | 193 | <class>QToolButton</class> |
194 | <property stdset="1"> | 194 | <property stdset="1"> |
195 | <name>name</name> | 195 | <name>name</name> |
196 | <cstring>Enable_TB</cstring> | 196 | <cstring>On_TB</cstring> |
197 | </property> | 197 | </property> |
198 | <property stdset="1"> | 198 | <property stdset="1"> |
199 | <name>sizePolicy</name> | 199 | <name>sizePolicy</name> |
@@ -241,6 +241,32 @@ | |||
241 | <bool>true</bool> | 241 | <bool>true</bool> |
242 | </property> | 242 | </property> |
243 | </widget> | 243 | </widget> |
244 | <widget> | ||
245 | <class>QToolButton</class> | ||
246 | <property stdset="1"> | ||
247 | <name>name</name> | ||
248 | <cstring>Disconnect_TB</cstring> | ||
249 | </property> | ||
250 | <property stdset="1"> | ||
251 | <name>sizePolicy</name> | ||
252 | <sizepolicy> | ||
253 | <hsizetype>0</hsizetype> | ||
254 | <vsizetype>0</vsizetype> | ||
255 | </sizepolicy> | ||
256 | </property> | ||
257 | <property stdset="1"> | ||
258 | <name>text</name> | ||
259 | <string>...</string> | ||
260 | </property> | ||
261 | <property stdset="1"> | ||
262 | <name>toggleButton</name> | ||
263 | <bool>true</bool> | ||
264 | </property> | ||
265 | <property stdset="1"> | ||
266 | <name>toggleButton</name> | ||
267 | <bool>true</bool> | ||
268 | </property> | ||
269 | </widget> | ||
244 | </hbox> | 270 | </hbox> |
245 | </widget> | 271 | </widget> |
246 | <widget> | 272 | <widget> |
@@ -254,18 +280,11 @@ | |||
254 | <class>QGroupBox</class> | 280 | <class>QGroupBox</class> |
255 | <property stdset="1"> | 281 | <property stdset="1"> |
256 | <name>name</name> | 282 | <name>name</name> |
257 | <cstring>CurProfile_GB</cstring> | 283 | <cstring>Profile_GB</cstring> |
258 | </property> | ||
259 | <property stdset="1"> | ||
260 | <name>sizePolicy</name> | ||
261 | <sizepolicy> | ||
262 | <hsizetype>5</hsizetype> | ||
263 | <vsizetype>1</vsizetype> | ||
264 | </sizepolicy> | ||
265 | </property> | 284 | </property> |
266 | <property stdset="1"> | 285 | <property stdset="1"> |
267 | <name>title</name> | 286 | <name>title</name> |
268 | <string></string> | 287 | <string>Profile</string> |
269 | </property> | 288 | </property> |
270 | <property> | 289 | <property> |
271 | <name>layoutMargin</name> | 290 | <name>layoutMargin</name> |
@@ -280,7 +299,7 @@ | |||
280 | </property> | 299 | </property> |
281 | <property stdset="1"> | 300 | <property stdset="1"> |
282 | <name>spacing</name> | 301 | <name>spacing</name> |
283 | <number>1</number> | 302 | <number>2</number> |
284 | </property> | 303 | </property> |
285 | <widget> | 304 | <widget> |
286 | <class>QLayoutWidget</class> | 305 | <class>QLayoutWidget</class> |
@@ -301,7 +320,7 @@ | |||
301 | <class>QLabel</class> | 320 | <class>QLabel</class> |
302 | <property stdset="1"> | 321 | <property stdset="1"> |
303 | <name>name</name> | 322 | <name>name</name> |
304 | <cstring>TextLabel2</cstring> | 323 | <cstring>TextLabel2_2</cstring> |
305 | </property> | 324 | </property> |
306 | <property stdset="1"> | 325 | <property stdset="1"> |
307 | <name>text</name> | 326 | <name>text</name> |
@@ -326,7 +345,7 @@ | |||
326 | <spacer> | 345 | <spacer> |
327 | <property> | 346 | <property> |
328 | <name>name</name> | 347 | <name>name</name> |
329 | <cstring>Spacer6</cstring> | 348 | <cstring>Spacer6_2</cstring> |
330 | </property> | 349 | </property> |
331 | <property stdset="1"> | 350 | <property stdset="1"> |
332 | <name>orientation</name> | 351 | <name>orientation</name> |
@@ -379,6 +398,145 @@ | |||
379 | <name>vAlign</name> | 398 | <name>vAlign</name> |
380 | </property> | 399 | </property> |
381 | </widget> | 400 | </widget> |
401 | <widget> | ||
402 | <class>QLayoutWidget</class> | ||
403 | <property stdset="1"> | ||
404 | <name>name</name> | ||
405 | <cstring>Layout4</cstring> | ||
406 | </property> | ||
407 | <hbox> | ||
408 | <property stdset="1"> | ||
409 | <name>margin</name> | ||
410 | <number>0</number> | ||
411 | </property> | ||
412 | <property stdset="1"> | ||
413 | <name>spacing</name> | ||
414 | <number>6</number> | ||
415 | </property> | ||
416 | <spacer> | ||
417 | <property> | ||
418 | <name>name</name> | ||
419 | <cstring>Spacer4</cstring> | ||
420 | </property> | ||
421 | <property stdset="1"> | ||
422 | <name>orientation</name> | ||
423 | <enum>Horizontal</enum> | ||
424 | </property> | ||
425 | <property stdset="1"> | ||
426 | <name>sizeType</name> | ||
427 | <enum>Expanding</enum> | ||
428 | </property> | ||
429 | <property> | ||
430 | <name>sizeHint</name> | ||
431 | <size> | ||
432 | <width>20</width> | ||
433 | <height>20</height> | ||
434 | </size> | ||
435 | </property> | ||
436 | </spacer> | ||
437 | <widget> | ||
438 | <class>QPushButton</class> | ||
439 | <property stdset="1"> | ||
440 | <name>name</name> | ||
441 | <cstring>ToMessages_BUT</cstring> | ||
442 | </property> | ||
443 | <property stdset="1"> | ||
444 | <name>sizePolicy</name> | ||
445 | <sizepolicy> | ||
446 | <hsizetype>1</hsizetype> | ||
447 | <vsizetype>0</vsizetype> | ||
448 | </sizepolicy> | ||
449 | </property> | ||
450 | <property stdset="1"> | ||
451 | <name>text</name> | ||
452 | <string>Messages ...</string> | ||
453 | </property> | ||
454 | </widget> | ||
455 | </hbox> | ||
456 | </widget> | ||
457 | </vbox> | ||
458 | </widget> | ||
459 | <widget> | ||
460 | <class>QGroupBox</class> | ||
461 | <property stdset="1"> | ||
462 | <name>name</name> | ||
463 | <cstring>Messages_GB</cstring> | ||
464 | </property> | ||
465 | <property stdset="1"> | ||
466 | <name>title</name> | ||
467 | <string>Messages</string> | ||
468 | </property> | ||
469 | <property> | ||
470 | <name>layoutMargin</name> | ||
471 | </property> | ||
472 | <property> | ||
473 | <name>layoutSpacing</name> | ||
474 | </property> | ||
475 | <vbox> | ||
476 | <property stdset="1"> | ||
477 | <name>margin</name> | ||
478 | <number>4</number> | ||
479 | </property> | ||
480 | <property stdset="1"> | ||
481 | <name>spacing</name> | ||
482 | <number>2</number> | ||
483 | </property> | ||
484 | <widget> | ||
485 | <class>QListBox</class> | ||
486 | <property stdset="1"> | ||
487 | <name>name</name> | ||
488 | <cstring>Mesages_LB</cstring> | ||
489 | </property> | ||
490 | </widget> | ||
491 | <widget> | ||
492 | <class>QLayoutWidget</class> | ||
493 | <property stdset="1"> | ||
494 | <name>name</name> | ||
495 | <cstring>Layout2</cstring> | ||
496 | </property> | ||
497 | <hbox> | ||
498 | <property stdset="1"> | ||
499 | <name>margin</name> | ||
500 | <number>0</number> | ||
501 | </property> | ||
502 | <property stdset="1"> | ||
503 | <name>spacing</name> | ||
504 | <number>6</number> | ||
505 | </property> | ||
506 | <spacer> | ||
507 | <property> | ||
508 | <name>name</name> | ||
509 | <cstring>Spacer3</cstring> | ||
510 | </property> | ||
511 | <property stdset="1"> | ||
512 | <name>orientation</name> | ||
513 | <enum>Horizontal</enum> | ||
514 | </property> | ||
515 | <property stdset="1"> | ||
516 | <name>sizeType</name> | ||
517 | <enum>Expanding</enum> | ||
518 | </property> | ||
519 | <property> | ||
520 | <name>sizeHint</name> | ||
521 | <size> | ||
522 | <width>20</width> | ||
523 | <height>20</height> | ||
524 | </size> | ||
525 | </property> | ||
526 | </spacer> | ||
527 | <widget> | ||
528 | <class>QPushButton</class> | ||
529 | <property stdset="1"> | ||
530 | <name>name</name> | ||
531 | <cstring>ToProfile_BUT</cstring> | ||
532 | </property> | ||
533 | <property stdset="1"> | ||
534 | <name>text</name> | ||
535 | <string>Profile ...</string> | ||
536 | </property> | ||
537 | </widget> | ||
538 | </hbox> | ||
539 | </widget> | ||
382 | </vbox> | 540 | </vbox> |
383 | </widget> | 541 | </widget> |
384 | </vbox> | 542 | </vbox> |
@@ -444,6 +602,18 @@ | |||
444 | <receiver>NetworkSettingsGUI</receiver> | 602 | <receiver>NetworkSettingsGUI</receiver> |
445 | <slot>SLOT_EditNode( QListBoxItem *)</slot> | 603 | <slot>SLOT_EditNode( QListBoxItem *)</slot> |
446 | </connection> | 604 | </connection> |
605 | <connection> | ||
606 | <sender>ToProfile_BUT</sender> | ||
607 | <signal>clicked()</signal> | ||
608 | <receiver>NetworkSettingsGUI</receiver> | ||
609 | <slot>SLOT_ToProfile()</slot> | ||
610 | </connection> | ||
611 | <connection> | ||
612 | <sender>ToMessages_BUT</sender> | ||
613 | <signal>clicked()</signal> | ||
614 | <receiver>NetworkSettingsGUI</receiver> | ||
615 | <slot>SLOT_ToMessages()</slot> | ||
616 | </connection> | ||
447 | <slot access="public">SLOT_AddNode()</slot> | 617 | <slot access="public">SLOT_AddNode()</slot> |
448 | <slot access="public">SLOT_CheckState()</slot> | 618 | <slot access="public">SLOT_CheckState()</slot> |
449 | <slot access="public">SLOT_Connect()</slot> | 619 | <slot access="public">SLOT_Connect()</slot> |
@@ -453,5 +623,8 @@ | |||
453 | <slot access="public">SLOT_GenerateConfig()</slot> | 623 | <slot access="public">SLOT_GenerateConfig()</slot> |
454 | <slot access="public">SLOT_On()</slot> | 624 | <slot access="public">SLOT_On()</slot> |
455 | <slot access="public">SLOT_ShowNode( QListBoxItem*)</slot> | 625 | <slot access="public">SLOT_ShowNode( QListBoxItem*)</slot> |
626 | <slot access="public">SLOT_ToMessages()</slot> | ||
627 | <slot access="public">SLOT_ToProfile()</slot> | ||
628 | <slot access="public">SLOT_Disconnect()</slot> | ||
456 | </connections> | 629 | </connections> |
457 | </UI> | 630 | </UI> |
diff --git a/noncore/settings/networksettings2/ppp/ppprun.cpp b/noncore/settings/networksettings2/ppp/ppprun.cpp index 8c75df3..a8abc50 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.cpp +++ b/noncore/settings/networksettings2/ppp/ppprun.cpp | |||
@@ -20,7 +20,7 @@ void PPPRun::detectState( NodeCollection * NC ) { | |||
20 | } | 20 | } |
21 | } | 21 | } |
22 | 22 | ||
23 | bool PPPRun::setState( NodeCollection * NC, Action_t A ) { | 23 | bool PPPRun::setState( NodeCollection * NC, Action_t A, bool ) { |
24 | switch( A ) { | 24 | switch( A ) { |
25 | case Activate : | 25 | case Activate : |
26 | NC->setCurrentState( Available ); | 26 | NC->setCurrentState( Available ); |
diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h index af51fbe..90a3f25 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.h +++ b/noncore/settings/networksettings2/ppp/ppprun.h | |||
@@ -27,7 +27,7 @@ public : | |||
27 | protected : | 27 | protected : |
28 | 28 | ||
29 | void detectState( NodeCollection * NC ); | 29 | void detectState( NodeCollection * NC ); |
30 | bool setState( NodeCollection * NC, Action_t A ); | 30 | bool setState( NodeCollection * NC, Action_t A, bool ); |
31 | bool canSetState( State_t S, Action_t A ) | 31 | bool canSetState( State_t S, Action_t A ) |
32 | { return AsDevice::connection()->findNext( | 32 | { return AsDevice::connection()->findNext( |
33 | AsDevice::netNode() )->runtime()->canSetState( S,A ); } | 33 | AsDevice::netNode() )->runtime()->canSetState( S,A ); } |
diff --git a/noncore/settings/networksettings2/profile/profileedit.cpp b/noncore/settings/networksettings2/profile/profileedit.cpp index 3f72c52..c9fb650 100644 --- a/noncore/settings/networksettings2/profile/profileedit.cpp +++ b/noncore/settings/networksettings2/profile/profileedit.cpp | |||
@@ -11,16 +11,18 @@ | |||
11 | #include "profileedit.h" | 11 | #include "profileedit.h" |
12 | 12 | ||
13 | ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : | 13 | ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : |
14 | ProfileGUI( Parent ), TrafficRefresh(this) { | 14 | ProfileGUI( Parent ), RefreshTimer(this) { |
15 | InterfaceInfo * II; | 15 | InterfaceInfo * II; |
16 | 16 | ||
17 | NNI = TNNI; | 17 | NNI = TNNI; |
18 | Dev = NNI->runtime()->device(); | 18 | Dev = NNI->runtime()->device(); |
19 | if( ( II = Dev->assignedInterface() ) ) { | 19 | if( ( II = Dev->assignedInterface() ) ) { |
20 | |||
20 | Refresh_CB->setEnabled( TRUE ); | 21 | Refresh_CB->setEnabled( TRUE ); |
21 | Snd_GB->setEnabled( TRUE ); | 22 | Snd_GB->setEnabled( TRUE ); |
22 | Rcv_GB->setEnabled( TRUE ); | 23 | Rcv_GB->setEnabled( TRUE ); |
23 | Collisions_FRM->setEnabled( TRUE ); | 24 | Collisions_FRM->setEnabled( TRUE ); |
25 | |||
24 | // show current content | 26 | // show current content |
25 | SLOT_Refresh(); | 27 | SLOT_Refresh(); |
26 | 28 | ||
@@ -42,12 +44,13 @@ ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : | |||
42 | S.prepend( " : " ); | 44 | S.prepend( " : " ); |
43 | } | 45 | } |
44 | InterfaceOptions_LBL->setText( S ); | 46 | InterfaceOptions_LBL->setText( S ); |
45 | } | ||
46 | 47 | ||
47 | connect( &TrafficRefresh, SIGNAL( timeout() ), | 48 | connect( &RefreshTimer, SIGNAL( timeout() ), |
48 | this, SLOT( SLOT_Refresh() ) ); | 49 | this, SLOT( SLOT_Refresh() ) ); |
49 | } | 50 | } |
50 | 51 | ||
52 | } | ||
53 | |||
51 | QString ProfileEdit::acceptable( void ) { | 54 | QString ProfileEdit::acceptable( void ) { |
52 | return QString(); | 55 | return QString(); |
53 | } | 56 | } |
@@ -85,9 +88,9 @@ void ProfileEdit::SLOT_Refresh( void ) { | |||
85 | 88 | ||
86 | void ProfileEdit::SLOT_AutoRefresh( bool ar ) { | 89 | void ProfileEdit::SLOT_AutoRefresh( bool ar ) { |
87 | if( ar ) { | 90 | if( ar ) { |
88 | TrafficRefresh.start( 1000 ); | 91 | RefreshTimer.start( 1000 ); |
89 | SLOT_Refresh(); | 92 | SLOT_Refresh(); |
90 | } else { | 93 | } else { |
91 | TrafficRefresh.stop(); | 94 | RefreshTimer.stop(); |
92 | } | 95 | } |
93 | } | 96 | } |
diff --git a/noncore/settings/networksettings2/profile/profileedit.h b/noncore/settings/networksettings2/profile/profileedit.h index 8ca34be..b186b58 100644 --- a/noncore/settings/networksettings2/profile/profileedit.h +++ b/noncore/settings/networksettings2/profile/profileedit.h | |||
@@ -23,7 +23,7 @@ public slots : | |||
23 | 23 | ||
24 | private : | 24 | private : |
25 | 25 | ||
26 | QTimer TrafficRefresh; | 26 | QTimer RefreshTimer; |
27 | ANetNodeInstance * NNI; | 27 | ANetNodeInstance * NNI; |
28 | AsDevice * Dev; | 28 | AsDevice * Dev; |
29 | }; | 29 | }; |
diff --git a/noncore/settings/networksettings2/profile/profilerun.cpp b/noncore/settings/networksettings2/profile/profilerun.cpp index feebf86..79bb93e 100644 --- a/noncore/settings/networksettings2/profile/profilerun.cpp +++ b/noncore/settings/networksettings2/profile/profilerun.cpp | |||
@@ -12,7 +12,7 @@ void ProfileRun::detectState( NodeCollection * NC ) { | |||
12 | } | 12 | } |
13 | } | 13 | } |
14 | 14 | ||
15 | bool ProfileRun::setState( NodeCollection * NC, Action_t A ) { | 15 | bool ProfileRun::setState( NodeCollection * NC, Action_t A, bool ) { |
16 | ANetNodeInstance * NNNI; | 16 | ANetNodeInstance * NNNI; |
17 | 17 | ||
18 | NNNI = netNode()->nextNode(); | 18 | NNNI = netNode()->nextNode(); |
diff --git a/noncore/settings/networksettings2/profile/profilerun.h b/noncore/settings/networksettings2/profile/profilerun.h index 6e8385c..c8ea063 100644 --- a/noncore/settings/networksettings2/profile/profilerun.h +++ b/noncore/settings/networksettings2/profile/profilerun.h | |||
@@ -13,7 +13,7 @@ public : | |||
13 | { Data = &D; } | 13 | { Data = &D; } |
14 | 14 | ||
15 | void detectState( NodeCollection * NC ); | 15 | void detectState( NodeCollection * NC ); |
16 | bool setState( NodeCollection * NC, Action_t A ); | 16 | bool setState( NodeCollection * NC, Action_t A, bool ); |
17 | bool canSetState( State_t Curr, Action_t A ); | 17 | bool canSetState( State_t Curr, Action_t A ); |
18 | 18 | ||
19 | bool handlesInterface( const QString & I ); | 19 | bool handlesInterface( const QString & I ); |
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp index 4ce6721..beacd7b 100644 --- a/noncore/settings/networksettings2/usb/usbrun.cpp +++ b/noncore/settings/networksettings2/usb/usbrun.cpp | |||
@@ -75,7 +75,7 @@ void USBRun::detectState( NodeCollection * NC ) { | |||
75 | NC->setCurrentState( Unavailable ); | 75 | NC->setCurrentState( Unavailable ); |
76 | } | 76 | } |
77 | 77 | ||
78 | bool USBRun::setState( NodeCollection * NC, Action_t A ) { | 78 | bool USBRun::setState( NodeCollection * NC, Action_t A, bool ) { |
79 | 79 | ||
80 | // we only handle activate and deactivate | 80 | // we only handle activate and deactivate |
81 | switch( A ) { | 81 | switch( A ) { |
diff --git a/noncore/settings/networksettings2/usb/usbrun.h b/noncore/settings/networksettings2/usb/usbrun.h index 6c6e4e4..03e21ab 100644 --- a/noncore/settings/networksettings2/usb/usbrun.h +++ b/noncore/settings/networksettings2/usb/usbrun.h | |||
@@ -23,7 +23,7 @@ public : | |||
23 | protected : | 23 | protected : |
24 | 24 | ||
25 | void detectState( NodeCollection * ); | 25 | void detectState( NodeCollection * ); |
26 | bool setState( NodeCollection * , Action_t A ); | 26 | bool setState( NodeCollection * , Action_t A, bool ); |
27 | bool canSetState( State_t , Action_t A ); | 27 | bool canSetState( State_t , Action_t A ); |
28 | 28 | ||
29 | bool handlesInterface( const QString & I ); | 29 | bool handlesInterface( const QString & I ); |
diff --git a/noncore/settings/networksettings2/vpn/vpnrun.h b/noncore/settings/networksettings2/vpn/vpnrun.h index 4d26298..c19b609 100644 --- a/noncore/settings/networksettings2/vpn/vpnrun.h +++ b/noncore/settings/networksettings2/vpn/vpnrun.h | |||
@@ -19,7 +19,7 @@ protected : | |||
19 | void detectState( NodeCollection * ) | 19 | void detectState( NodeCollection * ) |
20 | { } | 20 | { } |
21 | 21 | ||
22 | bool setState( NodeCollection *, Action_t ) | 22 | bool setState( NodeCollection *, Action_t, bool ) |
23 | { return 0; } | 23 | { return 0; } |
24 | 24 | ||
25 | bool canSetState( State_t, Action_t ) | 25 | bool canSetState( State_t, Action_t ) |
diff --git a/noncore/settings/networksettings2/wlan/wlanGUI.ui b/noncore/settings/networksettings2/wlan/wlanGUI.ui index 9614369..1aec138 100644 --- a/noncore/settings/networksettings2/wlan/wlanGUI.ui +++ b/noncore/settings/networksettings2/wlan/wlanGUI.ui | |||
@@ -11,8 +11,8 @@ | |||
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>192</width> | 14 | <width>209</width> |
15 | <height>329</height> | 15 | <height>307</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <property stdset="1"> | 18 | <property stdset="1"> |
@@ -32,7 +32,7 @@ | |||
32 | </property> | 32 | </property> |
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>spacing</name> | 34 | <name>spacing</name> |
35 | <number>0</number> | 35 | <number>1</number> |
36 | </property> | 36 | </property> |
37 | <widget> | 37 | <widget> |
38 | <class>QTabWidget</class> | 38 | <class>QTabWidget</class> |
@@ -73,80 +73,76 @@ | |||
73 | <class>QLayoutWidget</class> | 73 | <class>QLayoutWidget</class> |
74 | <property stdset="1"> | 74 | <property stdset="1"> |
75 | <name>name</name> | 75 | <name>name</name> |
76 | <cstring>Layout6</cstring> | 76 | <cstring>Layout11</cstring> |
77 | </property> | 77 | </property> |
78 | <property> | 78 | <property> |
79 | <name>layoutMargin</name> | 79 | <name>layoutSpacing</name> |
80 | </property> | 80 | </property> |
81 | <grid> | 81 | <grid> |
82 | <property stdset="1"> | 82 | <property stdset="1"> |
83 | <name>margin</name> | 83 | <name>margin</name> |
84 | <number>1</number> | 84 | <number>0</number> |
85 | </property> | 85 | </property> |
86 | <property stdset="1"> | 86 | <property stdset="1"> |
87 | <name>spacing</name> | 87 | <name>spacing</name> |
88 | <number>6</number> | 88 | <number>1</number> |
89 | </property> | ||
90 | <widget row="1" column="0" > | ||
91 | <class>QLabel</class> | ||
92 | <property stdset="1"> | ||
93 | <name>name</name> | ||
94 | <cstring>essidLabel</cstring> | ||
95 | </property> | ||
96 | <property stdset="1"> | ||
97 | <name>enabled</name> | ||
98 | <bool>true</bool> | ||
99 | </property> | 89 | </property> |
100 | <property stdset="1"> | 90 | <widget row="0" column="1" > |
101 | <name>sizePolicy</name> | 91 | <class>QComboBox</class> |
102 | <sizepolicy> | 92 | <item> |
103 | <hsizetype>1</hsizetype> | 93 | <property> |
104 | <vsizetype>1</vsizetype> | 94 | <name>text</name> |
105 | </sizepolicy> | 95 | <string>Auto</string> |
106 | </property> | 96 | </property> |
107 | <property stdset="1"> | 97 | </item> |
98 | <item> | ||
99 | <property> | ||
108 | <name>text</name> | 100 | <name>text</name> |
109 | <string>ESS-ID</string> | 101 | <string>Managed</string> |
110 | </property> | 102 | </property> |
111 | </widget> | 103 | </item> |
112 | <widget row="1" column="1" > | ||
113 | <class>QComboBox</class> | ||
114 | <item> | 104 | <item> |
115 | <property> | 105 | <property> |
116 | <name>text</name> | 106 | <name>text</name> |
117 | <string>any</string> | 107 | <string>Ad-Hoc</string> |
118 | </property> | 108 | </property> |
119 | </item> | 109 | </item> |
120 | <property stdset="1"> | 110 | <property stdset="1"> |
121 | <name>name</name> | 111 | <name>name</name> |
122 | <cstring>ESSID_CB</cstring> | 112 | <cstring>Mode_CB</cstring> |
113 | </property> | ||
114 | <property stdset="1"> | ||
115 | <name>enabled</name> | ||
116 | <bool>true</bool> | ||
123 | </property> | 117 | </property> |
124 | <property stdset="1"> | 118 | <property stdset="1"> |
125 | <name>sizePolicy</name> | 119 | <name>sizePolicy</name> |
126 | <sizepolicy> | 120 | <sizepolicy> |
127 | <hsizetype>7</hsizetype> | 121 | <hsizetype>1</hsizetype> |
128 | <vsizetype>0</vsizetype> | 122 | <vsizetype>0</vsizetype> |
129 | </sizepolicy> | 123 | </sizepolicy> |
130 | </property> | 124 | </property> |
125 | </widget> | ||
126 | <widget row="2" column="0" > | ||
127 | <class>QLabel</class> | ||
131 | <property stdset="1"> | 128 | <property stdset="1"> |
132 | <name>editable</name> | 129 | <name>name</name> |
133 | <bool>true</bool> | 130 | <cstring>essidLabel_2</cstring> |
134 | </property> | ||
135 | <property stdset="1"> | ||
136 | <name>currentItem</name> | ||
137 | <number>0</number> | ||
138 | </property> | 131 | </property> |
139 | <property stdset="1"> | 132 | <property stdset="1"> |
140 | <name>sizeLimit</name> | 133 | <name>enabled</name> |
141 | <number>5</number> | 134 | <bool>true</bool> |
142 | </property> | 135 | </property> |
143 | <property stdset="1"> | 136 | <property stdset="1"> |
144 | <name>autoCompletion</name> | 137 | <name>sizePolicy</name> |
145 | <bool>true</bool> | 138 | <sizepolicy> |
139 | <hsizetype>1</hsizetype> | ||
140 | <vsizetype>1</vsizetype> | ||
141 | </sizepolicy> | ||
146 | </property> | 142 | </property> |
147 | <property stdset="1"> | 143 | <property stdset="1"> |
148 | <name>duplicatesEnabled</name> | 144 | <name>text</name> |
149 | <bool>false</bool> | 145 | <string>Name</string> |
150 | </property> | 146 | </property> |
151 | </widget> | 147 | </widget> |
152 | <widget row="0" column="0" > | 148 | <widget row="0" column="0" > |
@@ -171,35 +167,18 @@ | |||
171 | <string>Mode</string> | 167 | <string>Mode</string> |
172 | </property> | 168 | </property> |
173 | </widget> | 169 | </widget> |
174 | <widget row="0" column="1" > | 170 | <widget row="1" column="1" > |
175 | <class>QComboBox</class> | 171 | <class>QLineEdit</class> |
176 | <item> | 172 | <property stdset="1"> |
177 | <property> | 173 | <name>name</name> |
178 | <name>text</name> | 174 | <cstring>ESSID_LE</cstring> |
179 | <string>Infrastructure</string> | ||
180 | </property> | ||
181 | </item> | ||
182 | <item> | ||
183 | <property> | ||
184 | <name>text</name> | ||
185 | <string>Auto</string> | ||
186 | </property> | ||
187 | </item> | ||
188 | <item> | ||
189 | <property> | ||
190 | <name>text</name> | ||
191 | <string>Managed</string> | ||
192 | </property> | ||
193 | </item> | ||
194 | <item> | ||
195 | <property> | ||
196 | <name>text</name> | ||
197 | <string>Ad-Hoc</string> | ||
198 | </property> | 175 | </property> |
199 | </item> | 176 | </widget> |
177 | <widget row="1" column="0" > | ||
178 | <class>QLabel</class> | ||
200 | <property stdset="1"> | 179 | <property stdset="1"> |
201 | <name>name</name> | 180 | <name>name</name> |
202 | <cstring>Mode_CB</cstring> | 181 | <cstring>essidLabel</cstring> |
203 | </property> | 182 | </property> |
204 | <property stdset="1"> | 183 | <property stdset="1"> |
205 | <name>enabled</name> | 184 | <name>enabled</name> |
@@ -209,9 +188,24 @@ | |||
209 | <name>sizePolicy</name> | 188 | <name>sizePolicy</name> |
210 | <sizepolicy> | 189 | <sizepolicy> |
211 | <hsizetype>1</hsizetype> | 190 | <hsizetype>1</hsizetype> |
212 | <vsizetype>0</vsizetype> | 191 | <vsizetype>1</vsizetype> |
213 | </sizepolicy> | 192 | </sizepolicy> |
214 | </property> | 193 | </property> |
194 | <property stdset="1"> | ||
195 | <name>text</name> | ||
196 | <string>ESS-ID</string> | ||
197 | </property> | ||
198 | </widget> | ||
199 | <widget row="2" column="1" > | ||
200 | <class>QLineEdit</class> | ||
201 | <property stdset="1"> | ||
202 | <name>name</name> | ||
203 | <cstring>NodeName_LE</cstring> | ||
204 | </property> | ||
205 | <property stdset="1"> | ||
206 | <name>text</name> | ||
207 | <string><UseHostName></string> | ||
208 | </property> | ||
215 | </widget> | 209 | </widget> |
216 | </grid> | 210 | </grid> |
217 | </widget> | 211 | </widget> |
@@ -244,7 +238,7 @@ | |||
244 | </property> | 238 | </property> |
245 | <property stdset="1"> | 239 | <property stdset="1"> |
246 | <name>text</name> | 240 | <name>text</name> |
247 | <string>Specify &Access Point</string> | 241 | <string>Specify Access Point</string> |
248 | </property> | 242 | </property> |
249 | </widget> | 243 | </widget> |
250 | <widget row="1" column="1" > | 244 | <widget row="1" column="1" > |
@@ -310,60 +304,6 @@ | |||
310 | </spacer> | 304 | </spacer> |
311 | </grid> | 305 | </grid> |
312 | </widget> | 306 | </widget> |
313 | <widget> | ||
314 | <class>QLayoutWidget</class> | ||
315 | <property stdset="1"> | ||
316 | <name>name</name> | ||
317 | <cstring>Layout7</cstring> | ||
318 | </property> | ||
319 | <property> | ||
320 | <name>layoutMargin</name> | ||
321 | </property> | ||
322 | <hbox> | ||
323 | <property stdset="1"> | ||
324 | <name>margin</name> | ||
325 | <number>1</number> | ||
326 | </property> | ||
327 | <property stdset="1"> | ||
328 | <name>spacing</name> | ||
329 | <number>6</number> | ||
330 | </property> | ||
331 | <widget> | ||
332 | <class>QCheckBox</class> | ||
333 | <property stdset="1"> | ||
334 | <name>name</name> | ||
335 | <cstring>SpecifyChannel_CB</cstring> | ||
336 | </property> | ||
337 | <property stdset="1"> | ||
338 | <name>text</name> | ||
339 | <string>Specific &Channel</string> | ||
340 | </property> | ||
341 | </widget> | ||
342 | <widget> | ||
343 | <class>QSpinBox</class> | ||
344 | <property stdset="1"> | ||
345 | <name>name</name> | ||
346 | <cstring>ChannelNr_SB</cstring> | ||
347 | </property> | ||
348 | <property stdset="1"> | ||
349 | <name>enabled</name> | ||
350 | <bool>false</bool> | ||
351 | </property> | ||
352 | <property stdset="1"> | ||
353 | <name>maxValue</name> | ||
354 | <number>15</number> | ||
355 | </property> | ||
356 | <property stdset="1"> | ||
357 | <name>minValue</name> | ||
358 | <number>1</number> | ||
359 | </property> | ||
360 | <property stdset="1"> | ||
361 | <name>value</name> | ||
362 | <number>1</number> | ||
363 | </property> | ||
364 | </widget> | ||
365 | </hbox> | ||
366 | </widget> | ||
367 | <spacer> | 307 | <spacer> |
368 | <property> | 308 | <property> |
369 | <name>name</name> | 309 | <name>name</name> |
@@ -410,7 +350,7 @@ | |||
410 | <class>QCheckBox</class> | 350 | <class>QCheckBox</class> |
411 | <property stdset="1"> | 351 | <property stdset="1"> |
412 | <name>name</name> | 352 | <name>name</name> |
413 | <cstring>EnableWEB_CB</cstring> | 353 | <cstring>EnableWEP_CB</cstring> |
414 | </property> | 354 | </property> |
415 | <property stdset="1"> | 355 | <property stdset="1"> |
416 | <name>text</name> | 356 | <name>text</name> |
@@ -511,6 +451,10 @@ | |||
511 | <name>name</name> | 451 | <name>name</name> |
512 | <cstring>Key2_LE</cstring> | 452 | <cstring>Key2_LE</cstring> |
513 | </property> | 453 | </property> |
454 | <property stdset="1"> | ||
455 | <name>enabled</name> | ||
456 | <bool>false</bool> | ||
457 | </property> | ||
514 | </widget> | 458 | </widget> |
515 | <widget row="3" column="1" > | 459 | <widget row="3" column="1" > |
516 | <class>QLineEdit</class> | 460 | <class>QLineEdit</class> |
@@ -518,6 +462,10 @@ | |||
518 | <name>name</name> | 462 | <name>name</name> |
519 | <cstring>Key4_LE</cstring> | 463 | <cstring>Key4_LE</cstring> |
520 | </property> | 464 | </property> |
465 | <property stdset="1"> | ||
466 | <name>enabled</name> | ||
467 | <bool>false</bool> | ||
468 | </property> | ||
521 | </widget> | 469 | </widget> |
522 | <widget row="2" column="1" > | 470 | <widget row="2" column="1" > |
523 | <class>QLineEdit</class> | 471 | <class>QLineEdit</class> |
@@ -525,6 +473,10 @@ | |||
525 | <name>name</name> | 473 | <name>name</name> |
526 | <cstring>Key3_LE</cstring> | 474 | <cstring>Key3_LE</cstring> |
527 | </property> | 475 | </property> |
476 | <property stdset="1"> | ||
477 | <name>enabled</name> | ||
478 | <bool>false</bool> | ||
479 | </property> | ||
528 | </widget> | 480 | </widget> |
529 | </grid> | 481 | </grid> |
530 | </widget> | 482 | </widget> |
@@ -532,7 +484,7 @@ | |||
532 | <class>QCheckBox</class> | 484 | <class>QCheckBox</class> |
533 | <property stdset="1"> | 485 | <property stdset="1"> |
534 | <name>name</name> | 486 | <name>name</name> |
535 | <cstring>CheckBox4</cstring> | 487 | <cstring>AcceptNonEncrypted_CB</cstring> |
536 | </property> | 488 | </property> |
537 | <property stdset="1"> | 489 | <property stdset="1"> |
538 | <name>enabled</name> | 490 | <name>enabled</name> |
@@ -589,7 +541,7 @@ | |||
589 | <class>QLayoutWidget</class> | 541 | <class>QLayoutWidget</class> |
590 | <property stdset="1"> | 542 | <property stdset="1"> |
591 | <name>name</name> | 543 | <name>name</name> |
592 | <cstring>Layout12</cstring> | 544 | <cstring>Layout13</cstring> |
593 | </property> | 545 | </property> |
594 | <property> | 546 | <property> |
595 | <name>layoutSpacing</name> | 547 | <name>layoutSpacing</name> |
@@ -603,26 +555,15 @@ | |||
603 | <name>spacing</name> | 555 | <name>spacing</name> |
604 | <number>2</number> | 556 | <number>2</number> |
605 | </property> | 557 | </property> |
606 | <widget row="0" column="0" > | 558 | <widget row="4" column="1" > |
607 | <class>QLabel</class> | ||
608 | <property stdset="1"> | ||
609 | <name>name</name> | ||
610 | <cstring>TextLabel1_3</cstring> | ||
611 | </property> | ||
612 | <property stdset="1"> | ||
613 | <name>text</name> | ||
614 | <string>Station</string> | ||
615 | </property> | ||
616 | </widget> | ||
617 | <widget row="3" column="1" > | ||
618 | <class>QLabel</class> | 559 | <class>QLabel</class> |
619 | <property stdset="1"> | 560 | <property stdset="1"> |
620 | <name>name</name> | 561 | <name>name</name> |
621 | <cstring>Channel_LBL</cstring> | 562 | <cstring>Frequency_LBL</cstring> |
622 | </property> | 563 | </property> |
623 | <property stdset="1"> | 564 | <property stdset="1"> |
624 | <name>frameShape</name> | 565 | <name>frameShape</name> |
625 | <enum>Panel</enum> | 566 | <enum>Box</enum> |
626 | </property> | 567 | </property> |
627 | <property stdset="1"> | 568 | <property stdset="1"> |
628 | <name>frameShadow</name> | 569 | <name>frameShadow</name> |
@@ -633,48 +574,34 @@ | |||
633 | <number>0</number> | 574 | <number>0</number> |
634 | </property> | 575 | </property> |
635 | </widget> | 576 | </widget> |
636 | <widget row="3" column="0" > | ||
637 | <class>QLabel</class> | ||
638 | <property stdset="1"> | ||
639 | <name>name</name> | ||
640 | <cstring>TextLabel4_3</cstring> | ||
641 | </property> | ||
642 | <property stdset="1"> | ||
643 | <name>text</name> | ||
644 | <string>Channel</string> | ||
645 | </property> | ||
646 | </widget> | ||
647 | <widget row="2" column="0" > | 577 | <widget row="2" column="0" > |
648 | <class>QLabel</class> | 578 | <class>QLabel</class> |
649 | <property stdset="1"> | 579 | <property stdset="1"> |
650 | <name>name</name> | 580 | <name>name</name> |
651 | <cstring>TextLabel3_3</cstring> | 581 | <cstring>TextLabel9_2</cstring> |
652 | </property> | 582 | </property> |
653 | <property stdset="1"> | 583 | <property stdset="1"> |
654 | <name>text</name> | 584 | <name>text</name> |
655 | <string>Mode</string> | 585 | <string>AP</string> |
656 | </property> | 586 | </property> |
657 | </widget> | 587 | </widget> |
658 | <widget row="1" column="0" > | 588 | <widget row="5" column="1" > |
659 | <class>QLabel</class> | 589 | <class>QLabel</class> |
660 | <property stdset="1"> | 590 | <property stdset="1"> |
661 | <name>name</name> | 591 | <name>name</name> |
662 | <cstring>TextLabel2_3</cstring> | 592 | <cstring>Channel_LBL</cstring> |
663 | </property> | 593 | </property> |
664 | <property stdset="1"> | 594 | <property stdset="1"> |
665 | <name>text</name> | 595 | <name>frameShape</name> |
666 | <string>ESSID</string> | 596 | <enum>Box</enum> |
667 | </property> | 597 | </property> |
668 | </widget> | ||
669 | <widget row="4" column="0" > | ||
670 | <class>QLabel</class> | ||
671 | <property stdset="1"> | 598 | <property stdset="1"> |
672 | <name>name</name> | 599 | <name>frameShadow</name> |
673 | <cstring>TextLabel9_2</cstring> | 600 | <enum>Plain</enum> |
674 | </property> | 601 | </property> |
675 | <property stdset="1"> | 602 | <property stdset="1"> |
676 | <name>text</name> | 603 | <name>indent</name> |
677 | <string>AP</string> | 604 | <number>0</number> |
678 | </property> | 605 | </property> |
679 | </widget> | 606 | </widget> |
680 | <widget row="0" column="1" > | 607 | <widget row="0" column="1" > |
@@ -685,7 +612,7 @@ | |||
685 | </property> | 612 | </property> |
686 | <property stdset="1"> | 613 | <property stdset="1"> |
687 | <name>frameShape</name> | 614 | <name>frameShape</name> |
688 | <enum>Panel</enum> | 615 | <enum>Box</enum> |
689 | </property> | 616 | </property> |
690 | <property stdset="1"> | 617 | <property stdset="1"> |
691 | <name>frameShadow</name> | 618 | <name>frameShadow</name> |
@@ -696,7 +623,18 @@ | |||
696 | <number>0</number> | 623 | <number>0</number> |
697 | </property> | 624 | </property> |
698 | </widget> | 625 | </widget> |
699 | <widget row="5" column="1" > | 626 | <widget row="6" column="0" > |
627 | <class>QLabel</class> | ||
628 | <property stdset="1"> | ||
629 | <name>name</name> | ||
630 | <cstring>TextLabel4_2_2</cstring> | ||
631 | </property> | ||
632 | <property stdset="1"> | ||
633 | <name>text</name> | ||
634 | <string>Rate</string> | ||
635 | </property> | ||
636 | </widget> | ||
637 | <widget row="6" column="1" > | ||
700 | <class>QLabel</class> | 638 | <class>QLabel</class> |
701 | <property stdset="1"> | 639 | <property stdset="1"> |
702 | <name>name</name> | 640 | <name>name</name> |
@@ -711,7 +649,7 @@ | |||
711 | </property> | 649 | </property> |
712 | <property stdset="1"> | 650 | <property stdset="1"> |
713 | <name>frameShape</name> | 651 | <name>frameShape</name> |
714 | <enum>Panel</enum> | 652 | <enum>Box</enum> |
715 | </property> | 653 | </property> |
716 | <property stdset="1"> | 654 | <property stdset="1"> |
717 | <name>frameShadow</name> | 655 | <name>frameShadow</name> |
@@ -722,26 +660,34 @@ | |||
722 | <number>0</number> | 660 | <number>0</number> |
723 | </property> | 661 | </property> |
724 | </widget> | 662 | </widget> |
725 | <widget row="5" column="0" > | 663 | <widget row="2" column="1" > |
726 | <class>QLabel</class> | 664 | <class>QLabel</class> |
727 | <property stdset="1"> | 665 | <property stdset="1"> |
728 | <name>name</name> | 666 | <name>name</name> |
729 | <cstring>TextLabel4_2_2</cstring> | 667 | <cstring>AP_LBL</cstring> |
730 | </property> | 668 | </property> |
731 | <property stdset="1"> | 669 | <property stdset="1"> |
732 | <name>text</name> | 670 | <name>frameShape</name> |
733 | <string>Rate</string> | 671 | <enum>Box</enum> |
672 | </property> | ||
673 | <property stdset="1"> | ||
674 | <name>frameShadow</name> | ||
675 | <enum>Plain</enum> | ||
676 | </property> | ||
677 | <property stdset="1"> | ||
678 | <name>indent</name> | ||
679 | <number>0</number> | ||
734 | </property> | 680 | </property> |
735 | </widget> | 681 | </widget> |
736 | <widget row="4" column="1" > | 682 | <widget row="3" column="1" > |
737 | <class>QLabel</class> | 683 | <class>QLabel</class> |
738 | <property stdset="1"> | 684 | <property stdset="1"> |
739 | <name>name</name> | 685 | <name>name</name> |
740 | <cstring>AP_LBL</cstring> | 686 | <cstring>Mode_LBL</cstring> |
741 | </property> | 687 | </property> |
742 | <property stdset="1"> | 688 | <property stdset="1"> |
743 | <name>frameShape</name> | 689 | <name>frameShape</name> |
744 | <enum>Panel</enum> | 690 | <enum>Box</enum> |
745 | </property> | 691 | </property> |
746 | <property stdset="1"> | 692 | <property stdset="1"> |
747 | <name>frameShadow</name> | 693 | <name>frameShadow</name> |
@@ -760,7 +706,7 @@ | |||
760 | </property> | 706 | </property> |
761 | <property stdset="1"> | 707 | <property stdset="1"> |
762 | <name>frameShape</name> | 708 | <name>frameShape</name> |
763 | <enum>Panel</enum> | 709 | <enum>Box</enum> |
764 | </property> | 710 | </property> |
765 | <property stdset="1"> | 711 | <property stdset="1"> |
766 | <name>frameShadow</name> | 712 | <name>frameShadow</name> |
@@ -771,23 +717,59 @@ | |||
771 | <number>0</number> | 717 | <number>0</number> |
772 | </property> | 718 | </property> |
773 | </widget> | 719 | </widget> |
774 | <widget row="2" column="1" > | 720 | <widget row="3" column="0" > |
775 | <class>QLabel</class> | 721 | <class>QLabel</class> |
776 | <property stdset="1"> | 722 | <property stdset="1"> |
777 | <name>name</name> | 723 | <name>name</name> |
778 | <cstring>Mode_LBL</cstring> | 724 | <cstring>TextLabel3_3</cstring> |
779 | </property> | 725 | </property> |
780 | <property stdset="1"> | 726 | <property stdset="1"> |
781 | <name>frameShape</name> | 727 | <name>text</name> |
782 | <enum>Panel</enum> | 728 | <string>Mode</string> |
783 | </property> | 729 | </property> |
730 | </widget> | ||
731 | <widget row="5" column="0" > | ||
732 | <class>QLabel</class> | ||
784 | <property stdset="1"> | 733 | <property stdset="1"> |
785 | <name>frameShadow</name> | 734 | <name>name</name> |
786 | <enum>Plain</enum> | 735 | <cstring>TextLabel4_3</cstring> |
787 | </property> | 736 | </property> |
788 | <property stdset="1"> | 737 | <property stdset="1"> |
789 | <name>indent</name> | 738 | <name>text</name> |
790 | <number>0</number> | 739 | <string>Channel</string> |
740 | </property> | ||
741 | </widget> | ||
742 | <widget row="0" column="0" > | ||
743 | <class>QLabel</class> | ||
744 | <property stdset="1"> | ||
745 | <name>name</name> | ||
746 | <cstring>TextLabel1_3</cstring> | ||
747 | </property> | ||
748 | <property stdset="1"> | ||
749 | <name>text</name> | ||
750 | <string>Station</string> | ||
751 | </property> | ||
752 | </widget> | ||
753 | <widget row="1" column="0" > | ||
754 | <class>QLabel</class> | ||
755 | <property stdset="1"> | ||
756 | <name>name</name> | ||
757 | <cstring>TextLabel2_3</cstring> | ||
758 | </property> | ||
759 | <property stdset="1"> | ||
760 | <name>text</name> | ||
761 | <string>ESSID</string> | ||
762 | </property> | ||
763 | </widget> | ||
764 | <widget row="4" column="0" > | ||
765 | <class>QLabel</class> | ||
766 | <property stdset="1"> | ||
767 | <name>name</name> | ||
768 | <cstring>TextLabel4_3_2</cstring> | ||
769 | </property> | ||
770 | <property stdset="1"> | ||
771 | <name>text</name> | ||
772 | <string>Frequency</string> | ||
791 | </property> | 773 | </property> |
792 | </widget> | 774 | </widget> |
793 | </grid> | 775 | </grid> |
@@ -799,6 +781,10 @@ | |||
799 | <cstring>GroupBox1</cstring> | 781 | <cstring>GroupBox1</cstring> |
800 | </property> | 782 | </property> |
801 | <property stdset="1"> | 783 | <property stdset="1"> |
784 | <name>margin</name> | ||
785 | <number>0</number> | ||
786 | </property> | ||
787 | <property stdset="1"> | ||
802 | <name>title</name> | 788 | <name>title</name> |
803 | <string>Link Quality</string> | 789 | <string>Link Quality</string> |
804 | </property> | 790 | </property> |
@@ -815,7 +801,7 @@ | |||
815 | </property> | 801 | </property> |
816 | <property stdset="1"> | 802 | <property stdset="1"> |
817 | <name>spacing</name> | 803 | <name>spacing</name> |
818 | <number>2</number> | 804 | <number>0</number> |
819 | </property> | 805 | </property> |
820 | <widget row="1" column="0" > | 806 | <widget row="1" column="0" > |
821 | <class>QLabel</class> | 807 | <class>QLabel</class> |
@@ -847,7 +833,7 @@ | |||
847 | </property> | 833 | </property> |
848 | <property stdset="1"> | 834 | <property stdset="1"> |
849 | <name>progress</name> | 835 | <name>progress</name> |
850 | <number>0</number> | 836 | <number>10</number> |
851 | </property> | 837 | </property> |
852 | </widget> | 838 | </widget> |
853 | <widget row="2" column="2" > | 839 | <widget row="2" column="2" > |
@@ -858,7 +844,7 @@ | |||
858 | </property> | 844 | </property> |
859 | <property stdset="1"> | 845 | <property stdset="1"> |
860 | <name>progress</name> | 846 | <name>progress</name> |
861 | <number>0</number> | 847 | <number>10</number> |
862 | </property> | 848 | </property> |
863 | </widget> | 849 | </widget> |
864 | <widget row="0" column="0" > | 850 | <widget row="0" column="0" > |
@@ -872,56 +858,89 @@ | |||
872 | <string>Signal</string> | 858 | <string>Signal</string> |
873 | </property> | 859 | </property> |
874 | </widget> | 860 | </widget> |
875 | <spacer row="0" column="1" > | 861 | <widget row="0" column="2" > |
862 | <class>QProgressBar</class> | ||
863 | <property stdset="1"> | ||
864 | <name>name</name> | ||
865 | <cstring>Signal_PB</cstring> | ||
866 | </property> | ||
867 | <property stdset="1"> | ||
868 | <name>frameShadow</name> | ||
869 | <enum>Plain</enum> | ||
870 | </property> | ||
871 | <property stdset="1"> | ||
872 | <name>lineWidth</name> | ||
873 | <number>1</number> | ||
874 | </property> | ||
875 | <property stdset="1"> | ||
876 | <name>progress</name> | ||
877 | <number>10</number> | ||
878 | </property> | ||
879 | </widget> | ||
880 | </grid> | ||
881 | </widget> | ||
882 | <spacer> | ||
876 | <property> | 883 | <property> |
877 | <name>name</name> | 884 | <name>name</name> |
878 | <cstring>Spacer28</cstring> | 885 | <cstring>Spacer11</cstring> |
879 | </property> | 886 | </property> |
880 | <property stdset="1"> | 887 | <property stdset="1"> |
881 | <name>orientation</name> | 888 | <name>orientation</name> |
882 | <enum>Horizontal</enum> | 889 | <enum>Vertical</enum> |
883 | </property> | 890 | </property> |
884 | <property stdset="1"> | 891 | <property stdset="1"> |
885 | <name>sizeType</name> | 892 | <name>sizeType</name> |
886 | <enum>Fixed</enum> | 893 | <enum>Expanding</enum> |
887 | </property> | 894 | </property> |
888 | <property> | 895 | <property> |
889 | <name>sizeHint</name> | 896 | <name>sizeHint</name> |
890 | <size> | 897 | <size> |
891 | <width>16</width> | 898 | <width>20</width> |
892 | <height>20</height> | 899 | <height>20</height> |
893 | </size> | 900 | </size> |
894 | </property> | 901 | </property> |
895 | </spacer> | 902 | </spacer> |
896 | <widget row="0" column="2" > | 903 | <widget> |
897 | <class>QProgressBar</class> | 904 | <class>QLayoutWidget</class> |
898 | <property stdset="1"> | 905 | <property stdset="1"> |
899 | <name>name</name> | 906 | <name>name</name> |
900 | <cstring>Signal_PB</cstring> | 907 | <cstring>Layout21</cstring> |
901 | </property> | 908 | </property> |
909 | <hbox> | ||
902 | <property stdset="1"> | 910 | <property stdset="1"> |
903 | <name>frameShadow</name> | 911 | <name>margin</name> |
904 | <enum>Plain</enum> | 912 | <number>0</number> |
905 | </property> | 913 | </property> |
906 | <property stdset="1"> | 914 | <property stdset="1"> |
907 | <name>lineWidth</name> | 915 | <name>spacing</name> |
908 | <number>1</number> | 916 | <number>6</number> |
917 | </property> | ||
918 | <widget> | ||
919 | <class>QCheckBox</class> | ||
920 | <property stdset="1"> | ||
921 | <name>name</name> | ||
922 | <cstring>Refresh_CB</cstring> | ||
909 | </property> | 923 | </property> |
910 | <property stdset="1"> | 924 | <property stdset="1"> |
911 | <name>progress</name> | 925 | <name>sizePolicy</name> |
912 | <number>0</number> | 926 | <sizepolicy> |
927 | <hsizetype>1</hsizetype> | ||
928 | <vsizetype>5</vsizetype> | ||
929 | </sizepolicy> | ||
930 | </property> | ||
931 | <property stdset="1"> | ||
932 | <name>text</name> | ||
933 | <string>Live feed </string> | ||
913 | </property> | 934 | </property> |
914 | </widget> | ||
915 | </grid> | ||
916 | </widget> | 935 | </widget> |
917 | <spacer> | 936 | <spacer> |
918 | <property> | 937 | <property> |
919 | <name>name</name> | 938 | <name>name</name> |
920 | <cstring>Spacer11</cstring> | 939 | <cstring>Spacer16</cstring> |
921 | </property> | 940 | </property> |
922 | <property stdset="1"> | 941 | <property stdset="1"> |
923 | <name>orientation</name> | 942 | <name>orientation</name> |
924 | <enum>Vertical</enum> | 943 | <enum>Horizontal</enum> |
925 | </property> | 944 | </property> |
926 | <property stdset="1"> | 945 | <property stdset="1"> |
927 | <name>sizeType</name> | 946 | <name>sizeType</name> |
@@ -935,6 +954,8 @@ | |||
935 | </size> | 954 | </size> |
936 | </property> | 955 | </property> |
937 | </spacer> | 956 | </spacer> |
957 | </hbox> | ||
958 | </widget> | ||
938 | </vbox> | 959 | </vbox> |
939 | </widget> | 960 | </widget> |
940 | </widget> | 961 | </widget> |
@@ -942,7 +963,7 @@ | |||
942 | </widget> | 963 | </widget> |
943 | <connections> | 964 | <connections> |
944 | <connection> | 965 | <connection> |
945 | <sender>EnableWEB_CB</sender> | 966 | <sender>EnableWEP_CB</sender> |
946 | <signal>toggled(bool)</signal> | 967 | <signal>toggled(bool)</signal> |
947 | <receiver>KeyButtonGroup</receiver> | 968 | <receiver>KeyButtonGroup</receiver> |
948 | <slot>setEnabled(bool)</slot> | 969 | <slot>setEnabled(bool)</slot> |
@@ -960,16 +981,41 @@ | |||
960 | <slot>setEnabled(bool)</slot> | 981 | <slot>setEnabled(bool)</slot> |
961 | </connection> | 982 | </connection> |
962 | <connection> | 983 | <connection> |
963 | <sender>SpecifyChannel_CB</sender> | 984 | <sender>EnableWEP_CB</sender> |
985 | <signal>toggled(bool)</signal> | ||
986 | <receiver>AcceptNonEncrypted_CB</receiver> | ||
987 | <slot>setEnabled(bool)</slot> | ||
988 | </connection> | ||
989 | <connection> | ||
990 | <sender>Key1_RB</sender> | ||
964 | <signal>toggled(bool)</signal> | 991 | <signal>toggled(bool)</signal> |
965 | <receiver>ChannelNr_SB</receiver> | 992 | <receiver>Key1_LE</receiver> |
966 | <slot>setEnabled(bool)</slot> | 993 | <slot>setEnabled(bool)</slot> |
967 | </connection> | 994 | </connection> |
968 | <connection> | 995 | <connection> |
969 | <sender>EnableWEB_CB</sender> | 996 | <sender>Key2_RB</sender> |
970 | <signal>toggled(bool)</signal> | 997 | <signal>toggled(bool)</signal> |
971 | <receiver>CheckBox4</receiver> | 998 | <receiver>Key2_LE</receiver> |
972 | <slot>setEnabled(bool)</slot> | 999 | <slot>setEnabled(bool)</slot> |
973 | </connection> | 1000 | </connection> |
1001 | <connection> | ||
1002 | <sender>Key3_RB</sender> | ||
1003 | <signal>toggled(bool)</signal> | ||
1004 | <receiver>Key3_LE</receiver> | ||
1005 | <slot>setEnabled(bool)</slot> | ||
1006 | </connection> | ||
1007 | <connection> | ||
1008 | <sender>Key4_RB</sender> | ||
1009 | <signal>toggled(bool)</signal> | ||
1010 | <receiver>Key4_LE</receiver> | ||
1011 | <slot>setEnabled(bool)</slot> | ||
1012 | </connection> | ||
1013 | <connection> | ||
1014 | <sender>Refresh_CB</sender> | ||
1015 | <signal>toggled(bool)</signal> | ||
1016 | <receiver>WLanGUI</receiver> | ||
1017 | <slot>SLOT_AutoRefresh(bool)</slot> | ||
1018 | </connection> | ||
1019 | <slot access="public">SLOT_AutoRefresh(bool)</slot> | ||
974 | </connections> | 1020 | </connections> |
975 | </UI> | 1021 | </UI> |
diff --git a/noncore/settings/networksettings2/wlan/wlan_NNI.cpp b/noncore/settings/networksettings2/wlan/wlan_NNI.cpp index 78e756c..61969f2 100644 --- a/noncore/settings/networksettings2/wlan/wlan_NNI.cpp +++ b/noncore/settings/networksettings2/wlan/wlan_NNI.cpp | |||
@@ -1,3 +1,4 @@ | |||
1 | #include <unistd.h> | ||
1 | #include "wlanedit.h" | 2 | #include "wlanedit.h" |
2 | #include "wlan_NNI.h" | 3 | #include "wlan_NNI.h" |
3 | #include "wlan_NN.h" | 4 | #include "wlan_NN.h" |
@@ -5,16 +6,66 @@ | |||
5 | AWLan::AWLan( WLanNetNode * PNN ) : ANetNodeInstance( PNN ) { | 6 | AWLan::AWLan( WLanNetNode * PNN ) : ANetNodeInstance( PNN ) { |
6 | GUI = 0; | 7 | GUI = 0; |
7 | RT = 0; | 8 | RT = 0; |
9 | Data.ESSID = ""; | ||
10 | Data.NodeName = tr("<UseHostName>"); | ||
11 | Data.Mode = 0; | ||
12 | Data.SpecificAP = 0; | ||
13 | Data.APMac = ""; | ||
14 | Data.Encrypted = 0; | ||
15 | Data.AcceptNonEncrypted = 0; | ||
16 | Data.Key[0] = ""; | ||
17 | Data.Key[1] = ""; | ||
18 | Data.Key[2] = ""; | ||
19 | Data.Key[3] = ""; | ||
8 | } | 20 | } |
9 | 21 | ||
10 | void AWLan::setSpecificAttribute( QString & , QString & ) { | 22 | void AWLan::setSpecificAttribute( QString & A, QString & V ) { |
23 | if( A == "essid" ) { | ||
24 | Data.ESSID = V; | ||
25 | } else if( A == "nodename" ) { | ||
26 | Data.NodeName = V; | ||
27 | } else if( A == "mode" ) { | ||
28 | Data.Mode = V.toShort(); | ||
29 | } else if( A == "specificap" ) { | ||
30 | Data.SpecificAP = (V=="yes"); | ||
31 | } else if( A == "apmac" ) { | ||
32 | Data.APMac = V; | ||
33 | } else if( A == "encrypted" ) { | ||
34 | Data.Encrypted = (V=="yes"); | ||
35 | } else if( A == "acceptnonencrypted" ) { | ||
36 | Data.AcceptNonEncrypted = (V=="yes"); | ||
37 | } else if( A == "key0" ) { | ||
38 | Data.Key[0] = V; | ||
39 | } else if( A == "key1" ) { | ||
40 | Data.Key[1] = V; | ||
41 | } else if( A == "key2" ) { | ||
42 | Data.Key[2] = V; | ||
43 | } else if( A == "key3" ) { | ||
44 | Data.Key[3] = V; | ||
45 | } | ||
11 | } | 46 | } |
12 | 47 | ||
13 | void AWLan::saveSpecificAttribute( QTextStream & ) { | 48 | void AWLan::saveSpecificAttribute( QTextStream & S ) { |
49 | S << "essid=" << quote( Data.ESSID ) << endl; | ||
50 | S << "nodename=" << quote( Data.NodeName ) << endl; | ||
51 | S << "mode=" << Data.Mode << endl; | ||
52 | S << "specificap=" | ||
53 | << ((Data.SpecificAP) ? "yes" : "no") | ||
54 | << endl; | ||
55 | S << "apmac=" << Data.APMac << endl; | ||
56 | S << "encrypted=" | ||
57 | << ((Data.Encrypted) ? "yes" : "no") | ||
58 | << endl; | ||
59 | S << "acceptnonencrypted=" | ||
60 | << ((Data.AcceptNonEncrypted) ? "yes" : "no") | ||
61 | << endl; | ||
62 | for( int i = 0 ;i < 4 ; i ++ ) { | ||
63 | S << "key" << i << "=" << Data.Key[i] << endl; | ||
64 | } | ||
14 | } | 65 | } |
15 | 66 | ||
16 | QWidget * AWLan::edit( QWidget * parent ) { | 67 | QWidget * AWLan::edit( QWidget * parent ) { |
17 | GUI = new WLanEdit( parent ); | 68 | GUI = new WLanEdit( parent, this ); |
18 | GUI->showData( Data ); | 69 | GUI->showData( Data ); |
19 | return GUI; | 70 | return GUI; |
20 | } | 71 | } |
@@ -29,8 +80,61 @@ void AWLan::commit( void ) { | |||
29 | } | 80 | } |
30 | 81 | ||
31 | bool AWLan::generateDataForCommonFile( | 82 | bool AWLan::generateDataForCommonFile( |
32 | SystemFile &, | 83 | SystemFile & S, |
33 | long ) { | 84 | long ) { |
34 | return 1; | 85 | |
86 | S << " wireless_essid \"" | ||
87 | << Data.ESSID | ||
88 | << "\"" | ||
89 | << endl; | ||
90 | |||
91 | if( ! Data.NodeName.isEmpty() ) { | ||
92 | if( Data.NodeName == tr("<UseHostName>") ) { | ||
93 | char Buf[100]; | ||
94 | if( gethostname(Buf, sizeof(Buf) ) == 0 ) { | ||
95 | Buf[99] = '\0'; // just to make sure | ||
96 | S << " wireless_nick " | ||
97 | << Buf | ||
98 | << endl; | ||
99 | } | ||
100 | } else { | ||
101 | S << " wireless_nick \"" | ||
102 | << Data.NodeName | ||
103 | << "\"" | ||
104 | << endl; | ||
105 | } | ||
106 | } | ||
107 | |||
108 | char * M; | ||
109 | switch ( Data.Mode ) { | ||
110 | case 0 : | ||
111 | M = "Auto"; | ||
112 | break; | ||
113 | case 1 : | ||
114 | M = "Managed"; | ||
115 | break; | ||
116 | case 2 : | ||
117 | M = "Ad-Hoc"; | ||
118 | break; | ||
119 | } | ||
120 | |||
121 | S << " wireless_mode " | ||
122 | << M | ||
123 | << endl; | ||
124 | if( Data.Encrypted ) { | ||
125 | for( int i = 0; i < 4; i ++ ) { | ||
126 | if( ! Data.Key[i].isEmpty() ) { | ||
127 | S << " wireless_key" | ||
128 | << i | ||
129 | << " " | ||
130 | << Data.Key[i] | ||
131 | << endl; | ||
132 | } | ||
133 | } | ||
134 | S << " wireless_keymode " | ||
135 | << ((Data.AcceptNonEncrypted) ? "open" : "restricted") | ||
136 | << endl; | ||
137 | } | ||
138 | return 0; | ||
35 | } | 139 | } |
36 | 140 | ||
diff --git a/noncore/settings/networksettings2/wlan/wlan_NNI.h b/noncore/settings/networksettings2/wlan/wlan_NNI.h index d861d13..2211c47 100644 --- a/noncore/settings/networksettings2/wlan/wlan_NNI.h +++ b/noncore/settings/networksettings2/wlan/wlan_NNI.h | |||
@@ -28,7 +28,7 @@ public : | |||
28 | { return (void *)&Data; } | 28 | { return (void *)&Data; } |
29 | 29 | ||
30 | virtual bool hasDataFor( const QString & ) | 30 | virtual bool hasDataFor( const QString & ) |
31 | { return 0; } | 31 | { return 1; } |
32 | virtual bool generateDataForCommonFile( | 32 | virtual bool generateDataForCommonFile( |
33 | SystemFile & SF, long DevNr ); | 33 | SystemFile & SF, long DevNr ); |
34 | protected : | 34 | protected : |
diff --git a/noncore/settings/networksettings2/wlan/wlandata.h b/noncore/settings/networksettings2/wlan/wlandata.h index ba1f2c2..36990a9 100644 --- a/noncore/settings/networksettings2/wlan/wlandata.h +++ b/noncore/settings/networksettings2/wlan/wlandata.h | |||
@@ -3,15 +3,14 @@ | |||
3 | 3 | ||
4 | #include <qstring.h> | 4 | #include <qstring.h> |
5 | typedef struct WLanData { | 5 | typedef struct WLanData { |
6 | QString Device; | 6 | QString ESSID; |
7 | QString LockFile; | 7 | QString NodeName; |
8 | long Speed; | 8 | short Mode; |
9 | short Parity; | 9 | bool SpecificAP; |
10 | short DataBits; | 10 | QString APMac; |
11 | short StopBits; | 11 | bool Encrypted; |
12 | bool HardwareControl; | 12 | QString Key[4]; |
13 | bool SoftwareControl; | 13 | bool AcceptNonEncrypted; |
14 | |||
15 | } WLanData_t; | 14 | } WLanData_t; |
16 | 15 | ||
17 | #endif | 16 | #endif |
diff --git a/noncore/settings/networksettings2/wlan/wlanedit.cpp b/noncore/settings/networksettings2/wlan/wlanedit.cpp index c884886..8d3979e 100644 --- a/noncore/settings/networksettings2/wlan/wlanedit.cpp +++ b/noncore/settings/networksettings2/wlan/wlanedit.cpp | |||
@@ -1,16 +1,115 @@ | |||
1 | #include <qlineedit.h> | ||
2 | #include <qprogressbar.h> | ||
3 | #include <qcombobox.h> | ||
4 | #include <qlabel.h> | ||
5 | #include <qregexp.h> | ||
6 | #include <qcheckbox.h> | ||
1 | #include <GUIUtils.h> | 7 | #include <GUIUtils.h> |
8 | #include <resources.h> | ||
9 | #include <wextensions.h> | ||
10 | |||
2 | #include "wlanedit.h" | 11 | #include "wlanedit.h" |
12 | #include "wlan_NN.h" | ||
13 | #include "wlan_NNI.h" | ||
14 | |||
15 | WLanEdit::WLanEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : | ||
16 | WLanGUI( Parent ), RefreshTimer(this){ | ||
17 | |||
18 | InterfaceInfo * II; | ||
19 | |||
20 | NNI = TNNI; | ||
21 | Dev = NNI->runtime()->device(); | ||
22 | WE = 0; | ||
23 | if( ( II = Dev->assignedInterface() ) ) { | ||
24 | // show data | ||
25 | WE = new WExtensions( II->Name ); | ||
26 | |||
27 | if( WE->doesHaveWirelessExtensions() ) { | ||
28 | QString S; | ||
29 | Station_LBL->setText( WE->station() ); | ||
30 | ESSID_LBL->setText( WE->essid() ); | ||
31 | Mode_LBL->setText( WE->mode() ); | ||
32 | S.setNum( WE->frequency() ); | ||
33 | Frequency_LBL->setText( S ); | ||
34 | S.setNum( WE->channel() ); | ||
35 | Channel_LBL->setText( S ); | ||
36 | S.setNum( WE->rate() ); | ||
37 | Rate_LBL->setText( S ); | ||
38 | AP_LBL->setText( WE->ap() ); | ||
39 | |||
40 | SLOT_Refresh(); | ||
3 | 41 | ||
4 | WLanEdit::WLanEdit( QWidget * Parent ) : WLanGUI( Parent ){ | 42 | connect( &RefreshTimer, SIGNAL( timeout() ), |
43 | this, SLOT( SLOT_Refresh() ) ); | ||
44 | } | ||
45 | } | ||
46 | } | ||
47 | |||
48 | WLanEdit::~WLanEdit( void ) { | ||
49 | if( WE ) | ||
50 | delete WE; | ||
5 | } | 51 | } |
6 | 52 | ||
7 | QString WLanEdit::acceptable( void ) { | 53 | QString WLanEdit::acceptable( void ) { |
54 | if( ESSID_LE->text().isEmpty() ) { | ||
55 | return QString("ESSID is mandatory"); | ||
56 | } | ||
57 | if( SpecifyAP_CB->isChecked() && | ||
58 | APMac_LE->text().isEmpty() ) { | ||
59 | return QString("APMac must have value"); | ||
60 | } | ||
8 | return QString(); | 61 | return QString(); |
9 | } | 62 | } |
10 | 63 | ||
11 | void WLanEdit::showData( WLanData_t & Data ) { | 64 | void WLanEdit::showData( WLanData_t & Data ) { |
65 | Mode_CB->setCurrentItem( Data.Mode ); | ||
66 | ESSID_LE->setText( Data.ESSID ); | ||
67 | NodeName_LE->setText( Data.NodeName ); | ||
68 | SpecifyAP_CB->setChecked( Data.SpecificAP ); | ||
69 | APMac_LE->setText( Data.APMac ); | ||
70 | |||
71 | EnableWEP_CB->setChecked( Data.Encrypted ); | ||
72 | AcceptNonEncrypted_CB->setChecked( Data.AcceptNonEncrypted ); | ||
73 | Key1_LE->setText( Data.Key[0] ); | ||
74 | Key2_LE->setText( Data.Key[1] ); | ||
75 | Key3_LE->setText( Data.Key[2] ); | ||
76 | Key4_LE->setText( Data.Key[3] ); | ||
12 | } | 77 | } |
13 | 78 | ||
14 | bool WLanEdit::commit( WLanData_t & Data ) { | 79 | bool WLanEdit::commit( WLanData_t & Data ) { |
80 | bool SM = 0; | ||
81 | |||
82 | TXTM( Data.ESSID, ESSID_LE, SM ); | ||
83 | TXTM( Data.NodeName, NodeName_LE, SM ); | ||
84 | TXTM( Data.APMac, APMac_LE, SM ); | ||
85 | TXTM( Data.Key[0], Key1_LE, SM ); | ||
86 | TXTM( Data.Key[1], Key2_LE, SM ); | ||
87 | TXTM( Data.Key[2], Key3_LE, SM ); | ||
88 | TXTM( Data.Key[3], Key4_LE, SM ); | ||
89 | CBM( Data.SpecificAP, SpecifyAP_CB, SM ); | ||
90 | CBM( Data.Encrypted, EnableWEP_CB, SM ); | ||
91 | CBM( Data.AcceptNonEncrypted, AcceptNonEncrypted_CB, SM ); | ||
92 | CIM( Data.Mode, Mode_CB, SM ); | ||
15 | return 0; | 93 | return 0; |
16 | } | 94 | } |
95 | |||
96 | void WLanEdit::SLOT_Refresh( void ) { | ||
97 | if( WE ) { | ||
98 | int signal, noise, quality; | ||
99 | WE->stats( signal, noise, quality); | ||
100 | |||
101 | Signal_PB->setProgress( signal ); | ||
102 | Noise_PB->setProgress( noise ); | ||
103 | Quality_PB->setProgress( quality ); | ||
104 | } | ||
105 | } | ||
106 | |||
107 | void WLanEdit::SLOT_AutoRefresh( bool ar ) { | ||
108 | if( ar ) { | ||
109 | RefreshTimer.start( 1000 ); | ||
110 | SLOT_Refresh(); | ||
111 | } else { | ||
112 | RefreshTimer.stop(); | ||
113 | } | ||
114 | } | ||
115 | |||
diff --git a/noncore/settings/networksettings2/wlan/wlanedit.h b/noncore/settings/networksettings2/wlan/wlanedit.h index b7442d5..e550c14 100644 --- a/noncore/settings/networksettings2/wlan/wlanedit.h +++ b/noncore/settings/networksettings2/wlan/wlanedit.h | |||
@@ -1,12 +1,32 @@ | |||
1 | #include <qtimer.h> | ||
2 | #include <wextensions.h> | ||
1 | #include "wlandata.h" | 3 | #include "wlandata.h" |
2 | #include "wlanGUI.h" | 4 | #include "wlanGUI.h" |
3 | 5 | ||
6 | class ANetNodeInstance; | ||
7 | class AsDevice; | ||
8 | class WExtensions; | ||
9 | |||
4 | class WLanEdit : public WLanGUI { | 10 | class WLanEdit : public WLanGUI { |
5 | 11 | ||
6 | public : | 12 | public : |
7 | 13 | ||
8 | WLanEdit( QWidget * parent ); | 14 | WLanEdit( QWidget * parent, ANetNodeInstance * NNI ); |
15 | ~WLanEdit( void ); | ||
9 | QString acceptable( void ); | 16 | QString acceptable( void ); |
10 | void showData( WLanData_t & Data ); | 17 | void showData( WLanData_t & Data ); |
11 | bool commit( WLanData_t & Data ); | 18 | bool commit( WLanData_t & Data ); |
19 | |||
20 | public slots : | ||
21 | |||
22 | void SLOT_AutoRefresh( bool ); | ||
23 | void SLOT_Refresh( void ); | ||
24 | |||
25 | private : | ||
26 | |||
27 | ANetNodeInstance * NNI; | ||
28 | AsDevice * Dev; | ||
29 | QTimer RefreshTimer; | ||
30 | WExtensions * WE; | ||
31 | |||
12 | }; | 32 | }; |
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.cpp b/noncore/settings/networksettings2/wlan/wlanrun.cpp index 79f11f7..3f1d4a9 100644 --- a/noncore/settings/networksettings2/wlan/wlanrun.cpp +++ b/noncore/settings/networksettings2/wlan/wlanrun.cpp | |||
@@ -1,5 +1,185 @@ | |||
1 | |||
2 | #include <qfile.h> | ||
3 | #include <qtextstream.h> | ||
4 | #include <qstringlist.h> | ||
5 | #include <resources.h> | ||
1 | #include "wlanrun.h" | 6 | #include "wlanrun.h" |
2 | 7 | ||
8 | void WLanRun::detectState( NodeCollection * NC ) { | ||
9 | |||
10 | // unavailable : no card found | ||
11 | // available : card found and assigned to us or free | ||
12 | // up : card found and assigned to us and up | ||
13 | |||
14 | QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number()); | ||
15 | System & Sys = NSResources->system(); | ||
16 | InterfaceInfo * Run; | ||
17 | |||
18 | QFile F( S ); | ||
19 | |||
20 | if( F.open( IO_ReadOnly ) ) { | ||
21 | // could open file -> read interface and assign | ||
22 | QString X; | ||
23 | QTextStream TS(&F); | ||
24 | X = TS.readLine(); | ||
25 | // find interface | ||
26 | if( handlesInterface( X ) ) { | ||
27 | for( QDictIterator<InterfaceInfo> It(Sys.interfaces()); | ||
28 | It.current(); | ||
29 | ++It ) { | ||
30 | Run = It.current(); | ||
31 | if( X == Run->Name ) { | ||
32 | Run->assignNode( netNode() ); | ||
33 | assignInterface( Run ); | ||
34 | NC->setCurrentState( IsUp ); | ||
35 | return; | ||
36 | } | ||
37 | } | ||
38 | } | ||
39 | } | ||
40 | |||
41 | if( ( Run = assignedInterface() ) ) { | ||
42 | // we already have an interface assigned -> still present ? | ||
43 | if( ! Run->IsUp ) { | ||
44 | // usb is still free -> keep assignment | ||
45 | NC->setCurrentState( Available ); | ||
46 | return; | ||
47 | } // else interface is up but NOT us -> some other profile | ||
48 | } | ||
49 | |||
50 | // nothing (valid) assigned to us | ||
51 | assignInterface( 0 ); | ||
52 | |||
53 | // find possible interface | ||
54 | for( QDictIterator<InterfaceInfo> It(Sys.interfaces()); | ||
55 | It.current(); | ||
56 | ++It ) { | ||
57 | Run = It.current(); | ||
58 | if( handlesInterface( *Run ) && | ||
59 | ( Run->CardType == ARPHRD_ETHER | ||
60 | #ifdef ARPHRD_IEEE1394 | ||
61 | || Run->CardType == ARPHRD_IEEE1394 | ||
62 | #endif | ||
63 | ) && | ||
64 | ! Run->IsUp | ||
65 | ) { | ||
66 | // proper type, and Not UP -> free | ||
67 | NC->setCurrentState( Off ); | ||
68 | return; | ||
69 | } | ||
70 | } | ||
71 | // no free found | ||
72 | |||
73 | NC->setCurrentState( Unavailable ); | ||
74 | |||
75 | } | ||
76 | |||
77 | bool WLanRun::setState( NodeCollection * NC, Action_t A, bool ) { | ||
78 | |||
79 | // we only handle activate and deactivate | ||
80 | switch( A ) { | ||
81 | case Activate : | ||
82 | { | ||
83 | if( NC->currentState() != Off ) { | ||
84 | return 0; | ||
85 | } | ||
86 | InterfaceInfo * N = getInterface(); | ||
87 | if( ! N ) { | ||
88 | // no interface available | ||
89 | NC->setCurrentState( Unavailable ); | ||
90 | return 0; | ||
91 | } | ||
92 | // because we were OFF the interface | ||
93 | // we get back is NOT assigned | ||
94 | N->assignNode( netNode() ); | ||
95 | assignInterface( N ); | ||
96 | NC->setCurrentState( Available ); | ||
97 | return 1; | ||
98 | } | ||
99 | case Deactivate : | ||
100 | if( NC->currentState() == IsUp ) { | ||
101 | // bring down first | ||
102 | if( ! connection()->setState( Down ) ) | ||
103 | // could not ... | ||
104 | return 0; | ||
105 | } else if( NC->currentState() != Available ) { | ||
106 | return 1; | ||
107 | } | ||
108 | assignedInterface()->assignNode( 0 ); // release | ||
109 | assignInterface( 0 ); | ||
110 | NC->setCurrentState( Off ); | ||
111 | return 1; | ||
112 | default : | ||
113 | // FT | ||
114 | break; | ||
115 | } | ||
116 | return 0; | ||
117 | } | ||
118 | |||
119 | bool WLanRun::canSetState( State_t Curr, Action_t A ) { | ||
120 | // we only handle up down activate and deactivate | ||
121 | switch( A ) { | ||
122 | case Activate : | ||
123 | { // at least available | ||
124 | if( Curr == Available ) { | ||
125 | return 1; | ||
126 | } | ||
127 | // or we can make one available | ||
128 | InterfaceInfo * N = getInterface(); | ||
129 | if( ! N || N->assignedNode() != 0 ) { | ||
130 | // non available or assigned | ||
131 | return 0; | ||
132 | } | ||
133 | return 1; | ||
134 | } | ||
135 | case Deactivate : | ||
136 | return ( Curr >= Available ); | ||
137 | default : | ||
138 | // FT | ||
139 | break; | ||
140 | } | ||
141 | return 0; | ||
142 | } | ||
143 | |||
144 | // get interface that is free or assigned to us | ||
145 | InterfaceInfo * WLanRun::getInterface( void ) { | ||
146 | |||
147 | System & S = NSResources->system(); | ||
148 | InterfaceInfo * best = 0, * Run; | ||
149 | |||
150 | for( QDictIterator<InterfaceInfo> It(S.interfaces()); | ||
151 | It.current(); | ||
152 | ++It ) { | ||
153 | Run = It.current(); | ||
154 | if( handlesInterface( *Run ) && | ||
155 | ( Run->CardType == ARPHRD_ETHER | ||
156 | #ifdef ARPHRD_IEEE1394 | ||
157 | || Run->CardType == ARPHRD_IEEE1394 | ||
158 | #endif | ||
159 | ) | ||
160 | ) { | ||
161 | // this is a LAN card | ||
162 | if( Run->assignedNode() == netNode() ) { | ||
163 | // assigned to us | ||
164 | return Run; | ||
165 | } else if( Run->assignedNode() == 0 ) { | ||
166 | // free | ||
167 | best = Run; | ||
168 | } | ||
169 | } | ||
170 | } | ||
171 | return best; // can be 0 | ||
172 | } | ||
173 | |||
3 | bool WLanRun::handlesInterface( const QString & S ) { | 174 | bool WLanRun::handlesInterface( const QString & S ) { |
175 | InterfaceInfo * II; | ||
176 | II = NSResources->system().interface( S ); | ||
177 | if( ( II = NSResources->system().interface( S ) ) ) { | ||
178 | return handlesInterface( *II ); | ||
179 | } | ||
4 | return Pat.match( S ) >= 0; | 180 | return Pat.match( S ) >= 0; |
5 | } | 181 | } |
182 | |||
183 | bool WLanRun::handlesInterface( const InterfaceInfo & II ) { | ||
184 | return ( Pat.match( II.Name ) < 0 ); | ||
185 | } | ||
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.h b/noncore/settings/networksettings2/wlan/wlanrun.h index f46bcb7..25d5b96 100644 --- a/noncore/settings/networksettings2/wlan/wlanrun.h +++ b/noncore/settings/networksettings2/wlan/wlanrun.h | |||
@@ -21,20 +21,17 @@ public : | |||
21 | 21 | ||
22 | protected : | 22 | protected : |
23 | 23 | ||
24 | void detectState( NodeCollection * ) | 24 | void detectState( NodeCollection * ); |
25 | { } | 25 | bool setState( NodeCollection *, Action_t, bool ); |
26 | 26 | bool canSetState( State_t, Action_t ); | |
27 | bool setState( NodeCollection *, Action_t ) | ||
28 | { return 0; } | ||
29 | |||
30 | bool canSetState( State_t, Action_t ) | ||
31 | { return 0; } | ||
32 | |||
33 | bool handlesInterface( const QString & I ); | 27 | bool handlesInterface( const QString & I ); |
28 | bool handlesInterface( const InterfaceInfo & II ); | ||
34 | 29 | ||
35 | private : | 30 | private : |
36 | 31 | ||
32 | InterfaceInfo * getInterface( void ); | ||
37 | QRegExp Pat; | 33 | QRegExp Pat; |
34 | WLanData * Data; | ||
38 | }; | 35 | }; |
39 | 36 | ||
40 | #endif | 37 | #endif |