Cleaned up ui files so tab is in correct order

10 files changed, 140 insertions, 800 deletions

diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO
index 020339f..862d681 100644
--- a/noncore/net/networksetup/TODO
+++ b/noncore/net/networksetup/TODO
@@ -1,14 +1,72 @@
 test WEP
 WEP key in file wireless.conf is not encrypted !, therefore it is very easy to get the key out of the zaurus..
 
 udchcp needs to output the dhcp information so interfaces can read it
 
 interfacesetupimp really doesn't need a interface* pointer
 
 Possible other modules to write: ppp, ipsec, bluetooth, ipchains
 
 PPP module needs to scan pppd.tdb to see what is currently active
 
 WLAN - add possiblity to input text or hex without knowing "s:"
 
 Interface setupimp needs to use kernel calls.
+
+Automaticly update the main list of interfaces:
+> That would be me. :-D  netlink, can you point me in the right
+> direction where  I can get more info on it?  (I figured there was some
+> kenel call) 
+
+You can look up the meaning of the packets you receive, or you can just go 
+poll for changes you might be interested in each time you receive _any_ 
+packet. Anything's better than periodic polling.
+
+Note that you can't do this as non-root on some kernels. There's a patch 
+which can go into the hh.org kernel if it's not already there. 
+cf. http://marc.theaimsgroup.com/?l=linux-kernel&m=103520821605353&w=2
+
+
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+
+int main(int argc, char **argv)
+{
+        int fd;
+        unsigned char buf[4096];
+        int ret;
+        int i, j;
+        struct sockaddr_nl snl;
+
+        fd = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
+        if (fd < 0) {
+                perror("socket");
+                exit(1);
+        }
+
+        snl.nl_family = AF_NETLINK;
+        snl.nl_pad = 0;
+        snl.nl_pid = getpid();
+        snl.nl_groups = RTM_NEWLINK|RTM_DELLINK;
+
+        if (bind(fd, &snl, sizeof(snl)) < 0) {
+                perror("bind");
+                exit(1);
+        }
+        while (1) {
+                ret = recv(fd, buf, 4096, 0);
+                if (ret < 0) {
+                        perror("recv");
+                        exit(1);
+                }
+                for (i=0; i<ret; i++) {
+                        printf("%02x ", buf[i]);
+                        }
+                printf("\n");
+        }
+
+}
+--
+
diff --git a/noncore/net/networksetup/addconnection.ui b/noncore/net/networksetup/addconnection.ui
index a349804..da6cf06 100644
--- a/noncore/net/networksetup/addconnection.ui
+++ b/noncore/net/networksetup/addconnection.ui
@@ -1,38 +1,38 @@
 <!DOCTYPE UI><UI>
 <class>AddConnection</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>AddConnection</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>233</width>
+            <width>229</width>
             <height>268</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Add Network Connection</string>
     </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
         <widget row="3"  column="1" >
             <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>cancelButton</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
@@ -129,25 +129,30 @@
             </property>
             <property>
                 <name>vAlign</name>
             </property>
             <property>
                 <name>wordwrap</name>
             </property>
         </widget>
     </grid>
 </widget>
 <connections>
     <connection>
         <sender>cancelButton</sender>
         <signal>clicked()</signal>
         <receiver>AddConnection</receiver>
         <slot>reject()</slot>
     </connection>
     <connection>
         <sender>addButton</sender>
         <signal>clicked()</signal>
         <receiver>AddConnection</receiver>
         <slot>accept()</slot>
     </connection>
 </connections>
+<tabstops>
+    <tabstop>registeredServicesList</tabstop>
+    <tabstop>addButton</tabstop>
+    <tabstop>cancelButton</tabstop>
+</tabstops>
 </UI>
