Link with libopiecore2

added linke to btmgr

18 files changed, 209 insertions, 164 deletions

diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui
index ddb5ddd..498f50b 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui
@@ -6,126 +6,166 @@
         <name>name</name>
         <cstring>BluetoothBNEP_FRM</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>283</width>
-            <height>199</height>
+            <width>278</width>
+            <height>339</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Bluetooth-bnep</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>2</number>
+            <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>2</number>
+            <number>0</number>
         </property>
         <widget>
-            <class>QLayoutWidget</class>
+            <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout4</cstring>
+                <cstring>AnyPAN_CB</cstring>
             </property>
-            <hbox>
                 <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
+                <name>text</name>
+                <string>Any available PAN device</string>
                 </property>
                 <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
+                <name>checked</name>
+                <bool>true</bool>
                 </property>
+        </widget>
                 <widget>
-                    <class>QLabel</class>
+            <class>QGroupBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>TextLabel4</cstring>
+                <cstring>GroupBox1</cstring>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Name</string>
+                <name>enabled</name>
+                <bool>false</bool>
                     </property>
-                </widget>
-                <widget>
-                    <class>QLineEdit</class>
                     <property stdset="1">
-                        <name>name</name>
-                        <cstring>Name_LE</cstring>
+                <name>title</name>
+                <string>Select Card</string>
                     </property>
-                </widget>
-            </hbox>
-        </widget>
-        <widget>
-            <class>QLabel</class>
+            <property>
+                <name>layoutMargin</name>
+            </property>
+            <vbox>
             <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel3</cstring>
+                    <name>margin</name>
+                    <number>5</number>
             </property>
             <property stdset="1">
-                <name>text</name>
-                <string>Description</string>
+                    <name>spacing</name>
+                    <number>6</number>
             </property>
-        </widget>
         <widget>
-            <class>QMultiLineEdit</class>
+                    <class>QListView</class>
+                    <column>
+                        <property>
+                            <name>text</name>
+                            <string>BDAddress</string>
+                        </property>
+                        <property>
+                            <name>clickable</name>
+                            <bool>true</bool>
+                        </property>
+                        <property>
+                            <name>resizeable</name>
+                            <bool>true</bool>
+                        </property>
+                    </column>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Description_LE</cstring>
+                        <cstring>BTPANServers_LV</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>allColumnsShowFocus</name>
+                        <bool>true</bool>
             </property>
         </widget>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout5</cstring>
+                        <cstring>Layout2</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget>
-                    <class>QCheckBox</class>
-                    <property stdset="1">
+                        <spacer>
+                            <property>
                         <name>name</name>
-                        <cstring>Automatic_CB</cstring>
+                                <cstring>Spacer1</cstring>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Start automatically</string>
+                                <name>orientation</name>
+                                <enum>Horizontal</enum>
                     </property>
-                </widget>
+                            <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>QCheckBox</class>
+                            <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Confirm_CB</cstring>
+                                <cstring>BTManager_BUT</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Confirm before start</string>
+                                <string>Rescan</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
     </vbox>
 </widget>
+    </vbox>
+</widget>
+<connections>
+    <connection>
+        <sender>BTManager_BUT</sender>
+        <signal>clicked()</signal>
+        <receiver>BluetoothBNEP_FRM</receiver>
+        <slot>SLOT_StartBTMgr()</slot>
+    </connection>
+    <connection>
+        <sender>AnyPAN_CB</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>GroupBox1</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <slot access="public">SLOT_StartBTMgr()</slot>
+</connections>
 </UI>
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp
index a27f1a7..9a3156b 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp
@@ -1,18 +1,26 @@
+#include <qtopia/qcopenvelope_qws.h>
+
 #include <GUIUtils.h>
 #include "bluetoothBNEPedit.h"
 
 
 BluetoothBNEPEdit::BluetoothBNEPEdit( QWidget * Parent ) : BluetoothBNEPGUI( Parent ){
 
 }
 
 QString BluetoothBNEPEdit::acceptable( void ) {
     return QString();
 }
 
