summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfaceadvanced.ui22
-rw-r--r--noncore/settings/networksettings/interfaces/interfaceinformation.ui22
-rw-r--r--noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp9
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetup.ui24
-rw-r--r--noncore/settings/networksettings/ppp/.cvsignore15
5 files changed, 9 insertions, 83 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaceadvanced.ui b/noncore/settings/networksettings/interfaces/interfaceadvanced.ui
index 9d9f98e..2e106cb 100644
--- a/noncore/settings/networksettings/interfaces/interfaceadvanced.ui
+++ b/noncore/settings/networksettings/interfaces/interfaceadvanced.ui
@@ -194,151 +194,129 @@
194 <name>frameShadow</name> 194 <name>frameShadow</name>
195 <enum>Sunken</enum> 195 <enum>Sunken</enum>
196 </property> 196 </property>
197 <property stdset="1"> 197 <property stdset="1">
198 <name>text</name> 198 <name>text</name>
199 <string></string> 199 <string></string>
200 </property> 200 </property>
201 </widget> 201 </widget>
202 <widget row="1" column="1" > 202 <widget row="1" column="1" >
203 <class>QLabel</class> 203 <class>QLabel</class>
204 <property stdset="1"> 204 <property stdset="1">
205 <name>name</name> 205 <name>name</name>
206 <cstring>leaseObtainedLabel</cstring> 206 <cstring>leaseObtainedLabel</cstring>
207 </property> 207 </property>
208 <property stdset="1"> 208 <property stdset="1">
209 <name>frameShape</name> 209 <name>frameShape</name>
210 <enum>Panel</enum> 210 <enum>Panel</enum>
211 </property> 211 </property>
212 <property stdset="1"> 212 <property stdset="1">
213 <name>frameShadow</name> 213 <name>frameShadow</name>
214 <enum>Sunken</enum> 214 <enum>Sunken</enum>
215 </property> 215 </property>
216 <property stdset="1"> 216 <property stdset="1">
217 <name>text</name> 217 <name>text</name>
218 <string></string> 218 <string></string>
219 </property> 219 </property>
220 </widget> 220 </widget>
221 <widget row="2" column="0" > 221 <widget row="2" column="0" >
222 <class>QLabel</class> 222 <class>QLabel</class>
223 <property stdset="1"> 223 <property stdset="1">
224 <name>name</name> 224 <name>name</name>
225 <cstring>TextLabel9</cstring> 225 <cstring>TextLabel9</cstring>
226 </property> 226 </property>
227 <property stdset="1"> 227 <property stdset="1">
228 <name>text</name> 228 <name>text</name>
229 <string>Lease Expires</string> 229 <string>Lease Expires</string>
230 </property> 230 </property>
231 </widget> 231 </widget>
232 <widget row="1" column="0" > 232 <widget row="1" column="0" >
233 <class>QLabel</class> 233 <class>QLabel</class>
234 <property stdset="1"> 234 <property stdset="1">
235 <name>name</name> 235 <name>name</name>
236 <cstring>TextLabel8</cstring> 236 <cstring>TextLabel8</cstring>
237 </property> 237 </property>
238 <property stdset="1"> 238 <property stdset="1">
239 <name>text</name> 239 <name>text</name>
240 <string>Lease Obtained</string> 240 <string>Lease Obtained</string>
241 </property> 241 </property>
242 </widget> 242 </widget>
243 <widget row="0" column="1" > 243 <widget row="0" column="1" >
244 <class>QLabel</class> 244 <class>QLabel</class>
245 <property stdset="1"> 245 <property stdset="1">
246 <name>name</name> 246 <name>name</name>
247 <cstring>dhcpServerLabel</cstring> 247 <cstring>dhcpServerLabel</cstring>
248 </property> 248 </property>
249 <property stdset="1"> 249 <property stdset="1">
250 <name>frameShape</name> 250 <name>frameShape</name>
251 <enum>Panel</enum> 251 <enum>Panel</enum>
252 </property> 252 </property>
253 <property stdset="1"> 253 <property stdset="1">
254 <name>frameShadow</name> 254 <name>frameShadow</name>
255 <enum>Sunken</enum> 255 <enum>Sunken</enum>
256 </property> 256 </property>
257 <property stdset="1"> 257 <property stdset="1">
258 <name>text</name> 258 <name>text</name>
259 <string></string> 259 <string></string>
260 </property> 260 </property>
261 </widget> 261 </widget>
262 </grid> 262 </grid>
263 </widget> 263 </widget>
264 <widget row="4" column="0" > 264 <widget row="4" column="0" >
265 <class>QLabel</class> 265 <class>QLabel</class>
266 <property stdset="1"> 266 <property stdset="1">
267 <name>name</name> 267 <name>name</name>
268 <cstring>TextLabel2</cstring> 268 <cstring>TextLabel2</cstring>
269 </property> 269 </property>
270 <property stdset="1"> 270 <property stdset="1">
271 <name>text</name> 271 <name>text</name>
272 <string>Broadcast</string> 272 <string>Broadcast</string>
273 </property> 273 </property>
274 </widget> 274 </widget>
275 <widget row="4" column="1" > 275 <widget row="4" column="1" >
276 <class>QLabel</class> 276 <class>QLabel</class>
277 <property stdset="1"> 277 <property stdset="1">
278 <name>name</name> 278 <name>name</name>
279 <cstring>broadcastLabel</cstring> 279 <cstring>broadcastLabel</cstring>
280 </property> 280 </property>
281 <property stdset="1"> 281 <property stdset="1">
282 <name>frameShape</name> 282 <name>frameShape</name>
283 <enum>Panel</enum> 283 <enum>Panel</enum>
284 </property> 284 </property>
285 <property stdset="1"> 285 <property stdset="1">
286 <name>frameShadow</name> 286 <name>frameShadow</name>
287 <enum>Sunken</enum> 287 <enum>Sunken</enum>
288 </property> 288 </property>
289 </widget> 289 </widget>
290 <widget row="3" column="0" > 290 <widget row="3" column="0" >
291 <class>QLabel</class> 291 <class>QLabel</class>
292 <property stdset="1"> 292 <property stdset="1">
293 <name>name</name> 293 <name>name</name>
294 <cstring>TextLabel1</cstring> 294 <cstring>TextLabel1</cstring>
295 </property> 295 </property>
296 <property stdset="1"> 296 <property stdset="1">
297 <name>text</name> 297 <name>text</name>
298 <string>MAC Address</string> 298 <string>MAC Address</string>
299 </property> 299 </property>
300 </widget> 300 </widget>
301 <widget row="3" column="1" > 301 <widget row="3" column="1" >
302 <class>QLabel</class> 302 <class>QLabel</class>
303 <property stdset="1"> 303 <property stdset="1">
304 <name>name</name> 304 <name>name</name>
305 <cstring>macAddressLabel</cstring> 305 <cstring>macAddressLabel</cstring>
306 </property> 306 </property>
307 <property stdset="1"> 307 <property stdset="1">
308 <name>frameShape</name> 308 <name>frameShape</name>
309 <enum>Panel</enum> 309 <enum>Panel</enum>
310 </property> 310 </property>
311 <property stdset="1"> 311 <property stdset="1">
312 <name>frameShadow</name> 312 <name>frameShadow</name>
313 <enum>Sunken</enum> 313 <enum>Sunken</enum>
314 </property> 314 </property>
315 <property stdset="1"> 315 <property stdset="1">
316 <name>text</name> 316 <name>text</name>
317 <string>00:00:00:00:00:00</string> 317 <string>00:00:00:00:00:00</string>
318 </property> 318 </property>
319 </widget> 319 </widget>
320 </grid> 320 </grid>
321</widget> 321</widget>
322<customwidgets>
323 <customwidget>
324 <class>QWidget</class>
325 <header location="local">qwidget.h</header>
326 <sizehint>
327 <width>100</width>
328 <height>100</height>
329 </sizehint>
330 <container>0</container>
331 <sizepolicy>
332 <hordata>7</hordata>
333 <verdata>7</verdata>
334 </sizepolicy>
335 <pixmap>image0</pixmap>
336 </customwidget>
337</customwidgets>
338<images>
339 <image>
340 <name>image0</name>
341 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
342 </image>
343</images>
344</UI> 322</UI>
diff --git a/noncore/settings/networksettings/interfaces/interfaceinformation.ui b/noncore/settings/networksettings/interfaces/interfaceinformation.ui
index e49e09f..763ad90 100644
--- a/noncore/settings/networksettings/interfaces/interfaceinformation.ui
+++ b/noncore/settings/networksettings/interfaces/interfaceinformation.ui
@@ -186,158 +186,136 @@
186 <enum>Sunken</enum> 186 <enum>Sunken</enum>
187 </property> 187 </property>
188 <property stdset="1"> 188 <property stdset="1">
189 <name>text</name> 189 <name>text</name>
190 <string>00:00:00:00:00:00</string> 190 <string>00:00:00:00:00:00</string>
191 </property> 191 </property>
192 </widget> 192 </widget>
193 <widget row="3" column="1" > 193 <widget row="3" column="1" >
194 <class>QLabel</class> 194 <class>QLabel</class>
195 <property stdset="1"> 195 <property stdset="1">
196 <name>name</name> 196 <name>name</name>
197 <cstring>broadcastLabel</cstring> 197 <cstring>broadcastLabel</cstring>
198 </property> 198 </property>
199 <property stdset="1"> 199 <property stdset="1">
200 <name>frameShape</name> 200 <name>frameShape</name>
201 <enum>Panel</enum> 201 <enum>Panel</enum>
202 </property> 202 </property>
203 <property stdset="1"> 203 <property stdset="1">
204 <name>frameShadow</name> 204 <name>frameShadow</name>
205 <enum>Sunken</enum> 205 <enum>Sunken</enum>
206 </property> 206 </property>
207 <property stdset="1"> 207 <property stdset="1">
208 <name>text</name> 208 <name>text</name>
209 <string></string> 209 <string></string>
210 </property> 210 </property>
211 </widget> 211 </widget>
212 <widget row="0" column="1" > 212 <widget row="0" column="1" >
213 <class>QLabel</class> 213 <class>QLabel</class>
214 <property stdset="1"> 214 <property stdset="1">
215 <name>name</name> 215 <name>name</name>
216 <cstring>ipAddressLabel</cstring> 216 <cstring>ipAddressLabel</cstring>
217 </property> 217 </property>
218 <property stdset="1"> 218 <property stdset="1">
219 <name>frameShape</name> 219 <name>frameShape</name>
220 <enum>Panel</enum> 220 <enum>Panel</enum>
221 </property> 221 </property>
222 <property stdset="1"> 222 <property stdset="1">
223 <name>frameShadow</name> 223 <name>frameShadow</name>
224 <enum>Sunken</enum> 224 <enum>Sunken</enum>
225 </property> 225 </property>
226 <property stdset="1"> 226 <property stdset="1">
227 <name>text</name> 227 <name>text</name>
228 <string>0.0.0.0</string> 228 <string>0.0.0.0</string>
229 </property> 229 </property>
230 </widget> 230 </widget>
231 <spacer row="7" column="1" > 231 <spacer row="7" column="1" >
232 <property> 232 <property>
233 <name>name</name> 233 <name>name</name>
234 <cstring>Spacer18</cstring> 234 <cstring>Spacer18</cstring>
235 </property> 235 </property>
236 <property stdset="1"> 236 <property stdset="1">
237 <name>orientation</name> 237 <name>orientation</name>
238 <enum>Vertical</enum> 238 <enum>Vertical</enum>
239 </property> 239 </property>
240 <property stdset="1"> 240 <property stdset="1">
241 <name>sizeType</name> 241 <name>sizeType</name>
242 <enum>Expanding</enum> 242 <enum>Expanding</enum>
243 </property> 243 </property>
244 <property> 244 <property>
245 <name>sizeHint</name> 245 <name>sizeHint</name>
246 <size> 246 <size>
247 <width>20</width> 247 <width>20</width>
248 <height>20</height> 248 <height>20</height>
249 </size> 249 </size>
250 </property> 250 </property>
251 </spacer> 251 </spacer>
252 <widget row="6" column="0" rowspan="1" colspan="2" > 252 <widget row="6" column="0" rowspan="1" colspan="2" >
253 <class>QLayoutWidget</class> 253 <class>QLayoutWidget</class>
254 <property stdset="1"> 254 <property stdset="1">
255 <name>name</name> 255 <name>name</name>
256 <cstring>Layout2</cstring> 256 <cstring>Layout2</cstring>
257 </property> 257 </property>
258 <hbox> 258 <hbox>
259 <property stdset="1"> 259 <property stdset="1">
260 <name>margin</name> 260 <name>margin</name>
261 <number>0</number> 261 <number>0</number>
262 </property> 262 </property>
263 <property stdset="1"> 263 <property stdset="1">
264 <name>spacing</name> 264 <name>spacing</name>
265 <number>6</number> 265 <number>6</number>
266 </property> 266 </property>
267 <spacer> 267 <spacer>
268 <property> 268 <property>
269 <name>name</name> 269 <name>name</name>
270 <cstring>Spacer10</cstring> 270 <cstring>Spacer10</cstring>
271 </property> 271 </property>
272 <property stdset="1"> 272 <property stdset="1">
273 <name>orientation</name> 273 <name>orientation</name>
274 <enum>Horizontal</enum> 274 <enum>Horizontal</enum>
275 </property> 275 </property>
276 <property stdset="1"> 276 <property stdset="1">
277 <name>sizeType</name> 277 <name>sizeType</name>
278 <enum>Expanding</enum> 278 <enum>Expanding</enum>
279 </property> 279 </property>
280 <property> 280 <property>
281 <name>sizeHint</name> 281 <name>sizeHint</name>
282 <size> 282 <size>
283 <width>20</width> 283 <width>20</width>
284 <height>20</height> 284 <height>20</height>
285 </size> 285 </size>
286 </property> 286 </property>
287 </spacer> 287 </spacer>
288 <widget> 288 <widget>
289 <class>QPushButton</class> 289 <class>QPushButton</class>
290 <property stdset="1"> 290 <property stdset="1">
291 <name>name</name> 291 <name>name</name>
292 <cstring>advancedButton</cstring> 292 <cstring>advancedButton</cstring>
293 </property> 293 </property>
294 <property stdset="1"> 294 <property stdset="1">
295 <name>text</name> 295 <name>text</name>
296 <string>&amp;View Advanced Information</string> 296 <string>&amp;View Advanced Information</string>
297 </property> 297 </property>
298 </widget> 298 </widget>
299 </hbox> 299 </hbox>
300 </widget> 300 </widget>
301 <widget row="5" column="0" rowspan="1" colspan="2" > 301 <widget row="5" column="0" rowspan="1" colspan="2" >
302 <class>Line</class> 302 <class>Line</class>
303 <property stdset="1"> 303 <property stdset="1">
304 <name>name</name> 304 <name>name</name>
305 <cstring>Line5</cstring> 305 <cstring>Line5</cstring>
306 </property> 306 </property>
307 <property stdset="1"> 307 <property stdset="1">
308 <name>orientation</name> 308 <name>orientation</name>
309 <enum>Horizontal</enum> 309 <enum>Horizontal</enum>
310 </property> 310 </property>
311 </widget> 311 </widget>
312 </grid> 312 </grid>
313</widget> 313</widget>
314<customwidgets>
315 <customwidget>
316 <class>QWidget</class>
317 <header location="local">qwidget.h</header>
318 <sizehint>
319 <width>100</width>
320 <height>100</height>
321 </sizehint>
322 <container>0</container>
323 <sizepolicy>
324 <hordata>7</hordata>
325 <verdata>7</verdata>
326 </sizepolicy>
327 <pixmap>image0</pixmap>
328 </customwidget>
329</customwidgets>
330<images>
331 <image>
332 <name>image0</name>
333 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
334 </image>
335</images>
336<tabstops> 314<tabstops>
337 <tabstop>startButton</tabstop> 315 <tabstop>startButton</tabstop>
338 <tabstop>stopButton</tabstop> 316 <tabstop>stopButton</tabstop>
339 <tabstop>refreshButton</tabstop> 317 <tabstop>refreshButton</tabstop>
340 <tabstop>restartButton</tabstop> 318 <tabstop>restartButton</tabstop>
341 <tabstop>advancedButton</tabstop> 319 <tabstop>advancedButton</tabstop>
342</tabstops> 320</tabstops>
343</UI> 321</UI>
diff --git a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
index 1fa5d38..271bb78 100644
--- a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
@@ -1,76 +1,79 @@
1#include "interfaceinformationimp.h" 1#include "interfaceinformationimp.h"
2#include "interfaceadvanced.h" 2#include "interfaceadvanced.h"
3 3
4#include <qpushbutton.h> 4#include <qpushbutton.h>
5#include <qlabel.h> 5#include <qlabel.h>
6#include <qgroupbox.h> 6#include <qgroupbox.h>
7#include <qmessagebox.h> 7#include <qmessagebox.h>
8 8
9#ifdef QTE_VERSION
10#else
11 #define showMaximized show
12#endif
13
9/** 14/**
10 * Constructor for the InterfaceInformationImp class. This class pretty much 15 * Constructor for the InterfaceInformationImp class. This class pretty much
11 * just display's information about the interface that is passed to it. 16 * just display's information about the interface that is passed to it.
12 */ 17 */
13InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *name, Interface *i, WFlags f):InterfaceInformation(parent, name, f), interface(i){ 18InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *name, Interface *i, WFlags f):InterfaceInformation(parent, name, f), interface(i){
14 connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); 19 connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
15 connect(i, SIGNAL(updateMessage(const QString &)), this, SLOT(showMessage(const QString &))); 20 connect(i, SIGNAL(updateMessage(const QString &)), this, SLOT(showMessage(const QString &)));
16 updateInterface(interface); 21 updateInterface(interface);
17 connect(startButton, SIGNAL(clicked()), interface, SLOT(start())); 22 connect(startButton, SIGNAL(clicked()), interface, SLOT(start()));
18 connect(stopButton, SIGNAL(clicked()), interface, SLOT(stop())); 23 connect(stopButton, SIGNAL(clicked()), interface, SLOT(stop()));
19 connect(restartButton, SIGNAL(clicked()), interface, SLOT(restart())); 24 connect(restartButton, SIGNAL(clicked()), interface, SLOT(restart()));
20 connect(refreshButton, SIGNAL(clicked()), interface, SLOT(refresh())); 25 connect(refreshButton, SIGNAL(clicked()), interface, SLOT(refresh()));
21 connect(advancedButton, SIGNAL(clicked()), this, SLOT(advanced())); 26 connect(advancedButton, SIGNAL(clicked()), this, SLOT(advanced()));
22} 27}
23 28
24/** 29/**
25 * Update the interface information and buttons. 30 * Update the interface information and buttons.
26 * @param Intarface *i the interface to update (should be the one we already 31 * @param Intarface *i the interface to update (should be the one we already
27 * know about). 32 * know about).
28 */ 33 */
29void InterfaceInformationImp::updateInterface(Interface *){ 34void InterfaceInformationImp::updateInterface(Interface *){
30 if(interface->getStatus()){ 35 if(interface->getStatus()){
31 startButton->setEnabled(false); 36 startButton->setEnabled(false);
32 stopButton->setEnabled(true); 37 stopButton->setEnabled(true);
33 restartButton->setEnabled(true); 38 restartButton->setEnabled(true);
34 } 39 }
35 else{ 40 else{
36 startButton->setEnabled(true); 41 startButton->setEnabled(true);
37 stopButton->setEnabled(false); 42 stopButton->setEnabled(false);
38 restartButton->setEnabled(false); 43 restartButton->setEnabled(false);
39 } 44 }
40 macAddressLabel->setText(interface->getMacAddress()); 45 macAddressLabel->setText(interface->getMacAddress());
41 ipAddressLabel->setText(interface->getIp()); 46 ipAddressLabel->setText(interface->getIp());
42 subnetMaskLabel->setText(interface->getSubnetMask()); 47 subnetMaskLabel->setText(interface->getSubnetMask());
43 broadcastLabel->setText(interface->getBroadcast()); 48 broadcastLabel->setText(interface->getBroadcast());
44} 49}
45 50
46/** 51/**
47 * Create the advanced widget. Fill it with the current interface's information. 52 * Create the advanced widget. Fill it with the current interface's information.
48 * Display it. 53 * Display it.
49 */ 54 */
50void InterfaceInformationImp::advanced(){ 55void InterfaceInformationImp::advanced(){
51 InterfaceAdvanced *a = new InterfaceAdvanced(0, "InterfaceAdvanced"); 56 InterfaceAdvanced *a = new InterfaceAdvanced(this, "InterfaceAdvanced", Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog);
52 a->interfaceName->setText(interface->getInterfaceName()); 57 a->interfaceName->setText(interface->getInterfaceName());
53 a->macAddressLabel->setText(interface->getMacAddress()); 58 a->macAddressLabel->setText(interface->getMacAddress());
54 a->ipAddressLabel->setText(interface->getIp()); 59 a->ipAddressLabel->setText(interface->getIp());
55 a->subnetMaskLabel->setText(interface->getSubnetMask()); 60 a->subnetMaskLabel->setText(interface->getSubnetMask());
56 a->broadcastLabel->setText(interface->getBroadcast()); 61 a->broadcastLabel->setText(interface->getBroadcast());
57 a->dhcpServerLabel->setText(interface->getDhcpServerIp()); 62 a->dhcpServerLabel->setText(interface->getDhcpServerIp());
58 a->leaseObtainedLabel->setText(interface->getLeaseObtained()); 63 a->leaseObtainedLabel->setText(interface->getLeaseObtained());
59 a->leaseExpiresLabel->setText(interface->getLeaseExpires()); 64 a->leaseExpiresLabel->setText(interface->getLeaseExpires());
60 a->dhcpInformation->setEnabled(interface->isDhcp()); 65 a->dhcpInformation->setEnabled(interface->isDhcp());
61
62 a->showMaximized(); 66 a->showMaximized();
63 a->show();
64} 67}
65 68
66/** 69/**
67 * Messages from the interface if start/stop went as planned. 70 * Messages from the interface if start/stop went as planned.
68 * Purly for user feedback. 71 * Purly for user feedback.
69 * @param message the message to display. 72 * @param message the message to display.
70 */ 73 */
71void InterfaceInformationImp::showMessage(const QString &message){ 74void InterfaceInformationImp::showMessage(const QString &message){
72 QMessageBox::information(this, "Message", message, QMessageBox::Ok); 75 QMessageBox::information(this, "Message", message, QMessageBox::Ok);
73} 76}
74 77
75// infoimp.cpp 78// infoimp.cpp
76 79
diff --git a/noncore/settings/networksettings/interfaces/interfacesetup.ui b/noncore/settings/networksettings/interfaces/interfacesetup.ui
index aff9d6c..efcab8b 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetup.ui
+++ b/noncore/settings/networksettings/interfaces/interfacesetup.ui
@@ -1,242 +1,220 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>InterfaceSetup</class> 2<class>InterfaceSetup</class>
3<widget> 3<widget>
4 <class>QWidget</class> 4 <class>QWidget</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>InterfaceSetup</cstring> 7 <cstring>InterfaceSetup</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>286</width> 14 <width>286</width>
15 <height>280</height> 15 <height>280</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Interface Configuration</string> 20 <string>Interface Configuration</string>
21 </property> 21 </property>
22 <vbox> 22 <vbox>
23 <property stdset="1"> 23 <property stdset="1">
24 <name>margin</name> 24 <name>margin</name>
25 <number>11</number> 25 <number>11</number>
26 </property> 26 </property>
27 <property stdset="1"> 27 <property stdset="1">
28 <name>spacing</name> 28 <name>spacing</name>
29 <number>6</number> 29 <number>6</number>
30 </property> 30 </property>
31 <widget> 31 <widget>
32 <class>QCheckBox</class> 32 <class>QCheckBox</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>autoStart</cstring> 35 <cstring>autoStart</cstring>
36 </property> 36 </property>
37 <property stdset="1"> 37 <property stdset="1">
38 <name>text</name> 38 <name>text</name>
39 <string>Bring up on bootup</string> 39 <string>Automatically bring up</string>
40 </property> 40 </property>
41 </widget> 41 </widget>
42 <widget> 42 <widget>
43 <class>QCheckBox</class> 43 <class>QCheckBox</class>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>name</name> 45 <name>name</name>
46 <cstring>dhcpCheckBox</cstring> 46 <cstring>dhcpCheckBox</cstring>
47 </property> 47 </property>
48 <property stdset="1"> 48 <property stdset="1">
49 <name>text</name> 49 <name>text</name>
50 <string>DHCP</string> 50 <string>DHCP</string>
51 </property> 51 </property>
52 <property stdset="1"> 52 <property stdset="1">
53 <name>checked</name> 53 <name>checked</name>
54 <bool>true</bool> 54 <bool>true</bool>
55 </property> 55 </property>
56 </widget> 56 </widget>
57 <widget> 57 <widget>
58 <class>QGroupBox</class> 58 <class>QGroupBox</class>
59 <property stdset="1"> 59 <property stdset="1">
60 <name>name</name> 60 <name>name</name>
61 <cstring>staticGroupBox</cstring> 61 <cstring>staticGroupBox</cstring>
62 </property> 62 </property>
63 <property stdset="1"> 63 <property stdset="1">
64 <name>enabled</name> 64 <name>enabled</name>
65 <bool>false</bool> 65 <bool>false</bool>
66 </property> 66 </property>
67 <property stdset="1"> 67 <property stdset="1">
68 <name>frameShape</name> 68 <name>frameShape</name>
69 <enum>Box</enum> 69 <enum>Box</enum>
70 </property> 70 </property>
71 <property stdset="1"> 71 <property stdset="1">
72 <name>frameShadow</name> 72 <name>frameShadow</name>
73 <enum>Sunken</enum> 73 <enum>Sunken</enum>
74 </property> 74 </property>
75 <property stdset="1"> 75 <property stdset="1">
76 <name>title</name> 76 <name>title</name>
77 <string>Static Ip Configuration</string> 77 <string>Static Ip Configuration</string>
78 </property> 78 </property>
79 <grid> 79 <grid>
80 <property stdset="1"> 80 <property stdset="1">
81 <name>margin</name> 81 <name>margin</name>
82 <number>11</number> 82 <number>11</number>
83 </property> 83 </property>
84 <property stdset="1"> 84 <property stdset="1">
85 <name>spacing</name> 85 <name>spacing</name>
86 <number>6</number> 86 <number>6</number>
87 </property> 87 </property>
88 <widget row="1" column="0" > 88 <widget row="1" column="0" >
89 <class>QLabel</class> 89 <class>QLabel</class>
90 <property stdset="1"> 90 <property stdset="1">
91 <name>name</name> 91 <name>name</name>
92 <cstring>TextLabel5</cstring> 92 <cstring>TextLabel5</cstring>
93 </property> 93 </property>
94 <property stdset="1"> 94 <property stdset="1">
95 <name>text</name> 95 <name>text</name>
96 <string>Subnet Mask</string> 96 <string>Subnet Mask</string>
97 </property> 97 </property>
98 </widget> 98 </widget>
99 <widget row="2" column="1" > 99 <widget row="2" column="1" >
100 <class>QLineEdit</class> 100 <class>QLineEdit</class>
101 <property stdset="1"> 101 <property stdset="1">
102 <name>name</name> 102 <name>name</name>
103 <cstring>gatewayEdit</cstring> 103 <cstring>gatewayEdit</cstring>
104 </property> 104 </property>
105 </widget> 105 </widget>
106 <widget row="1" column="1" > 106 <widget row="1" column="1" >
107 <class>QLineEdit</class> 107 <class>QLineEdit</class>
108 <property stdset="1"> 108 <property stdset="1">
109 <name>name</name> 109 <name>name</name>
110 <cstring>subnetMaskEdit</cstring> 110 <cstring>subnetMaskEdit</cstring>
111 </property> 111 </property>
112 </widget> 112 </widget>
113 <widget row="0" column="1" > 113 <widget row="0" column="1" >
114 <class>QLineEdit</class> 114 <class>QLineEdit</class>
115 <property stdset="1"> 115 <property stdset="1">
116 <name>name</name> 116 <name>name</name>
117 <cstring>ipAddressEdit</cstring> 117 <cstring>ipAddressEdit</cstring>
118 </property> 118 </property>
119 </widget> 119 </widget>
120 <widget row="3" column="0" > 120 <widget row="3" column="0" >
121 <class>QLabel</class> 121 <class>QLabel</class>
122 <property stdset="1"> 122 <property stdset="1">
123 <name>name</name> 123 <name>name</name>
124 <cstring>TextLabel2</cstring> 124 <cstring>TextLabel2</cstring>
125 </property> 125 </property>
126 <property stdset="1"> 126 <property stdset="1">
127 <name>text</name> 127 <name>text</name>
128 <string>First DNS</string> 128 <string>First DNS</string>
129 </property> 129 </property>
130 </widget> 130 </widget>
131 <widget row="0" column="0" > 131 <widget row="0" column="0" >
132 <class>QLabel</class> 132 <class>QLabel</class>
133 <property stdset="1"> 133 <property stdset="1">
134 <name>name</name> 134 <name>name</name>
135 <cstring>TextLabel4</cstring> 135 <cstring>TextLabel4</cstring>
136 </property> 136 </property>
137 <property stdset="1"> 137 <property stdset="1">
138 <name>text</name> 138 <name>text</name>
139 <string>IP Address</string> 139 <string>IP Address</string>
140 </property> 140 </property>
141 </widget> 141 </widget>
142 <widget row="2" column="0" > 142 <widget row="2" column="0" >
143 <class>QLabel</class> 143 <class>QLabel</class>
144 <property stdset="1"> 144 <property stdset="1">
145 <name>name</name> 145 <name>name</name>
146 <cstring>TextLabel1_2</cstring> 146 <cstring>TextLabel1_2</cstring>
147 </property> 147 </property>
148 <property stdset="1"> 148 <property stdset="1">
149 <name>text</name> 149 <name>text</name>
150 <string>Gateway</string> 150 <string>Gateway</string>
151 </property> 151 </property>
152 </widget> 152 </widget>
153 <widget row="4" column="0" > 153 <widget row="4" column="0" >
154 <class>QLabel</class> 154 <class>QLabel</class>
155 <property stdset="1"> 155 <property stdset="1">
156 <name>name</name> 156 <name>name</name>
157 <cstring>TextLabel3</cstring> 157 <cstring>TextLabel3</cstring>
158 </property> 158 </property>
159 <property stdset="1"> 159 <property stdset="1">
160 <name>text</name> 160 <name>text</name>
161 <string>Second DNS</string> 161 <string>Second DNS</string>
162 </property> 162 </property>
163 </widget> 163 </widget>
164 <widget row="3" column="1" > 164 <widget row="3" column="1" >
165 <class>QLineEdit</class> 165 <class>QLineEdit</class>
166 <property stdset="1"> 166 <property stdset="1">
167 <name>name</name> 167 <name>name</name>
168 <cstring>firstDNSLineEdit</cstring> 168 <cstring>firstDNSLineEdit</cstring>
169 </property> 169 </property>
170 </widget> 170 </widget>
171 <widget row="4" column="1" > 171 <widget row="4" column="1" >
172 <class>QLineEdit</class> 172 <class>QLineEdit</class>
173 <property stdset="1"> 173 <property stdset="1">
174 <name>name</name> 174 <name>name</name>
175 <cstring>secondDNSLineEdit</cstring> 175 <cstring>secondDNSLineEdit</cstring>
176 </property> 176 </property>
177 </widget> 177 </widget>
178 </grid> 178 </grid>
179 </widget> 179 </widget>
180 <spacer> 180 <spacer>
181 <property> 181 <property>
182 <name>name</name> 182 <name>name</name>
183 <cstring>Spacer9</cstring> 183 <cstring>Spacer9</cstring>
184 </property> 184 </property>
185 <property stdset="1"> 185 <property stdset="1">
186 <name>orientation</name> 186 <name>orientation</name>
187 <enum>Vertical</enum> 187 <enum>Vertical</enum>
188 </property> 188 </property>
189 <property stdset="1"> 189 <property stdset="1">
190 <name>sizeType</name> 190 <name>sizeType</name>
191 <enum>Expanding</enum> 191 <enum>Expanding</enum>
192 </property> 192 </property>
193 <property> 193 <property>
194 <name>sizeHint</name> 194 <name>sizeHint</name>
195 <size> 195 <size>
196 <width>20</width> 196 <width>20</width>
197 <height>20</height> 197 <height>20</height>
198 </size> 198 </size>
199 </property> 199 </property>
200 </spacer> 200 </spacer>
201 </vbox> 201 </vbox>
202</widget> 202</widget>
203<customwidgets>
204 <customwidget>
205 <class>QWidget</class>
206 <header location="local">qwidget.h</header>
207 <sizehint>
208 <width>100</width>
209 <height>100</height>
210 </sizehint>
211 <container>0</container>
212 <sizepolicy>
213 <hordata>7</hordata>
214 <verdata>7</verdata>
215 </sizepolicy>
216 <pixmap>image0</pixmap>
217 </customwidget>
218</customwidgets>
219<images>
220 <image>
221 <name>image0</name>
222 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
223 </image>
224</images>
225<connections> 203<connections>
226 <connection> 204 <connection>
227 <sender>dhcpCheckBox</sender> 205 <sender>dhcpCheckBox</sender>
228 <signal>toggled(bool)</signal> 206 <signal>toggled(bool)</signal>
229 <receiver>staticGroupBox</receiver> 207 <receiver>staticGroupBox</receiver>
230 <slot>setDisabled(bool)</slot> 208 <slot>setDisabled(bool)</slot>
231 </connection> 209 </connection>
232</connections> 210</connections>
233<tabstops> 211<tabstops>
234 <tabstop>autoStart</tabstop> 212 <tabstop>autoStart</tabstop>
235 <tabstop>dhcpCheckBox</tabstop> 213 <tabstop>dhcpCheckBox</tabstop>
236 <tabstop>ipAddressEdit</tabstop> 214 <tabstop>ipAddressEdit</tabstop>
237 <tabstop>subnetMaskEdit</tabstop> 215 <tabstop>subnetMaskEdit</tabstop>
238 <tabstop>gatewayEdit</tabstop> 216 <tabstop>gatewayEdit</tabstop>
239 <tabstop>firstDNSLineEdit</tabstop> 217 <tabstop>firstDNSLineEdit</tabstop>
240 <tabstop>secondDNSLineEdit</tabstop> 218 <tabstop>secondDNSLineEdit</tabstop>
241</tabstops> 219</tabstops>
242</UI> 220</UI>
diff --git a/noncore/settings/networksettings/ppp/.cvsignore b/noncore/settings/networksettings/ppp/.cvsignore
index 1ba7ac7..74490f0 100644
--- a/noncore/settings/networksettings/ppp/.cvsignore
+++ b/noncore/settings/networksettings/ppp/.cvsignore
@@ -1,23 +1,12 @@
1*.moc 1*.moc
2*.moc.o 2*.moc.o
3*.o 3*.o
4.deps 4.deps
5.libs 5.libs
6.moc.cpp 6.moc.cpp
7.moc.o 7.moc.o
8.o 8.o
9Makefile* 9Makefile*
10addconnection.cpp
11addconnection.h
12interfaceadvanced.cpp
13interfaceadvanced.h
14interfaceinformation.cpp
15interfaceinformation.h
16interfacesetup.cpp
17interfacesetup.h
18mainwindow.cpp
19mainwindow.h
20moc_*.cpp 10moc_*.cpp
21networksetup 11ppp.h
22systemadvanced.cpp 12ppp.cpp
23systemadvanced.h