diff --git a/noncore/net/networksetup/ppp/ppp.ui b/noncore/net/networksetup/ppp/ppp.ui
index 67d6735..56e1621 100644
--- a/noncore/net/networksetup/ppp/ppp.ui
+++ b/noncore/net/networksetup/ppp/ppp.ui
@@ -736,35 +736,35 @@
     </connection>
     <connection>
         <sender>dial_manual</sender>
         <signal>toggled(bool)</signal>
         <receiver>idletime</receiver>
         <slot>setDisabled(bool)</slot>
     </connection>
     <connection>
         <sender>connectdelay</sender>
         <signal>valueChanged(int)</signal>
         <receiver>connectdelay_text</receiver>
         <slot>setNum(int)</slot>
     </connection>
 </connections>
 <tabstops>
     <tabstop>TabWidget2</tabstop>
     <tabstop>acname</tabstop>
     <tabstop>username</tabstop>
     <tabstop>password</tabstop>
     <tabstop>phone</tabstop>
     <tabstop>atdial</tabstop>
     <tabstop>speed</tabstop>
     <tabstop>crtscts</tabstop>
     <tabstop>connectdelay</tabstop>
-    <tabstop>dial_manual</tabstop>
-    <tabstop>dial_idle</tabstop>
     <tabstop>dial_demand</tabstop>
     <tabstop>idletime</tabstop>
     <tabstop>defaultroute</tabstop>
     <tabstop>gateway</tabstop>
     <tabstop>usepeerdns</tabstop>
     <tabstop>dns1</tabstop>
     <tabstop>dns2</tabstop>
+    <tabstop>dial_manual</tabstop>
+    <tabstop>dial_idle</tabstop>
 </tabstops>
 </UI>
diff --git a/noncore/net/networksetup/systemadvanced.ui b/noncore/net/networksetup/systemadvanced.ui
deleted file mode 100644
index cd7ac61..0000000
--- a/noncore/net/networksetup/systemadvanced.ui
+++ b/dev/null
@@ -1,396 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>SystemNetworking</class>
-<widget>
-    <class>QWidget</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>SystemNetworking</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>218</width>
-            <height>289</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>System Networking</string>
-    </property>
-    <vbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>0</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <widget>
-            <class>QTabWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>tabWidget</cstring>
-            </property>
-            <property>
-                <name>layoutMargin</name>
-            </property>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>DNS</string>
-                </attribute>
-                <grid>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>11</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
-                    </property>
-                    <widget row="0"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel6</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Hostname</string>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel5</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>DNS</string>
-                        </property>
-                        <property stdset="1">
-                            <name>alignment</name>
-                            <set>AlignTop|AlignLeft</set>
-                        </property>
-                        <property>
-                            <name>vAlign</name>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="1" >
-                        <class>QListBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>ListBox5</cstring>
-                        </property>
-                    </widget>
-                    <widget row="0"  column="1" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>LineEdit7</cstring>
-                        </property>
-                    </widget>
-                    <widget row="3"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel7</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Hosts</string>
-                        </property>
-                    </widget>
-                    <widget row="3"  column="1" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel9</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>List here....</string>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="0" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>PushButton15</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Add</string>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="1" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>PushButton16</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Delete</string>
-                        </property>
-                    </widget>
-                    <spacer row="4"  column="1" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer14</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Vertical</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>
-                </grid>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Routing</string>
-                </attribute>
-                <grid>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>11</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
-                    </property>
-                    <widget row="0"  column="0"  rowspan="1"  colspan="2" >
-                        <class>QListView</class>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Destination</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Gateway</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Genmask</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Flags</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Metric</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Ref</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Use</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Iface</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>192.168.1.0</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>*</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>255.255.255.0</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>U</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>0</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>0</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>0</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>eth0</string>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                    </item>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>ListView4</cstring>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="0" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>PushButton17</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Add</string>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="1" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>PushButton18</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Remove</string>
-                        </property>
-                    </widget>
-                    <spacer row="2"  column="1" >
-              
\ No newline at end of file
diff --git a/noncore/net/networksetup/wlan/wlan.ui b/noncore/net/networksetup/wlan/wlan.ui
index 1b29a3e..47d6db6 100644
--- a/noncore/net/networksetup/wlan/wlan.ui
+++ b/noncore/net/networksetup/wlan/wlan.ui
@@ -1,38 +1,38 @@
 <!DOCTYPE UI><UI>
 <class>WLAN</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>WLAN</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>238</width>
