summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h2
-rw-r--r--noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h2
-rw-r--r--noncore/settings/networksettings2/cable/cablerun.cpp2
-rw-r--r--noncore/settings/networksettings2/cable/cablerun.h2
-rw-r--r--noncore/settings/networksettings2/irda/irdarun.h2
-rw-r--r--noncore/settings/networksettings2/lancard/lancardrun.cpp2
-rw-r--r--noncore/settings/networksettings2/lancard/lancardrun.h2
-rw-r--r--noncore/settings/networksettings2/modem/modemrun.h2
-rw-r--r--noncore/settings/networksettings2/network/networkrun.cpp6
-rw-r--r--noncore/settings/networksettings2/network/networkrun.h2
-rw-r--r--noncore/settings/networksettings2/networksettings.cpp28
-rw-r--r--noncore/settings/networksettings2/networksettings.h3
-rw-r--r--noncore/settings/networksettings2/networksettings2/netnode.cpp17
-rw-r--r--noncore/settings/networksettings2/networksettings2/netnode.h6
-rw-r--r--noncore/settings/networksettings2/networksettings2/networksettings2.pro2
-rw-r--r--noncore/settings/networksettings2/networksettings2/resources.cpp3
-rw-r--r--noncore/settings/networksettings2/networksettingsGUI.ui207
-rw-r--r--noncore/settings/networksettings2/ppp/ppprun.cpp2
-rw-r--r--noncore/settings/networksettings2/ppp/ppprun.h2
-rw-r--r--noncore/settings/networksettings2/profile/profileedit.cpp13
-rw-r--r--noncore/settings/networksettings2/profile/profileedit.h2
-rw-r--r--noncore/settings/networksettings2/profile/profilerun.cpp2
-rw-r--r--noncore/settings/networksettings2/profile/profilerun.h2
-rw-r--r--noncore/settings/networksettings2/usb/usbrun.cpp2
-rw-r--r--noncore/settings/networksettings2/usb/usbrun.h2
-rw-r--r--noncore/settings/networksettings2/vpn/vpnrun.h2
-rw-r--r--noncore/settings/networksettings2/wlan/wlanGUI.ui480
-rw-r--r--noncore/settings/networksettings2/wlan/wlan_NNI.cpp114
-rw-r--r--noncore/settings/networksettings2/wlan/wlan_NNI.h2
-rw-r--r--noncore/settings/networksettings2/wlan/wlandata.h17
-rw-r--r--noncore/settings/networksettings2/wlan/wlanedit.cpp101
-rw-r--r--noncore/settings/networksettings2/wlan/wlanedit.h22
-rw-r--r--noncore/settings/networksettings2/wlan/wlanrun.cpp180
-rw-r--r--noncore/settings/networksettings2/wlan/wlanrun.h15
34 files changed, 957 insertions, 293 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
@@ -19,9 +19,9 @@ protected :
void detectState( NodeCollection * )
{ }
- bool setState( NodeCollection * , Action_t )
+ bool setState( NodeCollection * , Action_t, bool )
{ return 0; }
bool canSetState( State_t , Action_t )
{ return 0; }
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
@@ -16,9 +16,9 @@ protected :
void detectState( NodeCollection * )
{ }
- bool setState( NodeCollection * , Action_t )
+ bool setState( NodeCollection * , Action_t, bool )
{ return 0; }
bool canSetState( State_t , Action_t )
{ return 0; }
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
@@ -12,9 +12,9 @@ void CableRun::detectState( NodeCollection * NC ) {
close( fd );
NC->setCurrentState( Available );
}
-bool CableRun::setState( NodeCollection * NC, Action_t A ) {
+bool CableRun::setState( NodeCollection * NC, Action_t A, bool ) {
if( A == Activate ) {
detectState(NC);
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
@@ -14,9 +14,9 @@ public :
protected :
void detectState( NodeCollection * NC );
- bool setState( NodeCollection * NC, Action_t A );
+ bool setState( NodeCollection * NC, Action_t A, bool Force );
bool canSetState( State_t Curr, Action_t A );
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
@@ -16,9 +16,9 @@ protected :
void detectState( NodeCollection * )
{ }
- bool setState( NodeCollection * , Action_t )
+ bool setState( NodeCollection * , Action_t, bool )
{ return 0; }
bool canSetState( State_t , Action_t )
{ return 0; }
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
@@ -72,9 +72,9 @@ void LanCardRun::detectState( NodeCollection * NC ) {
NC->setCurrentState( Unavailable );
}
-bool LanCardRun::setState( NodeCollection * NC, Action_t A ) {
+bool LanCardRun::setState( NodeCollection * NC, Action_t A, bool ) {
// we only handle activate and deactivate
switch( A ) {
case Activate :
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
@@ -22,9 +22,9 @@ public :
protected :
void detectState( NodeCollection * NC );
- bool setState( NodeCollection * NC, Action_t A );
+ bool setState( NodeCollection * NC, Action_t A, bool Force );
bool canSetState( State_t Curr, Action_t A );
bool handlesInterface( const QString & I );
bool handlesInterface( const InterfaceInfo & II );
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
@@ -16,9 +16,9 @@ protected :
void detectState( NodeCollection * )
{ }
- bool setState( NodeCollection *, Action_t )
+ bool setState( NodeCollection *, Action_t, bool )
{ return 0; }
bool canSetState( State_t, Action_t )
{ return 0; }
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
@@ -16,26 +16,26 @@ void NetworkRun::detectState( NodeCollection * NC ) {
// has no interface -> delegate
RI->detectState( NC );
}
-bool NetworkRun::setState( NodeCollection * NC, Action_t A ) {
+bool NetworkRun::setState( NodeCollection * NC, Action_t A, bool Force ) {
// we handle UP and DOWN
RuntimeInfo * RI = netNode()->nextNode()->runtime();
AsDevice * Next = RI->asDevice();
InterfaceInfo * II = Next->assignedInterface();
if( A == Up ) {
// we can bring UP if lower level is available
- if( NC->currentState() == Available ) {
+ if( NC->currentState() == Available || Force ) {
QString S;
S.sprintf( "ifup %s=%s-c%d-allowed",
II->Name.latin1(), II->Name.latin1(),
connection()->number() );
NSResources->system().runAsRoot( S );
}
return 1;
} else if( A == Down ) {
- if( NC->currentState() == IsUp ) {
+ if( NC->currentState() == IsUp || Force ) {
QString S;
S.sprintf( "ifdown %s=%s-c%d-allowed",
II->Name.latin1(), II->Name.latin1(),
connection()->number() );
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
@@ -14,9 +14,9 @@ public :
protected :
void detectState( NodeCollection * );
- bool setState( NodeCollection * ,Action_t A );
+ bool setState( NodeCollection * ,Action_t A, bool );
bool canSetState( State_t , Action_t A );
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
@@ -22,19 +22,23 @@ NetworkSettings::NetworkSettings( QWidget *parent,
WFlags fl ) : NetworkSettingsGUI(parent,name,fl),
NSD() {
UpdateTimer = new QTimer( this );
+
// set pixmaps
Add_TB->setPixmap( NSResources->getPixmap( "add" ) );
Delete_TB->setPixmap( NSResources->getPixmap( "remove" ) );
CheckState_TB->setPixmap( NSResources->getPixmap( "check" ) );
Enable_TB->setPixmap( NSResources->getPixmap( "disabled" ) );
GenConfig_TB->setPixmap( NSResources->getPixmap( "configure" ) );
Connect_TB->setPixmap( NSResources->getPixmap( "connected" ) );
+ Disconnect_TB->setPixmap( NSResources->getPixmap( "disconnected" ) );
On_TB->setPixmap( NSResources->getPixmap( "off" ) );
+ SLOT_ToProfile();
+
// populate main Listbox
Profiles_LB->clear();
{ Name2Connection_t & M = NSResources->connections();
NodeCollection * NC;
@@ -275,9 +279,9 @@ void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) {
} else {
Description_LBL->setText( NC->description() );
}
- CurProfile_GB->setTitle( LBI->text() );
+ Profile_GB->setTitle( LBI->text() );
State_LBL->setText( NC->stateName() );
}
void NetworkSettings::SLOT_CheckState( void ) {
@@ -408,8 +412,30 @@ void NetworkSettings::SLOT_Connect( void ) {
// we do not update the GUI but wait for the REAL upping of the device
}
+void NetworkSettings::SLOT_Disconnect( void ) {
+ QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() );
+
+ if ( ! LBI )
+ return;
+
+ NodeCollection * NC =
+ NSResources->findConnection( LBI->text() );
+
+ NC->setState( Down, 1 );
+}
+
+void NetworkSettings::SLOT_ToMessages( void ) {
+ Profile_GB->hide();
+ Messages_GB->show();
+}
+
+void NetworkSettings::SLOT_ToProfile( void ) {
+ Profile_GB->show();
+ Messages_GB->hide();
+}
+
void NetworkSettings::SLOT_QCopMessage(const QCString &msg, const QByteArray &data) {
QDataStream stream( data, IO_ReadOnly );
if( msg == "raise" ) {
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
@@ -35,11 +35,14 @@ public slots :
void SLOT_CheckState( void );
void SLOT_Enable( void );
void SLOT_On( void );
void SLOT_Connect( void );
+ void SLOT_Disconnect( void );
void SLOT_GenerateConfig( void );
void SLOT_RefreshStates( void );
void SLOT_QCopMessage( const QCString&,const QByteArray& );
+ void SLOT_ToProfile( void );
+ void SLOT_ToMessages( void );
private :
void updateProfileState( QListBoxItem * it );
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,6 +1,8 @@
-#include <qpe/qpeapplication.h>
#include <time.h>
+#include <qpe/qpeapplication.h>
+#include <qpainter.h>
+#include <qbitmap.h>
#include <qtextstream.h>
#include <qpixmap.h>
#include "resources.h"
@@ -246,10 +248,19 @@ static char * State2PixmapTbl[] = {
"connected" // up
};
QPixmap NodeCollection::devicePixmap( void ) {
- return NSResources->getPixmap(
- device()->netNode()->pixmapName()+"-large" );
+ QPixmap pm = NSResources->getPixmap(
+ getToplevel()->nextNode()->pixmapName()+"-large");
+
+ QPixmap Mini = NSResources->getPixmap( device()->netNode()->pixmapName() );
+
+ QPainter painter( &pm );
+ painter.drawPixmap( pm.width()-Mini.width(),
+ pm.height()-Mini.height(),
+ Mini );
+ pm.setMask( pm.createHeuristicMask( TRUE ) );
+ return pm;
}
QPixmap NodeCollection::statePixmap( State_t S) {
return NSResources->getPixmap( State2PixmapTbl[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
@@ -257,9 +257,9 @@ public :
NodeCollection * connection()
{ return NNI->connection(); }
virtual void detectState( NodeCollection * NC ) = 0;
- virtual bool setState( NodeCollection * NC, Action_t A ) = 0;
+ virtual bool setState( NodeCollection * NC, Action_t A, bool Force = 0 ) = 0;
virtual bool canSetState( State_t Curr, Action_t A ) = 0;
signals :
@@ -321,10 +321,10 @@ public :
QString stateName( State_t );
QString stateName( bool Update = 0 )
{ return stateName( state(Update) ); }
- bool setState( Action_t A )
- { return getToplevel()->runtime()->setState( this, A ); }
+ bool setState( Action_t A, bool Force =0 )
+ { return getToplevel()->runtime()->setState( this, A, Force ); }
bool canSetState( Action_t A )
{ return getToplevel()->runtime()->canSetState( CurrentState, A ); }
void save( QTextStream & TS );
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
@@ -9,13 +9,15 @@ HEADERS = netnode.h \
GUIUtils.h \
asconnection.h \
asfullsetup.h \
systemfile.h \
+ wextensions.h \
asdevice.h
SOURCES = netnode.cpp \
GUIUtils.cpp \
system.cpp \
systemfile.cpp \
+ wextensions.cpp \
resources.cpp
INCLUDEPATH += $(OPIEDIR)/include ../networksettings2
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopiecore2
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
@@ -176,9 +176,10 @@ bool TheNSResources::loadNetNode(
QPixmap TheNSResources::getPixmap( const QString & QS ) {
QString S("networksettings2/");
S += QS;
- return Resource::loadPixmap( QString("networksettings2/")+QS );
+ fprintf( stderr, "%s\n", S.latin1() );
+ return Resource::loadPixmap( S );
}
QString TheNSResources::tr( const char * s ) {
return qApp->translate( "resource", 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
@@ -10,10 +10,10 @@
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>399</width>
- <height>502</height>
+ <width>160</width>
+ <height>260</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
@@ -31,9 +31,9 @@
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>0</number>
+ <number>2</number>
</property>
<widget>
<class>QFrame</class>
<property stdset="1">
@@ -166,9 +166,9 @@
<widget>
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
- <cstring>On_TB</cstring>
+ <cstring>Enable_TB</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
@@ -192,9 +192,9 @@
<widget>
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
- <cstring>Enable_TB</cstring>
+ <cstring>On_TB</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
@@ -240,8 +240,34 @@
<name>toggleButton</name>
<bool>true</bool>
</property>
</widget>
+ <widget>
+ <class>QToolButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Disconnect_TB</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>0</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>...</string>
+ </property>
+ <property stdset="1">
+ <name>toggleButton</name>
+ <bool>true</bool>
+ </property>
+ <property stdset="1">
+ <name>toggleButton</name>
+ <bool>true</bool>
+ </property>
+ </widget>
</hbox>
</widget>
<widget>
<class>QListBox</class>
@@ -253,20 +279,13 @@
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
- <cstring>CurProfile_GB</cstring>
- </property>
- <property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>1</vsizetype>
- </sizepolicy>
+ <cstring>Profile_GB</cstring>
</property>
<property stdset="1">
<name>title</name>
- <string></string>
+ <string>Profile</string>
</property>
<property>
<name>layoutMargin</name>
</property>
@@ -279,9 +298,9 @@
<number>4</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>1</number>
+ <number>2</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
@@ -300,9 +319,9 @@
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel2</cstring>
+ <cstring>TextLabel2_2</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>State</string>
@@ -325,9 +344,9 @@
</widget>
<spacer>
<property>
<name>name</name>
- <cstring>Spacer6</cstring>
+ <cstring>Spacer6_2</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
@@ -378,8 +397,147 @@
<property>
<name>vAlign</name>
</property>
</widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout4</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer4</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget>
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>ToMessages_BUT</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>0</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Messages ...</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ </vbox>
+ </widget>
+ <widget>
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Messages_GB</cstring>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Messages</string>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>4</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>2</number>
+ </property>
+ <widget>
+ <class>QListBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Mesages_LB</cstring>
+ </property>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout2</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer3</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget>
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>ToProfile_BUT</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Profile ...</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
</vbox>
</widget>
</vbox>
</widget>
@@ -443,8 +601,20 @@
<signal>doubleClicked(QListBoxItem*)</signal>
<receiver>NetworkSettingsGUI</receiver>
<slot>SLOT_EditNode( QListBoxItem *)</slot>
</connection>
+ <connection>
+ <sender>ToProfile_BUT</sender>
+ <signal>clicked()</signal>
+ <receiver>NetworkSettingsGUI</receiver>
+ <slot>SLOT_ToProfile()</slot>
+ </connection>
+ <connection>
+ <sender>ToMessages_BUT</sender>
+ <signal>clicked()</signal>
+ <receiver>NetworkSettingsGUI</receiver>
+ <slot>SLOT_ToMessages()</slot>
+ </connection>
<slot access="public">SLOT_AddNode()</slot>
<slot access="public">SLOT_CheckState()</slot>
<slot access="public">SLOT_Connect()</slot>
<slot access="public">SLOT_DeleteNode()</slot>
@@ -452,6 +622,9 @@
<slot access="public">SLOT_Enable()</slot>
<slot access="public">SLOT_GenerateConfig()</slot>
<slot access="public">SLOT_On()</slot>
<slot access="public">SLOT_ShowNode( QListBoxItem*)</slot>
+ <slot access="public">SLOT_ToMessages()</slot>
+ <slot access="public">SLOT_ToProfile()</slot>
+ <slot access="public">SLOT_Disconnect()</slot>
</connections>
</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
@@ -19,9 +19,9 @@ void PPPRun::detectState( NodeCollection * NC ) {
AsDevice::netNode()->nextNode()->runtime()->detectState( NC );
}
}
-bool PPPRun::setState( NodeCollection * NC, Action_t A ) {
+bool PPPRun::setState( NodeCollection * NC, Action_t A, bool ) {
switch( A ) {
case Activate :
NC->setCurrentState( Available );
// no
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
@@ -26,9 +26,9 @@ public :
protected :
void detectState( NodeCollection * NC );
- bool setState( NodeCollection * NC, Action_t A );
+ bool setState( NodeCollection * NC, Action_t A, bool );
bool canSetState( State_t S, Action_t A )
{ return AsDevice::connection()->findNext(
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
@@ -10,18 +10,20 @@
#include "profileedit.h"
ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) :
- ProfileGUI( Parent ), TrafficRefresh(this) {
+ ProfileGUI( Parent ), RefreshTimer(this) {
InterfaceInfo * II;
NNI = TNNI;
Dev = NNI->runtime()->device();
if( ( II = Dev->assignedInterface() ) ) {
+
Refresh_CB->setEnabled( TRUE );
Snd_GB->setEnabled( TRUE );
Rcv_GB->setEnabled( TRUE );
Collisions_FRM->setEnabled( TRUE );
+
// show current content
SLOT_Refresh();
// fill in static data
@@ -41,12 +43,13 @@ ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) :
if( ! S.isEmpty() ) {
S.prepend( " : " );
}
InterfaceOptions_LBL->setText( S );
+
+ connect( &RefreshTimer, SIGNAL( timeout() ),
+ this, SLOT( SLOT_Refresh() ) );
}
- connect( &TrafficRefresh, SIGNAL( timeout() ),
- this, SLOT( SLOT_Refresh() ) );
}
QString ProfileEdit::acceptable( void ) {
return QString();
@@ -84,10 +87,10 @@ void ProfileEdit::SLOT_Refresh( void ) {
}
void ProfileEdit::SLOT_AutoRefresh( bool ar ) {
if( ar ) {
- TrafficRefresh.start( 1000 );
+ RefreshTimer.start( 1000 );
SLOT_Refresh();
} else {
- TrafficRefresh.stop();
+ RefreshTimer.stop();
}
}
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
@@ -22,8 +22,8 @@ public slots :
void SLOT_Refresh( void );
private :
- QTimer TrafficRefresh;
+ QTimer RefreshTimer;
ANetNodeInstance * NNI;
AsDevice * Dev;
};
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
@@ -11,9 +11,9 @@ void ProfileRun::detectState( NodeCollection * NC ) {
netNode()->nextNode()->runtime()->detectState( NC );
}
}
-bool ProfileRun::setState( NodeCollection * NC, Action_t A ) {
+bool ProfileRun::setState( NodeCollection * NC, Action_t A, bool ) {
ANetNodeInstance * NNNI;
NNNI = netNode()->nextNode();
switch ( A ) {
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
@@ -12,9 +12,9 @@ public :
AsFullSetup( NNI )
{ Data = &D; }
void detectState( NodeCollection * NC );
- bool setState( NodeCollection * NC, Action_t A );
+ bool setState( NodeCollection * NC, Action_t A, bool );
bool canSetState( State_t Curr, Action_t A );
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
@@ -74,9 +74,9 @@ void USBRun::detectState( NodeCollection * NC ) {
NC->setCurrentState( Unavailable );
}
-bool USBRun::setState( NodeCollection * NC, Action_t A ) {
+bool USBRun::setState( NodeCollection * NC, Action_t A, bool ) {
// we only handle activate and deactivate
switch( A ) {
case Activate :
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
@@ -22,9 +22,9 @@ public :
{ return (AsDevice *)this; }
protected :
void detectState( NodeCollection * );
- bool setState( NodeCollection * , Action_t A );
+ bool setState( NodeCollection * , Action_t A, bool );
bool canSetState( State_t , Action_t A );
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
@@ -18,9 +18,9 @@ protected :
void detectState( NodeCollection * )
{ }
- bool setState( NodeCollection *, Action_t )
+ bool setState( NodeCollection *, Action_t, bool )
{ return 0; }
bool canSetState( State_t, Action_t )
{ return 0; }
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
@@ -10,10 +10,10 @@
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>192</width>
- <height>329</height>
+ <width>209</width>
+ <height>307</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
@@ -31,9 +31,9 @@
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>0</number>
+ <number>1</number>
</property>
<widget>
<class>QTabWidget</class>
<property stdset="1">
@@ -72,27 +72,45 @@
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout6</cstring>
+ <cstring>Layout11</cstring>
</property>
<property>
- <name>layoutMargin</name>
+ <name>layoutSpacing</name>
</property>
<grid>
<property stdset="1">
<name>margin</name>
- <number>1</number>
+ <number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>6</number>
+ <number>1</number>
</property>
- <widget row="1" column="0" >
- <class>QLabel</class>
+ <widget row="0" column="1" >
+ <class>QComboBox</class>
+ <item>
+ <property>
+ <name>text</name>
+ <string>Auto</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>Managed</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>Ad-Hoc</string>
+ </property>
+ </item>
<property stdset="1">
<name>name</name>
- <cstring>essidLabel</cstring>
+ <cstring>Mode_CB</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
@@ -100,54 +118,32 @@
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>1</hsizetype>
- <vsizetype>1</vsizetype>
+ <vsizetype>0</vsizetype>
</sizepolicy>
</property>
- <property stdset="1">
- <name>text</name>
- <string>ESS-ID</string>
- </property>
</widget>
- <widget row="1" column="1" >
- <class>QComboBox</class>
- <item>
- <property>
- <name>text</name>
- <string>any</string>
- </property>
- </item>
+ <widget row="2" column="0" >
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>ESSID_CB</cstring>
- </property>
- <property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- </sizepolicy>
+ <cstring>essidLabel_2</cstring>
</property>
<property stdset="1">
- <name>editable</name>
+ <name>enabled</name>
<bool>true</bool>
</property>
<property stdset="1">
- <name>currentItem</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>sizeLimit</name>
- <number>5</number>
- </property>
- <property stdset="1">
- <name>autoCompletion</name>
- <bool>true</bool>
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
- <name>duplicatesEnabled</name>
- <bool>false</bool>
+ <name>text</name>
+ <string>Name</string>
</property>
</widget>
<widget row="0" column="0" >
<class>QLabel</class>
@@ -170,37 +166,20 @@
<name>text</name>
<string>Mode</string>
</property>
</widget>
- <widget row="0" column="1" >
- <class>QComboBox</class>
- <item>
- <property>
- <name>text</name>
- <string>Infrastructure</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>Auto</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>Managed</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>Ad-Hoc</string>
- </property>
- </item>
+ <widget row="1" column="1" >
+ <class>QLineEdit</class>
<property stdset="1">
<name>name</name>
- <cstring>Mode_CB</cstring>
+ <cstring>ESSID_LE</cstring>
+ </property>
+ </widget>
+ <widget row="1" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>essidLabel</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
@@ -208,11 +187,26 @@
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <vsizetype>1</vsizetype>
</sizepolicy>
</property>
+ <property stdset="1">
+ <name>text</name>
+ <string>ESS-ID</string>
+ </property>
+ </widget>
+ <widget row="2" column="1" >
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>NodeName_LE</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>&lt;UseHostName&gt;</string>
+ </property>
</widget>
</grid>
</widget>
<widget>
@@ -243,9 +237,9 @@
<cstring>SpecifyAP_CB</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Specify &amp;Access Point</string>
+ <string>Specify Access Point</string>
</property>
</widget>
<widget row="1" column="1" >
<class>QLabel</class>
@@ -309,62 +303,8 @@
</property>
</spacer>
</grid>
</widget>
- <widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout7</cstring>
- </property>
- <property>
- <name>layoutMargin</name>
- </property>
- <hbox>
- <property stdset="1">
- <name>margin</name>
- <number>1</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>SpecifyChannel_CB</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Specific &amp;Channel</string>
- </property>
- </widget>
- <widget>
- <class>QSpinBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>ChannelNr_SB</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
- </property>
- <property stdset="1">
- <name>maxValue</name>
- <number>15</number>
- </property>
- <property stdset="1">
- <name>minValue</name>
- <number>1</number>
- </property>
- <property stdset="1">
- <name>value</name>
- <number>1</number>
- </property>
- </widget>
- </hbox>
- </widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer7</cstring>
@@ -409,9 +349,9 @@
<widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>EnableWEB_CB</cstring>
+ <cstring>EnableWEP_CB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Enable Encryption</string>
@@ -510,30 +450,42 @@
<property stdset="1">
<name>name</name>
<cstring>Key2_LE</cstring>
</property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
</widget>
<widget row="3" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>Key4_LE</cstring>
</property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
</widget>
<widget row="2" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>Key3_LE</cstring>
</property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
</widget>
</grid>
</widget>
<widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>CheckBox4</cstring>
+ <cstring>AcceptNonEncrypted_CB</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>false</bool>
@@ -588,9 +540,9 @@
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout12</cstring>
+ <cstring>Layout13</cstring>
</property>
<property>
<name>layoutSpacing</name>
</property>
@@ -602,28 +554,17 @@
<property stdset="1">
<name>spacing</name>
<number>2</number>
</property>
- <widget row="0" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1_3</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Station</string>
- </property>
- </widget>
- <widget row="3" column="1" >
+ <widget row="4" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>Channel_LBL</cstring>
+ <cstring>Frequency_LBL</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
- <enum>Panel</enum>
+ <enum>Box</enum>
</property>
<property stdset="1">
<name>frameShadow</name>
<enum>Plain</enum>
@@ -632,50 +573,36 @@
<name>indent</name>
<number>0</number>
</property>
</widget>
- <widget row="3" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel4_3</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Channel</string>
- </property>
- </widget>
<widget row="2" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel3_3</cstring>
+ <cstring>TextLabel9_2</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Mode</string>
+ <string>AP</string>
</property>
</widget>
- <widget row="1" column="0" >
+ <widget row="5" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel2_3</cstring>
+ <cstring>Channel_LBL</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>ESSID</string>
+ <name>frameShape</name>
+ <enum>Box</enum>
</property>
- </widget>
- <widget row="4" column="0" >
- <class>QLabel</class>
<property stdset="1">
- <name>name</name>
- <cstring>TextLabel9_2</cstring>
+ <name>frameShadow</name>
+ <enum>Plain</enum>
</property>
<property stdset="1">
- <name>text</name>
- <string>AP</string>
+ <name>indent</name>
+ <number>0</number>
</property>
</widget>
<widget row="0" column="1" >
<class>QLabel</class>
@@ -684,9 +611,9 @@
<cstring>Station_LBL</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
- <enum>Panel</enum>
+ <enum>Box</enum>
</property>
<property stdset="1">
<name>frameShadow</name>
<enum>Plain</enum>
@@ -695,9 +622,20 @@
<name>indent</name>
<number>0</number>
</property>
</widget>
- <widget row="5" column="1" >
+ <widget row="6" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel4_2_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Rate</string>
+ </property>
+ </widget>
+ <widget row="6" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>Rate_LBL</cstring>
@@ -710,9 +648,9 @@
</sizepolicy>
</property>
<property stdset="1">
<name>frameShape</name>
- <enum>Panel</enum>
+ <enum>Box</enum>
</property>
<property stdset="1">
<name>frameShadow</name>
<enum>Plain</enum>
@@ -721,28 +659,36 @@
<name>indent</name>
<number>0</number>
</property>
</widget>
- <widget row="5" column="0" >
+ <widget row="2" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel4_2_2</cstring>
+ <cstring>AP_LBL</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Rate</string>
+ <name>frameShape</name>
+ <enum>Box</enum>
+ </property>
+ <property stdset="1">
+ <name>frameShadow</name>
+ <enum>Plain</enum>
+ </property>
+ <property stdset="1">
+ <name>indent</name>
+ <number>0</number>
</property>
</widget>
- <widget row="4" column="1" >
+ <widget row="3" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>AP_LBL</cstring>
+ <cstring>Mode_LBL</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
- <enum>Panel</enum>
+ <enum>Box</enum>
</property>
<property stdset="1">
<name>frameShadow</name>
<enum>Plain</enum>
@@ -759,9 +705,9 @@
<cstring>ESSID_LBL</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
- <enum>Panel</enum>
+ <enum>Box</enum>
</property>
<property stdset="1">
<name>frameShadow</name>
<enum>Plain</enum>
@@ -770,25 +716,61 @@
<name>indent</name>
<number>0</number>
</property>
</widget>
- <widget row="2" column="1" >
+ <widget row="3" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>Mode_LBL</cstring>
+ <cstring>TextLabel3_3</cstring>
</property>
<property stdset="1">
- <name>frameShape</name>
- <enum>Panel</enum>
+ <name>text</name>
+ <string>Mode</string>
</property>
+ </widget>
+ <widget row="5" column="0" >
+ <class>QLabel</class>
<property stdset="1">
- <name>frameShadow</name>
- <enum>Plain</enum>
+ <name>name</name>
+ <cstring>TextLabel4_3</cstring>
</property>
<property stdset="1">
- <name>indent</name>
- <number>0</number>
+ <name>text</name>
+ <string>Channel</string>
+ </property>
+ </widget>
+ <widget row="0" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1_3</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Station</string>
+ </property>
+ </widget>
+ <widget row="1" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel2_3</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>ESSID</string>
+ </property>
+ </widget>
+ <widget row="4" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel4_3_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Frequency</string>
</property>
</widget>
</grid>
</widget>
@@ -798,8 +780,12 @@
<name>name</name>
<cstring>GroupBox1</cstring>
</property>
<property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
<name>title</name>
<string>Link Quality</string>
</property>
<property>
@@ -814,9 +800,9 @@
<number>2</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>2</number>
+ <number>0</number>
</property>
<widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
@@ -846,9 +832,9 @@
<cstring>Noise_PB</cstring>
</property>
<property stdset="1">
<name>progress</name>
- <number>0</number>
+ <number>10</number>
</property>
</widget>
<widget row="2" column="2" >
<class>QProgressBar</class>
@@ -857,9 +843,9 @@
<cstring>Quality_PB</cstring>
</property>
<property stdset="1">
<name>progress</name>
- <number>0</number>
+ <number>10</number>
</property>
</widget>
<widget row="0" column="0" >
<class>QLabel</class>
@@ -871,29 +857,8 @@
<name>text</name>
<string>Signal</string>
</property>
</widget>
- <spacer row="0" column="1" >
- <property>
- <name>name</name>
- <cstring>Spacer28</cstring>
- </property>
- <property stdset="1">
- <name>orientation</name>
- <enum>Horizontal</enum>
- </property>
- <property stdset="1">
- <name>sizeType</name>
- <enum>Fixed</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>16</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
<widget row="0" column="2" >
<class>QProgressBar</class>
<property stdset="1">
<name>name</name>
@@ -908,9 +873,9 @@
<number>1</number>
</property>
<property stdset="1">
<name>progress</name>
- <number>0</number>
+ <number>10</number>
</property>
</widget>
</grid>
</widget>
@@ -934,16 +899,72 @@
<height>20</height>
</size>
</property>
</spacer>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout21</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Refresh_CB</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>5</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Live feed </string>
+ </property>
+ </widget>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer16</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
</vbox>
</widget>
</widget>
</vbox>
</widget>
<connections>
<connection>
- <sender>EnableWEB_CB</sender>
+ <sender>EnableWEP_CB</sender>
<signal>toggled(bool)</signal>
<receiver>KeyButtonGroup</receiver>
<slot>setEnabled(bool)</slot>
</connection>
@@ -959,17 +980,42 @@
<receiver>macLabel</receiver>
<slot>setEnabled(bool)</slot>
</connection>
<connection>
- <sender>SpecifyChannel_CB</sender>
+ <sender>EnableWEP_CB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>AcceptNonEncrypted_CB</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>Key1_RB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>Key1_LE</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>Key2_RB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>Key2_LE</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>Key3_RB</sender>
<signal>toggled(bool)</signal>
- <receiver>ChannelNr_SB</receiver>
+ <receiver>Key3_LE</receiver>
<slot>setEnabled(bool)</slot>
</connection>
<connection>
- <sender>EnableWEB_CB</sender>
+ <sender>Key4_RB</sender>
<signal>toggled(bool)</signal>
- <receiver>CheckBox4</receiver>
+ <receiver>Key4_LE</receiver>
<slot>setEnabled(bool)</slot>
</connection>
+ <connection>
+ <sender>Refresh_CB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>WLanGUI</receiver>
+ <slot>SLOT_AutoRefresh(bool)</slot>
+ </connection>
+ <slot access="public">SLOT_AutoRefresh(bool)</slot>
</connections>
</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,21 +1,72 @@
+#include <unistd.h>
#include "wlanedit.h"
#include "wlan_NNI.h"
#include "wlan_NN.h"
AWLan::AWLan( WLanNetNode * PNN ) : ANetNodeInstance( PNN ) {
GUI = 0;
RT = 0;
+ Data.ESSID = "";
+ Data.NodeName = tr("<UseHostName>");
+ Data.Mode = 0;
+ Data.SpecificAP = 0;
+ Data.APMac = "";
+ Data.Encrypted = 0;
+ Data.AcceptNonEncrypted = 0;
+ Data.Key[0] = "";
+ Data.Key[1] = "";
+ Data.Key[2] = "";
+ Data.Key[3] = "";
}
-void AWLan::setSpecificAttribute( QString & , QString & ) {
+void AWLan::setSpecificAttribute( QString & A, QString & V ) {
+ if( A == "essid" ) {
+ Data.ESSID = V;
+ } else if( A == "nodename" ) {
+ Data.NodeName = V;
+ } else if( A == "mode" ) {
+ Data.Mode = V.toShort();
+ } else if( A == "specificap" ) {
+ Data.SpecificAP = (V=="yes");
+ } else if( A == "apmac" ) {
+ Data.APMac = V;
+ } else if( A == "encrypted" ) {
+ Data.Encrypted = (V=="yes");
+ } else if( A == "acceptnonencrypted" ) {
+ Data.AcceptNonEncrypted = (V=="yes");
+ } else if( A == "key0" ) {
+ Data.Key[0] = V;
+ } else if( A == "key1" ) {
+ Data.Key[1] = V;
+ } else if( A == "key2" ) {
+ Data.Key[2] = V;
+ } else if( A == "key3" ) {
+ Data.Key[3] = V;
+ }
}
-void AWLan::saveSpecificAttribute( QTextStream & ) {
+void AWLan::saveSpecificAttribute( QTextStream & S ) {
+ S << "essid=" << quote( Data.ESSID ) << endl;
+ S << "nodename=" << quote( Data.NodeName ) << endl;
+ S << "mode=" << Data.Mode << endl;
+ S << "specificap="
+ << ((Data.SpecificAP) ? "yes" : "no")
+ << endl;
+ S << "apmac=" << Data.APMac << endl;
+ S << "encrypted="
+ << ((Data.Encrypted) ? "yes" : "no")
+ << endl;
+ S << "acceptnonencrypted="
+ << ((Data.AcceptNonEncrypted) ? "yes" : "no")
+ << endl;
+ for( int i = 0 ;i < 4 ; i ++ ) {
+ S << "key" << i << "=" << Data.Key[i] << endl;
+ }
}
QWidget * AWLan::edit( QWidget * parent ) {
- GUI = new WLanEdit( parent );
+ GUI = new WLanEdit( parent, this );
GUI->showData( Data );
return GUI;
}
@@ -28,9 +79,62 @@ void AWLan::commit( void ) {
setModified( 1 );
}
bool AWLan::generateDataForCommonFile(
- SystemFile &,
+ SystemFile & S,
long ) {
- return 1;
+
+ S << " wireless_essid \""
+ << Data.ESSID
+ << "\""
+ << endl;
+
+ if( ! Data.NodeName.isEmpty() ) {
+ if( Data.NodeName == tr("<UseHostName>") ) {
+ char Buf[100];
+ if( gethostname(Buf, sizeof(Buf) ) == 0 ) {
+ Buf[99] = '\0'; // just to make sure
+ S << " wireless_nick "
+ << Buf
+ << endl;
+ }
+ } else {
+ S << " wireless_nick \""
+ << Data.NodeName
+ << "\""
+ << endl;
+ }
+ }
+
+ char * M;
+ switch ( Data.Mode ) {
+ case 0 :
+ M = "Auto";
+ break;
+ case 1 :
+ M = "Managed";
+ break;
+ case 2 :
+ M = "Ad-Hoc";
+ break;
+ }
+
+ S << " wireless_mode "
+ << M
+ << endl;
+ if( Data.Encrypted ) {
+ for( int i = 0; i < 4; i ++ ) {
+ if( ! Data.Key[i].isEmpty() ) {
+ S << " wireless_key"
+ << i
+ << " "
+ << Data.Key[i]
+ << endl;
+ }
+ }
+ S << " wireless_keymode "
+ << ((Data.AcceptNonEncrypted) ? "open" : "restricted")
+ << endl;
+ }
+ return 0;
}
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
@@ -27,9 +27,9 @@ public :
virtual void * data( void )
{ return (void *)&Data; }
virtual bool hasDataFor( const QString & )
- { return 0; }
+ { return 1; }
virtual bool generateDataForCommonFile(
SystemFile & SF, long DevNr );
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
@@ -2,16 +2,15 @@
#define WLAN_DATA_H
#include <qstring.h>
typedef struct WLanData {
- QString Device;
- QString LockFile;
- long Speed;
- short Parity;
- short DataBits;
- short StopBits;
- bool HardwareControl;
- bool SoftwareControl;
-
+ QString ESSID;
+ QString NodeName;
+ short Mode;
+ bool SpecificAP;
+ QString APMac;
+ bool Encrypted;
+ QString Key[4];
+ bool AcceptNonEncrypted;
} WLanData_t;
#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 @@
+#include <qlineedit.h>
+#include <qprogressbar.h>
+#include <qcombobox.h>
+#include <qlabel.h>
+#include <qregexp.h>
+#include <qcheckbox.h>
#include <GUIUtils.h>
+#include <resources.h>
+#include <wextensions.h>
+
#include "wlanedit.h"
+#include "wlan_NN.h"
+#include "wlan_NNI.h"
+
+WLanEdit::WLanEdit( QWidget * Parent, ANetNodeInstance * TNNI ) :
+ WLanGUI( Parent ), RefreshTimer(this){
+
+ InterfaceInfo * II;
+
+ NNI = TNNI;
+ Dev = NNI->runtime()->device();
+ WE = 0;
+ if( ( II = Dev->assignedInterface() ) ) {
+ // show data
+ WE = new WExtensions( II->Name );
+
+ if( WE->doesHaveWirelessExtensions() ) {
+ QString S;
+ Station_LBL->setText( WE->station() );
+ ESSID_LBL->setText( WE->essid() );
+ Mode_LBL->setText( WE->mode() );
+ S.setNum( WE->frequency() );
+ Frequency_LBL->setText( S );
+ S.setNum( WE->channel() );
+ Channel_LBL->setText( S );
+ S.setNum( WE->rate() );
+ Rate_LBL->setText( S );
+ AP_LBL->setText( WE->ap() );
+
+ SLOT_Refresh();
+
+ connect( &RefreshTimer, SIGNAL( timeout() ),
+ this, SLOT( SLOT_Refresh() ) );
+ }
+ }
+}
-WLanEdit::WLanEdit( QWidget * Parent ) : WLanGUI( Parent ){
+WLanEdit::~WLanEdit( void ) {
+ if( WE )
+ delete WE;
}
QString WLanEdit::acceptable( void ) {
+ if( ESSID_LE->text().isEmpty() ) {
+ return QString("ESSID is mandatory");
+ }
+ if( SpecifyAP_CB->isChecked() &&
+ APMac_LE->text().isEmpty() ) {
+ return QString("APMac must have value");
+ }
return QString();
}
void WLanEdit::showData( WLanData_t & Data ) {
+ Mode_CB->setCurrentItem( Data.Mode );
+ ESSID_LE->setText( Data.ESSID );
+ NodeName_LE->setText( Data.NodeName );
+ SpecifyAP_CB->setChecked( Data.SpecificAP );
+ APMac_LE->setText( Data.APMac );
+
+ EnableWEP_CB->setChecked( Data.Encrypted );
+ AcceptNonEncrypted_CB->setChecked( Data.AcceptNonEncrypted );
+ Key1_LE->setText( Data.Key[0] );
+ Key2_LE->setText( Data.Key[1] );
+ Key3_LE->setText( Data.Key[2] );
+ Key4_LE->setText( Data.Key[3] );
}
bool WLanEdit::commit( WLanData_t & Data ) {
+ bool SM = 0;
+
+ TXTM( Data.ESSID, ESSID_LE, SM );
+ TXTM( Data.NodeName, NodeName_LE, SM );
+ TXTM( Data.APMac, APMac_LE, SM );
+ TXTM( Data.Key[0], Key1_LE, SM );
+ TXTM( Data.Key[1], Key2_LE, SM );
+ TXTM( Data.Key[2], Key3_LE, SM );
+ TXTM( Data.Key[3], Key4_LE, SM );
+ CBM( Data.SpecificAP, SpecifyAP_CB, SM );
+ CBM( Data.Encrypted, EnableWEP_CB, SM );
+ CBM( Data.AcceptNonEncrypted, AcceptNonEncrypted_CB, SM );
+ CIM( Data.Mode, Mode_CB, SM );
return 0;
}
+
+void WLanEdit::SLOT_Refresh( void ) {
+ if( WE ) {
+ int signal, noise, quality;
+ WE->stats( signal, noise, quality);
+
+ Signal_PB->setProgress( signal );
+ Noise_PB->setProgress( noise );
+ Quality_PB->setProgress( quality );
+ }
+}
+
+void WLanEdit::SLOT_AutoRefresh( bool ar ) {
+ if( ar ) {
+ RefreshTimer.start( 1000 );
+ SLOT_Refresh();
+ } else {
+ RefreshTimer.stop();
+ }
+}
+
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 @@
+#include <qtimer.h>
+#include <wextensions.h>
#include "wlandata.h"
#include "wlanGUI.h"
+class ANetNodeInstance;
+class AsDevice;
+class WExtensions;
+
class WLanEdit : public WLanGUI {
public :
- WLanEdit( QWidget * parent );
+ WLanEdit( QWidget * parent, ANetNodeInstance * NNI );
+ ~WLanEdit( void );
QString acceptable( void );
void showData( WLanData_t & Data );
bool commit( WLanData_t & Data );
+
+public slots :
+
+ void SLOT_AutoRefresh( bool );
+ void SLOT_Refresh( void );
+
+private :
+
+ ANetNodeInstance * NNI;
+ AsDevice * Dev;
+ QTimer RefreshTimer;
+ WExtensions * WE;
+
};
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 @@
+
+#include <qfile.h>
+#include <qtextstream.h>
+#include <qstringlist.h>
+#include <resources.h>
#include "wlanrun.h"
+void WLanRun::detectState( NodeCollection * NC ) {
+
+ // unavailable : no card found
+ // available : card found and assigned to us or free
+ // up : card found and assigned to us and up
+
+ QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number());
+ System & Sys = NSResources->system();
+ InterfaceInfo * Run;
+
+ QFile F( S );
+
+ if( F.open( IO_ReadOnly ) ) {
+ // could open file -> read interface and assign
+ QString X;
+ QTextStream TS(&F);
+ X = TS.readLine();
+ // find interface
+ if( handlesInterface( X ) ) {
+ for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
+ It.current();
+ ++It ) {
+ Run = It.current();
+ if( X == Run->Name ) {
+ Run->assignNode( netNode() );
+ assignInterface( Run );
+ NC->setCurrentState( IsUp );
+ return;
+ }
+ }
+ }
+ }
+
+ if( ( Run = assignedInterface() ) ) {
+ // we already have an interface assigned -> still present ?
+ if( ! Run->IsUp ) {
+ // usb is still free -> keep assignment
+ NC->setCurrentState( Available );
+ return;
+ } // else interface is up but NOT us -> some other profile
+ }
+
+ // nothing (valid) assigned to us
+ assignInterface( 0 );
+
+ // find possible interface
+ for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
+ It.current();
+ ++It ) {
+ Run = It.current();
+ if( handlesInterface( *Run ) &&
+ ( Run->CardType == ARPHRD_ETHER
+#ifdef ARPHRD_IEEE1394
+ || Run->CardType == ARPHRD_IEEE1394
+#endif
+ ) &&
+ ! Run->IsUp
+ ) {
+ // proper type, and Not UP -> free
+ NC->setCurrentState( Off );
+ return;
+ }
+ }
+ // no free found
+
+ NC->setCurrentState( Unavailable );
+
+}
+
+bool WLanRun::setState( NodeCollection * NC, Action_t A, bool ) {
+
+ // we only handle activate and deactivate
+ switch( A ) {
+ case Activate :
+ {
+ if( NC->currentState() != Off ) {
+ return 0;
+ }
+ InterfaceInfo * N = getInterface();
+ if( ! N ) {
+ // no interface available
+ NC->setCurrentState( Unavailable );
+ return 0;
+ }
+ // because we were OFF the interface
+ // we get back is NOT assigned
+ N->assignNode( netNode() );
+ assignInterface( N );
+ NC->setCurrentState( Available );
+ return 1;
+ }
+ case Deactivate :
+ if( NC->currentState() == IsUp ) {
+ // bring down first
+ if( ! connection()->setState( Down ) )
+ // could not ...
+ return 0;
+ } else if( NC->currentState() != Available ) {
+ return 1;
+ }
+ assignedInterface()->assignNode( 0 ); // release
+ assignInterface( 0 );
+ NC->setCurrentState( Off );
+ return 1;
+ default :
+ // FT
+ break;
+ }
+ return 0;
+}
+
+bool WLanRun::canSetState( State_t Curr, Action_t A ) {
+ // we only handle up down activate and deactivate
+ switch( A ) {
+ case Activate :
+ { // at least available
+ if( Curr == Available ) {
+ return 1;
+ }
+ // or we can make one available
+ InterfaceInfo * N = getInterface();
+ if( ! N || N->assignedNode() != 0 ) {
+ // non available or assigned
+ return 0;
+ }
+ return 1;
+ }
+ case Deactivate :
+ return ( Curr >= Available );
+ default :
+ // FT
+ break;
+ }
+ return 0;
+}
+
+// get interface that is free or assigned to us
+InterfaceInfo * WLanRun::getInterface( void ) {
+
+ System & S = NSResources->system();
+ InterfaceInfo * best = 0, * Run;
+
+ for( QDictIterator<InterfaceInfo> It(S.interfaces());
+ It.current();
+ ++It ) {
+ Run = It.current();
+ if( handlesInterface( *Run ) &&
+ ( Run->CardType == ARPHRD_ETHER
+#ifdef ARPHRD_IEEE1394
+ || Run->CardType == ARPHRD_IEEE1394
+#endif
+ )
+ ) {
+ // this is a LAN card
+ if( Run->assignedNode() == netNode() ) {
+ // assigned to us
+ return Run;
+ } else if( Run->assignedNode() == 0 ) {
+ // free
+ best = Run;
+ }
+ }
+ }
+ return best; // can be 0
+}
+
bool WLanRun::handlesInterface( const QString & S ) {
+ InterfaceInfo * II;
+ II = NSResources->system().interface( S );
+ if( ( II = NSResources->system().interface( S ) ) ) {
+ return handlesInterface( *II );
+ }
return Pat.match( S ) >= 0;
}
+
+bool WLanRun::handlesInterface( const InterfaceInfo & II ) {
+ return ( Pat.match( II.Name ) < 0 );
+}
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
@@ -20,21 +20,18 @@ public :
{ return (AsDevice *)this; }
protected :
- void detectState( NodeCollection * )
- { }
-
- bool setState( NodeCollection *, Action_t )
- { return 0; }
-
- bool canSetState( State_t, Action_t )
- { return 0; }
-
+ void detectState( NodeCollection * );
+ bool setState( NodeCollection *, Action_t, bool );
+ bool canSetState( State_t, Action_t );
bool handlesInterface( const QString & I );
+ bool handlesInterface( const InterfaceInfo & II );
private :
+ InterfaceInfo * getInterface( void );
QRegExp Pat;
+ WLanData * Data;
};
#endif