ui cleanup with groupboxes

14 files changed, 746 insertions, 660 deletions

diff --git a/noncore/net/networksetup/interfaceadvanced.ui b/noncore/net/networksetup/interfaceadvanced.ui
index 8ef0b29..7520abe 100644
--- a/noncore/net/networksetup/interfaceadvanced.ui
+++ b/noncore/net/networksetup/interfaceadvanced.ui
@@ -10,10 +10,10 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>197</width>
-            <height>253</height>
+            <width>188</width>
+            <height>277</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
@@ -98,43 +98,28 @@
                 <name>text</name>
                 <string>Interface</string>
             </property>
         </widget>
-        <widget row="8"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel9</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Lease Expires</string>
-            </property>
-        </widget>
-        <widget row="8"  column="1" >
+        <widget row="4"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>leaseExpiresLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>frameShape</name>
-                <enum>Panel</enum>
+                <cstring>TextLabel4</cstring>
             </property>
             <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Sunken</enum>
+                <name>enabled</name>
+                <bool>true</bool>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string></string>
+                <string>Subnet Mask</string>
             </property>
         </widget>
-        <widget row="7"  column="1" >
+        <widget row="2"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>leaseObtainedLabel</cstring>
+                <cstring>ipAddressLabel</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
                 <enum>Panel</enum>
@@ -144,27 +129,16 @@
                 <enum>Sunken</enum>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string></string>
-            </property>
-        </widget>
-        <widget row="7"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel8</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Lease Obtained</string>
+                <string>0.0.0.0</string>
             </property>
         </widget>
-        <widget row="6"  column="1" >
+        <widget row="4"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>dhcpServerLabel</cstring>
+                <cstring>subnetMaskLabel</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
                 <enum>Panel</enum>
@@ -174,38 +148,27 @@
                 <enum>Sunken</enum>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>255.255.255.255</string>
-            </property>
-        </widget>
-        <widget row="6"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel6</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>DHCP Server</string>
+                <string>0.0.0.0</string>
             </property>
         </widget>
-        <widget row="4"  column="0" >
+        <widget row="3"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>TextLabel4</cstring>
+                <cstring>TextLabel2</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Subnet Mask</string>
+                <string>Broadcast</string>
             </property>
         </widget>
-        <widget row="2"  column="1" >
+        <widget row="3"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>ipAddressLabel</cstring>
+                <cstring>broadcastLabel</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
                 <enum>Panel</enum>
@@ -213,33 +176,121 @@
             <property stdset="1">
                 <name>frameShadow</name>
                 <enum>Sunken</enum>
             </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>0.0.0.0</string>
-            </property>
         </widget>
-        <widget row="4"  column="1" >
-            <class>QLabel</class>
+        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
+            <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>subnetMaskLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>frameShape</name>
-                <enum>Panel</enum>
-            </property>
-            <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Sunken</enum>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>0.0.0.0</string>
-            </property>
+                <cstring>GroupBox2</cstring>
+            </property>
+            <property stdset="1">
+                <name>title</name>
+                <string>DHCP Information</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="0"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel6</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>DHCP Server</string>
+                    </property>
+                </widget>
+                <widget row="2"  column="1" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>leaseExpiresLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShape</name>
+                        <enum>Panel</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShadow</name>
+                        <enum>Sunken</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string></string>
+                    </property>
+                </widget>
+                <widget row="1"  column="1" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>leaseObtainedLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShape</name>
+                        <enum>Panel</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShadow</name>
+                        <enum>Sunken</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string></string>
+                    </property>
+                </widget>
+                <widget row="2"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel9</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Lease Expires</string>
+                    </property>
+                </widget>
+                <widget row="1"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel8</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Lease Obtained</string>
+                    </property>
+                </widget>
+                <widget row="0"  column="1" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>dhcpServerLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShape</name>
+                        <enum>Panel</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShadow</name>
+                        <enum>Sunken</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string></string>
+                    </property>
+                </widget>
+            </grid>
         </widget>
-        <spacer row="9"  column="1" >
+        <spacer row="6"  column="1" >
             <property>
                 <name>name</name>
                 <cstring>Spacer2</cstring>
             </property>
@@ -258,45 +309,8 @@
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget row="3"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel2</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Broadcast</string>
-            </property>
-        </widget>
-        <widget row="3"  column="1" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>broadcastLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>frameShape</name>
-                <enum>Panel</enum>
-            </property>
-            <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Sunken</enum>
-            </property>
-        </widget>
-        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
-            <class>Line</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Line2</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Horizontal</enum>
-            </property>
-        </widget>
     </grid>
 </widget>
 <customwidgets>
     <customwidget>