+            <width>237</width>
             <height>286</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Wireless LAN Setting</string>
     </property>
     <property stdset="1">
         <name>sizeGripEnabled</name>
         <bool>true</bool>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
         <widget>
@@ -479,39 +479,42 @@
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>network802</sender>
         <signal>toggled(bool)</signal>
         <receiver>networkChannel</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>wepEnabled</sender>
         <signal>toggled(bool)</signal>
         <receiver>ButtonGroup43</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>wepEnabled</sender>
         <signal>toggled(bool)</signal>
         <receiver>ButtonGroup44</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
 <tabstops>
     <tabstop>tabWidget</tabstop>
     <tabstop>essNon</tabstop>
+    <tabstop>essSpecific</tabstop>
     <tabstop>essSpecificLineEdit</tabstop>
     <tabstop>networkInfrastructure</tabstop>
+    <tabstop>network802</tabstop>
     <tabstop>networkChannel</tabstop>
+    <tabstop>wepEnabled</tabstop>
     <tabstop>authOpen</tabstop>
     <tabstop>authShared</tabstop>
     <tabstop>keyRadio0</tabstop>
     <tabstop>keyLineEdit0</tabstop>
     <tabstop>keyRadio1</tabstop>
     <tabstop>keyLineEdit1</tabstop>
     <tabstop>keyRadio2</tabstop>
     <tabstop>keyLineEdit2</tabstop>
     <tabstop>keyRadio3</tabstop>
     <tabstop>keyLineEdit3</tabstop>
 </tabstops>
 </UI>
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO
index 020339f..862d681 100644
--- a/noncore/settings/networksettings/TODO
+++ b/noncore/settings/networksettings/TODO
@@ -1,14 +1,72 @@
 test WEP
 WEP key in file wireless.conf is not encrypted !, therefore it is very easy to get the key out of the zaurus..
 
 udchcp needs to output the dhcp information so interfaces can read it
 
 interfacesetupimp really doesn't need a interface* pointer
 
 Possible other modules to write: ppp, ipsec, bluetooth, ipchains
 
 PPP module needs to scan pppd.tdb to see what is currently active
 
 WLAN - add possiblity to input text or hex without knowing "s:"
 
 Interface setupimp needs to use kernel calls.
+
+Automaticly update the main list of interfaces:
+> That would be me. :-D  netlink, can you point me in the right
+> direction where  I can get more info on it?  (I figured there was some
+> kenel call) 
+
+You can look up the meaning of the packets you receive, or you can just go 
+poll for changes you might be interested in each time you receive _any_ 
+packet. Anything's better than periodic polling.
+
+Note that you can't do this as non-root on some kernels. There's a patch 
+which can go into the hh.org kernel if it's not already there. 
+cf. http://marc.theaimsgroup.com/?l=linux-kernel&m=103520821605353&w=2
+
+
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+
+int main(int argc, char **argv)
+{
+        int fd;
+        unsigned char buf[4096];
+        int ret;
+        int i, j;
+        struct sockaddr_nl snl;
+
+        fd = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
+        if (fd < 0) {
+                perror("socket");
+                exit(1);
+        }
+
+        snl.nl_family = AF_NETLINK;
+        snl.nl_pad = 0;
+        snl.nl_pid = getpid();
+        snl.nl_groups = RTM_NEWLINK|RTM_DELLINK;
+
+        if (bind(fd, &snl, sizeof(snl)) < 0) {
+                perror("bind");
+                exit(1);
+        }
+        while (1) {
+                ret = recv(fd, buf, 4096, 0);
+                if (ret < 0) {
+                        perror("recv");
+                        exit(1);
+                }
+                for (i=0; i<ret; i++) {
+                        printf("%02x ", buf[i]);
+                        }
+                printf("\n");
+        }
+
+}
+--
+
diff --git a/noncore/settings/networksettings/addconnection.ui b/noncore/settings/networksettings/addconnection.ui
index a349804..da6cf06 100644
--- a/noncore/settings/networksettings/addconnection.ui
+++ b/noncore/settings/networksettings/addconnection.ui
@@ -1,38 +1,38 @@
 <!DOCTYPE UI><UI>
 <class>AddConnection</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>AddConnection</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>233</width>