-bool BluetoothBNEPEdit::commit( BluetoothBNEPData & Data ) {
+bool BluetoothBNEPEdit::commit( BluetoothBNEPData & ) {
     return 0;
 }
 
-void BluetoothBNEPEdit::showData( BluetoothBNEPData & Data ) {
+void BluetoothBNEPEdit::showData( BluetoothBNEPData & ) {
+}
+
+void BluetoothBNEPEdit::SLOT_StartBTMgr( void ) {
+      QCopEnvelope e( "QPE/System", "execute(QString)" );
+              e << QString( "bluetooth-manager" );
+
 }
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h
index d546f1e..82d23ad 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h
@@ -5,9 +5,13 @@ class BluetoothBNEPEdit  : public BluetoothBNEPGUI {
 
 public :
 
     BluetoothBNEPEdit( QWidget * parent );
 
     QString acceptable( void );
     bool commit( BluetoothBNEPData & Data );
     void showData( BluetoothBNEPData & Data );
+
+public slots :
+
+    void SLOT_StartBTMgr( void );
 };
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
index 1d0a0f7..b59b4f0 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
@@ -43,27 +43,35 @@ const char ** BluetoothBNEPNetNode::needs( void ) {
 }
 
 const char * BluetoothBNEPNetNode::provides( void ) {
       return "device";
 }
 
 bool BluetoothBNEPNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) {
       return S == "interfaces";
 }
 
 bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile( 
-                                SystemFile & , 
-                                long ) {
-      return 1;
+                                SystemFile & S , 
+                                long DevNr) {
+      QString NIC = genNic( DevNr );
+
+      if( S.name() == "interfaces" ) {
+        // generate mapping stanza for this interface
+        S << "# check if " << NIC << " can be brought UP" << endl;
+        S << "mapping " << NIC << endl;
+        S << "  script networksettings2-request" << endl << endl;
+      }
+      return 0;
 }
 
 QString BluetoothBNEPNetNode::genNic( long nr ) { 
       QString S; 
       return S.sprintf( "bnep%ld", nr );
 }
 
 
diff --git a/noncore/settings/networksettings2/cable/cable_NN.cpp b/noncore/settings/networksettings2/cable/cable_NN.cpp
index e95b4f6..b8c690b 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.cpp
+++ b/noncore/settings/networksettings2/cable/cable_NN.cpp
@@ -33,23 +33,23 @@ const char ** CableNetNode::needs( void ) {
 }
 
 const char * CableNetNode::provides( void ) {
       return "line";
 }
 
 bool CableNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool CableNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
-      return 1;
+      return 0;
 }
 
 void CableNetNode::setSpecificAttribute( QString & , QString &  ) {
 }
 
 void CableNetNode::saveSpecificAttribute( QTextStream & ) {
 }
 
diff --git a/noncore/settings/networksettings2/irda/irda_NN.cpp b/noncore/settings/networksettings2/irda/irda_NN.cpp
index f2fda5c..49bc06e 100644
--- a/noncore/settings/networksettings2/irda/irda_NN.cpp
+++ b/noncore/settings/networksettings2/irda/irda_NN.cpp
@@ -33,23 +33,23 @@ const char ** IRDANetNode::needs( void ) {
 }
 
 const char * IRDANetNode::provides( void ) {
       return "line";
 }
 
 bool IRDANetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool IRDANetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
-      return 1;
+      return 0;
 }
 
 void IRDANetNode::setSpecificAttribute( QString & , QString & ) {
 }
 
 void IRDANetNode::saveSpecificAttribute( QTextStream & ) {
 }
 
diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.cpp b/noncore/settings/networksettings2/lancard/lancard_NN.cpp
index a4afab1..05cd06d 100644
--- a/noncore/settings/networksettings2/lancard/lancard_NN.cpp
+++ b/noncore/settings/networksettings2/lancard/lancard_NN.cpp
@@ -35,17 +35,17 @@ const char ** LanCardNetNode::needs( void ) {
 }
 
 const char * LanCardNetNode::provides( void ) {
       return "device";
 }
 
 bool LanCardNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool LanCardNetNode::hasDataFor( const QString & S ) {
       return S == "interfaces";
 }
 
 bool LanCardNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & S , 