@@ -316,8 +330,8 @@
 </customwidgets>
 <images>
     <image>
         <name>image0</name>
-        <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data>
+        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
 </UI>
diff --git a/noncore/net/networksetup/interfaceinformation.ui b/noncore/net/networksetup/interfaceinformation.ui
index 2a9b3fb..8b6280d 100644
--- a/noncore/net/networksetup/interfaceinformation.ui
+++ b/noncore/net/networksetup/interfaceinformation.ui
@@ -10,10 +10,10 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>191</width>
-            <height>241</height>
+            <width>203</width>
+            <height>244</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
@@ -99,78 +99,8 @@
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <spacer row="6"  column="1" >
-            <property>
-                <name>name</name>
-                <cstring>Spacer18</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>
-        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout2</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer10</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>advancedButton</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>View Advanced Information</string>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
         <widget row="0"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
@@ -209,8 +139,16 @@
                 <name>name</name>
                 <cstring>TextLabel24</cstring>
             </property>
             <property stdset="1">
+                <name>frameShape</name>
+                <enum>MShape</enum>
+            </property>
+            <property stdset="1">
+                <name>frameShadow</name>
+                <enum>MShadow</enum>
+            </property>
+            <property stdset="1">
                 <name>text</name>
                 <string>Broadcast</string>
             </property>
         </widget>
@@ -289,8 +227,89 @@
                 <name>text</name>
                 <string>0.0.0.0</string>
             </property>
         </widget>
+        <spacer row="7"  column="1" >
+            <property>
+                <name>name</name>
+                <cstring>Spacer18</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>
+        <widget row="6"  column="0"  rowspan="1"  colspan="2" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout2</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer10</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>advancedButton</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>View Advanced Information</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
+            <class>Line</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Line5</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+        </widget>
     </grid>
 </widget>
 <customwidgets>
     <customwidget>
@@ -313,5 +332,7 @@
         <name>image0</name>
         <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
+<connections>
+</connections>
 </UI>
diff --git a/noncore/net/networksetup/interfacesetup.ui b/noncore/net/networksetup/interfacesetup.ui
index 698422c..ff9810e 100644
--- a/noncore/net/networksetup/interfacesetup.ui
+++ b/noncore/net/networksetup/interfacesetup.ui
@@ -10,10 +10,10 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>193</width>
-            <height>310</height>
+            <width>177</width>
+            <height>320</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
@@ -38,19 +38,8 @@
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget row="6"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel4</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>IP Address</string>
-            </property>
-        </widget>
         <widget row="0"  column="0"  rowspan="1"  colspan="2" >
             <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
@@ -73,30 +62,8 @@
                 <name>name</name>
                 <cstring>profileCombo</cstring>
             </property>
         </widget>
-        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
-            <class>QGroupBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>staticGroupBox</cstring>
-            </property>
-            <property stdset="1">
-                <name>enabled</name>
-                <bool>false</bool>
-            </property>
-            <property stdset="1">
-                <name>title</name>
-                <string>Static Ip Configuration</string>
-            </property>
-        </widget>
-        <widget row="6"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>ipAddressEdit</cstring>
-            </property>
-        </widget>
         <widget row="4"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
@@ -121,19 +88,8 @@
                 <name>checked</name>
                 <bool>true</bool>
             </property>
         </widget>
-        <widget row="7"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel5</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Subnet Mask</string>
-            </property>
-        </widget>
         <widget row="2"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
@@ -166,9 +122,9 @@
                 <name>value</name>
                 <number>24</number>
             </property>
         </widget>
-        <spacer row="11"  column="1" >
+        <spacer row="6"  column="1" >
             <property>
                 <name>name</name>
                 <cstring>Spacer9</cstring>
             </property>
@@ -187,68 +143,122 @@
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget row="10"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>secondDNSLineEdit</cstring>
-            </property>
-        </widget>
-        <widget row="10"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel3</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Second DNS</string>
-            </property>
-        </widget>
-        <widget row="9"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel2</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>First DNS</string>
-            </property>
-        </widget>
-        <widget row="9"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>firstDNSLineEdit</cstring>
-            </property>
-        </widget>
-        <widget row="8"  column="0" >
-            <class>QLabel</class>
+        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
+            <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>TextLabel1_2</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Gateway</string>
+                <cstring>staticGroupBox</cstring>
             </property>