+            <width>229</width>
             <height>268</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Add Network Connection</string>
     </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
         <widget row="3"  column="1" >
             <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>cancelButton</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
@@ -129,25 +129,30 @@
             </property>
             <property>
                 <name>vAlign</name>
             </property>
             <property>
                 <name>wordwrap</name>
             </property>
         </widget>
     </grid>
 </widget>
 <connections>
     <connection>
         <sender>cancelButton</sender>
         <signal>clicked()</signal>
         <receiver>AddConnection</receiver>
         <slot>reject()</slot>
     </connection>
     <connection>
         <sender>addButton</sender>
         <signal>clicked()</signal>
         <receiver>AddConnection</receiver>
         <slot>accept()</slot>
     </connection>
 </connections>
+<tabstops>
+    <tabstop>registeredServicesList</tabstop>
+    <tabstop>addButton</tabstop>
+    <tabstop>cancelButton</tabstop>
+</tabstops>
 </UI>
diff --git a/noncore/settings/networksettings/ppp/ppp.ui b/noncore/settings/networksettings/ppp/ppp.ui
index 67d6735..56e1621 100644
--- a/noncore/settings/networksettings/ppp/ppp.ui
+++ b/noncore/settings/networksettings/ppp/ppp.ui
@@ -736,35 +736,35 @@
     </connection>
     <connection>
         <sender>dial_manual</sender>
         <signal>toggled(bool)</signal>
         <receiver>idletime</receiver>
         <slot>setDisabled(bool)</slot>
     </connection>
     <connection>
         <sender>connectdelay</sender>
         <signal>valueChanged(int)</signal>
         <receiver>connectdelay_text</receiver>
         <slot>setNum(int)</slot>
     </connection>
 </connections>
 <tabstops>
     <tabstop>TabWidget2</tabstop>
     <tabstop>acname</tabstop>
     <tabstop>username</tabstop>
     <tabstop>password</tabstop>
     <tabstop>phone</tabstop>
     <tabstop>atdial</tabstop>
     <tabstop>speed</tabstop>
     <tabstop>crtscts</tabstop>
     <tabstop>connectdelay</tabstop>
-    <tabstop>dial_manual</tabstop>
-    <tabstop>dial_idle</tabstop>
     <tabstop>dial_demand</tabstop>
     <tabstop>idletime</tabstop>
     <tabstop>defaultroute</tabstop>
     <tabstop>gateway</tabstop>
     <tabstop>usepeerdns</tabstop>
     <tabstop>dns1</tabstop>
     <tabstop>dns2</tabstop>
+    <tabstop>dial_manual</tabstop>
+    <tabstop>dial_idle</tabstop>
 </tabstops>
 </UI>