diff --git a/noncore/settings/networksettings2/modem/modem_NN.cpp b/noncore/settings/networksettings2/modem/modem_NN.cpp
index 9d70d7a..18aa480 100644
--- a/noncore/settings/networksettings2/modem/modem_NN.cpp
+++ b/noncore/settings/networksettings2/modem/modem_NN.cpp
@@ -34,23 +34,23 @@ const char ** ModemNetNode::needs( void ) {
 }
 
 const char * ModemNetNode::provides( void ) {
       return "line";
 }
 
 bool ModemNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool ModemNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
-      return 1;
+      return 0;
 }
 
 void ModemNetNode::setSpecificAttribute( QString & , QString & ) {
 }
 
 void ModemNetNode::saveSpecificAttribute( QTextStream & ) {
 }
 
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp
index b5989df..b4313c4 100644
--- a/noncore/settings/networksettings2/network/network_NN.cpp
+++ b/noncore/settings/networksettings2/network/network_NN.cpp
@@ -35,23 +35,23 @@ const char ** NetworkNetNode::needs( void ) {
 }
 
 const char * NetworkNetNode::provides( void ) {
       return "connection";
 }
 
 bool NetworkNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool NetworkNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
-      return 1;
+      return 0;
 }
 
 void NetworkNetNode::setSpecificAttribute( QString & , QString & ) {
 }
 
 void NetworkNetNode::saveSpecificAttribute( QTextStream & ) {
 }
 
diff --git a/noncore/settings/networksettings2/networksettings.pro b/noncore/settings/networksettings2/networksettings.pro
index 34b9cde..ff147b1 100644
--- a/noncore/settings/networksettings2/networksettings.pro
+++ b/noncore/settings/networksettings2/networksettings.pro
@@ -6,16 +6,16 @@ HEADERS   = networksettings.h \
             editconnection.h
 SOURCES   = main.cpp \
             networksettings.cpp \
             nsdata.cpp \
             activateprofile.cpp \
             editconnection.cpp
 INCLUDEPATH += $(OPIEDIR)/include networksettings2/
 DEPENDPATH  += $(OPIEDIR)/include networksettings2/
-LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings2 -lnetworksettings2 -lopie
+LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings2 -lnetworksettings2 -lopiecore2
 INTERFACES = networksettingsGUI.ui \
              editconnectionGUI.ui \
              activateprofileGUI.ui
 TARGET    = $(OPIEDIR)/bin/networksettings2
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/networksettings2/networksettings2.pro b/noncore/settings/networksettings2/networksettings2/networksettings2.pro
index c9945ff..11b5f84 100644
--- a/noncore/settings/networksettings2/networksettings2/networksettings2.pro
+++ b/noncore/settings/networksettings2/networksettings2/networksettings2.pro
@@ -13,14 +13,14 @@ HEADERS		= netnode.h  \
                   asdevice.h
 SOURCES		= netnode.cpp \
                   GUIUtils.cpp \
                   system.cpp \
                   systemfile.cpp \
                   resources.cpp
 INCLUDEPATH	+= $(OPIEDIR)/include ../networksettings2
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopiecore2
 INTERFACES	= 
 TARGET		= networksettings2
 VERSION		= 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp
index 64b83f7..bb37f10 100644
--- a/noncore/settings/networksettings2/nsdata.cpp
+++ b/noncore/settings/networksettings2/nsdata.cpp
@@ -297,17 +297,17 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
         for( QDictIterator<ANetNodeInstance> NNIIt(NNIs);
              NNIIt.current();
              ++NNIIt
            ){
           // for all nodes find those that are modified
           NNI = NNIIt.current();
 
           if( ForceIt || NNI->isModified() ) {
-            if( ! NNI->nodeClass()->generateProperFilesFor( NNI ) ) {
+            if( NNI->nodeClass()->generateProperFilesFor( NNI ) ) {
               // problem generating
               S = qApp->translate( "NetworkSettings", 
                                    "<p>Cannot generate files proper to \"%1\"</p>" ).
                       arg(NNI->nodeClass()->name()) ;
               return S;
             }
           }
         }
@@ -489,26 +489,26 @@ QString NetworkSettingsData::generateSystemFileNode(
         long DevInstNr ) {
 
       QString S="";
       ANetNode * CurDevNN = DevNNI->nodeClass();
       Name2Connection_t & M = NSResources->connections();
 
       if( SF.preDeviceSection( CurDevNN ) ) {
         S = qApp->translate( "NetworkSettings", 
-            "<p>Error in preDeviceSection for file \"%1\" and nodetype \"%2\"</p>" ).
+            "<p>Error in \"Pre-Device Part\" for file \"%1\" and nodetype \"%2\"</p>" ).
             arg( SF.name() ).
             arg( CurDevNN->name() );
         return S;
       }
 
       if( CurDevNN->hasDataFor( SF.name() ) ) {
         if( CurDevNN->generateDeviceDataForCommonFile( SF, DevInstNr ) ) {
           S = qApp->translate( "NetworkSettings", 
-            "<p>Error in node Device part for file \"%1\" and node \"%2\"</p>" ).
+            "<p>Error in \"Device Part\" for file \"%1\" and node \"%2\"</p>" ).
               arg( SF.name() ).
               arg( CurDevNN->name() );
           return S;
         }
       }
 
       // now generate profile specific data for all 
       // connections working on a device of the current
@@ -532,51 +532,51 @@ QString NetworkSettingsData::generateSystemFileNode(
             // other 
             continue;
           }
         }
 
         // generate 'entry' 
         if( SF.preNodeSection( DevNNI, DevInstNr ) ) {
           S = qApp->translate( "NetworkSettings", 
-              "<p>Error in preNodeSection for file \"%1\" and node \"%2\"</p>" ).
+              "<p>Error in \"Pre-Node Part\" for file \"%1\" and node \"%2\"</p>" ).
               arg( SF.name() ).
               arg( CurDevNN->name() );
           return S;
         }
 
         // ask all nodes in connection 
         for( QListIterator<ANetNodeInstance> cncit(*NC); 
              cncit.current();
              ++cncit ) {
           ANetNodeInstance * NNI = cncit.current();
 
           if( NNI->hasDataFor( SF.name() ) ) {
             if( NNI->generateDataForCommonFile(SF,DevInstNr) ) {
               S = qApp->translate( "NetworkSettings", 
-                "<p>Error in node part for file \"%1\" and node \"%2\"</p>" ).
+                "<p>Error in \"Node Part\" for file \"%1\" and node \"%2\"</p>" ).
                   arg( SF.name() ).
                   arg( NNI->nodeClass()->name() );
               return S;
             }
           }
         }
 
         if( SF.postNodeSection( DevNNI, DevInstNr ) ) {
           S = qApp->translate( "NetworkSettings", 
-              "<p>Error in postNodeSection for file \"%1\" and node \"%2\"</p>" ).
+              "<p>Error in \"Post-Node Part\" for file \"%1\" and node \"%2\"</p>" ).
                   arg( SF.name() ).
                   arg( CurDevNN->name() );
           return S;
         }
         SF << endl;
       }
 
       if( SF.postDeviceSection( CurDevNN ) ) {
         S = qApp->translate( "NetworkSettings", 
-            "<p>Error in postDeviceSection for file \"%1\" and node \"%2\"</p>" ).
+            "<p>Error in \"Post-Device Part\" for file \"%1\" and node \"%2\"</p>" ).
                 arg( SF.name() ).
                 arg( CurDevNN->name() );
         return S;
       }
 
       return S;
 }
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
index 208c7c2..b7edf87 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
@@ -36,23 +36,23 @@ const char ** PPPNetNode::needs( void ) {
 }
 
 const char * PPPNetNode::provides( void ) {
       return "connection";
 }
 
 bool PPPNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool PPPNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
