*** empty log message ***

8 files changed, 688 insertions, 243 deletions

diff --git a/noncore/settings/networksettings2/wlan/wlanGUI.ui b/noncore/settings/networksettings2/wlan/wlanGUI.ui
index 9614369..1aec138 100644
--- a/noncore/settings/networksettings2/wlan/wlanGUI.ui
+++ b/noncore/settings/networksettings2/wlan/wlanGUI.ui
@@ -11,8 +11,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>192</width>
-            <height>329</height>
+            <width>209</width>
+            <height>307</height>
         </rect>
     </property>
     <property stdset="1">
@@ -32,7 +32,7 @@
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>0</number>
+            <number>1</number>
         </property>
         <widget>
             <class>QTabWidget</class>
@@ -73,25 +73,43 @@
                         <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>
@@ -101,52 +119,30 @@
                                     <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" >
@@ -171,35 +167,18 @@
                                     <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>
@@ -209,9 +188,24 @@
                                     <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>
@@ -244,7 +238,7 @@
                                 </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" >
@@ -310,60 +304,6 @@
                             </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>
@@ -410,7 +350,7 @@
                         <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>EnableWEB_CB</cstring>
+                            <cstring>EnableWEP_CB</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
@@ -511,6 +451,10 @@
                                     <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>
@@ -518,6 +462,10 @@
                                     <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>
@@ -525,6 +473,10 @@
                                     <name>name</name>
                                     <cstring>Key3_LE</cstring>
                                 </property>
+                                <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>false</bool>
+                                </property>
                             </widget>
                         </grid>
                     </widget>
@@ -532,7 +484,7 @@
                         <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>CheckBox4</cstring>
+                            <cstring>AcceptNonEncrypted_CB</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
@@ -589,7 +541,7 @@
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout12</cstring>
+                            <cstring>Layout13</cstring>
                         </property>
                         <property>
                             <name>layoutSpacing</name>
@@ -603,26 +555,15 @@
                                 <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>
@@ -633,48 +574,34 @@
                                     <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" >
@@ -685,7 +612,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>frameShape</name>
-                                    <enum>Panel</enum>
+                                    <enum>Box</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShadow</name>
@@ -696,7 +623,18 @@
                                     <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>
@@ -711,7 +649,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>frameShape</name>
-                                    <enum>Panel</enum>
+                                    <enum>Box</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShadow</name>
@@ -722,26 +660,34 @@
                                     <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>
@@ -760,7 +706,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>frameShape</name>
-                                    <enum>Panel</enum>
+                                    <enum>Box</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShadow</name>
@@ -771,23 +717,59 @@
                                     <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>
@@ -799,6 +781,10 @@
                             <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>
@@ -815,7 +801,7 @@
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
-                                <number>2</number>
+                                <number>0</number>
                             </property>
                             <widget row="1"  column="0" >
                                 <class>QLabel</class>
@@ -847,7 +833,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>progress</name>
-                                    <number>0</number>
+                                    <number>10</number>
                                 </property>
                             </widget>
                             <widget row="2"  column="2" >
@@ -858,7 +844,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>progress</name>
-                                    <number>0</number>
+                                    <number>10</number>
                                 </property>
                             </widget>
                             <widget row="0"  column="0" >
@@ -872,27 +858,6 @@
                                     <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">
@@ -909,7 +874,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>progress</name>
-                                    <number>0</number>
+                                    <number>10</number>
                                 </property>
                             </widget>
                         </grid>
@@ -935,6 +900,62 @@
                             </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>
@@ -942,7 +963,7 @@
 </widget>
 <connections>
     <connection>
-        <sender>EnableWEB_CB</sender>
+        <sender>EnableWEP_CB</sender>
         <signal>toggled(bool)</signal>
         <receiver>KeyButtonGroup</receiver>
         <slot>setEnabled(bool)</slot>
@@ -960,16 +981,41 @@
         <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,3 +1,4 @@
+#include <unistd.h>
 #include "wlanedit.h"
 #include "wlan_NNI.h"
 #include "wlan_NN.h"
@@ -5,16 +6,66 @@
 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;
 }
@@ -29,8 +80,61 @@ void AWLan::commit( void ) {
 }
 
 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
@@ -28,7 +28,7 @@ public :
         { 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
@@ -3,15 +3,14 @@
 
 #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
@@ -21,20 +21,17 @@ public :
 
 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