-        </widget>
-        <widget row="7"  column="1" >
-            <class>QLineEdit</class>
             <property stdset="1">
-                <name>name</name>
-                <cstring>subnetMaskEdit</cstring>
+                <name>enabled</name>
+                <bool>false</bool>
             </property>
-        </widget>
-        <widget row="8"  column="1" >
-            <class>QLineEdit</class>
             <property stdset="1">
-                <name>name</name>
-                <cstring>gatewayEdit</cstring>
+                <name>title</name>
+                <string>Static Ip Configuration</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>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>firstDNSLineEdit</cstring>
+                    </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>Subnet Mask</string>
+                    </property>
+                </widget>
+                <widget row="2"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>gatewayEdit</cstring>
+                    </property>
+                </widget>
+                <widget row="1"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>subnetMaskEdit</cstring>
+                    </property>
+                </widget>
+                <widget row="0"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>ipAddressEdit</cstring>
+                    </property>
+                </widget>
+                <widget row="3"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>First DNS</string>
+                    </property>
+                </widget>
+                <widget row="4"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>secondDNSLineEdit</cstring>
+                    </property>
+                </widget>
+                <widget row="0"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel4</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>IP Address</string>
+                    </property>
+                </widget>
+                <widget row="2"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel1_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Gateway</string>
+                    </property>
+                </widget>
+                <widget row="4"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel3</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Second DNS</string>
+                    </property>
+                </widget>
+            </grid>
         </widget>
     </grid>
 </widget>
 <connections>
diff --git a/noncore/net/networksetup/mainwindow.ui b/noncore/net/networksetup/mainwindow.ui
index f7efe99..c1fa101 100644
--- a/noncore/net/networksetup/mainwindow.ui
+++ b/noncore/net/networksetup/mainwindow.ui
@@ -270,9 +270,9 @@
                             <cstring>PushButton7</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Set Current</string>
+                            <string>&amp;Set Current</string>
                         </property>
                     </widget>
                     <widget row="3"  column="1"  rowspan="1"  colspan="2" >
                         <class>QPushButton</class>
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 2f821a9..0f48a4b 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -1,12 +1,12 @@
 #include "mainwindowimp.h"

 #include "addserviceimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

-#include "interface.h"

 #include "kprocess.h"

 #include "module.h"

 

+

 #include <qpushbutton.h>

 #include <qtabwidget.h>

 #include <qlistbox.h>

 #include <qlistview.h>

@@ -30,13 +30,8 @@
 

 #define TEMP_ALL "/tmp/ifconfig-a"

 #define TEMP_UP "/tmp/ifconfig"

 

-#define NO_SELECT_ERROR_AND_RETURN { \

-  QMessageBox::information(this, "Error","Please select an interface.", "Ok"); \

-  return; \

-}

-

 MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true) {

   connect(addServiceButton, SIGNAL(clicked()), this, SLOT(addClicked()));

   connect(removeServiceButton, SIGNAL(clicked()), this, SLOT(removeClicked()));

   connect(informationServiceButton, SIGNAL(clicked()), this, SLOT(informationClicked()));

@@ -80,8 +75,26 @@ MainWindowImp::~MainWindowImp(){
   }

 }

 

 void MainWindowImp::loadModules(QString path){

+  qDebug(path.latin1());

+  QDir d;

+  d.setPath(path);

+  if(!d.exists()){

+    qDebug("MainWindowImp:: Path doesn't exists");

+    return;

+  }

+  d.setFilter( QDir::Files | QDir::NoSymLinks );

+  const QFileInfoList *list = d.entryInfoList();

+  QFileInfoListIterator it( *list );

+  QFileInfo *fi;

+  while ( (fi=it.current()) ) {

+    if(fi->fileName().contains(".so")){

+      qDebug("Found");

+      Module *foo = loadPlugin(path + "/" + fi->fileName());

+    }

+    ++it;

+  }

 }

 

 /**

  * Attempt to load a function and resolve a function.

@@ -89,9 +102,9 @@ void MainWindowImp::loadModules(QString path){
  * @param resolveString - function pointer to resolve 

  * @return pointer to the function with name resolveString or NULL

  */ 

 Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){

-  //qDebug(pluginFileName.latin1());

+  qDebug(pluginFileName.latin1());

   QLibrary *lib = new QLibrary(pluginFileName);

   void *functionPointer = lib->resolve(resolveString);

   if( !functionPointer ){

     qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());

@@ -111,36 +124,8 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
   libraries.insert(object, lib);

   return object;

 }

 