diff --git a/noncore/settings/networksettings/systemadvanced.ui b/noncore/settings/networksettings/systemadvanced.ui
deleted file mode 100644
index cd7ac61..0000000
--- a/noncore/settings/networksettings/systemadvanced.ui
+++ b/dev/null
@@ -1,396 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>SystemNetworking</class>
-<widget>
-    <class>QWidget</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>SystemNetworking</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>218</width>
-            <height>289</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>System Networking</string>
-    </property>
-    <vbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>0</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <widget>
-            <class>QTabWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>tabWidget</cstring>
-            </property>
-            <property>
-                <name>layoutMargin</name>
-            </property>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>DNS</string>
-                </attribute>
-                <grid>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>11</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
-                    </property>
-                    <widget row="0"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel6</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Hostname</string>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel5</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>DNS</string>
-                        </property>
-                        <property stdset="1">
-                            <name>alignment</name>
-                            <set>AlignTop|AlignLeft</set>
-                        </property>
-                        <property>
-                            <name>vAlign</name>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="1" >
-                        <class>QListBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>ListBox5</cstring>
-                        </property>
-                    </widget>
-                    <widget row="0"  column="1" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>LineEdit7</cstring>
-                        </property>
-                    </widget>
-                    <widget row="3"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel7</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Hosts</string>
-                        </property>
-                    </widget>
-                    <widget row="3"  column="1" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel9</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>List here....</string>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="0" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>PushButton15</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Add</string>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="1" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>PushButton16</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Delete</string>
-                        </property>
-                    </widget>
-                    <spacer row="4"  column="1" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer14</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Vertical</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>
-                </grid>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Routing</string>
-                </attribute>
-                <grid>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>11</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
-                    </property>
-                    <widget row="0"  column="0"  rowspan="1"  colspan="2" >
-                        <class>QListView</class>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Destination</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Gateway</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Genmask</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Flags</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Metric</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Ref</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Use</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Iface</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>192.168.1.0</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>*</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>255.255.255.0</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>U</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>0</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>0</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>0</string>
-                        </property>
-                        <property>
-                            <name>text</name>
-                            <string>eth0</string>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                        <property>
-                            <name>pixmap</name>
-                            <pixmap></pixmap>
-                        </property>
-                    </item>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>ListView4</cstring>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="0" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>PushButton17</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Add</string>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="1" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>PushButton18</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Remove</string>
-                        </property>
-                    </widget>
-                    <spacer row="2"  column="1" >
-              
\ No newline at end of file
diff --git a/noncore/settings/networksettings/wlan/wlan.ui b/noncore/settings/networksettings/wlan/wlan.ui
index 1b29a3e..47d6db6 100644
--- a/noncore/settings/networksettings/wlan/wlan.ui
+++ b/noncore/settings/networksettings/wlan/wlan.ui
@@ -1,38 +1,38 @@
 <!DOCTYPE UI><UI>
 <class>WLAN</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>WLAN</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>238</width>
+            <width>237</width>
             <height>286</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Wireless LAN Setting</string>
     </property>
     <property stdset="1">
         <name>sizeGripEnabled</name>
         <bool>true</bool>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
         <widget>
@@ -479,39 +479,42 @@
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>network802</sender>
         <signal>toggled(bool)</signal>
         <receiver>networkChannel</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>wepEnabled</sender>
         <signal>toggled(bool)</signal>
         <receiver>ButtonGroup43</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>wepEnabled</sender>
         <signal>toggled(bool)</signal>
         <receiver>ButtonGroup44</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
 <tabstops>
     <tabstop>tabWidget</tabstop>
     <tabstop>essNon</tabstop>
+    <tabstop>essSpecific</tabstop>
     <tabstop>essSpecificLineEdit</tabstop>
     <tabstop>networkInfrastructure</tabstop>
+    <tabstop>network802</tabstop>
     <tabstop>networkChannel</tabstop>
+    <tabstop>wepEnabled</tabstop>
     <tabstop>authOpen</tabstop>
     <tabstop>authShared</tabstop>
     <tabstop>keyRadio0</tabstop>
     <tabstop>keyLineEdit0</tabstop>
     <tabstop>keyRadio1</tabstop>
     <tabstop>keyLineEdit1</tabstop>
     <tabstop>keyRadio2</tabstop>
     <tabstop>keyLineEdit2</tabstop>
     <tabstop>keyRadio3</tabstop>
     <tabstop>keyLineEdit3</tabstop>
 </tabstops>
 </UI>