-      return 1;
+      return 0;
 }
 
 QString PPPNetNode::genNic( long NicNr ) { 
       QString S; 
       return S.sprintf( "ppp%ld", NicNr ); 
 }
 
 void PPPNetNode::setSpecificAttribute( QString & , QString & ) {
diff --git a/noncore/settings/networksettings2/profile/profile_NN.cpp b/noncore/settings/networksettings2/profile/profile_NN.cpp
index d06b7ef..59c34a3 100644
--- a/noncore/settings/networksettings2/profile/profile_NN.cpp
+++ b/noncore/settings/networksettings2/profile/profile_NN.cpp
@@ -35,23 +35,23 @@ const char ** ProfileNetNode::needs( void ) {
 }
 
 const char * ProfileNetNode::provides( void ) {
       return "fullsetup";
 }
 
 bool ProfileNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool ProfileNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
-      return 1;
+      return 0;
 }
 
 void ProfileNetNode::setSpecificAttribute( QString & , QString & ) {
 }
 
 void ProfileNetNode::saveSpecificAttribute( QTextStream & ) {
 }
 
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp
index 9101490..c10a09c 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -34,17 +34,17 @@ const char ** USBNetNode::needs( void ) {
 }
 
 const char * USBNetNode::provides( void ) {
       return "device";
 }
 
 bool USBNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool USBNetNode::hasDataFor( const QString & S ) {
       return (S== "interfaces");
 }
 
 bool USBNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & S , 
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
index bfc30f9..6c7b308 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
@@ -35,23 +35,23 @@ const char ** VPNNetNode::needs( void ) {
 }
 
 const char * VPNNetNode::provides( void ) {
       return "connection";
 }
 
 bool VPNNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool VPNNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
-      return 1;
+      return 0;
 }
 
 void VPNNetNode::setSpecificAttribute( QString & , QString & ) {
 }
 
 void VPNNetNode::saveSpecificAttribute( QTextStream & ) {
 }
 
diff --git a/noncore/settings/networksettings2/wlan/wlanGUI.ui b/noncore/settings/networksettings2/wlan/wlanGUI.ui
index 23d6f86..9614369 100644
--- a/noncore/settings/networksettings2/wlan/wlanGUI.ui
+++ b/noncore/settings/networksettings2/wlan/wlanGUI.ui
@@ -6,17 +6,17 @@
         <name>name</name>
         <cstring>WLanGUI</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>196</width>
+            <width>192</width>
             <height>329</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Form1</string>
     </property>
     <property>
@@ -33,17 +33,17 @@
         <property stdset="1">
             <name>spacing</name>
             <number>0</number>
         </property>
         <widget>
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>tabWidget</cstring>
+                <cstring>WLan_TAB</cstring>
             </property>
             <property stdset="1">
                 <name>enabled</name>
                 <bool>true</bool>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
@@ -114,17 +114,17 @@
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>any</string>
                                     </property>
                                 </item>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>essid</cstring>
+                                    <cstring>ESSID_CB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
                                         <hsizetype>7</hsizetype>
                                         <vsizetype>0</vsizetype>
                                     </sizepolicy>
                                 </property>
@@ -194,17 +194,17 @@
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>Ad-Hoc</string>
                                     </property>
                                 </item>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>mode</cstring>
+                                    <cstring>Mode_CB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
                                     <bool>true</bool>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
@@ -235,17 +235,17 @@
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>2</number>
                             </property>
                             <widget row="0"  column="0"  rowspan="1"  colspan="3" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>specifyAp</cstring>
+                                    <cstring>SpecifyAP_CB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Specify &amp;Access Point</string>
                                 </property>
                             </widget>
                             <widget row="1"  column="1" >
                                 <class>QLabel</class>