-/*

-QList<QString> MainWindowImp::retrieveUnloadedPluginList(){

-  QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;

-  QString path = DirStr + "plugins";

-  QDir d(path);

-  d.setFilter( QDir::Files | QDir::Hidden );

-

-  QMap<QObject*, QLibrary*>::Iterator libraryIt;

-  QList<QString> rlist; 

-  rlist.setAutoDelete(false);

-	  

-  const QFileInfoList *list = d.entryInfoList();

-  QFileInfoListIterator it( *list );

-  QFileInfo *fi;

-  while ( (fi=it.current()) ) {

-    if(fi->fileName().contains(".so")){

-      for( libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt )

-        if((path + "/" + fi->fileName()) != (libraryIt.data())->library()){

-          QString *s = new QString(path + "/" + fi->fileName());

-          rlist.append(s);

-	}

-    }

-    ++it;

-  }

-  return rlist;

-}

-*/

-

 /**

  * The Add button was clicked.  Bring up the add dialog and if OK is hit

  * load the plugin and append it to the list

  */ 

@@ -160,9 +145,12 @@ void MainWindowImp::addClicked(){
  * If they do then remove from the list and unload.

  */ 

 void MainWindowImp::removeClicked(){

   QListViewItem *item = serviceList->currentItem();

-  if(item == NULL) NO_SELECT_ERROR_AND_RETURN

+  if(item == NULL) {

+     QMessageBox::information(this, "Error","Please select an interface.", "Ok");

+     return; 

+  }

   

   if(modules.find(interfaceItems[item]) == modules.end()){

     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");

   }

@@ -177,9 +165,12 @@ void MainWindowImp::removeClicked(){
  * Prompt with errors.

  */ 

 void MainWindowImp::configureClicked(){

   QListViewItem *item = serviceList->currentItem();

-  if(item == NULL) NO_SELECT_ERROR_AND_RETURN

+  if(item == NULL){

+   	 QMessageBox::information(this, "Error","Please select an interface.", "Ok");

+     return;

+  } 

   

   if(modules.find(interfaceItems[item]) == modules.end()){

     InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]);

     conf->showMaximized();

@@ -196,10 +187,13 @@ void MainWindowImp::configureClicked(){
  * Report an error

  */ 

 void MainWindowImp::informationClicked(){

   QListViewItem *item = serviceList->currentItem();

-  if(item == NULL)NO_SELECT_ERROR_AND_RETURN

-	

+  if(item == NULL){

+    QMessageBox::information(this, "Error","Please select an interface.", "Ok");

+    return;

+  }

+

   if(modules.find(interfaceItems[item]) == modules.end()){

     InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);

     i->showMaximized();

     i->show();

@@ -310,8 +304,12 @@ void MainWindowImp::updateInterface(Interface *i){
  

   QString typeName = "lan";

   if(i->getHardwareName().contains("Local Loopback"))

     typeName = "lo";

+  if(i->getInterfaceName().contains("irda"))

+    typeName = "irda";

+  if(i->getInterfaceName().contains("wlan"))

+    typeName = "wlan";

   QPixmap type = (Resource::loadPixmap(typeName));

   item->setPixmap(1, type);

 

   item->setText(2, i->getHardwareName());

diff --git a/noncore/net/networksetup/module.h b/noncore/net/networksetup/module.h
index f146d8c..13fd523 100644
--- a/noncore/net/networksetup/module.h
+++ b/noncore/net/networksetup/module.h
@@ -1,6 +1,6 @@
-#ifndef MODULE_H
-#define MODULE_H
+#ifndef NETCONF_MODULE_H
+#define NETCONF_MODULE_H
 
 #include <qobject.h>
 #include <qlist.h>
 #include <qmap.h>
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro
index 7d9918b..a01b050 100644
--- a/noncore/net/networksetup/networksetup.pro
+++ b/noncore/net/networksetup/networksetup.pro
@@ -2,9 +2,9 @@ TEMPLATE	= app
 CONFIG		= qt warn_on debug
 #CONFIG		= qt warn_on release
 HEADERS		= mainwindowimp.h addserviceimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h  kprocctrl.h module.h  kprocess.h
 SOURCES		= main.cpp mainwindowimp.cpp addserviceimp.cpp interface.cpp interfaceinformationimp.cpp  interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
-INCLUDEPATH	+= $(QPEDIR)/include
-DEPENDPATH	+= $(QPEDIR)/include
+#INCLUDEPATH	+= $(QPEDIR)/include
+#DEPENDPATH	+= $(QPEDIR)/include
 LIBS            += -lqpe
 INTERFACES	= mainwindow.ui addservice.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
 TARGET		= networksetup
diff --git a/noncore/settings/networksettings/interfaceadvanced.ui b/noncore/settings/networksettings/interfaceadvanced.ui
index 8ef0b29..7520abe 100644
--- a/noncore/settings/networksettings/interfaceadvanced.ui
+++ b/noncore/settings/networksettings/interfaceadvanced.ui
@@ -10,10 +10,10 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>197</width>
-            <height>253</height>
+            <width>188</width>
+            <height>277</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
@@ -98,43 +98,28 @@
                 <name>text</name>
                 <string>Interface</string>
             </property>
         </widget>
-        <widget row="8"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel9</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Lease Expires</string>
-            </property>
-        </widget>
-        <widget row="8"  column="1" >
+        <widget row="4"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>leaseExpiresLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>frameShape</name>
-                <enum>Panel</enum>
+                <cstring>TextLabel4</cstring>
             </property>
             <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Sunken</enum>
+                <name>enabled</name>
+                <bool>true</bool>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string></string>
+                <string>Subnet Mask</string>
             </property>
         </widget>
-        <widget row="7"  column="1" >
+        <widget row="2"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>leaseObtainedLabel</cstring>
+                <cstring>ipAddressLabel</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
                 <enum>Panel</enum>
@@ -144,27 +129,16 @@
                 <enum>Sunken</enum>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string></string>
-            </property>
-        </widget>
-        <widget row="7"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel8</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Lease Obtained</string>
+                <string>0.0.0.0</string>
             </property>
         </widget>
-        <widget row="6"  column="1" >
+        <widget row="4"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>dhcpServerLabel</cstring>
+                <cstring>subnetMaskLabel</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
                 <enum>Panel</enum>
@@ -174,38 +148,27 @@
                 <enum>Sunken</enum>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>255.255.255.255</string>
-            </property>
-        </widget>
-        <widget row="6"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel6</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>DHCP Server</string>
+                <string>0.0.0.0</string>
             </property>
         </widget>
-        <widget row="4"  column="0" >
+        <widget row="3"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>TextLabel4</cstring>
+                <cstring>TextLabel2</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Subnet Mask</string>
+                <string>Broadcast</string>
             </property>
         </widget>
-        <widget row="2"  column="1" >
+        <widget row="3"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>ipAddressLabel</cstring>
+                <cstring>broadcastLabel</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
                 <enum>Panel</enum>
@@ -213,33 +176,121 @@
             <property stdset="1">
                 <name>frameShadow</name>
                 <enum>Sunken</enum>
             </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>0.0.0.0</string>
-            </property>
         </widget>
-        <widget row="4"  column="1" >
-            <class>QLabel</class>
+        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
+            <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>subnetMaskLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>frameShape</name>
-                <enum>Panel</enum>
-            </property>
-            <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Sunken</enum>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>0.0.0.0</string>
-            </property>
+                <cstring>GroupBox2</cstring>
+            </property>
+            <property stdset="1">
+                <name>title</name>
+                <string>DHCP Information</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="0"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel6</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>DHCP Server</string>
+                    </property>
+                </widget>
+                <widget row="2"  column="1" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>leaseExpiresLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShape</name>
+                        <enum>Panel</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShadow</name>
+                        <enum>Sunken</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string></string>
+                    </property>
+                </widget>
+                <widget row="1"  column="1" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>leaseObtainedLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShape</name>
+                        <enum>Panel</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShadow</name>
+                        <enum>Sunken</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string></string>
+                    </property>
+                </widget>
+                <widget row="2"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel9</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Lease Expires</string>
+                    </property>
+                </widget>
+                <widget row="1"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel8</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Lease Obtained</string>
+                    </property>
+                </widget>
+                <widget row="0"  column="1" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>dhcpServerLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShape</name>
+                        <enum>Panel</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShadow</name>
+                        <enum>Sunken</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string></string>
+                    </property>
+                </widget>
+            </grid>
         </widget>
-        <spacer row="9"  column="1" >
+        <spacer row="6"  column="1" >
             <property>
                 <name>name</name>
                 <cstring>Spacer2</cstring>
             </property>
@@ -258,45 +309,8 @@
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget row="3"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel2</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Broadcast</string>
-            </property>
-        </widget>
-        <widget row="3"  column="1" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>broadcastLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>frameShape</name>
-                <enum>Panel</enum>
-            </property>
-            <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Sunken</enum>
-            </property>
-        </widget>
-        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
-            <class>Line</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Line2</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Horizontal</enum>
-            </property>
-        </widget>
     </grid>
 </widget>
 <customwidgets>
     <customwidget>
@@ -316,8 +330,8 @@
 </customwidgets>
 <images>
     <image>
         <name>image0</name>
-        <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data>
+        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
 </UI>
diff --git a/noncore/settings/networksettings/interfaceinformation.ui b/noncore/settings/networksettings/interfaceinformation.ui
index 2a9b3fb..8b6280d 100644
--- a/noncore/settings/networksettings/interfaceinformation.ui
+++ b/noncore/settings/networksettings/interfaceinformation.ui
@@ -10,10 +10,10 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>191</width>
-            <height>241</height>
+            <width>203</width>
+            <height>244</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
@@ -99,78 +99,8 @@
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <spacer row="6"  column="1" >
-            <property>
-                <name>name</name>
-                <cstring>Spacer18</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>
-        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout2</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer10</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>advancedButton</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>View Advanced Information</string>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
         <widget row="0"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
@@ -209,8 +139,16 @@
                 <name>name</name>
                 <cstring>TextLabel24</cstring>
             </property>
             <property stdset="1">
+                <name>frameShape</name>
+                <enum>MShape</enum>
+            </property>
+            <property stdset="1">
+                <name>frameShadow</name>
+                <enum>MShadow</enum>
+            </property>
+            <property stdset="1">
                 <name>text</name>
                 <string>Broadcast</string>
             </property>
         </widget>
@@ -289,8 +227,89 @@
                 <name>text</name>
                 <string>0.0.0.0</string>
             </property>
         </widget>
+        <spacer row="7"  column="1" >
+            <property>
+                <name>name</name>
+                <cstring>Spacer18</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>
+        <widget row="6"  column="0"  rowspan="1"  colspan="2" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout2</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer10</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>advancedButton</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>View Advanced Information</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
+            <class>Line</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Line5</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+        </widget>
     </grid>
 </widget>
 <customwidgets>
     <customwidget>
@@ -313,5 +332,7 @@
         <name>image0</name>
         <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
+<connections>
+</connections>
 </UI>
diff --git a/noncore/settings/networksettings/interfacesetup.ui b/noncore/settings/networksettings/interfacesetup.ui
index 698422c..ff9810e 100644
--- a/noncore/settings/networksettings/interfacesetup.ui
+++ b/noncore/settings/networksettings/interfacesetup.ui
@@ -10,10 +10,10 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>193</width>
-            <height>310</height>
+            <width>177</width>
+            <height>320</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
@@ -38,19 +38,8 @@
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget row="6"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel4</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>IP Address</string>
-            </property>
-        </widget>
         <widget row="0"  column="0"  rowspan="1"  colspan="2" >
             <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
@@ -73,30 +62,8 @@
                 <name>name</name>
                 <cstring>profileCombo</cstring>
             </property>
         </widget>
-        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
-            <class>QGroupBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>staticGroupBox</cstring>
-            </property>
-            <property stdset="1">
-                <name>enabled</name>
-                <bool>false</bool>
-            </property>
-            <property stdset="1">
-                <name>title</name>
-                <string>Static Ip Configuration</string>
-            </property>
-        </widget>
-        <widget row="6"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>ipAddressEdit</cstring>
-            </property>
-        </widget>
         <widget row="4"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
@@ -121,19 +88,8 @@
                 <name>checked</name>
                 <bool>true</bool>
             </property>
         </widget>
-        <widget row="7"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel5</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Subnet Mask</string>
-            </property>
-        </widget>
         <widget row="2"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
@@ -166,9 +122,9 @@
                 <name>value</name>
                 <number>24</number>
             </property>
         </widget>
-        <spacer row="11"  column="1" >
+        <spacer row="6"  column="1" >
             <property>
                 <name>name</name>
                 <cstring>Spacer9</cstring>
             </property>
@@ -187,68 +143,122 @@
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget row="10"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>secondDNSLineEdit</cstring>
-            </property>
-        </widget>
-        <widget row="10"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel3</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Second DNS</string>
-            </property>
-        </widget>
-        <widget row="9"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel2</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>First DNS</string>
-            </property>
-        </widget>
-        <widget row="9"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>firstDNSLineEdit</cstring>
-            </property>
-        </widget>
-        <widget row="8"  column="0" >
-            <class>QLabel</class>
+        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
+            <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>TextLabel1_2</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Gateway</string>
+                <cstring>staticGroupBox</cstring>
             </property>
-        </widget>
-        <widget row="7"  column="1" >
-            <class>QLineEdit</class>
             <property stdset="1">
-                <name>name</name>
-                <cstring>subnetMaskEdit</cstring>
+                <name>enabled</name>
+                <bool>false</bool>
             </property>
-        </widget>
-        <widget row="8"  column="1" >
-            <class>QLineEdit</class>
             <property stdset="1">
-                <name>name</name>
-                <cstring>gatewayEdit</cstring>
+                <name>title</name>
+                <string>Static Ip Configuration</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>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>firstDNSLineEdit</cstring>
+                    </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>Subnet Mask</string>
+                    </property>
+                </widget>
+                <widget row="2"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>gatewayEdit</cstring>
+                    </property>
+                </widget>
+                <widget row="1"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>subnetMaskEdit</cstring>
+                    </property>
+                </widget>
+                <widget row="0"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>ipAddressEdit</cstring>
+                    </property>
+                </widget>
+                <widget row="3"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>First DNS</string>
+                    </property>
+                </widget>
+                <widget row="4"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>secondDNSLineEdit</cstring>
+                    </property>
+                </widget>
+                <widget row="0"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel4</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>IP Address</string>
+                    </property>
+                </widget>
+                <widget row="2"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel1_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Gateway</string>
+                    </property>
+                </widget>
+                <widget row="4"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel3</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Second DNS</string>
+                    </property>
+                </widget>
+            </grid>
         </widget>
     </grid>
 </widget>
 <connections>
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow.ui
index f7efe99..c1fa101 100644
--- a/noncore/settings/networksettings/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow.ui
@@ -270,9 +270,9 @@
                             <cstring>PushButton7</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Set Current</string>
+                            <string>&amp;Set Current</string>
                         </property>
                     </widget>
                     <widget row="3"  column="1"  rowspan="1"  colspan="2" >
                         <class>QPushButton</class>
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 2f821a9..0f48a4b 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -1,12 +1,12 @@
 #include "mainwindowimp.h"

 #include "addserviceimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

-#include "interface.h"

 #include "kprocess.h"

 #include "module.h"

 

+

 #include <qpushbutton.h>

 #include <qtabwidget.h>

 #include <qlistbox.h>

 #include <qlistview.h>

@@ -30,13 +30,8 @@
 

 #define TEMP_ALL "/tmp/ifconfig-a"

 #define TEMP_UP "/tmp/ifconfig"

 

-#define NO_SELECT_ERROR_AND_RETURN { \

-  QMessageBox::information(this, "Error","Please select an interface.", "Ok"); \

-  return; \

-}

-

 MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true) {

   connect(addServiceButton, SIGNAL(clicked()), this, SLOT(addClicked()));

   connect(removeServiceButton, SIGNAL(clicked()), this, SLOT(removeClicked()));

   connect(informationServiceButton, SIGNAL(clicked()), this, SLOT(informationClicked()));

@@ -80,8 +75,26 @@ MainWindowImp::~MainWindowImp(){
   }

 }

 

 void MainWindowImp::loadModules(QString path){

+  qDebug(path.latin1());

+  QDir d;

+  d.setPath(path);

+  if(!d.exists()){

+    qDebug("MainWindowImp:: Path doesn't exists");

+    return;

+  }

+  d.setFilter( QDir::Files | QDir::NoSymLinks );

+  const QFileInfoList *list = d.entryInfoList();

+  QFileInfoListIterator it( *list );

+  QFileInfo *fi;

+  while ( (fi=it.current()) ) {

+    if(fi->fileName().contains(".so")){

+      qDebug("Found");

+      Module *foo = loadPlugin(path + "/" + fi->fileName());

+    }

+    ++it;

+  }

 }

 

 /**

  * Attempt to load a function and resolve a function.

@@ -89,9 +102,9 @@ void MainWindowImp::loadModules(QString path){
  * @param resolveString - function pointer to resolve 

  * @return pointer to the function with name resolveString or NULL

  */ 

 Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){

-  //qDebug(pluginFileName.latin1());

+  qDebug(pluginFileName.latin1());

   QLibrary *lib = new QLibrary(pluginFileName);

   void *functionPointer = lib->resolve(resolveString);

   if( !functionPointer ){

     qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());

@@ -111,36 +124,8 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
   libraries.insert(object, lib);

   return object;

 }

 

-/*

-QList<QString> MainWindowImp::retrieveUnloadedPluginList(){

-  QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;

-  QString path = DirStr + "plugins";

-  QDir d(path);

-  d.setFilter( QDir::Files | QDir::Hidden );

-

-  QMap<QObject*, QLibrary*>::Iterator libraryIt;

-  QList<QString> rlist; 

-  rlist.setAutoDelete(false);

-	  

-  const QFileInfoList *list = d.entryInfoList();

-  QFileInfoListIterator it( *list );

-  QFileInfo *fi;

-  while ( (fi=it.current()) ) {

-    if(fi->fileName().contains(".so")){

-      for( libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt )

-        if((path + "/" + fi->fileName()) != (libraryIt.data())->library()){

-          QString *s = new QString(path + "/" + fi->fileName());

-          rlist.append(s);

-	}

-    }

-    ++it;

-  }

-  return rlist;

-}

-*/

-

 /**

  * The Add button was clicked.  Bring up the add dialog and if OK is hit

  * load the plugin and append it to the list

  */ 

@@ -160,9 +145,12 @@ void MainWindowImp::addClicked(){
  * If they do then remove from the list and unload.

  */ 

 void MainWindowImp::removeClicked(){

   QListViewItem *item = serviceList->currentItem();

-  if(item == NULL) NO_SELECT_ERROR_AND_RETURN

+  if(item == NULL) {

+     QMessageBox::information(this, "Error","Please select an interface.", "Ok");

+     return; 

+  }

   

   if(modules.find(interfaceItems[item]) == modules.end()){

     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");

   }

@@ -177,9 +165,12 @@ void MainWindowImp::removeClicked(){
  * Prompt with errors.

  */ 

 void MainWindowImp::configureClicked(){

   QListViewItem *item = serviceList->currentItem();

-  if(item == NULL) NO_SELECT_ERROR_AND_RETURN

+  if(item == NULL){

+   	 QMessageBox::information(this, "Error","Please select an interface.", "Ok");

+     return;

+  } 

   

   if(modules.find(interfaceItems[item]) == modules.end()){

     InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]);

     conf->showMaximized();

@@ -196,10 +187,13 @@ void MainWindowImp::configureClicked(){
  * Report an error

  */ 

 void MainWindowImp::informationClicked(){

   QListViewItem *item = serviceList->currentItem();

-  if(item == NULL)NO_SELECT_ERROR_AND_RETURN

-	

+  if(item == NULL){

+    QMessageBox::information(this, "Error","Please select an interface.", "Ok");

+    return;

+  }

+

   if(modules.find(interfaceItems[item]) == modules.end()){

     InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);

     i->showMaximized();

     i->show();

@@ -310,8 +304,12 @@ void MainWindowImp::updateInterface(Interface *i){
  

   QString typeName = "lan";

   if(i->getHardwareName().contains("Local Loopback"))

     typeName = "lo";

+  if(i->getInterfaceName().contains("irda"))

+    typeName = "irda";

+  if(i->getInterfaceName().contains("wlan"))

+    typeName = "wlan";

   QPixmap type = (Resource::loadPixmap(typeName));

   item->setPixmap(1, type);

 

   item->setText(2, i->getHardwareName());

diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index f146d8c..13fd523 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -1,6 +1,6 @@
-#ifndef MODULE_H
-#define MODULE_H
+#ifndef NETCONF_MODULE_H
+#define NETCONF_MODULE_H
 
 #include <qobject.h>
 #include <qlist.h>
 #include <qmap.h>
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro
index 7d9918b..a01b050 100644
--- a/noncore/settings/networksettings/networksetup.pro
+++ b/noncore/settings/networksettings/networksetup.pro
@@ -2,9 +2,9 @@ TEMPLATE	= app
 CONFIG		= qt warn_on debug
 #CONFIG		= qt warn_on release
 HEADERS		= mainwindowimp.h addserviceimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h  kprocctrl.h module.h  kprocess.h
 SOURCES		= main.cpp mainwindowimp.cpp addserviceimp.cpp interface.cpp interfaceinformationimp.cpp  interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
-INCLUDEPATH	+= $(QPEDIR)/include
-DEPENDPATH	+= $(QPEDIR)/include
+#INCLUDEPATH	+= $(QPEDIR)/include
+#DEPENDPATH	+= $(QPEDIR)/include
 LIBS            += -lqpe
 INTERFACES	= mainwindow.ui addservice.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
 TARGET		= networksetup