summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-10-02 19:23:45 (UTC)
committer benmeyer <benmeyer>2002-10-02 19:23:45 (UTC)
commit2d0c6327dd40ab6847ce055c40ca59893bc8b9b2 (patch) (unidiff)
tree260222139bb322f24d058cba10db0f7d1c43858f
parentc997983c6917885f6c487b942a9b294fa50ae618 (diff)
downloadopie-2d0c6327dd40ab6847ce055c40ca59893bc8b9b2.zip
opie-2d0c6327dd40ab6847ce055c40ca59893bc8b9b2.tar.gz
opie-2d0c6327dd40ab6847ce055c40ca59893bc8b9b2.tar.bz2
Fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/interfaceinformation.ui11
-rw-r--r--noncore/net/networksetup/interfacesetup.ui13
-rw-r--r--noncore/net/networksetup/mainwindow.ui177
-rw-r--r--noncore/net/networksetup/mainwindowimp.cpp25
-rw-r--r--noncore/net/networksetup/mainwindowimp.h3
-rw-r--r--noncore/net/networksetup/namedialog.cpp61
-rw-r--r--noncore/net/networksetup/namedialog.h36
-rw-r--r--noncore/net/networksetup/networksetup.pro4
-rw-r--r--noncore/net/networksetup/systemadvanced.ui51
-rw-r--r--noncore/settings/networksettings/interfaceinformation.ui11
-rw-r--r--noncore/settings/networksettings/interfacesetup.ui13
-rw-r--r--noncore/settings/networksettings/mainwindow.ui177
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp25
-rw-r--r--noncore/settings/networksettings/mainwindowimp.h3
-rw-r--r--noncore/settings/networksettings/namedialog.cpp61
-rw-r--r--noncore/settings/networksettings/namedialog.h36
-rw-r--r--noncore/settings/networksettings/networksetup.pro4
-rw-r--r--noncore/settings/networksettings/systemadvanced.ui51
18 files changed, 322 insertions, 440 deletions
diff --git a/noncore/net/networksetup/interfaceinformation.ui b/noncore/net/networksetup/interfaceinformation.ui
index 8b6280d..76af19c 100644
--- a/noncore/net/networksetup/interfaceinformation.ui
+++ b/noncore/net/networksetup/interfaceinformation.ui
@@ -1,78 +1,78 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>InterfaceInformation</class> 2<class>InterfaceInformation</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>InterfaceInformation</cstring> 7 <cstring>InterfaceInformation</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>203</width> 14 <width>199</width>
15 <height>244</height> 15 <height>244</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 Information</string> 20 <string>Interface Information</string>
21 </property> 21 </property>
22 <grid> 22 <grid>
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 row="4" column="0" rowspan="1" colspan="2" > 31 <widget row="4" column="0" rowspan="1" colspan="2" >
32 <class>QLayoutWidget</class> 32 <class>QLayoutWidget</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>Layout1</cstring> 35 <cstring>Layout1</cstring>
36 </property> 36 </property>
37 <grid> 37 <grid>
38 <property stdset="1"> 38 <property stdset="1">
39 <name>margin</name> 39 <name>margin</name>
40 <number>0</number> 40 <number>0</number>
41 </property> 41 </property>
42 <property stdset="1"> 42 <property stdset="1">
43 <name>spacing</name> 43 <name>spacing</name>
44 <number>6</number> 44 <number>6</number>
45 </property> 45 </property>
46 <widget row="1" column="0" > 46 <widget row="1" column="0" >
47 <class>QPushButton</class> 47 <class>QPushButton</class>
48 <property stdset="1"> 48 <property stdset="1">
49 <name>name</name> 49 <name>name</name>
50 <cstring>refreshButton</cstring> 50 <cstring>refreshButton</cstring>
51 </property> 51 </property>
52 <property stdset="1"> 52 <property stdset="1">
53 <name>text</name> 53 <name>text</name>
54 <string>Refresh</string> 54 <string>Refresh</string>
55 </property> 55 </property>
56 </widget> 56 </widget>
57 <widget row="0" column="1" > 57 <widget row="0" column="1" >
58 <class>QPushButton</class> 58 <class>QPushButton</class>
59 <property stdset="1"> 59 <property stdset="1">
60 <name>name</name> 60 <name>name</name>
61 <cstring>stopButton</cstring> 61 <cstring>stopButton</cstring>
62 </property> 62 </property>
63 <property stdset="1"> 63 <property stdset="1">
64 <name>text</name> 64 <name>text</name>
65 <string>Stop</string> 65 <string>Stop</string>
66 </property> 66 </property>
67 </widget> 67 </widget>
68 <widget row="1" column="1" > 68 <widget row="1" column="1" >
69 <class>QPushButton</class> 69 <class>QPushButton</class>
70 <property stdset="1"> 70 <property stdset="1">
71 <name>name</name> 71 <name>name</name>
72 <cstring>restartButton</cstring> 72 <cstring>restartButton</cstring>
73 </property> 73 </property>
74 <property stdset="1"> 74 <property stdset="1">
75 <name>text</name> 75 <name>text</name>
76 <string>Restart</string> 76 <string>Restart</string>
77 </property> 77 </property>
78 </widget> 78 </widget>
@@ -272,67 +272,72 @@
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>View Advanced Information</string> 296 <string>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> 314<customwidgets>
315 <customwidget> 315 <customwidget>
316 <class>QWidget</class> 316 <class>QWidget</class>
317 <header location="local">qwidget.h</header> 317 <header location="local">qwidget.h</header>
318 <sizehint> 318 <sizehint>
319 <width>100</width> 319 <width>100</width>
320 <height>100</height> 320 <height>100</height>
321 </sizehint> 321 </sizehint>
322 <container>0</container> 322 <container>0</container>
323 <sizepolicy> 323 <sizepolicy>
324 <hordata>7</hordata> 324 <hordata>7</hordata>
325 <verdata>7</verdata> 325 <verdata>7</verdata>
326 </sizepolicy> 326 </sizepolicy>
327 <pixmap>image0</pixmap> 327 <pixmap>image0</pixmap>
328 </customwidget> 328 </customwidget>
329</customwidgets> 329</customwidgets>
330<images> 330<images>
331 <image> 331 <image>
332 <name>image0</name> 332 <name>image0</name>
333 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> 333 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
334 </image> 334 </image>
335</images> 335</images>
336<connections> 336<tabstops>
337</connections> 337 <tabstop>startButton</tabstop>
338 <tabstop>stopButton</tabstop>
339 <tabstop>refreshButton</tabstop>
340 <tabstop>restartButton</tabstop>
341 <tabstop>advancedButton</tabstop>
342</tabstops>
338</UI> 343</UI>
diff --git a/noncore/net/networksetup/interfacesetup.ui b/noncore/net/networksetup/interfacesetup.ui
index d367608..3db9a0b 100644
--- a/noncore/net/networksetup/interfacesetup.ui
+++ b/noncore/net/networksetup/interfacesetup.ui
@@ -1,78 +1,78 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>InterfaceSetup</class> 2<class>InterfaceSetup</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</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>271</width> 14 <width>267</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>Automaticly bring up</string> 39 <string>Automaticly bring up</string>
40 </property> 40 </property>
41 </widget> 41 </widget>
42 <widget> 42 <widget>
43 <class>QLayoutWidget</class> 43 <class>QLayoutWidget</class>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>name</name> 45 <name>name</name>
46 <cstring>Layout8</cstring> 46 <cstring>Layout8</cstring>
47 </property> 47 </property>
48 <hbox> 48 <hbox>
49 <property stdset="1"> 49 <property stdset="1">
50 <name>margin</name> 50 <name>margin</name>
51 <number>0</number> 51 <number>0</number>
52 </property> 52 </property>
53 <property stdset="1"> 53 <property stdset="1">
54 <name>spacing</name> 54 <name>spacing</name>
55 <number>6</number> 55 <number>6</number>
56 </property> 56 </property>
57 <widget> 57 <widget>
58 <class>QLabel</class> 58 <class>QLabel</class>
59 <property stdset="1"> 59 <property stdset="1">
60 <name>name</name> 60 <name>name</name>
61 <cstring>TextLabel1</cstring> 61 <cstring>TextLabel1</cstring>
62 </property> 62 </property>
63 <property stdset="1"> 63 <property stdset="1">
64 <name>text</name> 64 <name>text</name>
65 <string>Profile</string> 65 <string>Profile</string>
66 </property> 66 </property>
67 </widget> 67 </widget>
68 <widget> 68 <widget>
69 <class>QComboBox</class> 69 <class>QComboBox</class>
70 <item> 70 <item>
71 <property> 71 <property>
72 <name>text</name> 72 <name>text</name>
73 <string>All</string> 73 <string>All</string>
74 </property> 74 </property>
75 </item> 75 </item>
76 <property stdset="1"> 76 <property stdset="1">
77 <name>name</name> 77 <name>name</name>
78 <cstring>profileCombo</cstring> 78 <cstring>profileCombo</cstring>
@@ -272,65 +272,76 @@
272 <name>name</name> 272 <name>name</name>
273 <cstring>TextLabel1_2</cstring> 273 <cstring>TextLabel1_2</cstring>
274 </property> 274 </property>
275 <property stdset="1"> 275 <property stdset="1">
276 <name>text</name> 276 <name>text</name>
277 <string>Gateway</string> 277 <string>Gateway</string>
278 </property> 278 </property>
279 </widget> 279 </widget>
280 <widget row="4" column="0" > 280 <widget row="4" column="0" >
281 <class>QLabel</class> 281 <class>QLabel</class>
282 <property stdset="1"> 282 <property stdset="1">
283 <name>name</name> 283 <name>name</name>
284 <cstring>TextLabel3</cstring> 284 <cstring>TextLabel3</cstring>
285 </property> 285 </property>
286 <property stdset="1"> 286 <property stdset="1">
287 <name>text</name> 287 <name>text</name>
288 <string>Second DNS</string> 288 <string>Second DNS</string>
289 </property> 289 </property>
290 </widget> 290 </widget>
291 </grid> 291 </grid>
292 </widget> 292 </widget>
293 <spacer> 293 <spacer>
294 <property> 294 <property>
295 <name>name</name> 295 <name>name</name>
296 <cstring>Spacer9</cstring> 296 <cstring>Spacer9</cstring>
297 </property> 297 </property>
298 <property stdset="1"> 298 <property stdset="1">
299 <name>orientation</name> 299 <name>orientation</name>
300 <enum>Vertical</enum> 300 <enum>Vertical</enum>
301 </property> 301 </property>
302 <property stdset="1"> 302 <property stdset="1">
303 <name>sizeType</name> 303 <name>sizeType</name>
304 <enum>Expanding</enum> 304 <enum>Expanding</enum>
305 </property> 305 </property>
306 <property> 306 <property>
307 <name>sizeHint</name> 307 <name>sizeHint</name>
308 <size> 308 <size>
309 <width>20</width> 309 <width>20</width>
310 <height>20</height> 310 <height>20</height>
311 </size> 311 </size>
312 </property> 312 </property>
313 </spacer> 313 </spacer>
314 </vbox> 314 </vbox>
315</widget> 315</widget>
316<connections> 316<connections>
317 <connection> 317 <connection>
318 <sender>dhcpCheckBox</sender> 318 <sender>dhcpCheckBox</sender>
319 <signal>toggled(bool)</signal> 319 <signal>toggled(bool)</signal>
320 <receiver>leaseHoursLabel</receiver> 320 <receiver>leaseHoursLabel</receiver>
321 <slot>setEnabled(bool)</slot> 321 <slot>setEnabled(bool)</slot>
322 </connection> 322 </connection>
323 <connection> 323 <connection>
324 <sender>dhcpCheckBox</sender> 324 <sender>dhcpCheckBox</sender>
325 <signal>toggled(bool)</signal> 325 <signal>toggled(bool)</signal>
326 <receiver>leaseTime</receiver> 326 <receiver>leaseTime</receiver>
327 <slot>setEnabled(bool)</slot> 327 <slot>setEnabled(bool)</slot>
328 </connection> 328 </connection>
329 <connection> 329 <connection>
330 <sender>dhcpCheckBox</sender> 330 <sender>dhcpCheckBox</sender>
331 <signal>toggled(bool)</signal> 331 <signal>toggled(bool)</signal>
332 <receiver>staticGroupBox</receiver> 332 <receiver>staticGroupBox</receiver>
333 <slot>setDisabled(bool)</slot> 333 <slot>setDisabled(bool)</slot>
334 </connection> 334 </connection>
335</connections> 335</connections>
336<tabstops>
337 <tabstop>autoStart</tabstop>
338 <tabstop>profileCombo</tabstop>
339 <tabstop>dhcpCheckBox</tabstop>
340 <tabstop>leaseTime</tabstop>
341 <tabstop>ipAddressEdit</tabstop>
342 <tabstop>subnetMaskEdit</tabstop>
343 <tabstop>gatewayEdit</tabstop>
344 <tabstop>firstDNSLineEdit</tabstop>
345 <tabstop>secondDNSLineEdit</tabstop>
346</tabstops>
336</UI> 347</UI>
diff --git a/noncore/net/networksetup/mainwindow.ui b/noncore/net/networksetup/mainwindow.ui
index 3538aeb..bea999b 100644
--- a/noncore/net/networksetup/mainwindow.ui
+++ b/noncore/net/networksetup/mainwindow.ui
@@ -1,78 +1,78 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>MainWindow</class> 2<class>MainWindow</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>MainWindow</cstring> 7 <cstring>MainWindow</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>217</width> 14 <width>230</width>
15 <height>289</height> 15 <height>289</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>Network Setup</string> 20 <string>Network Setup</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>0</number> 25 <number>0</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>QTabWidget</class> 32 <class>QTabWidget</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>tabWidget</cstring> 35 <cstring>tabWidget</cstring>
36 </property> 36 </property>
37 <property> 37 <property>
38 <name>layoutMargin</name> 38 <name>layoutMargin</name>
39 </property> 39 </property>
40 <widget> 40 <widget>
41 <class>QWidget</class> 41 <class>QWidget</class>
42 <property stdset="1"> 42 <property stdset="1">
43 <name>name</name> 43 <name>name</name>
44 <cstring>Widget3</cstring> 44 <cstring>Widget3</cstring>
45 </property> 45 </property>
46 <attribute> 46 <attribute>
47 <name>title</name> 47 <name>title</name>
48 <string>Connections</string> 48 <string>Connections</string>
49 </attribute> 49 </attribute>
50 <vbox> 50 <vbox>
51 <property stdset="1"> 51 <property stdset="1">
52 <name>margin</name> 52 <name>margin</name>
53 <number>0</number> 53 <number>0</number>
54 </property> 54 </property>
55 <property stdset="1"> 55 <property stdset="1">
56 <name>spacing</name> 56 <name>spacing</name>
57 <number>6</number> 57 <number>6</number>
58 </property> 58 </property>
59 <widget> 59 <widget>
60 <class>QListView</class> 60 <class>QListView</class>
61 <column> 61 <column>
62 <property> 62 <property>
63 <name>text</name> 63 <name>text</name>
64 <string>i</string> 64 <string>i</string>
65 </property> 65 </property>
66 <property> 66 <property>
67 <name>clickable</name> 67 <name>clickable</name>
68 <bool>true</bool> 68 <bool>true</bool>
69 </property> 69 </property>
70 <property> 70 <property>
71 <name>resizeable</name> 71 <name>resizeable</name>
72 <bool>true</bool> 72 <bool>true</bool>
73 </property> 73 </property>
74 </column> 74 </column>
75 <column> 75 <column>
76 <property> 76 <property>
77 <name>text</name> 77 <name>text</name>
78 <string>t</string> 78 <string>t</string>
@@ -147,226 +147,289 @@
147 <name>name</name> 147 <name>name</name>
148 <cstring>addConnectionButton</cstring> 148 <cstring>addConnectionButton</cstring>
149 </property> 149 </property>
150 <property stdset="1"> 150 <property stdset="1">
151 <name>text</name> 151 <name>text</name>
152 <string>&amp;Add</string> 152 <string>&amp;Add</string>
153 </property> 153 </property>
154 </widget> 154 </widget>
155 <widget row="0" column="0" > 155 <widget row="0" column="0" >
156 <class>QPushButton</class> 156 <class>QPushButton</class>
157 <property stdset="1"> 157 <property stdset="1">
158 <name>name</name> 158 <name>name</name>
159 <cstring>informationConnectionButton</cstring> 159 <cstring>informationConnectionButton</cstring>
160 </property> 160 </property>
161 <property stdset="1"> 161 <property stdset="1">
162 <name>text</name> 162 <name>text</name>
163 <string>&amp;Information</string> 163 <string>&amp;Information</string>
164 </property> 164 </property>
165 </widget> 165 </widget>
166 <widget row="0" column="1" > 166 <widget row="0" column="1" >
167 <class>QPushButton</class> 167 <class>QPushButton</class>
168 <property stdset="1"> 168 <property stdset="1">
169 <name>name</name> 169 <name>name</name>
170 <cstring>configureConnectionButton</cstring> 170 <cstring>configureConnectionButton</cstring>
171 </property> 171 </property>
172 <property stdset="1"> 172 <property stdset="1">
173 <name>text</name> 173 <name>text</name>
174 <string>&amp;Configure</string> 174 <string>&amp;Configure</string>
175 </property> 175 </property>
176 </widget> 176 </widget>
177 <widget row="1" column="1" > 177 <widget row="1" column="1" >
178 <class>QPushButton</class> 178 <class>QPushButton</class>
179 <property stdset="1"> 179 <property stdset="1">
180 <name>name</name> 180 <name>name</name>
181 <cstring>removeConnectionButton</cstring> 181 <cstring>removeConnectionButton</cstring>
182 </property> 182 </property>
183 <property stdset="1"> 183 <property stdset="1">
184 <name>text</name> 184 <name>text</name>
185 <string>&amp;Remove</string> 185 <string>&amp;Remove</string>
186 </property> 186 </property>
187 </widget> 187 </widget>
188 </grid> 188 </grid>
189 </widget> 189 </widget>
190 </vbox> 190 </vbox>
191 </widget> 191 </widget>
192 <widget> 192 <widget>
193 <class>QWidget</class> 193 <class>QWidget</class>
194 <property stdset="1"> 194 <property stdset="1">
195 <name>name</name> 195 <name>name</name>
196 <cstring>tab</cstring> 196 <cstring>tab</cstring>
197 </property> 197 </property>
198 <attribute> 198 <attribute>
199 <name>title</name> 199 <name>title</name>
200 <string>Profiles</string> 200 <string>Profiles</string>
201 </attribute> 201 </attribute>
202 <grid> 202 <grid>
203 <property stdset="1"> 203 <property stdset="1">
204 <name>margin</name> 204 <name>margin</name>
205 <number>11</number> 205 <number>11</number>
206 </property> 206 </property>
207 <property stdset="1"> 207 <property stdset="1">
208 <name>spacing</name> 208 <name>spacing</name>
209 <number>6</number> 209 <number>6</number>
210 </property> 210 </property>
211 <widget row="1" column="0" rowspan="1" colspan="3" > 211 <spacer row="7" column="2" >
212 <class>Line</class> 212 <property>
213 <property stdset="1">
214 <name>name</name> 213 <name>name</name>
215 <cstring>Line1</cstring> 214 <cstring>Spacer16</cstring>
216 </property> 215 </property>
217 <property stdset="1"> 216 <property stdset="1">
218 <name>orientation</name> 217 <name>orientation</name>
219 <enum>Horizontal</enum> 218 <enum>Vertical</enum>
220 </property> 219 </property>
221 </widget>
222 <widget row="0" column="0" >
223 <class>QLabel</class>
224 <property stdset="1"> 220 <property stdset="1">
225 <name>name</name> 221 <name>sizeType</name>
226 <cstring>TextLabel1</cstring> 222 <enum>Expanding</enum>
227 </property> 223 </property>
228 <property stdset="1"> 224 <property>
229 <name>text</name> 225 <name>sizeHint</name>
230 <string>Current Profile</string> 226 <size>
227 <width>20</width>
228 <height>20</height>
229 </size>
231 </property> 230 </property>
232 </widget> 231 </spacer>
233 <widget row="0" column="1" > 232 <widget row="0" column="1" >
234 <class>QLabel</class> 233 <class>QLabel</class>
235 <property stdset="1"> 234 <property stdset="1">
236 <name>name</name> 235 <name>name</name>
237 <cstring>currentProfileLabel</cstring> 236 <cstring>currentProfileLabel</cstring>
238 </property> 237 </property>
239 <property stdset="1"> 238 <property stdset="1">
240 <name>frameShape</name> 239 <name>frameShape</name>
241 <enum>Panel</enum> 240 <enum>Panel</enum>
242 </property> 241 </property>
243 <property stdset="1"> 242 <property stdset="1">
244 <name>frameShadow</name> 243 <name>frameShadow</name>
245 <enum>Sunken</enum> 244 <enum>Sunken</enum>
246 </property> 245 </property>
247 <property stdset="1"> 246 <property stdset="1">
248 <name>text</name> 247 <name>text</name>
249 <string>All</string> 248 <string>All</string>
250 </property> 249 </property>
251 </widget> 250 </widget>
252 <spacer row="0" column="2" > 251 <widget row="3" column="2" >
253 <property> 252 <class>QPushButton</class>
253 <property stdset="1">
254 <name>name</name> 254 <name>name</name>
255 <cstring>Spacer2</cstring> 255 <cstring>setCurrentProfileButton</cstring>
256 </property> 256 </property>
257 <property stdset="1"> 257 <property stdset="1">
258 <name>orientation</name> 258 <name>text</name>
259 <enum>Horizontal</enum> 259 <string>&amp;Set Current</string>
260 </property> 260 </property>
261 </widget>
262 <widget row="5" column="0" rowspan="1" colspan="3" >
263 <class>Line</class>
261 <property stdset="1"> 264 <property stdset="1">
262 <name>sizeType</name>
263 <enum>Expanding</enum>
264 </property>
265 <property>
266 <name>sizeHint</name>
267 <size>
268 <width>20</width>
269 <height>20</height>
270 </size>
271 </property>
272 </spacer>
273 <spacer row="6" column="2" >
274 <property>
275 <name>name</name> 265 <name>name</name>
276 <cstring>Spacer16</cstring> 266 <cstring>Line6</cstring>
277 </property> 267 </property>
278 <property stdset="1"> 268 <property stdset="1">
279 <name>orientation</name> 269 <name>orientation</name>
280 <enum>Vertical</enum> 270 <enum>Horizontal</enum>
281 </property> 271 </property>
272 </widget>
273 <widget row="1" column="0" rowspan="1" colspan="3" >
274 <class>Line</class>
282 <property stdset="1"> 275 <property stdset="1">
283 <name>sizeType</name> 276 <name>name</name>
284 <enum>Expanding</enum> 277 <cstring>Line1</cstring>
285 </property> 278 </property>
286 <property> 279 <property stdset="1">
287 <name>sizeHint</name> 280 <name>orientation</name>
288 <size> 281 <enum>Horizontal</enum>
289 <width>20</width>
290 <height>20</height>
291 </size>
292 </property> 282 </property>
293 </spacer> 283 </widget>
294 <widget row="5" column="2" > 284 <widget row="0" column="0" >
295 <class>QPushButton</class> 285 <class>QLabel</class>
296 <property stdset="1"> 286 <property stdset="1">
297 <name>name</name> 287 <name>name</name>
298 <cstring>PushButton7</cstring> 288 <cstring>TextLabel1</cstring>
299 </property> 289 </property>
300 <property stdset="1"> 290 <property stdset="1">
301 <name>text</name> 291 <name>text</name>
302 <string>&amp;Set Current</string> 292 <string>Current Profile</string>
303 </property> 293 </property>
304 </widget> 294 </widget>
305 <widget row="4" column="2" > 295 <widget row="4" column="2" >
306 <class>QPushButton</class> 296 <class>QPushButton</class>
307 <property stdset="1"> 297 <property stdset="1">
308 <name>name</name> 298 <name>name</name>
309 <cstring>removeProfileButton</cstring> 299 <cstring>removeProfileButton</cstring>
310 </property> 300 </property>
311 <property stdset="1"> 301 <property stdset="1">
312 <name>text</name> 302 <name>text</name>
313 <string>&amp;Remove</string> 303 <string>&amp;Remove</string>
314 </property> 304 </property>
315 </widget> 305 </widget>
316 <widget row="3" column="2" > 306 <widget row="3" column="0" rowspan="2" colspan="2" >
317 <class>QPushButton</class> 307 <class>QListBox</class>
318 <property stdset="1"> 308 <property stdset="1">
319 <name>name</name> 309 <name>name</name>
320 <cstring>newProfileButton</cstring> 310 <cstring>profilesList</cstring>
311 </property>
312 </widget>
313 <spacer row="0" column="2" >
314 <property>
315 <name>name</name>
316 <cstring>Spacer2</cstring>
321 </property> 317 </property>
322 <property stdset="1"> 318 <property stdset="1">
323 <name>text</name> 319 <name>orientation</name>
324 <string>&amp;New</string> 320 <enum>Horizontal</enum>
325 </property> 321 </property>
326 </widget> 322 <property stdset="1">
323 <name>sizeType</name>
324 <enum>Expanding</enum>
325 </property>
326 <property>
327 <name>sizeHint</name>
328 <size>
329 <width>20</width>
330 <height>20</height>
331 </size>
332 </property>
333 </spacer>
327 <widget row="2" column="0" > 334 <widget row="2" column="0" >
328 <class>QLabel</class> 335 <class>QLabel</class>
329 <property stdset="1"> 336 <property stdset="1">
330 <name>name</name> 337 <name>name</name>
331 <cstring>TextLabel1_2</cstring> 338 <cstring>TextLabel1_2</cstring>
332 </property> 339 </property>
333 <property stdset="1"> 340 <property stdset="1">
334 <name>text</name> 341 <name>text</name>
335 <string>Profiles</string> 342 <string>Profiles</string>
336 </property> 343 </property>
337 </widget> 344 </widget>
338 <widget row="3" column="0" rowspan="3" colspan="2" > 345 <widget row="6" column="0" rowspan="1" colspan="3" >
339 <class>QListBox</class> 346 <class>QLayoutWidget</class>
340 <property stdset="1"> 347 <property stdset="1">
341 <name>name</name> 348 <name>name</name>
342 <cstring>profilesList</cstring> 349 <cstring>Layout6</cstring>
343 </property> 350 </property>
351 <hbox>
352 <property stdset="1">
353 <name>margin</name>
354 <number>0</number>
355 </property>
356 <property stdset="1">
357 <name>spacing</name>
358 <number>6</number>
359 </property>
360 <widget>
361 <class>QLabel</class>
362 <property stdset="1">
363 <name>name</name>
364 <cstring>TextLabel1_3</cstring>
365 </property>
366 <property stdset="1">
367 <name>text</name>
368 <string>New Profile</string>
369 </property>
370 </widget>
371 <widget>
372 <class>QLineEdit</class>
373 <property stdset="1">
374 <name>name</name>
375 <cstring>newProfile</cstring>
376 </property>
377 </widget>
378 <widget>
379 <class>QPushButton</class>
380 <property stdset="1">
381 <name>name</name>
382 <cstring>newProfileButton</cstring>
383 </property>
384 <property stdset="1">
385 <name>enabled</name>
386 <bool>false</bool>
387 </property>
388 <property stdset="1">
389 <name>text</name>
390 <string>&amp;Add</string>
391 </property>
392 </widget>
393 </hbox>
344 </widget> 394 </widget>
345 </grid> 395 </grid>
346 </widget> 396 </widget>
347 </widget> 397 </widget>
348 </vbox> 398 </vbox>
349</widget> 399</widget>
350<customwidgets> 400<customwidgets>
351 <customwidget> 401 <customwidget>
352 <class>QWidget</class> 402 <class>QWidget</class>
353 <header location="local">qwidget.h</header> 403 <header location="local">qwidget.h</header>
354 <sizehint> 404 <sizehint>
355 <width>100</width> 405 <width>100</width>
356 <height>100</height> 406 <height>100</height>
357 </sizehint> 407 </sizehint>
358 <container>0</container> 408 <container>0</container>
359 <sizepolicy> 409 <sizepolicy>
360 <hordata>7</hordata> 410 <hordata>7</hordata>
361 <verdata>7</verdata> 411 <verdata>7</verdata>
362 </sizepolicy> 412 </sizepolicy>
363 <pixmap>image0</pixmap> 413 <pixmap>image0</pixmap>
364 </customwidget> 414 </customwidget>
365</customwidgets> 415</customwidgets>
366<images> 416<images>
367 <image> 417 <image>
368 <name>image0</name> 418 <name>image0</name>
369 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> 419 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
370 </image> 420 </image>
371</images> 421</images>
422<tabstops>
423 <tabstop>tabWidget</tabstop>
424 <tabstop>connectionList</tabstop>
425 <tabstop>informationConnectionButton</tabstop>
426 <tabstop>configureConnectionButton</tabstop>
427 <tabstop>addConnectionButton</tabstop>
428 <tabstop>removeConnectionButton</tabstop>
429 <tabstop>profilesList</tabstop>
430 <tabstop>setCurrentProfileButton</tabstop>
431 <tabstop>removeProfileButton</tabstop>
432 <tabstop>newProfile</tabstop>
433 <tabstop>newProfileButton</tabstop>
434</tabstops>
372</UI> 435</UI>
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index e9429e3..e895971 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -1,125 +1,127 @@
1#include "mainwindowimp.h" 1#include "mainwindowimp.h"
2#include "addconnectionimp.h" 2#include "addconnectionimp.h"
3#include "interfaceinformationimp.h" 3#include "interfaceinformationimp.h"
4#include "interfacesetupimp.h" 4#include "interfacesetupimp.h"
5#include "module.h" 5#include "module.h"
6 6
7#include "kprocess.h" 7#include "kprocess.h"
8#include "namedialog.h"
9 8
10#include <qpushbutton.h> 9#include <qpushbutton.h>
11#include <qtabwidget.h> 10#include <qtabwidget.h>
12#include <qlistbox.h> 11#include <qlistbox.h>
12#include <qlineedit.h>
13#include <qlistview.h> 13#include <qlistview.h>
14#include <qheader.h> 14#include <qheader.h>
15#include <qlabel.h> 15#include <qlabel.h>
16 16
17#include <qmainwindow.h> 17#include <qmainwindow.h>
18#include <qmessagebox.h> 18#include <qmessagebox.h>
19 19
20#include <qpe/config.h> 20#include <qpe/config.h>
21#include <qpe/qlibrary.h> 21#include <qpe/qlibrary.h>
22#include <qpe/resource.h> 22#include <qpe/resource.h>
23 23
24#include <qlist.h> 24#include <qlist.h>
25#include <qdir.h> 25#include <qdir.h>
26#include <qfile.h> 26#include <qfile.h>
27#include <qtextstream.h> 27#include <qtextstream.h>
28 28
29#define TEMP_ALL "/tmp/ifconfig-a" 29#define TEMP_ALL "/tmp/ifconfig-a"
30#define TEMP_UP "/tmp/ifconfig" 30#define TEMP_UP "/tmp/ifconfig"
31 31
32MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){ 32MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){
33 connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); 33 connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));
34 connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); 34 connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
35 connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); 35 connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
36 connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); 36 connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked()));
37 37
38 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); 38 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
39 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); 39 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
40 connect(profilesList, SIGNAL(highlighted(const QString&)), this, SLOT(changeProfile(const QString&))); 40 connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile()));
41 41
42 connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));
42 // Load connections. 43 // Load connections.
43 loadModules(QDir::homeDirPath() + "/.networksetup/plugins"); 44 loadModules(QDir::homeDirPath() + "/.networksetup/plugins");
44 getInterfaceList(); 45 getInterfaceList();
45 connectionList->header()->hide(); 46 connectionList->header()->hide();
46 47
47 48
48 Config cfg("NetworkSetup"); 49 Config cfg("NetworkSetup");
49 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); 50 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));
50 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) 51 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)
51 profilesList->insertItem((*it)); 52 profilesList->insertItem((*it));
52 advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); 53 advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false);
53} 54}
54 55
55/** 56/**
56 * Deconstructor. Save profiles. Delete loaded libraries. 57 * Deconstructor. Save profiles. Delete loaded libraries.
57 */ 58 */
58MainWindowImp::~MainWindowImp(){ 59MainWindowImp::~MainWindowImp(){
59 // Save profiles. 60 // Save profiles.
60 if(profiles.count() > 1){ 61 if(profiles.count() > 1){
61 Config cfg("NetworkSetup"); 62 Config cfg("NetworkSetup");
63 cfg.setGroup("General");
62 cfg.writeEntry("Profiles", profiles.join(" ")); 64 cfg.writeEntry("Profiles", profiles.join(" "));
63 } 65 }
64 // Delete Modules and Libraries 66 // Delete Modules and Libraries
65 QMap<Module*, QLibrary*>::Iterator it; 67 QMap<Module*, QLibrary*>::Iterator it;
66 for( it = libraries.begin(); it != libraries.end(); ++it ){ 68 for( it = libraries.begin(); it != libraries.end(); ++it ){
67 delete it.key(); 69 delete it.key();
68 delete it.data(); 70 delete it.data();
69 } 71 }
70} 72}
71 73
72/** 74/**
73 * Load all modules that are found in the path 75 * Load all modules that are found in the path
74 * @param path a directory that is scaned for any plugins that can be loaded 76 * @param path a directory that is scaned for any plugins that can be loaded
75 * and attempts to load them 77 * and attempts to load them
76 */ 78 */
77void MainWindowImp::loadModules(QString path){ 79void MainWindowImp::loadModules(QString path){
78 qDebug(path.latin1()); 80 qDebug(path.latin1());
79 QDir d(path); 81 QDir d(path);
80 if(!d.exists()) 82 if(!d.exists())
81 return; 83 return;
82 84
83 // Don't want sym links 85 // Don't want sym links
84 d.setFilter( QDir::Files | QDir::NoSymLinks ); 86 d.setFilter( QDir::Files | QDir::NoSymLinks );
85 const QFileInfoList *list = d.entryInfoList(); 87 const QFileInfoList *list = d.entryInfoList();
86 QFileInfoListIterator it( *list ); 88 QFileInfoListIterator it( *list );
87 QFileInfo *fi; 89 QFileInfo *fi;
88 while ( (fi=it.current()) ) { 90 while ( (fi=it.current()) ) {
89 if(fi->fileName().contains(".so")){ 91 if(fi->fileName().contains(".so")){
90 loadPlugin(path + "/" + fi->fileName()); 92 loadPlugin(path + "/" + fi->fileName());
91 } 93 }
92 ++it; 94 ++it;
93 } 95 }
94} 96}
95 97
96/** 98/**
97 * Attempt to load a function and resolve a function. 99 * Attempt to load a function and resolve a function.
98 * @param pluginFileName - the name of the file in which to attempt to load 100 * @param pluginFileName - the name of the file in which to attempt to load
99 * @param resolveString - function pointer to resolve 101 * @param resolveString - function pointer to resolve
100 * @return pointer to the function with name resolveString or NULL 102 * @return pointer to the function with name resolveString or NULL
101 */ 103 */
102Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){ 104Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
103 qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1()); 105 qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1());
104 QLibrary *lib = new QLibrary(pluginFileName); 106 QLibrary *lib = new QLibrary(pluginFileName);
105 void *functionPointer = lib->resolve(resolveString); 107 void *functionPointer = lib->resolve(resolveString);
106 if( !functionPointer ){ 108 if( !functionPointer ){
107 qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1()); 109 qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());
108 delete lib; 110 delete lib;
109 return NULL; 111 return NULL;
110 } 112 }
111 113
112 // Try to get an object. 114 // Try to get an object.
113 Module *object = ((Module* (*)()) functionPointer)(); 115 Module *object = ((Module* (*)()) functionPointer)();
114 if(object == NULL){ 116 if(object == NULL){
115 qDebug("MainWindowImp: Couldn't create object, but did load library!"); 117 qDebug("MainWindowImp: Couldn't create object, but did load library!");
116 delete lib; 118 delete lib;
117 return NULL; 119 return NULL;
118 } 120 }
119 121
120 // Store for deletion later 122 // Store for deletion later
121 libraries.insert(object, lib); 123 libraries.insert(object, lib);
122 return object; 124 return object;
123} 125}
124 126
125/** 127/**
@@ -311,112 +313,115 @@ void MainWindowImp::jobDone(KProcess *process){
311 i->setStatus(true); 313 i->setStatus(true);
312 } 314 }
313 315
314 i->setAttached(true); 316 i->setAttached(true);
315 i->setInterfaceName(interfaceName); 317 i->setInterfaceName(interfaceName);
316 318
317 QString hardName = "Ethernet"; 319 QString hardName = "Ethernet";
318 int hardwareName = line.find("Link encap:"); 320 int hardwareName = line.find("Link encap:");
319 int macAddress = line.find("HWaddr"); 321 int macAddress = line.find("HWaddr");
320 if(macAddress == -1) 322 if(macAddress == -1)
321 macAddress = line.length(); 323 macAddress = line.length();
322 if(hardwareName != -1) 324 if(hardwareName != -1)
323 i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName())); 325 i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName()));
324 // We have found an interface 326 // We have found an interface
325 //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1()); 327 //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());
326 interfaceNames.insert(i->getInterfaceName(), i); 328 interfaceNames.insert(i->getInterfaceName(), i);
327 updateInterface(i); 329 updateInterface(i);
328 } 330 }
329 } 331 }
330 file.close(); 332 file.close();
331 QFile::remove(fileName); 333 QFile::remove(fileName);
332} 334}
333 335
334/** 336/**
335 * Update this interface. If no QListViewItem exists create one. 337 * Update this interface. If no QListViewItem exists create one.
336 * @param Interface* pointer to the interface that needs to be updated. 338 * @param Interface* pointer to the interface that needs to be updated.
337 */ 339 */
338void MainWindowImp::updateInterface(Interface *i){ 340void MainWindowImp::updateInterface(Interface *i){
339 QListViewItem *item = NULL; 341 QListViewItem *item = NULL;
340 342
341 // Find the interface, making it if needed. 343 // Find the interface, making it if needed.
342 if(items.find(i) == items.end()){ 344 if(items.find(i) == items.end()){
343 item = new QListViewItem(connectionList, "", "", ""); 345 item = new QListViewItem(connectionList, "", "", "");
344 // See if you can't find a module owner for this interface 346 // See if you can't find a module owner for this interface
345 QMap<Module*, QLibrary*>::Iterator it; 347 QMap<Module*, QLibrary*>::Iterator it;
346 for( it = libraries.begin(); it != libraries.end(); ++it ){ 348 for( it = libraries.begin(); it != libraries.end(); ++it ){
347 if(it.key()->isOwner(i)) 349 if(it.key()->isOwner(i))
348 i->setModuleOwner(it.key()); 350 i->setModuleOwner(it.key());
349 } 351 }
350 items.insert(i, item); 352 items.insert(i, item);
351 interfaceItems.insert(item, i); 353 interfaceItems.insert(item, i);
352 } 354 }
353 else 355 else
354 item = items[i]; 356 item = items[i];
355 357
356 // Update the icons and information 358 // Update the icons and information
357 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down"))); 359 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
358 360
359 QString typeName = "lan"; 361 QString typeName = "lan";
360 if(i->getHardwareName().contains("Local Loopback")) 362 if(i->getHardwareName().contains("Local Loopback"))
361 typeName = "lo"; 363 typeName = "lo";
362 if(i->getInterfaceName().contains("irda")) 364 if(i->getInterfaceName().contains("irda"))
363 typeName = "irda"; 365 typeName = "irda";
364 if(i->getInterfaceName().contains("wlan")) 366 if(i->getInterfaceName().contains("wlan"))
365 typeName = "wlan"; 367 typeName = "wlan";
366 // Actually try to use the Module 368 // Actually try to use the Module
367 if(i->getModuleOwner() != NULL) 369 if(i->getModuleOwner() != NULL)
368 typeName = i->getModuleOwner()->getPixmapName(i); 370 typeName = i->getModuleOwner()->getPixmapName(i);
369 371
370 item->setPixmap(1, (Resource::loadPixmap(typeName))); 372 item->setPixmap(1, (Resource::loadPixmap(typeName)));
371 item->setText(2, i->getHardwareName()); 373 item->setText(2, i->getHardwareName());
372 item->setText(3, (i->getStatus()) ? i->getIp() : QString("")); 374 item->setText(3, (i->getStatus()) ? i->getIp() : QString(""));
373} 375}
374 376
377void MainWindowImp::newProfileChanged(const QString& newText){
378 if(newText.length() > 0)
379 newProfileButton->setEnabled(true);
380 else
381 newProfileButton->setEnabled(false);
382}
383
375/** 384/**
376 * Adds a new profile to the list of profiles. 385 * Adds a new profile to the list of profiles.
377 * Don't add profiles that already exists. 386 * Don't add profiles that already exists.
378 * Appends to the list and QStringList 387 * Appends to the list and QStringList
379 */ 388 */
380void MainWindowImp::addProfile(){ 389void MainWindowImp::addProfile(){
381 NameDialog foo(this, "namedialog", true); 390 QString newProfileName = newProfile->text();
382 QString newProfileName = foo.go();
383 if(newProfileName.length() == 0)
384 return;
385
386 if(profiles.grep(newProfileName).count() > 0){ 391 if(profiles.grep(newProfileName).count() > 0){
387 QMessageBox::information(this, "Can't Add","Profile already exists.", "Ok"); 392 QMessageBox::information(this, "Can't Add","Profile already exists.", "Ok");
388 return; 393 return;
389 } 394 }
390 profiles.append(newProfileName); 395 profiles.append(newProfileName);
391 profilesList->insertItem(newProfileName); 396 profilesList->insertItem(newProfileName);
392} 397}
393 398
394/** 399/**
395 * Removes the currently selected profile in the combo. 400 * Removes the currently selected profile in the combo.
396 * Doesn't delete if there are less then 2 profiles. 401 * Doesn't delete if there are less then 2 profiles.
397 */ 402 */
398void MainWindowImp::removeProfile(){ 403void MainWindowImp::removeProfile(){
399 if(profilesList->count() <= 1){ 404 if(profilesList->count() <= 1){
400 QMessageBox::information(this, "Can't remove anything.","Need One Profile.", "Ok"); 405 QMessageBox::information(this, "Can't remove anything.","Need One Profile.", "Ok");
401 return; 406 return;
402 } 407 }
403 QString profileToRemove = profilesList->currentText(); 408 QString profileToRemove = profilesList->currentText();
404 if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok){ 409 if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok){
405 profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), "")); 410 profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), ""));
406 profilesList->clear(); 411 profilesList->clear();
407 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) 412 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)
408 profilesList->insertItem((*it)); 413 profilesList->insertItem((*it));
409 } 414 }
410 415
411} 416}
412 417
413/** 418/**
414 * A new profile has been selected, change. 419 * A new profile has been selected, change.
415 * @param newProfile the new profile. 420 * @param newProfile the new profile.
416 */ 421 */
417void MainWindowImp::changeProfile(const QString& newProfile){ 422void MainWindowImp::changeProfile(){
418 currentProfileLabel->setText(newProfile); 423 currentProfileLabel->setText(profilesList->text(profilesList->currentItem()));
419} 424}
420 425
421// mainwindowimp.cpp 426// mainwindowimp.cpp
422 427
diff --git a/noncore/net/networksetup/mainwindowimp.h b/noncore/net/networksetup/mainwindowimp.h
index 629b758..c67c161 100644
--- a/noncore/net/networksetup/mainwindowimp.h
+++ b/noncore/net/networksetup/mainwindowimp.h
@@ -1,57 +1,58 @@
1#ifndef MAINWINOWIMP_H 1#ifndef MAINWINOWIMP_H
2#define MAINWINOWIMP_H 2#define MAINWINOWIMP_H
3 3
4#include "mainwindow.h" 4#include "mainwindow.h"
5#include <qmap.h> 5#include <qmap.h>
6#include <qstringlist.h> 6#include <qstringlist.h>
7 7
8class Module; 8class Module;
9class Interface; 9class Interface;
10class QLibrary; 10class QLibrary;
11class KProcess; 11class KProcess;
12 12
13class MainWindowImp : public MainWindow { 13class MainWindowImp : public MainWindow {
14 Q_OBJECT 14 Q_OBJECT
15 15
16public: 16public:
17 MainWindowImp(QWidget *parent=0, const char *name=0); 17 MainWindowImp(QWidget *parent=0, const char *name=0);
18 ~MainWindowImp(); 18 ~MainWindowImp();
19 19
20private slots: 20private slots:
21 void addClicked(); 21 void addClicked();
22 void removeClicked(); 22 void removeClicked();
23 void configureClicked(); 23 void configureClicked();
24 void informationClicked(); 24 void informationClicked();
25 25
26 void jobDone(KProcess *process); 26 void jobDone(KProcess *process);
27 void getInterfaceList(); 27 void getInterfaceList();
28 28
29 void addProfile(); 29 void addProfile();
30 void removeProfile(); 30 void removeProfile();
31 void changeProfile(const QString&); 31 void changeProfile();
32 32
33 void updateInterface(Interface *i); 33 void updateInterface(Interface *i);
34 void newProfileChanged(const QString& newText);
34 35
35private: 36private:
36 void loadModules(QString path); 37 void loadModules(QString path);
37 38
38 Module* loadPlugin(QString pluginFileName, 39 Module* loadPlugin(QString pluginFileName,
39 QString resolveString = "create_plugin"); 40 QString resolveString = "create_plugin");
40 41
41 // For our local list of names 42 // For our local list of names
42 QMap<QString, Interface*> interfaceNames; 43 QMap<QString, Interface*> interfaceNames;
43 44
44 QMap<Module*, QLibrary*> libraries; 45 QMap<Module*, QLibrary*> libraries;
45 QMap<Interface*, QListViewItem*> items; 46 QMap<Interface*, QListViewItem*> items;
46 QMap<QListViewItem*, Interface*> interfaceItems; 47 QMap<QListViewItem*, Interface*> interfaceItems;
47 48
48 QMap<KProcess*, QString> threads; 49 QMap<KProcess*, QString> threads;
49 QStringList profiles; 50 QStringList profiles;
50 51
51 bool advancedUserMode; 52 bool advancedUserMode;
52}; 53};
53 54
54#endif 55#endif
55 56
56// mainwindowimp.h 57// mainwindowimp.h
57 58
diff --git a/noncore/net/networksetup/namedialog.cpp b/noncore/net/networksetup/namedialog.cpp
deleted file mode 100644
index c5efa37..0000000
--- a/noncore/net/networksetup/namedialog.cpp
+++ b/dev/null
@@ -1,61 +0,0 @@
1/****************************************************************************
2** Form implementation generated from reading ui file 'namedialog.ui'
3**
4** Created: Sat Dec 15 04:36:20 2001
5** by: The User Interface Compiler (uic)
6**
7** WARNING! All changes made in this file will be lost!
8****************************************************************************/
9#include "namedialog.h"
10
11#include <qlineedit.h>
12#include <qpushbutton.h>
13#include <qlayout.h>
14#include <qvariant.h>
15#include <qtooltip.h>
16#include <qwhatsthis.h>
17
18/*
19 * Constructs a NameDialog which is a child of 'parent', with the
20 * name 'name' and widget flags set to 'f'
21 *
22 * The dialog will by default be modeless, unless you set 'modal' to
23 * TRUE to construct a modal dialog.
24 */
25NameDialog::NameDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
26 : QDialog( parent, name, modal, fl )
27{
28 if ( !name )
29 setName( "NameDialog" );
30 resize( 176, 65 );
31 setCaption( tr( "Enter A Name" ) );
32 NameDialogLayout = new QGridLayout( this );
33 NameDialogLayout->setSpacing( 6 );
34 NameDialogLayout->setMargin( 5 );
35
36 Name = new QLineEdit( this, "Name" );
37
38 NameDialogLayout->addMultiCellWidget( Name, 0, 0, 0, 1 );
39
40 cancel = new QPushButton( this, "Cancel" );
41 cancel->setText( tr( "&Cancel" ) );
42
43 NameDialogLayout->addWidget( cancel, 1, 1 );
44
45 ok = new QPushButton( this, "ok" );
46 ok->setText( tr( "&Ok" ) );
47
48 NameDialogLayout->addWidget( ok, 1, 0 );
49
50 connect( ok, SIGNAL( clicked() ), this, SLOT( accept() ) );
51 connect( cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
52 connect( Name, SIGNAL(returnPressed () ), this, SLOT(accept() ) );
53}
54
55QString NameDialog::go(){
56 if( exec() ) //pressed OK
57 return (Name->text());
58 else //pressed cancel
59 return QString();
60}
61
diff --git a/noncore/net/networksetup/namedialog.h b/noncore/net/networksetup/namedialog.h
deleted file mode 100644
index 4c4e149..0000000
--- a/noncore/net/networksetup/namedialog.h
+++ b/dev/null
@@ -1,36 +0,0 @@
1/****************************************************************************
2** Form interface generated from reading ui file 'namedialog.ui'
3**
4** Created: Sat Dec 15 04:36:14 2001
5** by: The User Interface Compiler (uic)
6**
7** WARNING! All changes made in this file will be lost!
8****************************************************************************/
9#ifndef NAMEDIALOG_H
10#define NAMEDIALOG_H
11
12#include <qvariant.h>
13#include <qdialog.h>
14class QVBoxLayout;
15class QHBoxLayout;
16class QGridLayout;
17class QLineEdit;
18class QPushButton;
19
20class NameDialog : public QDialog
21{
22 Q_OBJECT
23
24public:
25 NameDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
26
27 QLineEdit* Name;
28 QPushButton* cancel;
29 QPushButton* ok;
30 QString go();
31
32protected:
33 QGridLayout* NameDialogLayout;
34};
35
36#endif // NAMEDIALOG_H
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro
index e146eb4..ba70180 100644
--- a/noncore/net/networksetup/networksetup.pro
+++ b/noncore/net/networksetup/networksetup.pro
@@ -1,10 +1,10 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 #CONFIG = qt warn_on debug 2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h namedialog.h 4 HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h
5 SOURCES = main.cpp namedialog.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp 5 SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
6 #INCLUDEPATH+= $(QPEDIR)/include 6 #INCLUDEPATH+= $(QPEDIR)/include
7 #DEPENDPATH+= $(QPEDIR)/include 7 #DEPENDPATH+= $(QPEDIR)/include
8LIBS += -lqpe 8LIBS += -lqpe
9 INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui 9 INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
10 TARGET = networksetup 10 TARGET = networksetup
diff --git a/noncore/net/networksetup/systemadvanced.ui b/noncore/net/networksetup/systemadvanced.ui
index 6ea192c..cd7ac61 100644
--- a/noncore/net/networksetup/systemadvanced.ui
+++ b/noncore/net/networksetup/systemadvanced.ui
@@ -1,78 +1,78 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>SystemNetworking</class> 2<class>SystemNetworking</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>SystemNetworking</cstring> 7 <cstring>SystemNetworking</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>222</width> 14 <width>218</width>
15 <height>289</height> 15 <height>289</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>System Networking</string> 20 <string>System Networking</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>0</number> 25 <number>0</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>QTabWidget</class> 32 <class>QTabWidget</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>tabWidget</cstring> 35 <cstring>tabWidget</cstring>
36 </property> 36 </property>
37 <property> 37 <property>
38 <name>layoutMargin</name> 38 <name>layoutMargin</name>
39 </property> 39 </property>
40 <widget> 40 <widget>
41 <class>QWidget</class> 41 <class>QWidget</class>
42 <property stdset="1"> 42 <property stdset="1">
43 <name>name</name> 43 <name>name</name>
44 <cstring>tab</cstring> 44 <cstring>tab</cstring>
45 </property> 45 </property>
46 <attribute> 46 <attribute>
47 <name>title</name> 47 <name>title</name>
48 <string>DNS</string> 48 <string>DNS</string>
49 </attribute> 49 </attribute>
50 <grid> 50 <grid>
51 <property stdset="1"> 51 <property stdset="1">
52 <name>margin</name> 52 <name>margin</name>
53 <number>11</number> 53 <number>11</number>
54 </property> 54 </property>
55 <property stdset="1"> 55 <property stdset="1">
56 <name>spacing</name> 56 <name>spacing</name>
57 <number>6</number> 57 <number>6</number>
58 </property> 58 </property>
59 <widget row="0" column="0" > 59 <widget row="0" column="0" >
60 <class>QLabel</class> 60 <class>QLabel</class>
61 <property stdset="1"> 61 <property stdset="1">
62 <name>name</name> 62 <name>name</name>
63 <cstring>TextLabel6</cstring> 63 <cstring>TextLabel6</cstring>
64 </property> 64 </property>
65 <property stdset="1"> 65 <property stdset="1">
66 <name>text</name> 66 <name>text</name>
67 <string>Hostname</string> 67 <string>Hostname</string>
68 </property> 68 </property>
69 </widget> 69 </widget>
70 <widget row="1" column="0" > 70 <widget row="1" column="0" >
71 <class>QLabel</class> 71 <class>QLabel</class>
72 <property stdset="1"> 72 <property stdset="1">
73 <name>name</name> 73 <name>name</name>
74 <cstring>TextLabel5</cstring> 74 <cstring>TextLabel5</cstring>
75 </property> 75 </property>
76 <property stdset="1"> 76 <property stdset="1">
77 <name>text</name> 77 <name>text</name>
78 <string>DNS</string> 78 <string>DNS</string>
@@ -332,112 +332,65 @@
332 <name>text</name> 332 <name>text</name>
333 <string>eth0</string> 333 <string>eth0</string>
334 </property> 334 </property>
335 <property> 335 <property>
336 <name>pixmap</name> 336 <name>pixmap</name>
337 <pixmap></pixmap> 337 <pixmap></pixmap>
338 </property> 338 </property>
339 <property> 339 <property>
340 <name>pixmap</name> 340 <name>pixmap</name>
341 <pixmap></pixmap> 341 <pixmap></pixmap>
342 </property> 342 </property>
343 <property> 343 <property>
344 <name>pixmap</name> 344 <name>pixmap</name>
345 <pixmap></pixmap> 345 <pixmap></pixmap>
346 </property> 346 </property>
347 <property> 347 <property>
348 <name>pixmap</name> 348 <name>pixmap</name>
349 <pixmap></pixmap> 349 <pixmap></pixmap>
350 </property> 350 </property>
351 <property> 351 <property>
352 <name>pixmap</name> 352 <name>pixmap</name>
353 <pixmap></pixmap> 353 <pixmap></pixmap>
354 </property> 354 </property>
355 <property> 355 <property>
356 <name>pixmap</name> 356 <name>pixmap</name>
357 <pixmap></pixmap> 357 <pixmap></pixmap>
358 </property> 358 </property>
359 <property> 359 <property>
360 <name>pixmap</name> 360 <name>pixmap</name>
361 <pixmap></pixmap> 361 <pixmap></pixmap>
362 </property> 362 </property>
363 <property> 363 <property>
364 <name>pixmap</name> 364 <name>pixmap</name>
365 <pixmap></pixmap> 365 <pixmap></pixmap>
366 </property> 366 </property>
367 </item> 367 </item>
368 <property stdset="1"> 368 <property stdset="1">
369 <name>name</name> 369 <name>name</name>
370 <cstring>ListView4</cstring> 370 <cstring>ListView4</cstring>
371 </property> 371 </property>
372 </widget> 372 </widget>
373 <widget row="1" column="0" > 373 <widget row="1" column="0" >
374 <class>QPushButton</class> 374 <class>QPushButton</class>
375 <property stdset="1"> 375 <property stdset="1">
376 <name>name</name> 376 <name>name</name>
377 <cstring>PushButton17</cstring> 377 <cstring>PushButton17</cstring>
378 </property> 378 </property>
379 <property stdset="1"> 379 <property stdset="1">
380 <name>text</name> 380 <name>text</name>
381 <string>&amp;Add</string> 381 <string>&amp;Add</string>
382 </property> 382 </property>
383 </widget> 383 </widget>
384 <widget row="1" column="1" > 384 <widget row="1" column="1" >
385 <class>QPushButton</class> 385 <class>QPushButton</class>
386 <property stdset="1"> 386 <property stdset="1">
387 <name>name</name> 387 <name>name</name>
388 <cstring>PushButton18</cstring> 388 <cstring>PushButton18</cstring>
389 </property> 389 </property>
390 <property stdset="1"> 390 <property stdset="1">
391 <name>text</name> 391 <name>text</name>
392 <string>Remove</string> 392 <string>Remove</string>
393 </property> 393 </property>
394 </widget> 394 </widget>
395 <spacer row="2" column="1" > 395 <spacer row="2" column="1" >
396 <property> 396 \ No newline at end of file
397 <name>name</name>
398 <cstring>Spacer15</cstring>
399 </property>
400 <property stdset="1">
401 <name>orientation</name>
402 <enum>Vertical</enum>
403 </property>
404 <property stdset="1">
405 <name>sizeType</name>
406 <enum>Expanding</enum>
407 </property>
408 <property>
409 <name>sizeHint</name>
410 <size>
411 <width>20</width>
412 <height>20</height>
413 </size>
414 </property>
415 </spacer>
416 </grid>
417 </widget>
418 </widget>
419 </vbox>
420</widget>
421<customwidgets>
422 <customwidget>
423 <class>QWidget</class>
424 <header location="local">qwidget.h</header>
425 <sizehint>
426 <width>100</width>
427 <height>100</height>
428 </sizehint>
429 <container>0</container>
430 <sizepolicy>
431 <hordata>7</hordata>
432 <verdata>7</verdata>
433 </sizepolicy>
434 <pixmap>image0</pixmap>
435 </customwidget>
436</customwidgets>
437<images>
438 <image>
439 <name>image0</name>
440 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
441 </image>
442</images>
443</UI>
diff --git a/noncore/settings/networksettings/interfaceinformation.ui b/noncore/settings/networksettings/interfaceinformation.ui
index 8b6280d..76af19c 100644
--- a/noncore/settings/networksettings/interfaceinformation.ui
+++ b/noncore/settings/networksettings/interfaceinformation.ui
@@ -1,78 +1,78 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>InterfaceInformation</class> 2<class>InterfaceInformation</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>InterfaceInformation</cstring> 7 <cstring>InterfaceInformation</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>203</width> 14 <width>199</width>
15 <height>244</height> 15 <height>244</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 Information</string> 20 <string>Interface Information</string>
21 </property> 21 </property>
22 <grid> 22 <grid>
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 row="4" column="0" rowspan="1" colspan="2" > 31 <widget row="4" column="0" rowspan="1" colspan="2" >
32 <class>QLayoutWidget</class> 32 <class>QLayoutWidget</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>Layout1</cstring> 35 <cstring>Layout1</cstring>
36 </property> 36 </property>
37 <grid> 37 <grid>
38 <property stdset="1"> 38 <property stdset="1">
39 <name>margin</name> 39 <name>margin</name>
40 <number>0</number> 40 <number>0</number>
41 </property> 41 </property>
42 <property stdset="1"> 42 <property stdset="1">
43 <name>spacing</name> 43 <name>spacing</name>
44 <number>6</number> 44 <number>6</number>
45 </property> 45 </property>
46 <widget row="1" column="0" > 46 <widget row="1" column="0" >
47 <class>QPushButton</class> 47 <class>QPushButton</class>
48 <property stdset="1"> 48 <property stdset="1">
49 <name>name</name> 49 <name>name</name>
50 <cstring>refreshButton</cstring> 50 <cstring>refreshButton</cstring>
51 </property> 51 </property>
52 <property stdset="1"> 52 <property stdset="1">
53 <name>text</name> 53 <name>text</name>
54 <string>Refresh</string> 54 <string>Refresh</string>
55 </property> 55 </property>
56 </widget> 56 </widget>
57 <widget row="0" column="1" > 57 <widget row="0" column="1" >
58 <class>QPushButton</class> 58 <class>QPushButton</class>
59 <property stdset="1"> 59 <property stdset="1">
60 <name>name</name> 60 <name>name</name>
61 <cstring>stopButton</cstring> 61 <cstring>stopButton</cstring>
62 </property> 62 </property>
63 <property stdset="1"> 63 <property stdset="1">
64 <name>text</name> 64 <name>text</name>
65 <string>Stop</string> 65 <string>Stop</string>
66 </property> 66 </property>
67 </widget> 67 </widget>
68 <widget row="1" column="1" > 68 <widget row="1" column="1" >
69 <class>QPushButton</class> 69 <class>QPushButton</class>
70 <property stdset="1"> 70 <property stdset="1">
71 <name>name</name> 71 <name>name</name>
72 <cstring>restartButton</cstring> 72 <cstring>restartButton</cstring>
73 </property> 73 </property>
74 <property stdset="1"> 74 <property stdset="1">
75 <name>text</name> 75 <name>text</name>
76 <string>Restart</string> 76 <string>Restart</string>
77 </property> 77 </property>
78 </widget> 78 </widget>
@@ -272,67 +272,72 @@
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>View Advanced Information</string> 296 <string>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> 314<customwidgets>
315 <customwidget> 315 <customwidget>
316 <class>QWidget</class> 316 <class>QWidget</class>
317 <header location="local">qwidget.h</header> 317 <header location="local">qwidget.h</header>
318 <sizehint> 318 <sizehint>
319 <width>100</width> 319 <width>100</width>
320 <height>100</height> 320 <height>100</height>
321 </sizehint> 321 </sizehint>
322 <container>0</container> 322 <container>0</container>
323 <sizepolicy> 323 <sizepolicy>
324 <hordata>7</hordata> 324 <hordata>7</hordata>
325 <verdata>7</verdata> 325 <verdata>7</verdata>
326 </sizepolicy> 326 </sizepolicy>
327 <pixmap>image0</pixmap> 327 <pixmap>image0</pixmap>
328 </customwidget> 328 </customwidget>
329</customwidgets> 329</customwidgets>
330<images> 330<images>
331 <image> 331 <image>
332 <name>image0</name> 332 <name>image0</name>
333 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> 333 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
334 </image> 334 </image>
335</images> 335</images>
336<connections> 336<tabstops>
337</connections> 337 <tabstop>startButton</tabstop>
338 <tabstop>stopButton</tabstop>
339 <tabstop>refreshButton</tabstop>
340 <tabstop>restartButton</tabstop>
341 <tabstop>advancedButton</tabstop>
342</tabstops>
338</UI> 343</UI>
diff --git a/noncore/settings/networksettings/interfacesetup.ui b/noncore/settings/networksettings/interfacesetup.ui
index d367608..3db9a0b 100644
--- a/noncore/settings/networksettings/interfacesetup.ui
+++ b/noncore/settings/networksettings/interfacesetup.ui
@@ -1,78 +1,78 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>InterfaceSetup</class> 2<class>InterfaceSetup</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</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>271</width> 14 <width>267</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>Automaticly bring up</string> 39 <string>Automaticly bring up</string>
40 </property> 40 </property>
41 </widget> 41 </widget>
42 <widget> 42 <widget>
43 <class>QLayoutWidget</class> 43 <class>QLayoutWidget</class>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>name</name> 45 <name>name</name>
46 <cstring>Layout8</cstring> 46 <cstring>Layout8</cstring>
47 </property> 47 </property>
48 <hbox> 48 <hbox>
49 <property stdset="1"> 49 <property stdset="1">
50 <name>margin</name> 50 <name>margin</name>
51 <number>0</number> 51 <number>0</number>
52 </property> 52 </property>
53 <property stdset="1"> 53 <property stdset="1">
54 <name>spacing</name> 54 <name>spacing</name>
55 <number>6</number> 55 <number>6</number>
56 </property> 56 </property>
57 <widget> 57 <widget>
58 <class>QLabel</class> 58 <class>QLabel</class>
59 <property stdset="1"> 59 <property stdset="1">
60 <name>name</name> 60 <name>name</name>
61 <cstring>TextLabel1</cstring> 61 <cstring>TextLabel1</cstring>
62 </property> 62 </property>
63 <property stdset="1"> 63 <property stdset="1">
64 <name>text</name> 64 <name>text</name>
65 <string>Profile</string> 65 <string>Profile</string>
66 </property> 66 </property>
67 </widget> 67 </widget>
68 <widget> 68 <widget>
69 <class>QComboBox</class> 69 <class>QComboBox</class>
70 <item> 70 <item>
71 <property> 71 <property>
72 <name>text</name> 72 <name>text</name>
73 <string>All</string> 73 <string>All</string>
74 </property> 74 </property>
75 </item> 75 </item>
76 <property stdset="1"> 76 <property stdset="1">
77 <name>name</name> 77 <name>name</name>
78 <cstring>profileCombo</cstring> 78 <cstring>profileCombo</cstring>
@@ -272,65 +272,76 @@
272 <name>name</name> 272 <name>name</name>
273 <cstring>TextLabel1_2</cstring> 273 <cstring>TextLabel1_2</cstring>
274 </property> 274 </property>
275 <property stdset="1"> 275 <property stdset="1">
276 <name>text</name> 276 <name>text</name>
277 <string>Gateway</string> 277 <string>Gateway</string>
278 </property> 278 </property>
279 </widget> 279 </widget>
280 <widget row="4" column="0" > 280 <widget row="4" column="0" >
281 <class>QLabel</class> 281 <class>QLabel</class>
282 <property stdset="1"> 282 <property stdset="1">
283 <name>name</name> 283 <name>name</name>
284 <cstring>TextLabel3</cstring> 284 <cstring>TextLabel3</cstring>
285 </property> 285 </property>
286 <property stdset="1"> 286 <property stdset="1">
287 <name>text</name> 287 <name>text</name>
288 <string>Second DNS</string> 288 <string>Second DNS</string>
289 </property> 289 </property>
290 </widget> 290 </widget>
291 </grid> 291 </grid>
292 </widget> 292 </widget>
293 <spacer> 293 <spacer>
294 <property> 294 <property>
295 <name>name</name> 295 <name>name</name>
296 <cstring>Spacer9</cstring> 296 <cstring>Spacer9</cstring>
297 </property> 297 </property>
298 <property stdset="1"> 298 <property stdset="1">
299 <name>orientation</name> 299 <name>orientation</name>
300 <enum>Vertical</enum> 300 <enum>Vertical</enum>
301 </property> 301 </property>
302 <property stdset="1"> 302 <property stdset="1">
303 <name>sizeType</name> 303 <name>sizeType</name>
304 <enum>Expanding</enum> 304 <enum>Expanding</enum>
305 </property> 305 </property>
306 <property> 306 <property>
307 <name>sizeHint</name> 307 <name>sizeHint</name>
308 <size> 308 <size>
309 <width>20</width> 309 <width>20</width>
310 <height>20</height> 310 <height>20</height>
311 </size> 311 </size>
312 </property> 312 </property>
313 </spacer> 313 </spacer>
314 </vbox> 314 </vbox>
315</widget> 315</widget>
316<connections> 316<connections>
317 <connection> 317 <connection>
318 <sender>dhcpCheckBox</sender> 318 <sender>dhcpCheckBox</sender>
319 <signal>toggled(bool)</signal> 319 <signal>toggled(bool)</signal>
320 <receiver>leaseHoursLabel</receiver> 320 <receiver>leaseHoursLabel</receiver>
321 <slot>setEnabled(bool)</slot> 321 <slot>setEnabled(bool)</slot>
322 </connection> 322 </connection>
323 <connection> 323 <connection>
324 <sender>dhcpCheckBox</sender> 324 <sender>dhcpCheckBox</sender>
325 <signal>toggled(bool)</signal> 325 <signal>toggled(bool)</signal>
326 <receiver>leaseTime</receiver> 326 <receiver>leaseTime</receiver>
327 <slot>setEnabled(bool)</slot> 327 <slot>setEnabled(bool)</slot>
328 </connection> 328 </connection>
329 <connection> 329 <connection>
330 <sender>dhcpCheckBox</sender> 330 <sender>dhcpCheckBox</sender>
331 <signal>toggled(bool)</signal> 331 <signal>toggled(bool)</signal>
332 <receiver>staticGroupBox</receiver> 332 <receiver>staticGroupBox</receiver>
333 <slot>setDisabled(bool)</slot> 333 <slot>setDisabled(bool)</slot>
334 </connection> 334 </connection>
335</connections> 335</connections>
336<tabstops>
337 <tabstop>autoStart</tabstop>
338 <tabstop>profileCombo</tabstop>
339 <tabstop>dhcpCheckBox</tabstop>
340 <tabstop>leaseTime</tabstop>
341 <tabstop>ipAddressEdit</tabstop>
342 <tabstop>subnetMaskEdit</tabstop>
343 <tabstop>gatewayEdit</tabstop>
344 <tabstop>firstDNSLineEdit</tabstop>
345 <tabstop>secondDNSLineEdit</tabstop>
346</tabstops>
336</UI> 347</UI>
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow.ui
index 3538aeb..bea999b 100644
--- a/noncore/settings/networksettings/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow.ui
@@ -1,78 +1,78 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>MainWindow</class> 2<class>MainWindow</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>MainWindow</cstring> 7 <cstring>MainWindow</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>217</width> 14 <width>230</width>
15 <height>289</height> 15 <height>289</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>Network Setup</string> 20 <string>Network Setup</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>0</number> 25 <number>0</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>QTabWidget</class> 32 <class>QTabWidget</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>tabWidget</cstring> 35 <cstring>tabWidget</cstring>
36 </property> 36 </property>
37 <property> 37 <property>
38 <name>layoutMargin</name> 38 <name>layoutMargin</name>
39 </property> 39 </property>
40 <widget> 40 <widget>
41 <class>QWidget</class> 41 <class>QWidget</class>
42 <property stdset="1"> 42 <property stdset="1">
43 <name>name</name> 43 <name>name</name>
44 <cstring>Widget3</cstring> 44 <cstring>Widget3</cstring>
45 </property> 45 </property>
46 <attribute> 46 <attribute>
47 <name>title</name> 47 <name>title</name>
48 <string>Connections</string> 48 <string>Connections</string>
49 </attribute> 49 </attribute>
50 <vbox> 50 <vbox>
51 <property stdset="1"> 51 <property stdset="1">
52 <name>margin</name> 52 <name>margin</name>
53 <number>0</number> 53 <number>0</number>
54 </property> 54 </property>
55 <property stdset="1"> 55 <property stdset="1">
56 <name>spacing</name> 56 <name>spacing</name>
57 <number>6</number> 57 <number>6</number>
58 </property> 58 </property>
59 <widget> 59 <widget>
60 <class>QListView</class> 60 <class>QListView</class>
61 <column> 61 <column>
62 <property> 62 <property>
63 <name>text</name> 63 <name>text</name>
64 <string>i</string> 64 <string>i</string>
65 </property> 65 </property>
66 <property> 66 <property>
67 <name>clickable</name> 67 <name>clickable</name>
68 <bool>true</bool> 68 <bool>true</bool>
69 </property> 69 </property>
70 <property> 70 <property>
71 <name>resizeable</name> 71 <name>resizeable</name>
72 <bool>true</bool> 72 <bool>true</bool>
73 </property> 73 </property>
74 </column> 74 </column>
75 <column> 75 <column>
76 <property> 76 <property>
77 <name>text</name> 77 <name>text</name>
78 <string>t</string> 78 <string>t</string>
@@ -147,226 +147,289 @@
147 <name>name</name> 147 <name>name</name>
148 <cstring>addConnectionButton</cstring> 148 <cstring>addConnectionButton</cstring>
149 </property> 149 </property>
150 <property stdset="1"> 150 <property stdset="1">
151 <name>text</name> 151 <name>text</name>
152 <string>&amp;Add</string> 152 <string>&amp;Add</string>
153 </property> 153 </property>
154 </widget> 154 </widget>
155 <widget row="0" column="0" > 155 <widget row="0" column="0" >
156 <class>QPushButton</class> 156 <class>QPushButton</class>
157 <property stdset="1"> 157 <property stdset="1">
158 <name>name</name> 158 <name>name</name>
159 <cstring>informationConnectionButton</cstring> 159 <cstring>informationConnectionButton</cstring>
160 </property> 160 </property>
161 <property stdset="1"> 161 <property stdset="1">
162 <name>text</name> 162 <name>text</name>
163 <string>&amp;Information</string> 163 <string>&amp;Information</string>
164 </property> 164 </property>
165 </widget> 165 </widget>
166 <widget row="0" column="1" > 166 <widget row="0" column="1" >
167 <class>QPushButton</class> 167 <class>QPushButton</class>
168 <property stdset="1"> 168 <property stdset="1">
169 <name>name</name> 169 <name>name</name>
170 <cstring>configureConnectionButton</cstring> 170 <cstring>configureConnectionButton</cstring>
171 </property> 171 </property>
172 <property stdset="1"> 172 <property stdset="1">
173 <name>text</name> 173 <name>text</name>
174 <string>&amp;Configure</string> 174 <string>&amp;Configure</string>
175 </property> 175 </property>
176 </widget> 176 </widget>
177 <widget row="1" column="1" > 177 <widget row="1" column="1" >
178 <class>QPushButton</class> 178 <class>QPushButton</class>
179 <property stdset="1"> 179 <property stdset="1">
180 <name>name</name> 180 <name>name</name>
181 <cstring>removeConnectionButton</cstring> 181 <cstring>removeConnectionButton</cstring>
182 </property> 182 </property>
183 <property stdset="1"> 183 <property stdset="1">
184 <name>text</name> 184 <name>text</name>
185 <string>&amp;Remove</string> 185 <string>&amp;Remove</string>
186 </property> 186 </property>
187 </widget> 187 </widget>
188 </grid> 188 </grid>
189 </widget> 189 </widget>
190 </vbox> 190 </vbox>
191 </widget> 191 </widget>
192 <widget> 192 <widget>
193 <class>QWidget</class> 193 <class>QWidget</class>
194 <property stdset="1"> 194 <property stdset="1">
195 <name>name</name> 195 <name>name</name>
196 <cstring>tab</cstring> 196 <cstring>tab</cstring>
197 </property> 197 </property>
198 <attribute> 198 <attribute>
199 <name>title</name> 199 <name>title</name>
200 <string>Profiles</string> 200 <string>Profiles</string>
201 </attribute> 201 </attribute>
202 <grid> 202 <grid>
203 <property stdset="1"> 203 <property stdset="1">
204 <name>margin</name> 204 <name>margin</name>
205 <number>11</number> 205 <number>11</number>
206 </property> 206 </property>
207 <property stdset="1"> 207 <property stdset="1">
208 <name>spacing</name> 208 <name>spacing</name>
209 <number>6</number> 209 <number>6</number>
210 </property> 210 </property>
211 <widget row="1" column="0" rowspan="1" colspan="3" > 211 <spacer row="7" column="2" >
212 <class>Line</class> 212 <property>
213 <property stdset="1">
214 <name>name</name> 213 <name>name</name>
215 <cstring>Line1</cstring> 214 <cstring>Spacer16</cstring>
216 </property> 215 </property>
217 <property stdset="1"> 216 <property stdset="1">
218 <name>orientation</name> 217 <name>orientation</name>
219 <enum>Horizontal</enum> 218 <enum>Vertical</enum>
220 </property> 219 </property>
221 </widget>
222 <widget row="0" column="0" >
223 <class>QLabel</class>
224 <property stdset="1"> 220 <property stdset="1">
225 <name>name</name> 221 <name>sizeType</name>
226 <cstring>TextLabel1</cstring> 222 <enum>Expanding</enum>
227 </property> 223 </property>
228 <property stdset="1"> 224 <property>
229 <name>text</name> 225 <name>sizeHint</name>
230 <string>Current Profile</string> 226 <size>
227 <width>20</width>
228 <height>20</height>
229 </size>
231 </property> 230 </property>
232 </widget> 231 </spacer>
233 <widget row="0" column="1" > 232 <widget row="0" column="1" >
234 <class>QLabel</class> 233 <class>QLabel</class>
235 <property stdset="1"> 234 <property stdset="1">
236 <name>name</name> 235 <name>name</name>
237 <cstring>currentProfileLabel</cstring> 236 <cstring>currentProfileLabel</cstring>
238 </property> 237 </property>
239 <property stdset="1"> 238 <property stdset="1">
240 <name>frameShape</name> 239 <name>frameShape</name>
241 <enum>Panel</enum> 240 <enum>Panel</enum>
242 </property> 241 </property>
243 <property stdset="1"> 242 <property stdset="1">
244 <name>frameShadow</name> 243 <name>frameShadow</name>
245 <enum>Sunken</enum> 244 <enum>Sunken</enum>
246 </property> 245 </property>
247 <property stdset="1"> 246 <property stdset="1">
248 <name>text</name> 247 <name>text</name>
249 <string>All</string> 248 <string>All</string>
250 </property> 249 </property>
251 </widget> 250 </widget>
252 <spacer row="0" column="2" > 251 <widget row="3" column="2" >
253 <property> 252 <class>QPushButton</class>
253 <property stdset="1">
254 <name>name</name> 254 <name>name</name>
255 <cstring>Spacer2</cstring> 255 <cstring>setCurrentProfileButton</cstring>
256 </property> 256 </property>
257 <property stdset="1"> 257 <property stdset="1">
258 <name>orientation</name> 258 <name>text</name>
259 <enum>Horizontal</enum> 259 <string>&amp;Set Current</string>
260 </property> 260 </property>
261 </widget>
262 <widget row="5" column="0" rowspan="1" colspan="3" >
263 <class>Line</class>
261 <property stdset="1"> 264 <property stdset="1">
262 <name>sizeType</name>
263 <enum>Expanding</enum>
264 </property>
265 <property>
266 <name>sizeHint</name>
267 <size>
268 <width>20</width>
269 <height>20</height>
270 </size>
271 </property>
272 </spacer>
273 <spacer row="6" column="2" >
274 <property>
275 <name>name</name> 265 <name>name</name>
276 <cstring>Spacer16</cstring> 266 <cstring>Line6</cstring>
277 </property> 267 </property>
278 <property stdset="1"> 268 <property stdset="1">
279 <name>orientation</name> 269 <name>orientation</name>
280 <enum>Vertical</enum> 270 <enum>Horizontal</enum>
281 </property> 271 </property>
272 </widget>
273 <widget row="1" column="0" rowspan="1" colspan="3" >
274 <class>Line</class>
282 <property stdset="1"> 275 <property stdset="1">
283 <name>sizeType</name> 276 <name>name</name>
284 <enum>Expanding</enum> 277 <cstring>Line1</cstring>
285 </property> 278 </property>
286 <property> 279 <property stdset="1">
287 <name>sizeHint</name> 280 <name>orientation</name>
288 <size> 281 <enum>Horizontal</enum>
289 <width>20</width>
290 <height>20</height>
291 </size>
292 </property> 282 </property>
293 </spacer> 283 </widget>
294 <widget row="5" column="2" > 284 <widget row="0" column="0" >
295 <class>QPushButton</class> 285 <class>QLabel</class>
296 <property stdset="1"> 286 <property stdset="1">
297 <name>name</name> 287 <name>name</name>
298 <cstring>PushButton7</cstring> 288 <cstring>TextLabel1</cstring>
299 </property> 289 </property>
300 <property stdset="1"> 290 <property stdset="1">
301 <name>text</name> 291 <name>text</name>
302 <string>&amp;Set Current</string> 292 <string>Current Profile</string>
303 </property> 293 </property>
304 </widget> 294 </widget>
305 <widget row="4" column="2" > 295 <widget row="4" column="2" >
306 <class>QPushButton</class> 296 <class>QPushButton</class>
307 <property stdset="1"> 297 <property stdset="1">
308 <name>name</name> 298 <name>name</name>
309 <cstring>removeProfileButton</cstring> 299 <cstring>removeProfileButton</cstring>
310 </property> 300 </property>
311 <property stdset="1"> 301 <property stdset="1">
312 <name>text</name> 302 <name>text</name>
313 <string>&amp;Remove</string> 303 <string>&amp;Remove</string>
314 </property> 304 </property>
315 </widget> 305 </widget>
316 <widget row="3" column="2" > 306 <widget row="3" column="0" rowspan="2" colspan="2" >
317 <class>QPushButton</class> 307 <class>QListBox</class>
318 <property stdset="1"> 308 <property stdset="1">
319 <name>name</name> 309 <name>name</name>
320 <cstring>newProfileButton</cstring> 310 <cstring>profilesList</cstring>
311 </property>
312 </widget>
313 <spacer row="0" column="2" >
314 <property>
315 <name>name</name>
316 <cstring>Spacer2</cstring>
321 </property> 317 </property>
322 <property stdset="1"> 318 <property stdset="1">
323 <name>text</name> 319 <name>orientation</name>
324 <string>&amp;New</string> 320 <enum>Horizontal</enum>
325 </property> 321 </property>
326 </widget> 322 <property stdset="1">
323 <name>sizeType</name>
324 <enum>Expanding</enum>
325 </property>
326 <property>
327 <name>sizeHint</name>
328 <size>
329 <width>20</width>
330 <height>20</height>
331 </size>
332 </property>
333 </spacer>
327 <widget row="2" column="0" > 334 <widget row="2" column="0" >
328 <class>QLabel</class> 335 <class>QLabel</class>
329 <property stdset="1"> 336 <property stdset="1">
330 <name>name</name> 337 <name>name</name>
331 <cstring>TextLabel1_2</cstring> 338 <cstring>TextLabel1_2</cstring>
332 </property> 339 </property>
333 <property stdset="1"> 340 <property stdset="1">
334 <name>text</name> 341 <name>text</name>
335 <string>Profiles</string> 342 <string>Profiles</string>
336 </property> 343 </property>
337 </widget> 344 </widget>
338 <widget row="3" column="0" rowspan="3" colspan="2" > 345 <widget row="6" column="0" rowspan="1" colspan="3" >
339 <class>QListBox</class> 346 <class>QLayoutWidget</class>
340 <property stdset="1"> 347 <property stdset="1">
341 <name>name</name> 348 <name>name</name>
342 <cstring>profilesList</cstring> 349 <cstring>Layout6</cstring>
343 </property> 350 </property>
351 <hbox>
352 <property stdset="1">
353 <name>margin</name>
354 <number>0</number>
355 </property>
356 <property stdset="1">
357 <name>spacing</name>
358 <number>6</number>
359 </property>
360 <widget>
361 <class>QLabel</class>
362 <property stdset="1">
363 <name>name</name>
364 <cstring>TextLabel1_3</cstring>
365 </property>
366 <property stdset="1">
367 <name>text</name>
368 <string>New Profile</string>
369 </property>
370 </widget>
371 <widget>
372 <class>QLineEdit</class>
373 <property stdset="1">
374 <name>name</name>
375 <cstring>newProfile</cstring>
376 </property>
377 </widget>
378 <widget>
379 <class>QPushButton</class>
380 <property stdset="1">
381 <name>name</name>
382 <cstring>newProfileButton</cstring>
383 </property>
384 <property stdset="1">
385 <name>enabled</name>
386 <bool>false</bool>
387 </property>
388 <property stdset="1">
389 <name>text</name>
390 <string>&amp;Add</string>
391 </property>
392 </widget>
393 </hbox>
344 </widget> 394 </widget>
345 </grid> 395 </grid>
346 </widget> 396 </widget>
347 </widget> 397 </widget>
348 </vbox> 398 </vbox>
349</widget> 399</widget>
350<customwidgets> 400<customwidgets>
351 <customwidget> 401 <customwidget>
352 <class>QWidget</class> 402 <class>QWidget</class>
353 <header location="local">qwidget.h</header> 403 <header location="local">qwidget.h</header>
354 <sizehint> 404 <sizehint>
355 <width>100</width> 405 <width>100</width>
356 <height>100</height> 406 <height>100</height>
357 </sizehint> 407 </sizehint>
358 <container>0</container> 408 <container>0</container>
359 <sizepolicy> 409 <sizepolicy>
360 <hordata>7</hordata> 410 <hordata>7</hordata>
361 <verdata>7</verdata> 411 <verdata>7</verdata>
362 </sizepolicy> 412 </sizepolicy>
363 <pixmap>image0</pixmap> 413 <pixmap>image0</pixmap>
364 </customwidget> 414 </customwidget>
365</customwidgets> 415</customwidgets>
366<images> 416<images>
367 <image> 417 <image>
368 <name>image0</name> 418 <name>image0</name>
369 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> 419 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
370 </image> 420 </image>
371</images> 421</images>
422<tabstops>
423 <tabstop>tabWidget</tabstop>
424 <tabstop>connectionList</tabstop>
425 <tabstop>informationConnectionButton</tabstop>
426 <tabstop>configureConnectionButton</tabstop>
427 <tabstop>addConnectionButton</tabstop>
428 <tabstop>removeConnectionButton</tabstop>
429 <tabstop>profilesList</tabstop>
430 <tabstop>setCurrentProfileButton</tabstop>
431 <tabstop>removeProfileButton</tabstop>
432 <tabstop>newProfile</tabstop>
433 <tabstop>newProfileButton</tabstop>
434</tabstops>
372</UI> 435</UI>
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index e9429e3..e895971 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -1,125 +1,127 @@
1#include "mainwindowimp.h" 1#include "mainwindowimp.h"
2#include "addconnectionimp.h" 2#include "addconnectionimp.h"
3#include "interfaceinformationimp.h" 3#include "interfaceinformationimp.h"
4#include "interfacesetupimp.h" 4#include "interfacesetupimp.h"
5#include "module.h" 5#include "module.h"
6 6
7#include "kprocess.h" 7#include "kprocess.h"
8#include "namedialog.h"
9 8
10#include <qpushbutton.h> 9#include <qpushbutton.h>
11#include <qtabwidget.h> 10#include <qtabwidget.h>
12#include <qlistbox.h> 11#include <qlistbox.h>
12#include <qlineedit.h>
13#include <qlistview.h> 13#include <qlistview.h>
14#include <qheader.h> 14#include <qheader.h>
15#include <qlabel.h> 15#include <qlabel.h>
16 16
17#include <qmainwindow.h> 17#include <qmainwindow.h>
18#include <qmessagebox.h> 18#include <qmessagebox.h>
19 19
20#include <qpe/config.h> 20#include <qpe/config.h>
21#include <qpe/qlibrary.h> 21#include <qpe/qlibrary.h>
22#include <qpe/resource.h> 22#include <qpe/resource.h>
23 23
24#include <qlist.h> 24#include <qlist.h>
25#include <qdir.h> 25#include <qdir.h>
26#include <qfile.h> 26#include <qfile.h>
27#include <qtextstream.h> 27#include <qtextstream.h>
28 28
29#define TEMP_ALL "/tmp/ifconfig-a" 29#define TEMP_ALL "/tmp/ifconfig-a"
30#define TEMP_UP "/tmp/ifconfig" 30#define TEMP_UP "/tmp/ifconfig"
31 31
32MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){ 32MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){
33 connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); 33 connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));
34 connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); 34 connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
35 connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); 35 connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
36 connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); 36 connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked()));
37 37
38 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); 38 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
39 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); 39 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
40 connect(profilesList, SIGNAL(highlighted(const QString&)), this, SLOT(changeProfile(const QString&))); 40 connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile()));
41 41
42 connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));
42 // Load connections. 43 // Load connections.
43 loadModules(QDir::homeDirPath() + "/.networksetup/plugins"); 44 loadModules(QDir::homeDirPath() + "/.networksetup/plugins");
44 getInterfaceList(); 45 getInterfaceList();
45 connectionList->header()->hide(); 46 connectionList->header()->hide();
46 47
47 48
48 Config cfg("NetworkSetup"); 49 Config cfg("NetworkSetup");
49 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); 50 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));
50 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) 51 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)
51 profilesList->insertItem((*it)); 52 profilesList->insertItem((*it));
52 advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); 53 advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false);
53} 54}
54 55
55/** 56/**
56 * Deconstructor. Save profiles. Delete loaded libraries. 57 * Deconstructor. Save profiles. Delete loaded libraries.
57 */ 58 */
58MainWindowImp::~MainWindowImp(){ 59MainWindowImp::~MainWindowImp(){
59 // Save profiles. 60 // Save profiles.
60 if(profiles.count() > 1){ 61 if(profiles.count() > 1){
61 Config cfg("NetworkSetup"); 62 Config cfg("NetworkSetup");
63 cfg.setGroup("General");
62 cfg.writeEntry("Profiles", profiles.join(" ")); 64 cfg.writeEntry("Profiles", profiles.join(" "));
63 } 65 }
64 // Delete Modules and Libraries 66 // Delete Modules and Libraries
65 QMap<Module*, QLibrary*>::Iterator it; 67 QMap<Module*, QLibrary*>::Iterator it;
66 for( it = libraries.begin(); it != libraries.end(); ++it ){ 68 for( it = libraries.begin(); it != libraries.end(); ++it ){
67 delete it.key(); 69 delete it.key();
68 delete it.data(); 70 delete it.data();
69 } 71 }
70} 72}
71 73
72/** 74/**
73 * Load all modules that are found in the path 75 * Load all modules that are found in the path
74 * @param path a directory that is scaned for any plugins that can be loaded 76 * @param path a directory that is scaned for any plugins that can be loaded
75 * and attempts to load them 77 * and attempts to load them
76 */ 78 */
77void MainWindowImp::loadModules(QString path){ 79void MainWindowImp::loadModules(QString path){
78 qDebug(path.latin1()); 80 qDebug(path.latin1());
79 QDir d(path); 81 QDir d(path);
80 if(!d.exists()) 82 if(!d.exists())
81 return; 83 return;
82 84
83 // Don't want sym links 85 // Don't want sym links
84 d.setFilter( QDir::Files | QDir::NoSymLinks ); 86 d.setFilter( QDir::Files | QDir::NoSymLinks );
85 const QFileInfoList *list = d.entryInfoList(); 87 const QFileInfoList *list = d.entryInfoList();
86 QFileInfoListIterator it( *list ); 88 QFileInfoListIterator it( *list );
87 QFileInfo *fi; 89 QFileInfo *fi;
88 while ( (fi=it.current()) ) { 90 while ( (fi=it.current()) ) {
89 if(fi->fileName().contains(".so")){ 91 if(fi->fileName().contains(".so")){
90 loadPlugin(path + "/" + fi->fileName()); 92 loadPlugin(path + "/" + fi->fileName());
91 } 93 }
92 ++it; 94 ++it;
93 } 95 }
94} 96}
95 97
96/** 98/**
97 * Attempt to load a function and resolve a function. 99 * Attempt to load a function and resolve a function.
98 * @param pluginFileName - the name of the file in which to attempt to load 100 * @param pluginFileName - the name of the file in which to attempt to load
99 * @param resolveString - function pointer to resolve 101 * @param resolveString - function pointer to resolve
100 * @return pointer to the function with name resolveString or NULL 102 * @return pointer to the function with name resolveString or NULL
101 */ 103 */
102Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){ 104Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
103 qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1()); 105 qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1());
104 QLibrary *lib = new QLibrary(pluginFileName); 106 QLibrary *lib = new QLibrary(pluginFileName);
105 void *functionPointer = lib->resolve(resolveString); 107 void *functionPointer = lib->resolve(resolveString);
106 if( !functionPointer ){ 108 if( !functionPointer ){
107 qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1()); 109 qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());
108 delete lib; 110 delete lib;
109 return NULL; 111 return NULL;
110 } 112 }
111 113
112 // Try to get an object. 114 // Try to get an object.
113 Module *object = ((Module* (*)()) functionPointer)(); 115 Module *object = ((Module* (*)()) functionPointer)();
114 if(object == NULL){ 116 if(object == NULL){
115 qDebug("MainWindowImp: Couldn't create object, but did load library!"); 117 qDebug("MainWindowImp: Couldn't create object, but did load library!");
116 delete lib; 118 delete lib;
117 return NULL; 119 return NULL;
118 } 120 }
119 121
120 // Store for deletion later 122 // Store for deletion later
121 libraries.insert(object, lib); 123 libraries.insert(object, lib);
122 return object; 124 return object;
123} 125}
124 126
125/** 127/**
@@ -311,112 +313,115 @@ void MainWindowImp::jobDone(KProcess *process){
311 i->setStatus(true); 313 i->setStatus(true);
312 } 314 }
313 315
314 i->setAttached(true); 316 i->setAttached(true);
315 i->setInterfaceName(interfaceName); 317 i->setInterfaceName(interfaceName);
316 318
317 QString hardName = "Ethernet"; 319 QString hardName = "Ethernet";
318 int hardwareName = line.find("Link encap:"); 320 int hardwareName = line.find("Link encap:");
319 int macAddress = line.find("HWaddr"); 321 int macAddress = line.find("HWaddr");
320 if(macAddress == -1) 322 if(macAddress == -1)
321 macAddress = line.length(); 323 macAddress = line.length();
322 if(hardwareName != -1) 324 if(hardwareName != -1)
323 i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName())); 325 i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName()));
324 // We have found an interface 326 // We have found an interface
325 //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1()); 327 //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());
326 interfaceNames.insert(i->getInterfaceName(), i); 328 interfaceNames.insert(i->getInterfaceName(), i);
327 updateInterface(i); 329 updateInterface(i);
328 } 330 }
329 } 331 }
330 file.close(); 332 file.close();
331 QFile::remove(fileName); 333 QFile::remove(fileName);
332} 334}
333 335
334/** 336/**
335 * Update this interface. If no QListViewItem exists create one. 337 * Update this interface. If no QListViewItem exists create one.
336 * @param Interface* pointer to the interface that needs to be updated. 338 * @param Interface* pointer to the interface that needs to be updated.
337 */ 339 */
338void MainWindowImp::updateInterface(Interface *i){ 340void MainWindowImp::updateInterface(Interface *i){
339 QListViewItem *item = NULL; 341 QListViewItem *item = NULL;
340 342
341 // Find the interface, making it if needed. 343 // Find the interface, making it if needed.
342 if(items.find(i) == items.end()){ 344 if(items.find(i) == items.end()){
343 item = new QListViewItem(connectionList, "", "", ""); 345 item = new QListViewItem(connectionList, "", "", "");
344 // See if you can't find a module owner for this interface 346 // See if you can't find a module owner for this interface
345 QMap<Module*, QLibrary*>::Iterator it; 347 QMap<Module*, QLibrary*>::Iterator it;
346 for( it = libraries.begin(); it != libraries.end(); ++it ){ 348 for( it = libraries.begin(); it != libraries.end(); ++it ){
347 if(it.key()->isOwner(i)) 349 if(it.key()->isOwner(i))
348 i->setModuleOwner(it.key()); 350 i->setModuleOwner(it.key());
349 } 351 }
350 items.insert(i, item); 352 items.insert(i, item);
351 interfaceItems.insert(item, i); 353 interfaceItems.insert(item, i);
352 } 354 }
353 else 355 else
354 item = items[i]; 356 item = items[i];
355 357
356 // Update the icons and information 358 // Update the icons and information
357 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down"))); 359 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
358 360
359 QString typeName = "lan"; 361 QString typeName = "lan";
360 if(i->getHardwareName().contains("Local Loopback")) 362 if(i->getHardwareName().contains("Local Loopback"))
361 typeName = "lo"; 363 typeName = "lo";
362 if(i->getInterfaceName().contains("irda")) 364 if(i->getInterfaceName().contains("irda"))
363 typeName = "irda"; 365 typeName = "irda";
364 if(i->getInterfaceName().contains("wlan")) 366 if(i->getInterfaceName().contains("wlan"))
365 typeName = "wlan"; 367 typeName = "wlan";
366 // Actually try to use the Module 368 // Actually try to use the Module
367 if(i->getModuleOwner() != NULL) 369 if(i->getModuleOwner() != NULL)
368 typeName = i->getModuleOwner()->getPixmapName(i); 370 typeName = i->getModuleOwner()->getPixmapName(i);
369 371
370 item->setPixmap(1, (Resource::loadPixmap(typeName))); 372 item->setPixmap(1, (Resource::loadPixmap(typeName)));
371 item->setText(2, i->getHardwareName()); 373 item->setText(2, i->getHardwareName());
372 item->setText(3, (i->getStatus()) ? i->getIp() : QString("")); 374 item->setText(3, (i->getStatus()) ? i->getIp() : QString(""));
373} 375}
374 376
377void MainWindowImp::newProfileChanged(const QString& newText){
378 if(newText.length() > 0)
379 newProfileButton->setEnabled(true);
380 else
381 newProfileButton->setEnabled(false);
382}
383
375/** 384/**
376 * Adds a new profile to the list of profiles. 385 * Adds a new profile to the list of profiles.
377 * Don't add profiles that already exists. 386 * Don't add profiles that already exists.
378 * Appends to the list and QStringList 387 * Appends to the list and QStringList
379 */ 388 */
380void MainWindowImp::addProfile(){ 389void MainWindowImp::addProfile(){
381 NameDialog foo(this, "namedialog", true); 390 QString newProfileName = newProfile->text();
382 QString newProfileName = foo.go();
383 if(newProfileName.length() == 0)
384 return;
385
386 if(profiles.grep(newProfileName).count() > 0){ 391 if(profiles.grep(newProfileName).count() > 0){
387 QMessageBox::information(this, "Can't Add","Profile already exists.", "Ok"); 392 QMessageBox::information(this, "Can't Add","Profile already exists.", "Ok");
388 return; 393 return;
389 } 394 }
390 profiles.append(newProfileName); 395 profiles.append(newProfileName);
391 profilesList->insertItem(newProfileName); 396 profilesList->insertItem(newProfileName);
392} 397}
393 398
394/** 399/**
395 * Removes the currently selected profile in the combo. 400 * Removes the currently selected profile in the combo.
396 * Doesn't delete if there are less then 2 profiles. 401 * Doesn't delete if there are less then 2 profiles.
397 */ 402 */
398void MainWindowImp::removeProfile(){ 403void MainWindowImp::removeProfile(){
399 if(profilesList->count() <= 1){ 404 if(profilesList->count() <= 1){
400 QMessageBox::information(this, "Can't remove anything.","Need One Profile.", "Ok"); 405 QMessageBox::information(this, "Can't remove anything.","Need One Profile.", "Ok");
401 return; 406 return;
402 } 407 }
403 QString profileToRemove = profilesList->currentText(); 408 QString profileToRemove = profilesList->currentText();
404 if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok){ 409 if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok){
405 profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), "")); 410 profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), ""));
406 profilesList->clear(); 411 profilesList->clear();
407 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) 412 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)
408 profilesList->insertItem((*it)); 413 profilesList->insertItem((*it));
409 } 414 }
410 415
411} 416}
412 417
413/** 418/**
414 * A new profile has been selected, change. 419 * A new profile has been selected, change.
415 * @param newProfile the new profile. 420 * @param newProfile the new profile.
416 */ 421 */
417void MainWindowImp::changeProfile(const QString& newProfile){ 422void MainWindowImp::changeProfile(){
418 currentProfileLabel->setText(newProfile); 423 currentProfileLabel->setText(profilesList->text(profilesList->currentItem()));
419} 424}
420 425
421// mainwindowimp.cpp 426// mainwindowimp.cpp
422 427
diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h
index 629b758..c67c161 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindowimp.h
@@ -1,57 +1,58 @@
1#ifndef MAINWINOWIMP_H 1#ifndef MAINWINOWIMP_H
2#define MAINWINOWIMP_H 2#define MAINWINOWIMP_H
3 3
4#include "mainwindow.h" 4#include "mainwindow.h"
5#include <qmap.h> 5#include <qmap.h>
6#include <qstringlist.h> 6#include <qstringlist.h>
7 7
8class Module; 8class Module;
9class Interface; 9class Interface;
10class QLibrary; 10class QLibrary;
11class KProcess; 11class KProcess;
12 12
13class MainWindowImp : public MainWindow { 13class MainWindowImp : public MainWindow {
14 Q_OBJECT 14 Q_OBJECT
15 15
16public: 16public:
17 MainWindowImp(QWidget *parent=0, const char *name=0); 17 MainWindowImp(QWidget *parent=0, const char *name=0);
18 ~MainWindowImp(); 18 ~MainWindowImp();
19 19
20private slots: 20private slots:
21 void addClicked(); 21 void addClicked();
22 void removeClicked(); 22 void removeClicked();
23 void configureClicked(); 23 void configureClicked();
24 void informationClicked(); 24 void informationClicked();
25 25
26 void jobDone(KProcess *process); 26 void jobDone(KProcess *process);
27 void getInterfaceList(); 27 void getInterfaceList();
28 28
29 void addProfile(); 29 void addProfile();
30 void removeProfile(); 30 void removeProfile();
31 void changeProfile(const QString&); 31 void changeProfile();
32 32
33 void updateInterface(Interface *i); 33 void updateInterface(Interface *i);
34 void newProfileChanged(const QString& newText);
34 35
35private: 36private:
36 void loadModules(QString path); 37 void loadModules(QString path);
37 38
38 Module* loadPlugin(QString pluginFileName, 39 Module* loadPlugin(QString pluginFileName,
39 QString resolveString = "create_plugin"); 40 QString resolveString = "create_plugin");
40 41
41 // For our local list of names 42 // For our local list of names
42 QMap<QString, Interface*> interfaceNames; 43 QMap<QString, Interface*> interfaceNames;
43 44
44 QMap<Module*, QLibrary*> libraries; 45 QMap<Module*, QLibrary*> libraries;
45 QMap<Interface*, QListViewItem*> items; 46 QMap<Interface*, QListViewItem*> items;
46 QMap<QListViewItem*, Interface*> interfaceItems; 47 QMap<QListViewItem*, Interface*> interfaceItems;
47 48
48 QMap<KProcess*, QString> threads; 49 QMap<KProcess*, QString> threads;
49 QStringList profiles; 50 QStringList profiles;
50 51
51 bool advancedUserMode; 52 bool advancedUserMode;
52}; 53};
53 54
54#endif 55#endif
55 56
56// mainwindowimp.h 57// mainwindowimp.h
57 58
diff --git a/noncore/settings/networksettings/namedialog.cpp b/noncore/settings/networksettings/namedialog.cpp
deleted file mode 100644
index c5efa37..0000000
--- a/noncore/settings/networksettings/namedialog.cpp
+++ b/dev/null
@@ -1,61 +0,0 @@
1/****************************************************************************
2** Form implementation generated from reading ui file 'namedialog.ui'
3**
4** Created: Sat Dec 15 04:36:20 2001
5** by: The User Interface Compiler (uic)
6**
7** WARNING! All changes made in this file will be lost!
8****************************************************************************/
9#include "namedialog.h"
10
11#include <qlineedit.h>
12#include <qpushbutton.h>
13#include <qlayout.h>
14#include <qvariant.h>
15#include <qtooltip.h>
16#include <qwhatsthis.h>
17
18/*
19 * Constructs a NameDialog which is a child of 'parent', with the
20 * name 'name' and widget flags set to 'f'
21 *
22 * The dialog will by default be modeless, unless you set 'modal' to
23 * TRUE to construct a modal dialog.
24 */
25NameDialog::NameDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
26 : QDialog( parent, name, modal, fl )
27{
28 if ( !name )
29 setName( "NameDialog" );
30 resize( 176, 65 );
31 setCaption( tr( "Enter A Name" ) );
32 NameDialogLayout = new QGridLayout( this );
33 NameDialogLayout->setSpacing( 6 );
34 NameDialogLayout->setMargin( 5 );
35
36 Name = new QLineEdit( this, "Name" );
37
38 NameDialogLayout->addMultiCellWidget( Name, 0, 0, 0, 1 );
39
40 cancel = new QPushButton( this, "Cancel" );
41 cancel->setText( tr( "&Cancel" ) );
42
43 NameDialogLayout->addWidget( cancel, 1, 1 );
44
45 ok = new QPushButton( this, "ok" );
46 ok->setText( tr( "&Ok" ) );
47
48 NameDialogLayout->addWidget( ok, 1, 0 );
49
50 connect( ok, SIGNAL( clicked() ), this, SLOT( accept() ) );
51 connect( cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
52 connect( Name, SIGNAL(returnPressed () ), this, SLOT(accept() ) );
53}
54
55QString NameDialog::go(){
56 if( exec() ) //pressed OK
57 return (Name->text());
58 else //pressed cancel
59 return QString();
60}
61
diff --git a/noncore/settings/networksettings/namedialog.h b/noncore/settings/networksettings/namedialog.h
deleted file mode 100644
index 4c4e149..0000000
--- a/noncore/settings/networksettings/namedialog.h
+++ b/dev/null
@@ -1,36 +0,0 @@
1/****************************************************************************
2** Form interface generated from reading ui file 'namedialog.ui'
3**
4** Created: Sat Dec 15 04:36:14 2001
5** by: The User Interface Compiler (uic)
6**
7** WARNING! All changes made in this file will be lost!
8****************************************************************************/
9#ifndef NAMEDIALOG_H
10#define NAMEDIALOG_H
11
12#include <qvariant.h>
13#include <qdialog.h>
14class QVBoxLayout;
15class QHBoxLayout;
16class QGridLayout;
17class QLineEdit;
18class QPushButton;
19
20class NameDialog : public QDialog
21{
22 Q_OBJECT
23
24public:
25 NameDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
26
27 QLineEdit* Name;
28 QPushButton* cancel;
29 QPushButton* ok;
30 QString go();
31
32protected:
33 QGridLayout* NameDialogLayout;
34};
35
36#endif // NAMEDIALOG_H
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro
index e146eb4..ba70180 100644
--- a/noncore/settings/networksettings/networksetup.pro
+++ b/noncore/settings/networksettings/networksetup.pro
@@ -1,10 +1,10 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 #CONFIG = qt warn_on debug 2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h namedialog.h 4 HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h
5 SOURCES = main.cpp namedialog.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp 5 SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
6 #INCLUDEPATH+= $(QPEDIR)/include 6 #INCLUDEPATH+= $(QPEDIR)/include
7 #DEPENDPATH+= $(QPEDIR)/include 7 #DEPENDPATH+= $(QPEDIR)/include
8LIBS += -lqpe 8LIBS += -lqpe
9 INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui 9 INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
10 TARGET = networksetup 10 TARGET = networksetup
diff --git a/noncore/settings/networksettings/systemadvanced.ui b/noncore/settings/networksettings/systemadvanced.ui
index 6ea192c..cd7ac61 100644
--- a/noncore/settings/networksettings/systemadvanced.ui
+++ b/noncore/settings/networksettings/systemadvanced.ui
@@ -1,78 +1,78 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>SystemNetworking</class> 2<class>SystemNetworking</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>SystemNetworking</cstring> 7 <cstring>SystemNetworking</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>222</width> 14 <width>218</width>
15 <height>289</height> 15 <height>289</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>System Networking</string> 20 <string>System Networking</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>0</number> 25 <number>0</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>QTabWidget</class> 32 <class>QTabWidget</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>tabWidget</cstring> 35 <cstring>tabWidget</cstring>
36 </property> 36 </property>
37 <property> 37 <property>
38 <name>layoutMargin</name> 38 <name>layoutMargin</name>
39 </property> 39 </property>
40 <widget> 40 <widget>
41 <class>QWidget</class> 41 <class>QWidget</class>
42 <property stdset="1"> 42 <property stdset="1">
43 <name>name</name> 43 <name>name</name>
44 <cstring>tab</cstring> 44 <cstring>tab</cstring>
45 </property> 45 </property>
46 <attribute> 46 <attribute>
47 <name>title</name> 47 <name>title</name>
48 <string>DNS</string> 48 <string>DNS</string>
49 </attribute> 49 </attribute>
50 <grid> 50 <grid>
51 <property stdset="1"> 51 <property stdset="1">
52 <name>margin</name> 52 <name>margin</name>
53 <number>11</number> 53 <number>11</number>
54 </property> 54 </property>
55 <property stdset="1"> 55 <property stdset="1">
56 <name>spacing</name> 56 <name>spacing</name>
57 <number>6</number> 57 <number>6</number>
58 </property> 58 </property>
59 <widget row="0" column="0" > 59 <widget row="0" column="0" >
60 <class>QLabel</class> 60 <class>QLabel</class>
61 <property stdset="1"> 61 <property stdset="1">
62 <name>name</name> 62 <name>name</name>
63 <cstring>TextLabel6</cstring> 63 <cstring>TextLabel6</cstring>
64 </property> 64 </property>
65 <property stdset="1"> 65 <property stdset="1">
66 <name>text</name> 66 <name>text</name>
67 <string>Hostname</string> 67 <string>Hostname</string>
68 </property> 68 </property>
69 </widget> 69 </widget>
70 <widget row="1" column="0" > 70 <widget row="1" column="0" >
71 <class>QLabel</class> 71 <class>QLabel</class>
72 <property stdset="1"> 72 <property stdset="1">
73 <name>name</name> 73 <name>name</name>
74 <cstring>TextLabel5</cstring> 74 <cstring>TextLabel5</cstring>
75 </property> 75 </property>
76 <property stdset="1"> 76 <property stdset="1">
77 <name>text</name> 77 <name>text</name>
78 <string>DNS</string> 78 <string>DNS</string>
@@ -332,112 +332,65 @@
332 <name>text</name> 332 <name>text</name>
333 <string>eth0</string> 333 <string>eth0</string>
334 </property> 334 </property>
335 <property> 335 <property>
336 <name>pixmap</name> 336 <name>pixmap</name>
337 <pixmap></pixmap> 337 <pixmap></pixmap>
338 </property> 338 </property>
339 <property> 339 <property>
340 <name>pixmap</name> 340 <name>pixmap</name>
341 <pixmap></pixmap> 341 <pixmap></pixmap>
342 </property> 342 </property>
343 <property> 343 <property>
344 <name>pixmap</name> 344 <name>pixmap</name>
345 <pixmap></pixmap> 345 <pixmap></pixmap>
346 </property> 346 </property>
347 <property> 347 <property>
348 <name>pixmap</name> 348 <name>pixmap</name>
349 <pixmap></pixmap> 349 <pixmap></pixmap>
350 </property> 350 </property>
351 <property> 351 <property>
352 <name>pixmap</name> 352 <name>pixmap</name>
353 <pixmap></pixmap> 353 <pixmap></pixmap>
354 </property> 354 </property>
355 <property> 355 <property>
356 <name>pixmap</name> 356 <name>pixmap</name>
357 <pixmap></pixmap> 357 <pixmap></pixmap>
358 </property> 358 </property>
359 <property> 359 <property>
360 <name>pixmap</name> 360 <name>pixmap</name>
361 <pixmap></pixmap> 361 <pixmap></pixmap>
362 </property> 362 </property>
363 <property> 363 <property>
364 <name>pixmap</name> 364 <name>pixmap</name>
365 <pixmap></pixmap> 365 <pixmap></pixmap>
366 </property> 366 </property>
367 </item> 367 </item>
368 <property stdset="1"> 368 <property stdset="1">
369 <name>name</name> 369 <name>name</name>
370 <cstring>ListView4</cstring> 370 <cstring>ListView4</cstring>
371 </property> 371 </property>
372 </widget> 372 </widget>
373 <widget row="1" column="0" > 373 <widget row="1" column="0" >
374 <class>QPushButton</class> 374 <class>QPushButton</class>
375 <property stdset="1"> 375 <property stdset="1">
376 <name>name</name> 376 <name>name</name>
377 <cstring>PushButton17</cstring> 377 <cstring>PushButton17</cstring>
378 </property> 378 </property>
379 <property stdset="1"> 379 <property stdset="1">
380 <name>text</name> 380 <name>text</name>
381 <string>&amp;Add</string> 381 <string>&amp;Add</string>
382 </property> 382 </property>
383 </widget> 383 </widget>
384 <widget row="1" column="1" > 384 <widget row="1" column="1" >
385 <class>QPushButton</class> 385 <class>QPushButton</class>
386 <property stdset="1"> 386 <property stdset="1">
387 <name>name</name> 387 <name>name</name>
388 <cstring>PushButton18</cstring> 388 <cstring>PushButton18</cstring>
389 </property> 389 </property>
390 <property stdset="1"> 390 <property stdset="1">
391 <name>text</name> 391 <name>text</name>
392 <string>Remove</string> 392 <string>Remove</string>
393 </property> 393 </property>
394 </widget> 394 </widget>
395 <spacer row="2" column="1" > 395 <spacer row="2" column="1" >
396 <property> 396 \ No newline at end of file
397 <name>name</name>
398 <cstring>Spacer15</cstring>
399 </property>
400 <property stdset="1">
401 <name>orientation</name>
402 <enum>Vertical</enum>
403 </property>
404 <property stdset="1">
405 <name>sizeType</name>
406 <enum>Expanding</enum>
407 </property>
408 <property>
409 <name>sizeHint</name>
410 <size>
411 <width>20</width>
412 <height>20</height>
413 </size>
414 </property>
415 </spacer>
416 </grid>
417 </widget>
418 </widget>
419 </vbox>
420</widget>
421<customwidgets>
422 <customwidget>
423 <class>QWidget</class>
424 <header location="local">qwidget.h</header>
425 <sizehint>
426 <width>100</width>
427 <height>100</height>
428 </sizehint>
429 <container>0</container>
430 <sizepolicy>
431 <hordata>7</hordata>
432 <verdata>7</verdata>
433 </sizepolicy>
434 <pixmap>image0</pixmap>
435 </customwidget>
436</customwidgets>
437<images>
438 <image>
439 <name>image0</name>
440 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
441 </image>
442</images>
443</UI>