@@ -268,17 +268,17 @@
                                     <name>text</name>
                                     <string>MAC</string>
                                 </property>
                             </widget>
                             <widget row="1"  column="2" >
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>macEdit</cstring>
+                                    <cstring>APMac_LE</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
                                     <bool>false</bool>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
@@ -327,28 +327,28 @@
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>specifyChan</cstring>
+                                    <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>networkChannel</cstring>
+                                    <cstring>ChannelNr_SB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
                                     <bool>false</bool>
                                 </property>
                                 <property stdset="1">
                                     <name>maxValue</name>
                                     <number>15</number>
@@ -395,27 +395,27 @@
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Encryption</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>0</number>
+                        <number>2</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>2</number>
                     </property>
                     <widget>
                         <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>wepEnabled</cstring>
+                            <cstring>EnableWEB_CB</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>&amp;Enable Encryption</string>
                         </property>
                     </widget>
                     <widget>
                         <class>QButtonGroup</class>
@@ -445,156 +445,109 @@
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>2</number>
                             </property>
                             <widget row="0"  column="0" >
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>keyRadio0</cstring>
+                                    <cstring>Key1_RB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Key &amp;1</string>
                                 </property>
                                 <property stdset="1">
                                     <name>checked</name>
                                     <bool>true</bool>
                                 </property>
                             </widget>
                             <widget row="3"  column="0" >
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>keyRadio3</cstring>
+                                    <cstring>Key4_RB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Key &amp;4</string>
                                 </property>
                             </widget>
                             <widget row="0"  column="1" >
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>LineEdit6</cstring>
+                                    <cstring>Key1_LE</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>frame</name>
+                                    <bool>true</bool>
                                 </property>
                             </widget>
                             <widget row="1"  column="0" >
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>keyRadio1</cstring>
+                                    <cstring>Key2_RB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Key &amp;2</string>
                                 </property>
                             </widget>
                             <widget row="2"  column="0" >
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>keyRadio2</cstring>
+                                    <cstring>Key3_RB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Key &amp;3</string>
                                 </property>
                             </widget>
                             <widget row="1"  column="1" >
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>LineEdit6_2</cstring>
+                                    <cstring>Key2_LE</cstring>
                                 </property>
                             </widget>
                             <widget row="3"  column="1" >
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>LineEdit6_4</cstring>
+                                    <cstring>Key4_LE</cstring>
                                 </property>
                             </widget>
                             <widget row="2"  column="1" >
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>LineEdit6_3</cstring>
+                                    <cstring>Key3_LE</cstring>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
                     <widget>
-                        <class>QButtonGroup</class>
+                        <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>NonEncButtonGroup</cstring>
+                            <cstring>CheckBox4</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>false</bool>
                         </property>
                         <property stdset="1">
-                            <name>title</name>
-                            <string>Non-encrypted Packets</string>
-                        </property>
-                        <property stdset="1">
-                            <name>radioButtonExclusive</name>
-                            <bool>true</bool>
-                        </property>
-                        <property>
-                            <name>layoutMargin</name>
-                        </property>
-                        <grid>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>2</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget row="0"  column="0" >
-                                <class>QRadioButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>acceptNonEnc</cstring>
-                                </property>
-                                <property stdset="1">
                                     <name>text</name>
-                                    <string>&amp;Accept</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>checked</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>buttonGroupId</name>
-                                    <number>0</number>
+                            <string>Accept Non-Encrypted packets</string>
                                 </property>
                             </widget>
-                            <widget row="0"  column="1" >
-                                <class>QRadioButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>rejectNonEnc</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Reject</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>buttonGroupId</name>
-                                    <number>1</number>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
                     <spacer>
                         <property>
                             <name>name</name>
                             <cstring>Spacer30</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Vertical</enum>
@@ -668,17 +621,21 @@
                                     <cstring>Channel_LBL</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShape</name>
                                     <enum>Panel</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShadow</name>
-                                    <enum>Sunken</enum>
+                                    <enum>Plain</enum>
+                                </property>
+                                <property stdset="1">
+                                    <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>
@@ -727,17 +684,21 @@
                                     <cstring>Station_LBL</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShape</name>
                                     <enum>Panel</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShadow</name>
-                                    <enum>Sunken</enum>
+                                    <enum>Plain</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>indent</name>
+                                    <number>0</number>
                                 </property>
                             </widget>
                             <widget row="5"  column="1" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>Rate_LBL</cstring>
                                 </property>
@@ -749,17 +710,21 @@
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShape</name>
                                     <enum>Panel</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShadow</name>
-                                    <enum>Sunken</enum>
+                                    <enum>Plain</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>indent</name>
+                                    <number>0</number>
                                 </property>
                             </widget>
                             <widget row="5"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel4_2_2</cstring>
                                 </property>
@@ -775,47 +740,59 @@
                                     <cstring>AP_LBL</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShape</name>
                                     <enum>Panel</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShadow</name>
-                                    <enum>Sunken</enum>
+                                    <enum>Plain</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>indent</name>
+                                    <number>0</number>
                                 </property>
                             </widget>
                             <widget row="1"  column="1" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>essidLabel_3</cstring>
+                                    <cstring>ESSID_LBL</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShape</name>
                                     <enum>Panel</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShadow</name>
-                                    <enum>Sunken</enum>
+                                    <enum>Plain</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>indent</name>
+                                    <number>0</number>
                                 </property>
                             </widget>
                             <widget row="2"  column="1" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>modeLabel_3</cstring>
+                                    <cstring>Mode_LBL</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShape</name>
                                     <enum>Panel</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShadow</name>
-                                    <enum>Sunken</enum>
+                                    <enum>Plain</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>indent</name>
+                                    <number>0</number>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
                     <widget>
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
@@ -918,16 +895,24 @@
                             </spacer>
                             <widget row="0"  column="2" >
                                 <class>QProgressBar</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>Signal_PB</cstring>
                                 </property>
                                 <property stdset="1">
+                                    <name>frameShadow</name>
+                                    <enum>Plain</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>lineWidth</name>
+                                    <number>1</number>
+                                </property>
+                                <property stdset="1">
                                     <name>progress</name>
                                     <number>0</number>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
                     <spacer>
                         <property>
@@ -952,39 +937,39 @@
                     </spacer>
                 </vbox>
             </widget>
         </widget>
     </vbox>
 </widget>
 <connections>
     <connection>
-        <sender>wepEnabled</sender>
+        <sender>EnableWEB_CB</sender>
         <signal>toggled(bool)</signal>
         <receiver>KeyButtonGroup</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>wepEnabled</sender>
+        <sender>SpecifyAP_CB</sender>
         <signal>toggled(bool)</signal>
-        <receiver>NonEncButtonGroup</receiver>
+        <receiver>APMac_LE</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>specifyAp</sender>
+        <sender>SpecifyAP_CB</sender>
         <signal>toggled(bool)</signal>
-        <receiver>macEdit</receiver>
+        <receiver>macLabel</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>specifyAp</sender>
+        <sender>SpecifyChannel_CB</sender>
         <signal>toggled(bool)</signal>
-        <receiver>macLabel</receiver>
+        <receiver>ChannelNr_SB</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>specifyChan</sender>
+        <sender>EnableWEB_CB</sender>
         <signal>toggled(bool)</signal>
-        <receiver>networkChannel</receiver>
+        <receiver>CheckBox4</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
 </UI>
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.cpp b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
index 7a2c1a7..ce8a734 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.cpp
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
@@ -35,17 +35,17 @@ const char ** WLanNetNode::needs( void ) {
 }
 
 const char * WLanNetNode::provides( void ) {
       return "device";
 }
 
 bool WLanNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
-      return 1;
+      return 0;
 }
 
 bool WLanNetNode::hasDataFor( const QString & S ) {
       return S == "interfaces";
 }
 
 bool WLanNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & S,