summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-09-30 19:41:41 (UTC)
committer benmeyer <benmeyer>2002-09-30 19:41:41 (UTC)
commita0f88d7d0fb0ffaf8d1aa7b753b0d48ee344e34f (patch) (unidiff)
tree10e1141777f657881af01cab036962c128109ec2
parentd49bd63f3b15795a1ee2497960f00eb3fb075e69 (diff)
downloadopie-a0f88d7d0fb0ffaf8d1aa7b753b0d48ee344e34f.zip
opie-a0f88d7d0fb0ffaf8d1aa7b753b0d48ee344e34f.tar.gz
opie-a0f88d7d0fb0ffaf8d1aa7b753b0d48ee344e34f.tar.bz2
ui cleanup with groupboxes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/interfaceadvanced.ui242
-rw-r--r--noncore/net/networksetup/interfaceinformation.ui165
-rw-r--r--noncore/net/networksetup/interfacesetup.ui210
-rw-r--r--noncore/net/networksetup/mainwindow.ui2
-rw-r--r--noncore/net/networksetup/mainwindowimp.cpp76
-rw-r--r--noncore/net/networksetup/module.h4
-rw-r--r--noncore/net/networksetup/networksetup.pro4
-rw-r--r--noncore/settings/networksettings/interfaceadvanced.ui242
-rw-r--r--noncore/settings/networksettings/interfaceinformation.ui165
-rw-r--r--noncore/settings/networksettings/interfacesetup.ui210
-rw-r--r--noncore/settings/networksettings/mainwindow.ui2
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp76
-rw-r--r--noncore/settings/networksettings/module.h4
-rw-r--r--noncore/settings/networksettings/networksetup.pro4
14 files changed, 746 insertions, 660 deletions
diff --git a/noncore/net/networksetup/interfaceadvanced.ui b/noncore/net/networksetup/interfaceadvanced.ui
index 8ef0b29..7520abe 100644
--- a/noncore/net/networksetup/interfaceadvanced.ui
+++ b/noncore/net/networksetup/interfaceadvanced.ui
@@ -1,47 +1,47 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>InterfaceAdvanced</class> 2<class>InterfaceAdvanced</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>InterfaceAdvanced</cstring> 7 <cstring>InterfaceAdvanced</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>197</width> 14 <width>188</width>
15 <height>253</height> 15 <height>277</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>Advanced Interface Information</string> 20 <string>Advanced 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="1" column="0" > 31 <widget row="1" column="0" >
32 <class>QLabel</class> 32 <class>QLabel</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>TextLabel1</cstring> 35 <cstring>TextLabel1</cstring>
36 </property> 36 </property>
37 <property stdset="1"> 37 <property stdset="1">
38 <name>text</name> 38 <name>text</name>
39 <string>MAC Address</string> 39 <string>MAC Address</string>
40 </property> 40 </property>
41 </widget> 41 </widget>
42 <widget row="0" column="1" > 42 <widget row="0" column="1" >
43 <class>QLabel</class> 43 <class>QLabel</class>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>name</name> 45 <name>name</name>
46 <cstring>interfaceName</cstring> 46 <cstring>interfaceName</cstring>
47 </property> 47 </property>
@@ -70,254 +70,268 @@
70 </property> 70 </property>
71 </widget> 71 </widget>
72 <widget row="1" column="1" > 72 <widget row="1" column="1" >
73 <class>QLabel</class> 73 <class>QLabel</class>
74 <property stdset="1"> 74 <property stdset="1">
75 <name>name</name> 75 <name>name</name>
76 <cstring>macAddressLabel</cstring> 76 <cstring>macAddressLabel</cstring>
77 </property> 77 </property>
78 <property stdset="1"> 78 <property stdset="1">
79 <name>frameShape</name> 79 <name>frameShape</name>
80 <enum>Panel</enum> 80 <enum>Panel</enum>
81 </property> 81 </property>
82 <property stdset="1"> 82 <property stdset="1">
83 <name>frameShadow</name> 83 <name>frameShadow</name>
84 <enum>Sunken</enum> 84 <enum>Sunken</enum>
85 </property> 85 </property>
86 <property stdset="1"> 86 <property stdset="1">
87 <name>text</name> 87 <name>text</name>
88 <string>00:00:00:00:00:00</string> 88 <string>00:00:00:00:00:00</string>
89 </property> 89 </property>
90 </widget> 90 </widget>
91 <widget row="0" column="0" > 91 <widget row="0" column="0" >
92 <class>QLabel</class> 92 <class>QLabel</class>
93 <property stdset="1"> 93 <property stdset="1">
94 <name>name</name> 94 <name>name</name>
95 <cstring>TextLabel7</cstring> 95 <cstring>TextLabel7</cstring>
96 </property> 96 </property>
97 <property stdset="1"> 97 <property stdset="1">
98 <name>text</name> 98 <name>text</name>
99 <string>Interface</string> 99 <string>Interface</string>
100 </property> 100 </property>
101 </widget> 101 </widget>
102 <widget row="8" column="0" > 102 <widget row="4" column="0" >
103 <class>QLabel</class>
104 <property stdset="1">
105 <name>name</name>
106 <cstring>TextLabel9</cstring>
107 </property>
108 <property stdset="1">
109 <name>text</name>
110 <string>Lease Expires</string>
111 </property>
112 </widget>
113 <widget row="8" column="1" >
114 <class>QLabel</class> 103 <class>QLabel</class>
115 <property stdset="1"> 104 <property stdset="1">
116 <name>name</name> 105 <name>name</name>
117 <cstring>leaseExpiresLabel</cstring> 106 <cstring>TextLabel4</cstring>
118 </property>
119 <property stdset="1">
120 <name>frameShape</name>
121 <enum>Panel</enum>
122 </property> 107 </property>
123 <property stdset="1"> 108 <property stdset="1">
124 <name>frameShadow</name> 109 <name>enabled</name>
125 <enum>Sunken</enum> 110 <bool>true</bool>
126 </property> 111 </property>
127 <property stdset="1"> 112 <property stdset="1">
128 <name>text</name> 113 <name>text</name>
129 <string></string> 114 <string>Subnet Mask</string>
130 </property> 115 </property>
131 </widget> 116 </widget>
132 <widget row="7" column="1" > 117 <widget row="2" column="1" >
133 <class>QLabel</class> 118 <class>QLabel</class>
134 <property stdset="1"> 119 <property stdset="1">
135 <name>name</name> 120 <name>name</name>
136 <cstring>leaseObtainedLabel</cstring> 121 <cstring>ipAddressLabel</cstring>
137 </property> 122 </property>
138 <property stdset="1"> 123 <property stdset="1">
139 <name>frameShape</name> 124 <name>frameShape</name>
140 <enum>Panel</enum> 125 <enum>Panel</enum>
141 </property> 126 </property>
142 <property stdset="1"> 127 <property stdset="1">
143 <name>frameShadow</name> 128 <name>frameShadow</name>
144 <enum>Sunken</enum> 129 <enum>Sunken</enum>
145 </property> 130 </property>
146 <property stdset="1"> 131 <property stdset="1">
147 <name>text</name> 132 <name>text</name>
148 <string></string> 133 <string>0.0.0.0</string>
149 </property>
150 </widget>
151 <widget row="7" column="0" >
152 <class>QLabel</class>
153 <property stdset="1">
154 <name>name</name>
155 <cstring>TextLabel8</cstring>
156 </property>
157 <property stdset="1">
158 <name>text</name>
159 <string>Lease Obtained</string>
160 </property> 134 </property>
161 </widget> 135 </widget>
162 <widget row="6" column="1" > 136 <widget row="4" column="1" >
163 <class>QLabel</class> 137 <class>QLabel</class>
164 <property stdset="1"> 138 <property stdset="1">
165 <name>name</name> 139 <name>name</name>
166 <cstring>dhcpServerLabel</cstring> 140 <cstring>subnetMaskLabel</cstring>
167 </property> 141 </property>
168 <property stdset="1"> 142 <property stdset="1">
169 <name>frameShape</name> 143 <name>frameShape</name>
170 <enum>Panel</enum> 144 <enum>Panel</enum>
171 </property> 145 </property>
172 <property stdset="1"> 146 <property stdset="1">
173 <name>frameShadow</name> 147 <name>frameShadow</name>
174 <enum>Sunken</enum> 148 <enum>Sunken</enum>
175 </property> 149 </property>
176 <property stdset="1"> 150 <property stdset="1">
177 <name>text</name> 151 <name>text</name>
178 <string>255.255.255.255</string> 152 <string>0.0.0.0</string>
179 </property>
180 </widget>
181 <widget row="6" column="0" >
182 <class>QLabel</class>
183 <property stdset="1">
184 <name>name</name>
185 <cstring>TextLabel6</cstring>
186 </property>
187 <property stdset="1">
188 <name>text</name>
189 <string>DHCP Server</string>
190 </property> 153 </property>
191 </widget> 154 </widget>
192 <widget row="4" column="0" > 155 <widget row="3" column="0" >
193 <class>QLabel</class> 156 <class>QLabel</class>
194 <property stdset="1"> 157 <property stdset="1">
195 <name>name</name> 158 <name>name</name>
196 <cstring>TextLabel4</cstring> 159 <cstring>TextLabel2</cstring>
197 </property> 160 </property>
198 <property stdset="1"> 161 <property stdset="1">
199 <name>text</name> 162 <name>text</name>
200 <string>Subnet Mask</string> 163 <string>Broadcast</string>
201 </property> 164 </property>
202 </widget> 165 </widget>
203 <widget row="2" column="1" > 166 <widget row="3" column="1" >
204 <class>QLabel</class> 167 <class>QLabel</class>
205 <property stdset="1"> 168 <property stdset="1">
206 <name>name</name> 169 <name>name</name>
207 <cstring>ipAddressLabel</cstring> 170 <cstring>broadcastLabel</cstring>
208 </property> 171 </property>
209 <property stdset="1"> 172 <property stdset="1">
210 <name>frameShape</name> 173 <name>frameShape</name>
211 <enum>Panel</enum> 174 <enum>Panel</enum>
212 </property> 175 </property>
213 <property stdset="1"> 176 <property stdset="1">
214 <name>frameShadow</name> 177 <name>frameShadow</name>
215 <enum>Sunken</enum> 178 <enum>Sunken</enum>
216 </property> 179 </property>
217 <property stdset="1">
218 <name>text</name>
219 <string>0.0.0.0</string>
220 </property>
221 </widget> 180 </widget>
222 <widget row="4" column="1" > 181 <widget row="5" column="0" rowspan="1" colspan="2" >
223 <class>QLabel</class> 182 <class>QGroupBox</class>
224 <property stdset="1"> 183 <property stdset="1">
225 <name>name</name> 184 <name>name</name>
226 <cstring>subnetMaskLabel</cstring> 185 <cstring>GroupBox2</cstring>
227 </property> 186 </property>
228 <property stdset="1"> 187 <property stdset="1">
229 <name>frameShape</name> 188 <name>title</name>
230 <enum>Panel</enum> 189 <string>DHCP Information</string>
231 </property> 190 </property>
232 <property stdset="1"> 191 <grid>
233 <name>frameShadow</name> 192 <property stdset="1">
234 <enum>Sunken</enum> 193 <name>margin</name>
235 </property> 194 <number>11</number>
236 <property stdset="1"> 195 </property>
237 <name>text</name> 196 <property stdset="1">
238 <string>0.0.0.0</string> 197 <name>spacing</name>
239 </property> 198 <number>6</number>
199 </property>
200 <widget row="0" column="0" >
201 <class>QLabel</class>
202 <property stdset="1">
203 <name>name</name>
204 <cstring>TextLabel6</cstring>
205 </property>
206 <property stdset="1">
207 <name>text</name>
208 <string>DHCP Server</string>
209 </property>
210 </widget>
211 <widget row="2" column="1" >
212 <class>QLabel</class>
213 <property stdset="1">
214 <name>name</name>
215 <cstring>leaseExpiresLabel</cstring>
216 </property>
217 <property stdset="1">
218 <name>frameShape</name>
219 <enum>Panel</enum>
220 </property>
221 <property stdset="1">
222 <name>frameShadow</name>
223 <enum>Sunken</enum>
224 </property>
225 <property stdset="1">
226 <name>text</name>
227 <string></string>
228 </property>
229 </widget>
230 <widget row="1" column="1" >
231 <class>QLabel</class>
232 <property stdset="1">
233 <name>name</name>
234 <cstring>leaseObtainedLabel</cstring>
235 </property>
236 <property stdset="1">
237 <name>frameShape</name>
238 <enum>Panel</enum>
239 </property>
240 <property stdset="1">
241 <name>frameShadow</name>
242 <enum>Sunken</enum>
243 </property>
244 <property stdset="1">
245 <name>text</name>
246 <string></string>
247 </property>
248 </widget>
249 <widget row="2" column="0" >
250 <class>QLabel</class>
251 <property stdset="1">
252 <name>name</name>
253 <cstring>TextLabel9</cstring>
254 </property>
255 <property stdset="1">
256 <name>text</name>
257 <string>Lease Expires</string>
258 </property>
259 </widget>
260 <widget row="1" column="0" >
261 <class>QLabel</class>
262 <property stdset="1">
263 <name>name</name>
264 <cstring>TextLabel8</cstring>
265 </property>
266 <property stdset="1">
267 <name>text</name>
268 <string>Lease Obtained</string>
269 </property>
270 </widget>
271 <widget row="0" column="1" >
272 <class>QLabel</class>
273 <property stdset="1">
274 <name>name</name>
275 <cstring>dhcpServerLabel</cstring>
276 </property>
277 <property stdset="1">
278 <name>frameShape</name>
279 <enum>Panel</enum>
280 </property>
281 <property stdset="1">
282 <name>frameShadow</name>
283 <enum>Sunken</enum>
284 </property>
285 <property stdset="1">
286 <name>text</name>
287 <string></string>
288 </property>
289 </widget>
290 </grid>
240 </widget> 291 </widget>
241 <spacer row="9" column="1" > 292 <spacer row="6" column="1" >
242 <property> 293 <property>
243 <name>name</name> 294 <name>name</name>
244 <cstring>Spacer2</cstring> 295 <cstring>Spacer2</cstring>
245 </property> 296 </property>
246 <property stdset="1"> 297 <property stdset="1">
247 <name>orientation</name> 298 <name>orientation</name>
248 <enum>Vertical</enum> 299 <enum>Vertical</enum>
249 </property> 300 </property>
250 <property stdset="1"> 301 <property stdset="1">
251 <name>sizeType</name> 302 <name>sizeType</name>
252 <enum>Expanding</enum> 303 <enum>Expanding</enum>
253 </property> 304 </property>
254 <property> 305 <property>
255 <name>sizeHint</name> 306 <name>sizeHint</name>
256 <size> 307 <size>
257 <width>20</width> 308 <width>20</width>
258 <height>20</height> 309 <height>20</height>
259 </size> 310 </size>
260 </property> 311 </property>
261 </spacer> 312 </spacer>
262 <widget row="3" column="0" >
263 <class>QLabel</class>
264 <property stdset="1">
265 <name>name</name>
266 <cstring>TextLabel2</cstring>
267 </property>
268 <property stdset="1">
269 <name>text</name>
270 <string>Broadcast</string>
271 </property>
272 </widget>
273 <widget row="3" column="1" >
274 <class>QLabel</class>
275 <property stdset="1">
276 <name>name</name>
277 <cstring>broadcastLabel</cstring>
278 </property>
279 <property stdset="1">
280 <name>frameShape</name>
281 <enum>Panel</enum>
282 </property>
283 <property stdset="1">
284 <name>frameShadow</name>
285 <enum>Sunken</enum>
286 </property>
287 </widget>
288 <widget row="5" column="0" rowspan="1" colspan="2" >
289 <class>Line</class>
290 <property stdset="1">
291 <name>name</name>
292 <cstring>Line2</cstring>
293 </property>
294 <property stdset="1">
295 <name>orientation</name>
296 <enum>Horizontal</enum>
297 </property>
298 </widget>
299 </grid> 313 </grid>
300</widget> 314</widget>
301<customwidgets> 315<customwidgets>
302 <customwidget> 316 <customwidget>
303 <class>QWidget</class> 317 <class>QWidget</class>
304 <header location="local">qwidget.h</header> 318 <header location="local">qwidget.h</header>
305 <sizehint> 319 <sizehint>
306 <width>100</width> 320 <width>100</width>
307 <height>100</height> 321 <height>100</height>
308 </sizehint> 322 </sizehint>
309 <container>0</container> 323 <container>0</container>
310 <sizepolicy> 324 <sizepolicy>
311 <hordata>7</hordata> 325 <hordata>7</hordata>
312 <verdata>7</verdata> 326 <verdata>7</verdata>
313 </sizepolicy> 327 </sizepolicy>
314 <pixmap>image0</pixmap> 328 <pixmap>image0</pixmap>
315 </customwidget> 329 </customwidget>
316</customwidgets> 330</customwidgets>
317<images> 331<images>
318 <image> 332 <image>
319 <name>image0</name> 333 <name>image0</name>
320 <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data> 334 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
321 </image> 335 </image>
322</images> 336</images>
323</UI> 337</UI>
diff --git a/noncore/net/networksetup/interfaceinformation.ui b/noncore/net/networksetup/interfaceinformation.ui
index 2a9b3fb..8b6280d 100644
--- a/noncore/net/networksetup/interfaceinformation.ui
+++ b/noncore/net/networksetup/interfaceinformation.ui
@@ -1,47 +1,47 @@
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>191</width> 14 <width>203</width>
15 <height>241</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>
@@ -71,174 +71,112 @@
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>
79 <widget row="0" column="0" > 79 <widget row="0" column="0" >
80 <class>QPushButton</class> 80 <class>QPushButton</class>
81 <property stdset="1"> 81 <property stdset="1">
82 <name>name</name> 82 <name>name</name>
83 <cstring>startButton</cstring> 83 <cstring>startButton</cstring>
84 </property> 84 </property>
85 <property stdset="1"> 85 <property stdset="1">
86 <name>text</name> 86 <name>text</name>
87 <string>Start</string> 87 <string>Start</string>
88 </property> 88 </property>
89 </widget> 89 </widget>
90 </grid> 90 </grid>
91 </widget> 91 </widget>
92 <widget row="0" column="0" > 92 <widget row="0" column="0" >
93 <class>Line</class> 93 <class>Line</class>
94 <property stdset="1"> 94 <property stdset="1">
95 <name>name</name> 95 <name>name</name>
96 <cstring>Line1</cstring> 96 <cstring>Line1</cstring>
97 </property> 97 </property>
98 <property stdset="1"> 98 <property stdset="1">
99 <name>orientation</name> 99 <name>orientation</name>
100 <enum>Horizontal</enum> 100 <enum>Horizontal</enum>
101 </property> 101 </property>
102 </widget> 102 </widget>
103 <spacer row="6" column="1" >
104 <property>
105 <name>name</name>
106 <cstring>Spacer18</cstring>
107 </property>
108 <property stdset="1">
109 <name>orientation</name>
110 <enum>Vertical</enum>
111 </property>
112 <property stdset="1">
113 <name>sizeType</name>
114 <enum>Expanding</enum>
115 </property>
116 <property>
117 <name>sizeHint</name>
118 <size>
119 <width>20</width>
120 <height>20</height>
121 </size>
122 </property>
123 </spacer>
124 <widget row="5" column="0" rowspan="1" colspan="2" >
125 <class>QLayoutWidget</class>
126 <property stdset="1">
127 <name>name</name>
128 <cstring>Layout2</cstring>
129 </property>
130 <hbox>
131 <property stdset="1">
132 <name>margin</name>
133 <number>0</number>
134 </property>
135 <property stdset="1">
136 <name>spacing</name>
137 <number>6</number>
138 </property>
139 <spacer>
140 <property>
141 <name>name</name>
142 <cstring>Spacer10</cstring>
143 </property>
144 <property stdset="1">
145 <name>orientation</name>
146 <enum>Horizontal</enum>
147 </property>
148 <property stdset="1">
149 <name>sizeType</name>
150 <enum>Expanding</enum>
151 </property>
152 <property>
153 <name>sizeHint</name>
154 <size>
155 <width>20</width>
156 <height>20</height>
157 </size>
158 </property>
159 </spacer>
160 <widget>
161 <class>QPushButton</class>
162 <property stdset="1">
163 <name>name</name>
164 <cstring>advancedButton</cstring>
165 </property>
166 <property stdset="1">
167 <name>text</name>
168 <string>View Advanced Information</string>
169 </property>
170 </widget>
171 </hbox>
172 </widget>
173 <widget row="0" column="0" > 103 <widget row="0" column="0" >
174 <class>QLabel</class> 104 <class>QLabel</class>
175 <property stdset="1"> 105 <property stdset="1">
176 <name>name</name> 106 <name>name</name>
177 <cstring>TextLabel22</cstring> 107 <cstring>TextLabel22</cstring>
178 </property> 108 </property>
179 <property stdset="1"> 109 <property stdset="1">
180 <name>text</name> 110 <name>text</name>
181 <string>IP Address</string> 111 <string>IP Address</string>
182 </property> 112 </property>
183 </widget> 113 </widget>
184 <widget row="1" column="0" > 114 <widget row="1" column="0" >
185 <class>QLabel</class> 115 <class>QLabel</class>
186 <property stdset="1"> 116 <property stdset="1">
187 <name>name</name> 117 <name>name</name>
188 <cstring>TextLabel23</cstring> 118 <cstring>TextLabel23</cstring>
189 </property> 119 </property>
190 <property stdset="1"> 120 <property stdset="1">
191 <name>text</name> 121 <name>text</name>
192 <string>Subnet Mask</string> 122 <string>Subnet Mask</string>
193 </property> 123 </property>
194 </widget> 124 </widget>
195 <widget row="2" column="0" > 125 <widget row="2" column="0" >
196 <class>QLabel</class> 126 <class>QLabel</class>
197 <property stdset="1"> 127 <property stdset="1">
198 <name>name</name> 128 <name>name</name>
199 <cstring>TextLabel21</cstring> 129 <cstring>TextLabel21</cstring>
200 </property> 130 </property>
201 <property stdset="1"> 131 <property stdset="1">
202 <name>text</name> 132 <name>text</name>
203 <string>MAC Address</string> 133 <string>MAC Address</string>
204 </property> 134 </property>
205 </widget> 135 </widget>
206 <widget row="3" column="0" > 136 <widget row="3" column="0" >
207 <class>QLabel</class> 137 <class>QLabel</class>
208 <property stdset="1"> 138 <property stdset="1">
209 <name>name</name> 139 <name>name</name>
210 <cstring>TextLabel24</cstring> 140 <cstring>TextLabel24</cstring>
211 </property> 141 </property>
212 <property stdset="1"> 142 <property stdset="1">
143 <name>frameShape</name>
144 <enum>MShape</enum>
145 </property>
146 <property stdset="1">
147 <name>frameShadow</name>
148 <enum>MShadow</enum>
149 </property>
150 <property stdset="1">
213 <name>text</name> 151 <name>text</name>
214 <string>Broadcast</string> 152 <string>Broadcast</string>
215 </property> 153 </property>
216 </widget> 154 </widget>
217 <widget row="1" column="1" > 155 <widget row="1" column="1" >
218 <class>QLabel</class> 156 <class>QLabel</class>
219 <property stdset="1"> 157 <property stdset="1">
220 <name>name</name> 158 <name>name</name>
221 <cstring>subnetMaskLabel</cstring> 159 <cstring>subnetMaskLabel</cstring>
222 </property> 160 </property>
223 <property stdset="1"> 161 <property stdset="1">
224 <name>frameShape</name> 162 <name>frameShape</name>
225 <enum>Panel</enum> 163 <enum>Panel</enum>
226 </property> 164 </property>
227 <property stdset="1"> 165 <property stdset="1">
228 <name>frameShadow</name> 166 <name>frameShadow</name>
229 <enum>Sunken</enum> 167 <enum>Sunken</enum>
230 </property> 168 </property>
231 <property stdset="1"> 169 <property stdset="1">
232 <name>text</name> 170 <name>text</name>
233 <string>0.0.0.0</string> 171 <string>0.0.0.0</string>
234 </property> 172 </property>
235 </widget> 173 </widget>
236 <widget row="2" column="1" > 174 <widget row="2" column="1" >
237 <class>QLabel</class> 175 <class>QLabel</class>
238 <property stdset="1"> 176 <property stdset="1">
239 <name>name</name> 177 <name>name</name>
240 <cstring>macAddressLabel</cstring> 178 <cstring>macAddressLabel</cstring>
241 </property> 179 </property>
242 <property stdset="1"> 180 <property stdset="1">
243 <name>frameShape</name> 181 <name>frameShape</name>
244 <enum>Panel</enum> 182 <enum>Panel</enum>
@@ -261,57 +199,140 @@
261 <property stdset="1"> 199 <property stdset="1">
262 <name>frameShape</name> 200 <name>frameShape</name>
263 <enum>Panel</enum> 201 <enum>Panel</enum>
264 </property> 202 </property>
265 <property stdset="1"> 203 <property stdset="1">
266 <name>frameShadow</name> 204 <name>frameShadow</name>
267 <enum>Sunken</enum> 205 <enum>Sunken</enum>
268 </property> 206 </property>
269 <property stdset="1"> 207 <property stdset="1">
270 <name>text</name> 208 <name>text</name>
271 <string></string> 209 <string></string>
272 </property> 210 </property>
273 </widget> 211 </widget>
274 <widget row="0" column="1" > 212 <widget row="0" column="1" >
275 <class>QLabel</class> 213 <class>QLabel</class>
276 <property stdset="1"> 214 <property stdset="1">
277 <name>name</name> 215 <name>name</name>
278 <cstring>ipAddressLabel</cstring> 216 <cstring>ipAddressLabel</cstring>
279 </property> 217 </property>
280 <property stdset="1"> 218 <property stdset="1">
281 <name>frameShape</name> 219 <name>frameShape</name>
282 <enum>Panel</enum> 220 <enum>Panel</enum>
283 </property> 221 </property>
284 <property stdset="1"> 222 <property stdset="1">
285 <name>frameShadow</name> 223 <name>frameShadow</name>
286 <enum>Sunken</enum> 224 <enum>Sunken</enum>
287 </property> 225 </property>
288 <property stdset="1"> 226 <property stdset="1">
289 <name>text</name> 227 <name>text</name>
290 <string>0.0.0.0</string> 228 <string>0.0.0.0</string>
291 </property> 229 </property>
292 </widget> 230 </widget>
231 <spacer row="7" column="1" >
232 <property>
233 <name>name</name>
234 <cstring>Spacer18</cstring>
235 </property>
236 <property stdset="1">
237 <name>orientation</name>
238 <enum>Vertical</enum>
239 </property>
240 <property stdset="1">
241 <name>sizeType</name>
242 <enum>Expanding</enum>
243 </property>
244 <property>
245 <name>sizeHint</name>
246 <size>
247 <width>20</width>
248 <height>20</height>
249 </size>
250 </property>
251 </spacer>
252 <widget row="6" column="0" rowspan="1" colspan="2" >
253 <class>QLayoutWidget</class>
254 <property stdset="1">
255 <name>name</name>
256 <cstring>Layout2</cstring>
257 </property>
258 <hbox>
259 <property stdset="1">
260 <name>margin</name>
261 <number>0</number>
262 </property>
263 <property stdset="1">
264 <name>spacing</name>
265 <number>6</number>
266 </property>
267 <spacer>
268 <property>
269 <name>name</name>
270 <cstring>Spacer10</cstring>
271 </property>
272 <property stdset="1">
273 <name>orientation</name>
274 <enum>Horizontal</enum>
275 </property>
276 <property stdset="1">
277 <name>sizeType</name>
278 <enum>Expanding</enum>
279 </property>
280 <property>
281 <name>sizeHint</name>
282 <size>
283 <width>20</width>
284 <height>20</height>
285 </size>
286 </property>
287 </spacer>
288 <widget>
289 <class>QPushButton</class>
290 <property stdset="1">
291 <name>name</name>
292 <cstring>advancedButton</cstring>
293 </property>
294 <property stdset="1">
295 <name>text</name>
296 <string>View Advanced Information</string>
297 </property>
298 </widget>
299 </hbox>
300 </widget>
301 <widget row="5" column="0" rowspan="1" colspan="2" >
302 <class>Line</class>
303 <property stdset="1">
304 <name>name</name>
305 <cstring>Line5</cstring>
306 </property>
307 <property stdset="1">
308 <name>orientation</name>
309 <enum>Horizontal</enum>
310 </property>
311 </widget>
293 </grid> 312 </grid>
294</widget> 313</widget>
295<customwidgets> 314<customwidgets>
296 <customwidget> 315 <customwidget>
297 <class>QWidget</class> 316 <class>QWidget</class>
298 <header location="local">qwidget.h</header> 317 <header location="local">qwidget.h</header>
299 <sizehint> 318 <sizehint>
300 <width>100</width> 319 <width>100</width>
301 <height>100</height> 320 <height>100</height>
302 </sizehint> 321 </sizehint>
303 <container>0</container> 322 <container>0</container>
304 <sizepolicy> 323 <sizepolicy>
305 <hordata>7</hordata> 324 <hordata>7</hordata>
306 <verdata>7</verdata> 325 <verdata>7</verdata>
307 </sizepolicy> 326 </sizepolicy>
308 <pixmap>image0</pixmap> 327 <pixmap>image0</pixmap>
309 </customwidget> 328 </customwidget>
310</customwidgets> 329</customwidgets>
311<images> 330<images>
312 <image> 331 <image>
313 <name>image0</name> 332 <name>image0</name>
314 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> 333 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
315 </image> 334 </image>
316</images> 335</images>
336<connections>
337</connections>
317</UI> 338</UI>
diff --git a/noncore/net/networksetup/interfacesetup.ui b/noncore/net/networksetup/interfacesetup.ui
index 698422c..ff9810e 100644
--- a/noncore/net/networksetup/interfacesetup.ui
+++ b/noncore/net/networksetup/interfacesetup.ui
@@ -1,274 +1,284 @@
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>193</width> 14 <width>177</width>
15 <height>310</height> 15 <height>320</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 <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="1" column="0" rowspan="1" colspan="2" > 31 <widget row="1" column="0" rowspan="1" colspan="2" >
32 <class>Line</class> 32 <class>Line</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>Line1</cstring> 35 <cstring>Line1</cstring>
36 </property> 36 </property>
37 <property stdset="1"> 37 <property stdset="1">
38 <name>orientation</name> 38 <name>orientation</name>
39 <enum>Horizontal</enum> 39 <enum>Horizontal</enum>
40 </property> 40 </property>
41 </widget> 41 </widget>
42 <widget row="6" column="0" >
43 <class>QLabel</class>
44 <property stdset="1">
45 <name>name</name>
46 <cstring>TextLabel4</cstring>
47 </property>
48 <property stdset="1">
49 <name>text</name>
50 <string>IP Address</string>
51 </property>
52 </widget>
53 <widget row="0" column="0" rowspan="1" colspan="2" > 42 <widget row="0" column="0" rowspan="1" colspan="2" >
54 <class>QCheckBox</class> 43 <class>QCheckBox</class>
55 <property stdset="1"> 44 <property stdset="1">
56 <name>name</name> 45 <name>name</name>
57 <cstring>autoStart</cstring> 46 <cstring>autoStart</cstring>
58 </property> 47 </property>
59 <property stdset="1"> 48 <property stdset="1">
60 <name>text</name> 49 <name>text</name>
61 <string>Automaticly bring up</string> 50 <string>Automaticly bring up</string>
62 </property> 51 </property>
63 </widget> 52 </widget>
64 <widget row="2" column="1" > 53 <widget row="2" column="1" >
65 <class>QComboBox</class> 54 <class>QComboBox</class>
66 <item> 55 <item>
67 <property> 56 <property>
68 <name>text</name> 57 <name>text</name>
69 <string>All</string> 58 <string>All</string>
70 </property> 59 </property>
71 </item> 60 </item>
72 <property stdset="1"> 61 <property stdset="1">
73 <name>name</name> 62 <name>name</name>
74 <cstring>profileCombo</cstring> 63 <cstring>profileCombo</cstring>
75 </property> 64 </property>
76 </widget> 65 </widget>
77 <widget row="5" column="0" rowspan="1" colspan="2" >
78 <class>QGroupBox</class>
79 <property stdset="1">
80 <name>name</name>
81 <cstring>staticGroupBox</cstring>
82 </property>
83 <property stdset="1">
84 <name>enabled</name>
85 <bool>false</bool>
86 </property>
87 <property stdset="1">
88 <name>title</name>
89 <string>Static Ip Configuration</string>
90 </property>
91 </widget>
92 <widget row="6" column="1" >
93 <class>QLineEdit</class>
94 <property stdset="1">
95 <name>name</name>
96 <cstring>ipAddressEdit</cstring>
97 </property>
98 </widget>
99 <widget row="4" column="0" > 66 <widget row="4" column="0" >
100 <class>QLabel</class> 67 <class>QLabel</class>
101 <property stdset="1"> 68 <property stdset="1">
102 <name>name</name> 69 <name>name</name>
103 <cstring>leaseHoursLabel</cstring> 70 <cstring>leaseHoursLabel</cstring>
104 </property> 71 </property>
105 <property stdset="1"> 72 <property stdset="1">
106 <name>text</name> 73 <name>text</name>
107 <string>Requested Lease</string> 74 <string>Requested Lease</string>
108 </property> 75 </property>
109 </widget> 76 </widget>
110 <widget row="3" column="0" rowspan="1" colspan="2" > 77 <widget row="3" column="0" rowspan="1" colspan="2" >
111 <class>QCheckBox</class> 78 <class>QCheckBox</class>
112 <property stdset="1"> 79 <property stdset="1">
113 <name>name</name> 80 <name>name</name>
114 <cstring>dhcpCheckBox</cstring> 81 <cstring>dhcpCheckBox</cstring>
115 </property> 82 </property>
116 <property stdset="1"> 83 <property stdset="1">
117 <name>text</name> 84 <name>text</name>
118 <string>DHCP</string> 85 <string>DHCP</string>
119 </property> 86 </property>
120 <property stdset="1"> 87 <property stdset="1">
121 <name>checked</name> 88 <name>checked</name>
122 <bool>true</bool> 89 <bool>true</bool>
123 </property> 90 </property>
124 </widget> 91 </widget>
125 <widget row="7" column="0" >
126 <class>QLabel</class>
127 <property stdset="1">
128 <name>name</name>
129 <cstring>TextLabel5</cstring>
130 </property>
131 <property stdset="1">
132 <name>text</name>
133 <string>Subnet Mask</string>
134 </property>
135 </widget>
136 <widget row="2" column="0" > 92 <widget row="2" column="0" >
137 <class>QLabel</class> 93 <class>QLabel</class>
138 <property stdset="1"> 94 <property stdset="1">
139 <name>name</name> 95 <name>name</name>
140 <cstring>TextLabel1</cstring> 96 <cstring>TextLabel1</cstring>
141 </property> 97 </property>
142 <property stdset="1"> 98 <property stdset="1">
143 <name>text</name> 99 <name>text</name>
144 <string>Profile:</string> 100 <string>Profile:</string>
145 </property> 101 </property>
146 </widget> 102 </widget>
147 <widget row="4" column="1" > 103 <widget row="4" column="1" >
148 <class>QSpinBox</class> 104 <class>QSpinBox</class>
149 <property stdset="1"> 105 <property stdset="1">
150 <name>name</name> 106 <name>name</name>
151 <cstring>leaseTime</cstring> 107 <cstring>leaseTime</cstring>
152 </property> 108 </property>
153 <property stdset="1"> 109 <property stdset="1">
154 <name>suffix</name> 110 <name>suffix</name>
155 <string> hours</string> 111 <string> hours</string>
156 </property> 112 </property>
157 <property stdset="1"> 113 <property stdset="1">
158 <name>maxValue</name> 114 <name>maxValue</name>
159 <number>336</number> 115 <number>336</number>
160 </property> 116 </property>
161 <property stdset="1"> 117 <property stdset="1">
162 <name>minValue</name> 118 <name>minValue</name>
163 <number>1</number> 119 <number>1</number>
164 </property> 120 </property>
165 <property stdset="1"> 121 <property stdset="1">
166 <name>value</name> 122 <name>value</name>
167 <number>24</number> 123 <number>24</number>
168 </property> 124 </property>
169 </widget> 125 </widget>
170 <spacer row="11" column="1" > 126 <spacer row="6" column="1" >
171 <property> 127 <property>
172 <name>name</name> 128 <name>name</name>
173 <cstring>Spacer9</cstring> 129 <cstring>Spacer9</cstring>
174 </property> 130 </property>
175 <property stdset="1"> 131 <property stdset="1">
176 <name>orientation</name> 132 <name>orientation</name>
177 <enum>Vertical</enum> 133 <enum>Vertical</enum>
178 </property> 134 </property>
179 <property stdset="1"> 135 <property stdset="1">
180 <name>sizeType</name> 136 <name>sizeType</name>
181 <enum>Expanding</enum> 137 <enum>Expanding</enum>
182 </property> 138 </property>
183 <property> 139 <property>
184 <name>sizeHint</name> 140 <name>sizeHint</name>
185 <size> 141 <size>
186 <width>20</width> 142 <width>20</width>
187 <height>20</height> 143 <height>20</height>
188 </size> 144 </size>
189 </property> 145 </property>
190 </spacer> 146 </spacer>
191 <widget row="10" column="1" > 147 <widget row="5" column="0" rowspan="1" colspan="2" >
192 <class>QLineEdit</class> 148 <class>QGroupBox</class>
193 <property stdset="1">
194 <name>name</name>
195 <cstring>secondDNSLineEdit</cstring>
196 </property>
197 </widget>
198 <widget row="10" column="0" >
199 <class>QLabel</class>
200 <property stdset="1">
201 <name>name</name>
202 <cstring>TextLabel3</cstring>
203 </property>
204 <property stdset="1">
205 <name>text</name>
206 <string>Second DNS</string>
207 </property>
208 </widget>
209 <widget row="9" column="0" >
210 <class>QLabel</class>
211 <property stdset="1">
212 <name>name</name>
213 <cstring>TextLabel2</cstring>
214 </property>
215 <property stdset="1">
216 <name>text</name>
217 <string>First DNS</string>
218 </property>
219 </widget>
220 <widget row="9" column="1" >
221 <class>QLineEdit</class>
222 <property stdset="1">
223 <name>name</name>
224 <cstring>firstDNSLineEdit</cstring>
225 </property>
226 </widget>
227 <widget row="8" column="0" >
228 <class>QLabel</class>
229 <property stdset="1"> 149 <property stdset="1">
230 <name>name</name> 150 <name>name</name>
231 <cstring>TextLabel1_2</cstring> 151 <cstring>staticGroupBox</cstring>
232 </property>
233 <property stdset="1">
234 <name>text</name>
235 <string>Gateway</string>
236 </property> 152 </property>
237 </widget>
238 <widget row="7" column="1" >
239 <class>QLineEdit</class>
240 <property stdset="1"> 153 <property stdset="1">
241 <name>name</name> 154 <name>enabled</name>
242 <cstring>subnetMaskEdit</cstring> 155 <bool>false</bool>
243 </property> 156 </property>
244 </widget>
245 <widget row="8" column="1" >
246 <class>QLineEdit</class>
247 <property stdset="1"> 157 <property stdset="1">
248 <name>name</name> 158 <name>title</name>
249 <cstring>gatewayEdit</cstring> 159 <string>Static Ip Configuration</string>
250 </property> 160 </property>
161 <grid>
162 <property stdset="1">
163 <name>margin</name>
164 <number>11</number>
165 </property>
166 <property stdset="1">
167 <name>spacing</name>
168 <number>6</number>
169 </property>
170 <widget row="3" column="1" >
171 <class>QLineEdit</class>
172 <property stdset="1">
173 <name>name</name>
174 <cstring>firstDNSLineEdit</cstring>
175 </property>
176 </widget>
177 <widget row="1" column="0" >
178 <class>QLabel</class>
179 <property stdset="1">
180 <name>name</name>
181 <cstring>TextLabel5</cstring>
182 </property>
183 <property stdset="1">
184 <name>text</name>
185 <string>Subnet Mask</string>
186 </property>
187 </widget>
188 <widget row="2" column="1" >
189 <class>QLineEdit</class>
190 <property stdset="1">
191 <name>name</name>
192 <cstring>gatewayEdit</cstring>
193 </property>
194 </widget>
195 <widget row="1" column="1" >
196 <class>QLineEdit</class>
197 <property stdset="1">
198 <name>name</name>
199 <cstring>subnetMaskEdit</cstring>
200 </property>
201 </widget>
202 <widget row="0" column="1" >
203 <class>QLineEdit</class>
204 <property stdset="1">
205 <name>name</name>
206 <cstring>ipAddressEdit</cstring>
207 </property>
208 </widget>
209 <widget row="3" column="0" >
210 <class>QLabel</class>
211 <property stdset="1">
212 <name>name</name>
213 <cstring>TextLabel2</cstring>
214 </property>
215 <property stdset="1">
216 <name>text</name>
217 <string>First DNS</string>
218 </property>
219 </widget>
220 <widget row="4" column="1" >
221 <class>QLineEdit</class>
222 <property stdset="1">
223 <name>name</name>
224 <cstring>secondDNSLineEdit</cstring>
225 </property>
226 </widget>
227 <widget row="0" column="0" >
228 <class>QLabel</class>
229 <property stdset="1">
230 <name>name</name>
231 <cstring>TextLabel4</cstring>
232 </property>
233 <property stdset="1">
234 <name>text</name>
235 <string>IP Address</string>
236 </property>
237 </widget>
238 <widget row="2" column="0" >
239 <class>QLabel</class>
240 <property stdset="1">
241 <name>name</name>
242 <cstring>TextLabel1_2</cstring>
243 </property>
244 <property stdset="1">
245 <name>text</name>
246 <string>Gateway</string>
247 </property>
248 </widget>
249 <widget row="4" column="0" >
250 <class>QLabel</class>
251 <property stdset="1">
252 <name>name</name>
253 <cstring>TextLabel3</cstring>
254 </property>
255 <property stdset="1">
256 <name>text</name>
257 <string>Second DNS</string>
258 </property>
259 </widget>
260 </grid>
251 </widget> 261 </widget>
252 </grid> 262 </grid>
253</widget> 263</widget>
254<connections> 264<connections>
255 <connection> 265 <connection>
256 <sender>dhcpCheckBox</sender> 266 <sender>dhcpCheckBox</sender>
257 <signal>toggled(bool)</signal> 267 <signal>toggled(bool)</signal>
258 <receiver>leaseHoursLabel</receiver> 268 <receiver>leaseHoursLabel</receiver>
259 <slot>setEnabled(bool)</slot> 269 <slot>setEnabled(bool)</slot>
260 </connection> 270 </connection>
261 <connection> 271 <connection>
262 <sender>dhcpCheckBox</sender> 272 <sender>dhcpCheckBox</sender>
263 <signal>toggled(bool)</signal> 273 <signal>toggled(bool)</signal>
264 <receiver>leaseTime</receiver> 274 <receiver>leaseTime</receiver>
265 <slot>setEnabled(bool)</slot> 275 <slot>setEnabled(bool)</slot>
266 </connection> 276 </connection>
267 <connection> 277 <connection>
268 <sender>dhcpCheckBox</sender> 278 <sender>dhcpCheckBox</sender>
269 <signal>toggled(bool)</signal> 279 <signal>toggled(bool)</signal>
270 <receiver>staticGroupBox</receiver> 280 <receiver>staticGroupBox</receiver>
271 <slot>setDisabled(bool)</slot> 281 <slot>setDisabled(bool)</slot>
272 </connection> 282 </connection>
273</connections> 283</connections>
274</UI> 284</UI>
diff --git a/noncore/net/networksetup/mainwindow.ui b/noncore/net/networksetup/mainwindow.ui
index f7efe99..c1fa101 100644
--- a/noncore/net/networksetup/mainwindow.ui
+++ b/noncore/net/networksetup/mainwindow.ui
@@ -242,65 +242,65 @@
242 </property> 242 </property>
243 <property stdset="1"> 243 <property stdset="1">
244 <name>orientation</name> 244 <name>orientation</name>
245 <enum>Vertical</enum> 245 <enum>Vertical</enum>
246 </property> 246 </property>
247 <property stdset="1"> 247 <property stdset="1">
248 <name>sizeType</name> 248 <name>sizeType</name>
249 <enum>Expanding</enum> 249 <enum>Expanding</enum>
250 </property> 250 </property>
251 <property> 251 <property>
252 <name>sizeHint</name> 252 <name>sizeHint</name>
253 <size> 253 <size>
254 <width>20</width> 254 <width>20</width>
255 <height>20</height> 255 <height>20</height>
256 </size> 256 </size>
257 </property> 257 </property>
258 </spacer> 258 </spacer>
259 <widget row="2" column="0" rowspan="3" colspan="1" > 259 <widget row="2" column="0" rowspan="3" colspan="1" >
260 <class>QListBox</class> 260 <class>QListBox</class>
261 <property stdset="1"> 261 <property stdset="1">
262 <name>name</name> 262 <name>name</name>
263 <cstring>profilesList</cstring> 263 <cstring>profilesList</cstring>
264 </property> 264 </property>
265 </widget> 265 </widget>
266 <widget row="4" column="1" rowspan="1" colspan="2" > 266 <widget row="4" column="1" rowspan="1" colspan="2" >
267 <class>QPushButton</class> 267 <class>QPushButton</class>
268 <property stdset="1"> 268 <property stdset="1">
269 <name>name</name> 269 <name>name</name>
270 <cstring>PushButton7</cstring> 270 <cstring>PushButton7</cstring>
271 </property> 271 </property>
272 <property stdset="1"> 272 <property stdset="1">
273 <name>text</name> 273 <name>text</name>
274 <string>Set Current</string> 274 <string>&amp;Set Current</string>
275 </property> 275 </property>
276 </widget> 276 </widget>
277 <widget row="3" column="1" rowspan="1" colspan="2" > 277 <widget row="3" column="1" rowspan="1" colspan="2" >
278 <class>QPushButton</class> 278 <class>QPushButton</class>
279 <property stdset="1"> 279 <property stdset="1">
280 <name>name</name> 280 <name>name</name>
281 <cstring>removeProfileButton</cstring> 281 <cstring>removeProfileButton</cstring>
282 </property> 282 </property>
283 <property stdset="1"> 283 <property stdset="1">
284 <name>text</name> 284 <name>text</name>
285 <string>&amp;Remove</string> 285 <string>&amp;Remove</string>
286 </property> 286 </property>
287 </widget> 287 </widget>
288 <widget row="2" column="1" rowspan="1" colspan="2" > 288 <widget row="2" column="1" rowspan="1" colspan="2" >
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>newProfileButton</cstring> 292 <cstring>newProfileButton</cstring>
293 </property> 293 </property>
294 <property stdset="1"> 294 <property stdset="1">
295 <name>text</name> 295 <name>text</name>
296 <string>&amp;New</string> 296 <string>&amp;New</string>
297 </property> 297 </property>
298 </widget> 298 </widget>
299 </grid> 299 </grid>
300 </widget> 300 </widget>
301 </widget> 301 </widget>
302 </vbox> 302 </vbox>
303</widget> 303</widget>
304<customwidgets> 304<customwidgets>
305 <customwidget> 305 <customwidget>
306 <class>QWidget</class> 306 <class>QWidget</class>
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 2f821a9..0f48a4b 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -1,233 +1,227 @@
1#include "mainwindowimp.h" 1#include "mainwindowimp.h"
2#include "addserviceimp.h" 2#include "addserviceimp.h"
3#include "interfaceinformationimp.h" 3#include "interfaceinformationimp.h"
4#include "interfacesetupimp.h" 4#include "interfacesetupimp.h"
5#include "interface.h"
6#include "kprocess.h" 5#include "kprocess.h"
7#include "module.h" 6#include "module.h"
8 7
8
9#include <qpushbutton.h> 9#include <qpushbutton.h>
10#include <qtabwidget.h> 10#include <qtabwidget.h>
11#include <qlistbox.h> 11#include <qlistbox.h>
12#include <qlistview.h> 12#include <qlistview.h>
13#include <qheader.h> 13#include <qheader.h>
14#include <qlabel.h> 14#include <qlabel.h>
15 15
16#include <qmainwindow.h> 16#include <qmainwindow.h>
17#include <qmessagebox.h> 17#include <qmessagebox.h>
18 18
19#include <qpe/config.h> 19#include <qpe/config.h>
20#include <qpe/qlibrary.h> 20#include <qpe/qlibrary.h>
21#include <qpe/resource.h> 21#include <qpe/resource.h>
22 22
23#include <qlist.h> 23#include <qlist.h>
24#include <qdir.h> 24#include <qdir.h>
25#include <qfile.h> 25#include <qfile.h>
26#include <qtextstream.h> 26#include <qtextstream.h>
27 27
28// For library loading. 28// For library loading.
29#include <dlfcn.h> 29#include <dlfcn.h>
30 30
31#define TEMP_ALL "/tmp/ifconfig-a" 31#define TEMP_ALL "/tmp/ifconfig-a"
32#define TEMP_UP "/tmp/ifconfig" 32#define TEMP_UP "/tmp/ifconfig"
33 33
34#define NO_SELECT_ERROR_AND_RETURN { \
35 QMessageBox::information(this, "Error","Please select an interface.", "Ok"); \
36 return; \
37}
38
39MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true) { 34MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true) {
40 connect(addServiceButton, SIGNAL(clicked()), this, SLOT(addClicked())); 35 connect(addServiceButton, SIGNAL(clicked()), this, SLOT(addClicked()));
41 connect(removeServiceButton, SIGNAL(clicked()), this, SLOT(removeClicked())); 36 connect(removeServiceButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
42 connect(informationServiceButton, SIGNAL(clicked()), this, SLOT(informationClicked())); 37 connect(informationServiceButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
43 connect(configureServiceButton, SIGNAL(clicked()), this, SLOT(configureClicked())); 38 connect(configureServiceButton, SIGNAL(clicked()), this, SLOT(configureClicked()));
44 39
45 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); 40 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
46 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); 41 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
47 connect(profilesList, SIGNAL(highlighted(const QString&)), this, SLOT(changeProfile(const QString&))); 42 connect(profilesList, SIGNAL(highlighted(const QString&)), this, SLOT(changeProfile(const QString&)));
48 43
49 // Make sure we have a plugin directory to scan. 44 // Make sure we have a plugin directory to scan.
50 QString DirStr = QDir::homeDirPath() + "/.networksetup/" ; 45 QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;
51 QDir pluginDir( DirStr ); 46 QDir pluginDir( DirStr );
52 pluginDir.mkdir( DirStr ); 47 pluginDir.mkdir( DirStr );
53 pluginDir.mkdir( ( DirStr + "plugins/" ) ); 48 pluginDir.mkdir( ( DirStr + "plugins/" ) );
54 QString path = DirStr + "plugins"; 49 QString path = DirStr + "plugins";
55 pluginDir.setPath(path); 50 pluginDir.setPath(path);
56 if(!pluginDir.exists()){ 51 if(!pluginDir.exists()){
57 qDebug(QString("MainWindowImp: ERROR: %1 %2").arg(__FILE__).arg(__LINE__).latin1()); 52 qDebug(QString("MainWindowImp: ERROR: %1 %2").arg(__FILE__).arg(__LINE__).latin1());
58 return; 53 return;
59 } 54 }
60 55
61 // Load any saved services. 56 // Load any saved services.
62 loadModules(path); 57 loadModules(path);
63 getInterfaceList(); 58 getInterfaceList();
64 serviceList->header()->hide(); 59 serviceList->header()->hide();
65 60
66 61
67 Config cfg("NetworkSetup"); 62 Config cfg("NetworkSetup");
68 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); 63 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));
69 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) 64 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)
70 profilesList->insertItem((*it)); 65 profilesList->insertItem((*it));
71} 66}
72 67
73/** 68/**
74 * Deconstructor. Unload libraries and save profile list. 69 * Deconstructor. Unload libraries and save profile list.
75 */ 70 */
76MainWindowImp::~MainWindowImp(){ 71MainWindowImp::~MainWindowImp(){
77 if(profiles.count() > 1){ 72 if(profiles.count() > 1){
78 Config cfg("NetworkSetup"); 73 Config cfg("NetworkSetup");
79 cfg.writeEntry("Profiles", profiles.join(" ")); 74 cfg.writeEntry("Profiles", profiles.join(" "));
80 } 75 }
81} 76}
82 77
83void MainWindowImp::loadModules(QString path){ 78void MainWindowImp::loadModules(QString path){
79 qDebug(path.latin1());
80 QDir d;
81 d.setPath(path);
82 if(!d.exists()){
83 qDebug("MainWindowImp:: Path doesn't exists");
84 return;
85 }
86 d.setFilter( QDir::Files | QDir::NoSymLinks );
87 const QFileInfoList *list = d.entryInfoList();
88 QFileInfoListIterator it( *list );
89 QFileInfo *fi;
90 while ( (fi=it.current()) ) {
91 if(fi->fileName().contains(".so")){
92 qDebug("Found");
93 Module *foo = loadPlugin(path + "/" + fi->fileName());
94 }
95 ++it;
96 }
84} 97}
85 98
86/** 99/**
87 * Attempt to load a function and resolve a function. 100 * Attempt to load a function and resolve a function.
88 * @param pluginFileName - the name of the file in which to attempt to load 101 * @param pluginFileName - the name of the file in which to attempt to load
89 * @param resolveString - function pointer to resolve 102 * @param resolveString - function pointer to resolve
90 * @return pointer to the function with name resolveString or NULL 103 * @return pointer to the function with name resolveString or NULL
91 */ 104 */
92Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){ 105Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
93 //qDebug(pluginFileName.latin1()); 106 qDebug(pluginFileName.latin1());
94 QLibrary *lib = new QLibrary(pluginFileName); 107 QLibrary *lib = new QLibrary(pluginFileName);
95 void *functionPointer = lib->resolve(resolveString); 108 void *functionPointer = lib->resolve(resolveString);
96 if( !functionPointer ){ 109 if( !functionPointer ){
97 qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1()); 110 qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());
98 delete lib; 111 delete lib;
99 return NULL; 112 return NULL;
100 } 113 }
101 114
102 // Try to get an object. 115 // Try to get an object.
103 Module *object = ((Module* (*)()) functionPointer)(); 116 Module *object = ((Module* (*)()) functionPointer)();
104 if(object == NULL){ 117 if(object == NULL){
105 qDebug("MainWindowImp: Couldn't create object, but did load library!"); 118 qDebug("MainWindowImp: Couldn't create object, but did load library!");
106 delete lib; 119 delete lib;
107 return NULL; 120 return NULL;
108 } 121 }
109 122
110 // Store for reference 123 // Store for reference
111 libraries.insert(object, lib); 124 libraries.insert(object, lib);
112 return object; 125 return object;
113} 126}
114 127
115/*
116QList<QString> MainWindowImp::retrieveUnloadedPluginList(){
117 QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;
118 QString path = DirStr + "plugins";
119 QDir d(path);
120 d.setFilter( QDir::Files | QDir::Hidden );
121
122 QMap<QObject*, QLibrary*>::Iterator libraryIt;
123 QList<QString> rlist;
124 rlist.setAutoDelete(false);
125
126 const QFileInfoList *list = d.entryInfoList();
127 QFileInfoListIterator it( *list );
128 QFileInfo *fi;
129 while ( (fi=it.current()) ) {
130 if(fi->fileName().contains(".so")){
131 for( libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt )
132 if((path + "/" + fi->fileName()) != (libraryIt.data())->library()){
133 QString *s = new QString(path + "/" + fi->fileName());
134 rlist.append(s);
135 }
136 }
137 ++it;
138 }
139 return rlist;
140}
141*/
142
143/** 128/**
144 * The Add button was clicked. Bring up the add dialog and if OK is hit 129 * The Add button was clicked. Bring up the add dialog and if OK is hit
145 * load the plugin and append it to the list 130 * load the plugin and append it to the list
146 */ 131 */
147void MainWindowImp::addClicked(){ 132void MainWindowImp::addClicked(){
148 // Now that we have a list of all of the protocals, list them. 133 // Now that we have a list of all of the protocals, list them.
149 { 134 {
150 QMessageBox::information(this, "No Modules", "Nothing to add.", "Ok"); 135 QMessageBox::information(this, "No Modules", "Nothing to add.", "Ok");
151 return; 136 return;
152 } 137 }
153 AddServiceImp service(this, "AddService", true); 138 AddServiceImp service(this, "AddService", true);
154 service.showMaximized(); 139 service.showMaximized();
155 service.exec(); 140 service.exec();
156} 141}
157 142
158/** 143/**
159 * Prompt the user to see if they really want to do this. 144 * Prompt the user to see if they really want to do this.
160 * If they do then remove from the list and unload. 145 * If they do then remove from the list and unload.
161 */ 146 */
162void MainWindowImp::removeClicked(){ 147void MainWindowImp::removeClicked(){
163 QListViewItem *item = serviceList->currentItem(); 148 QListViewItem *item = serviceList->currentItem();
164 if(item == NULL) NO_SELECT_ERROR_AND_RETURN 149 if(item == NULL) {
150 QMessageBox::information(this, "Error","Please select an interface.", "Ok");
151 return;
152 }
165 153
166 if(modules.find(interfaceItems[item]) == modules.end()){ 154 if(modules.find(interfaceItems[item]) == modules.end()){
167 QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok"); 155 QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");
168 } 156 }
169 else{ 157 else{
170 // Try to remove. 158 // Try to remove.
171 } 159 }
172 160
173} 161}
174 162
175/** 163/**
176 * See if there is a configuration for the selected protocal. 164 * See if there is a configuration for the selected protocal.
177 * Prompt with errors. 165 * Prompt with errors.
178 */ 166 */
179void MainWindowImp::configureClicked(){ 167void MainWindowImp::configureClicked(){
180 QListViewItem *item = serviceList->currentItem(); 168 QListViewItem *item = serviceList->currentItem();
181 if(item == NULL) NO_SELECT_ERROR_AND_RETURN 169 if(item == NULL){
170 QMessageBox::information(this, "Error","Please select an interface.", "Ok");
171 return;
172 }
182 173
183 if(modules.find(interfaceItems[item]) == modules.end()){ 174 if(modules.find(interfaceItems[item]) == modules.end()){
184 InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]); 175 InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]);
185 conf->showMaximized(); 176 conf->showMaximized();
186 conf->show(); 177 conf->show();
187 } 178 }
188 else{ 179 else{
189 InterfaceSetupImp *conf = new InterfaceSetupImp(this, "InterfaceConfiguration"); 180 InterfaceSetupImp *conf = new InterfaceSetupImp(this, "InterfaceConfiguration");
190 conf->show(); 181 conf->show();
191 } 182 }
192} 183}
193 184
194/** 185/**
195 * Pull up the information about the selected interface 186 * Pull up the information about the selected interface
196 * Report an error 187 * Report an error
197 */ 188 */
198void MainWindowImp::informationClicked(){ 189void MainWindowImp::informationClicked(){
199 QListViewItem *item = serviceList->currentItem(); 190 QListViewItem *item = serviceList->currentItem();
200 if(item == NULL)NO_SELECT_ERROR_AND_RETURN 191 if(item == NULL){
201 192 QMessageBox::information(this, "Error","Please select an interface.", "Ok");
193 return;
194 }
195
202 if(modules.find(interfaceItems[item]) == modules.end()){ 196 if(modules.find(interfaceItems[item]) == modules.end()){
203 InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]); 197 InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);
204 i->showMaximized(); 198 i->showMaximized();
205 i->show(); 199 i->show();
206 } 200 }
207 else{ 201 else{
208 QTabWidget *t = new QTabWidget(this, "InterfaceInformationTAB"); 202 QTabWidget *t = new QTabWidget(this, "InterfaceInformationTAB");
209 InterfaceInformationImp *i = new InterfaceInformationImp(t, "TCPIPInformation", interfaceItems[item], true); 203 InterfaceInformationImp *i = new InterfaceInformationImp(t, "TCPIPInformation", interfaceItems[item], true);
210 t->insertTab(i, "TCP/IP"); 204 t->insertTab(i, "TCP/IP");
211 t->show(); 205 t->show();
212 } 206 }
213} 207}
214 208
215/** 209/**
216 * Aquire the list of active interfaces from ifconfig 210 * Aquire the list of active interfaces from ifconfig
217 * Call ifconfig and ifconfig -a 211 * Call ifconfig and ifconfig -a
218 */ 212 */
219void MainWindowImp::getInterfaceList(){ 213void MainWindowImp::getInterfaceList(){
220 KShellProcess *processAll = new KShellProcess(); 214 KShellProcess *processAll = new KShellProcess();
221 *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL; 215 *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL;
222 connect(processAll, SIGNAL(processExited(KProcess *)), 216 connect(processAll, SIGNAL(processExited(KProcess *)),
223 this, SLOT(jobDone(KProcess *))); 217 this, SLOT(jobDone(KProcess *)));
224 threads.insert(processAll, TEMP_ALL); 218 threads.insert(processAll, TEMP_ALL);
225 processAll->start(KShellProcess::NotifyOnExit); 219 processAll->start(KShellProcess::NotifyOnExit);
226 220
227 KShellProcess *process = new KShellProcess(); 221 KShellProcess *process = new KShellProcess();
228 *process << "/sbin/ifconfig" << " > " TEMP_UP; 222 *process << "/sbin/ifconfig" << " > " TEMP_UP;
229 connect(process, SIGNAL(processExited(KProcess *)), 223 connect(process, SIGNAL(processExited(KProcess *)),
230 this, SLOT(jobDone(KProcess *))); 224 this, SLOT(jobDone(KProcess *)));
231 threads.insert(process, TEMP_UP); 225 threads.insert(process, TEMP_UP);
232 process->start(KShellProcess::NotifyOnExit); 226 process->start(KShellProcess::NotifyOnExit);
233} 227}
@@ -282,64 +276,68 @@ void MainWindowImp::jobDone(KProcess *process){
282 } 276 }
283 } 277 }
284 file.close(); 278 file.close();
285 QFile::remove(fileName); 279 QFile::remove(fileName);
286} 280}
287 281
288void MainWindowImp::updateInterface(Interface *i){ 282void MainWindowImp::updateInterface(Interface *i){
289 QListViewItem *item = NULL; 283 QListViewItem *item = NULL;
290 284
291 // See if we already have it 285 // See if we already have it
292 if(items.find(i) == items.end()){ 286 if(items.find(i) == items.end()){
293 item = new QListViewItem(serviceList, "", "", ""); 287 item = new QListViewItem(serviceList, "", "", "");
294 // See if you can't find a module owner for this interface 288 // See if you can't find a module owner for this interface
295 //EmployeeMap::Iterator it; 289 //EmployeeMap::Iterator it;
296 //for( it = map.begin(); it != map.end(); ++it ) 290 //for( it = map.begin(); it != map.end(); ++it )
297 // printf( "%s, %s earns %d\n", it.key().latin1(), it.data().name().latin1(), it.data().salary() ); 291 // printf( "%s, %s earns %d\n", it.key().latin1(), it.data().name().latin1(), it.data().salary() );
298 292
299 items.insert(i, item); 293 items.insert(i, item);
300 interfaceItems.insert(item, i); 294 interfaceItems.insert(item, i);
301 } 295 }
302 else 296 else
303 item = items[i]; 297 item = items[i];
304 298
305 QString statusImage = "down"; 299 QString statusImage = "down";
306 if(i->getStatus()) 300 if(i->getStatus())
307 statusImage = "up"; 301 statusImage = "up";
308 QPixmap status = (Resource::loadPixmap(statusImage)); 302 QPixmap status = (Resource::loadPixmap(statusImage));
309 item->setPixmap(0, status); 303 item->setPixmap(0, status);
310 304
311 QString typeName = "lan"; 305 QString typeName = "lan";
312 if(i->getHardwareName().contains("Local Loopback")) 306 if(i->getHardwareName().contains("Local Loopback"))
313 typeName = "lo"; 307 typeName = "lo";
308 if(i->getInterfaceName().contains("irda"))
309 typeName = "irda";
310 if(i->getInterfaceName().contains("wlan"))
311 typeName = "wlan";
314 QPixmap type = (Resource::loadPixmap(typeName)); 312 QPixmap type = (Resource::loadPixmap(typeName));
315 item->setPixmap(1, type); 313 item->setPixmap(1, type);
316 314
317 item->setText(2, i->getHardwareName()); 315 item->setText(2, i->getHardwareName());
318 316
319} 317}
320 318
321/** 319/**
322 * Adds a new profile to the list of profiles. 320 * Adds a new profile to the list of profiles.
323 * Don't add profiles that already exists. 321 * Don't add profiles that already exists.
324 * Appends to the combo and QStringList 322 * Appends to the combo and QStringList
325 */ 323 */
326void MainWindowImp::addProfile(){ 324void MainWindowImp::addProfile(){
327 QString newProfileName = "New"; 325 QString newProfileName = "New";
328 if(profiles.grep(newProfileName).count() > 0){ 326 if(profiles.grep(newProfileName).count() > 0){
329 QMessageBox::information(this, "Can't Add.","Profile already exists.", "Ok"); 327 QMessageBox::information(this, "Can't Add.","Profile already exists.", "Ok");
330 return; 328 return;
331 } 329 }
332 profiles.append(newProfileName); 330 profiles.append(newProfileName);
333 profilesList->insertItem(newProfileName); 331 profilesList->insertItem(newProfileName);
334 332
335} 333}
336 334
337/** 335/**
338 * Removes the currently selected profile in the combo. 336 * Removes the currently selected profile in the combo.
339 * Doesn't delete if there are less then 2 profiles. 337 * Doesn't delete if there are less then 2 profiles.
340 */ 338 */
341void MainWindowImp::removeProfile(){ 339void MainWindowImp::removeProfile(){
342 if(profilesList->count() <= 1){ 340 if(profilesList->count() <= 1){
343 QMessageBox::information(this, "Can't remove anything.","Need One Profile.", "Ok"); 341 QMessageBox::information(this, "Can't remove anything.","Need One Profile.", "Ok");
344 return; 342 return;
345 } 343 }
diff --git a/noncore/net/networksetup/module.h b/noncore/net/networksetup/module.h
index f146d8c..13fd523 100644
--- a/noncore/net/networksetup/module.h
+++ b/noncore/net/networksetup/module.h
@@ -1,33 +1,33 @@
1#ifndef MODULE_H 1#ifndef NETCONF_MODULE_H
2#define MODULE_H 2#define NETCONF_MODULE_H
3 3
4#include <qobject.h> 4#include <qobject.h>
5#include <qlist.h> 5#include <qlist.h>
6#include <qmap.h> 6#include <qmap.h>
7#include "interface.h" 7#include "interface.h"
8 8
9class QWidget; 9class QWidget;
10 10
11class Module : QObject{ 11class Module : QObject{
12 12
13signals: 13signals:
14 void updateInterface(Interface *i); 14 void updateInterface(Interface *i);
15 15
16public: 16public:
17 Module(){}; 17 Module(){};
18 18
19 virtual bool isOwner(Interface *){ return false; }; 19 virtual bool isOwner(Interface *){ return false; };
20 virtual QWidget *configure(){ return NULL; } ; 20 virtual QWidget *configure(){ return NULL; } ;
21 virtual QWidget *information(){ return NULL; }; 21 virtual QWidget *information(){ return NULL; };
22 virtual QList<Interface> getInterfaces() = 0; 22 virtual QList<Interface> getInterfaces() = 0;
23 virtual QMap<QString, QString> possibleNewInterfaces() = 0; 23 virtual QMap<QString, QString> possibleNewInterfaces() = 0;
24 virtual Interface *addNewInterface(QString name) = 0; 24 virtual Interface *addNewInterface(QString name) = 0;
25 virtual bool remove(Interface* i) = 0; 25 virtual bool remove(Interface* i) = 0;
26 26
27 27
28}; 28};
29 29
30#endif 30#endif
31 31
32// module.h 32// module.h
33 33
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro
index 7d9918b..a01b050 100644
--- a/noncore/net/networksetup/networksetup.pro
+++ b/noncore/net/networksetup/networksetup.pro
@@ -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 addserviceimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h 4 HEADERS = mainwindowimp.h addserviceimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h
5 SOURCES = main.cpp mainwindowimp.cpp addserviceimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp 5 SOURCES = main.cpp mainwindowimp.cpp addserviceimp.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 addservice.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui 9 INTERFACES= mainwindow.ui addservice.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
10 TARGET = networksetup 10 TARGET = networksetup
diff --git a/noncore/settings/networksettings/interfaceadvanced.ui b/noncore/settings/networksettings/interfaceadvanced.ui
index 8ef0b29..7520abe 100644
--- a/noncore/settings/networksettings/interfaceadvanced.ui
+++ b/noncore/settings/networksettings/interfaceadvanced.ui
@@ -1,47 +1,47 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>InterfaceAdvanced</class> 2<class>InterfaceAdvanced</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>InterfaceAdvanced</cstring> 7 <cstring>InterfaceAdvanced</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>197</width> 14 <width>188</width>
15 <height>253</height> 15 <height>277</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>Advanced Interface Information</string> 20 <string>Advanced 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="1" column="0" > 31 <widget row="1" column="0" >
32 <class>QLabel</class> 32 <class>QLabel</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>TextLabel1</cstring> 35 <cstring>TextLabel1</cstring>
36 </property> 36 </property>
37 <property stdset="1"> 37 <property stdset="1">
38 <name>text</name> 38 <name>text</name>
39 <string>MAC Address</string> 39 <string>MAC Address</string>
40 </property> 40 </property>
41 </widget> 41 </widget>
42 <widget row="0" column="1" > 42 <widget row="0" column="1" >
43 <class>QLabel</class> 43 <class>QLabel</class>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>name</name> 45 <name>name</name>
46 <cstring>interfaceName</cstring> 46 <cstring>interfaceName</cstring>
47 </property> 47 </property>
@@ -70,254 +70,268 @@
70 </property> 70 </property>
71 </widget> 71 </widget>
72 <widget row="1" column="1" > 72 <widget row="1" column="1" >
73 <class>QLabel</class> 73 <class>QLabel</class>
74 <property stdset="1"> 74 <property stdset="1">
75 <name>name</name> 75 <name>name</name>
76 <cstring>macAddressLabel</cstring> 76 <cstring>macAddressLabel</cstring>
77 </property> 77 </property>
78 <property stdset="1"> 78 <property stdset="1">
79 <name>frameShape</name> 79 <name>frameShape</name>
80 <enum>Panel</enum> 80 <enum>Panel</enum>
81 </property> 81 </property>
82 <property stdset="1"> 82 <property stdset="1">
83 <name>frameShadow</name> 83 <name>frameShadow</name>
84 <enum>Sunken</enum> 84 <enum>Sunken</enum>
85 </property> 85 </property>
86 <property stdset="1"> 86 <property stdset="1">
87 <name>text</name> 87 <name>text</name>
88 <string>00:00:00:00:00:00</string> 88 <string>00:00:00:00:00:00</string>
89 </property> 89 </property>
90 </widget> 90 </widget>
91 <widget row="0" column="0" > 91 <widget row="0" column="0" >
92 <class>QLabel</class> 92 <class>QLabel</class>
93 <property stdset="1"> 93 <property stdset="1">
94 <name>name</name> 94 <name>name</name>
95 <cstring>TextLabel7</cstring> 95 <cstring>TextLabel7</cstring>
96 </property> 96 </property>
97 <property stdset="1"> 97 <property stdset="1">
98 <name>text</name> 98 <name>text</name>
99 <string>Interface</string> 99 <string>Interface</string>
100 </property> 100 </property>
101 </widget> 101 </widget>
102 <widget row="8" column="0" > 102 <widget row="4" column="0" >
103 <class>QLabel</class>
104 <property stdset="1">
105 <name>name</name>
106 <cstring>TextLabel9</cstring>
107 </property>
108 <property stdset="1">
109 <name>text</name>
110 <string>Lease Expires</string>
111 </property>
112 </widget>
113 <widget row="8" column="1" >
114 <class>QLabel</class> 103 <class>QLabel</class>
115 <property stdset="1"> 104 <property stdset="1">
116 <name>name</name> 105 <name>name</name>
117 <cstring>leaseExpiresLabel</cstring> 106 <cstring>TextLabel4</cstring>
118 </property>
119 <property stdset="1">
120 <name>frameShape</name>
121 <enum>Panel</enum>
122 </property> 107 </property>
123 <property stdset="1"> 108 <property stdset="1">
124 <name>frameShadow</name> 109 <name>enabled</name>
125 <enum>Sunken</enum> 110 <bool>true</bool>
126 </property> 111 </property>
127 <property stdset="1"> 112 <property stdset="1">
128 <name>text</name> 113 <name>text</name>
129 <string></string> 114 <string>Subnet Mask</string>
130 </property> 115 </property>
131 </widget> 116 </widget>
132 <widget row="7" column="1" > 117 <widget row="2" column="1" >
133 <class>QLabel</class> 118 <class>QLabel</class>
134 <property stdset="1"> 119 <property stdset="1">
135 <name>name</name> 120 <name>name</name>
136 <cstring>leaseObtainedLabel</cstring> 121 <cstring>ipAddressLabel</cstring>
137 </property> 122 </property>
138 <property stdset="1"> 123 <property stdset="1">
139 <name>frameShape</name> 124 <name>frameShape</name>
140 <enum>Panel</enum> 125 <enum>Panel</enum>
141 </property> 126 </property>
142 <property stdset="1"> 127 <property stdset="1">
143 <name>frameShadow</name> 128 <name>frameShadow</name>
144 <enum>Sunken</enum> 129 <enum>Sunken</enum>
145 </property> 130 </property>
146 <property stdset="1"> 131 <property stdset="1">
147 <name>text</name> 132 <name>text</name>
148 <string></string> 133 <string>0.0.0.0</string>
149 </property>
150 </widget>
151 <widget row="7" column="0" >
152 <class>QLabel</class>
153 <property stdset="1">
154 <name>name</name>
155 <cstring>TextLabel8</cstring>
156 </property>
157 <property stdset="1">
158 <name>text</name>
159 <string>Lease Obtained</string>
160 </property> 134 </property>
161 </widget> 135 </widget>
162 <widget row="6" column="1" > 136 <widget row="4" column="1" >
163 <class>QLabel</class> 137 <class>QLabel</class>
164 <property stdset="1"> 138 <property stdset="1">
165 <name>name</name> 139 <name>name</name>
166 <cstring>dhcpServerLabel</cstring> 140 <cstring>subnetMaskLabel</cstring>
167 </property> 141 </property>
168 <property stdset="1"> 142 <property stdset="1">
169 <name>frameShape</name> 143 <name>frameShape</name>
170 <enum>Panel</enum> 144 <enum>Panel</enum>
171 </property> 145 </property>
172 <property stdset="1"> 146 <property stdset="1">
173 <name>frameShadow</name> 147 <name>frameShadow</name>
174 <enum>Sunken</enum> 148 <enum>Sunken</enum>
175 </property> 149 </property>
176 <property stdset="1"> 150 <property stdset="1">
177 <name>text</name> 151 <name>text</name>
178 <string>255.255.255.255</string> 152 <string>0.0.0.0</string>
179 </property>
180 </widget>
181 <widget row="6" column="0" >
182 <class>QLabel</class>
183 <property stdset="1">
184 <name>name</name>
185 <cstring>TextLabel6</cstring>
186 </property>
187 <property stdset="1">
188 <name>text</name>
189 <string>DHCP Server</string>
190 </property> 153 </property>
191 </widget> 154 </widget>
192 <widget row="4" column="0" > 155 <widget row="3" column="0" >
193 <class>QLabel</class> 156 <class>QLabel</class>
194 <property stdset="1"> 157 <property stdset="1">
195 <name>name</name> 158 <name>name</name>
196 <cstring>TextLabel4</cstring> 159 <cstring>TextLabel2</cstring>
197 </property> 160 </property>
198 <property stdset="1"> 161 <property stdset="1">
199 <name>text</name> 162 <name>text</name>
200 <string>Subnet Mask</string> 163 <string>Broadcast</string>
201 </property> 164 </property>
202 </widget> 165 </widget>
203 <widget row="2" column="1" > 166 <widget row="3" column="1" >
204 <class>QLabel</class> 167 <class>QLabel</class>
205 <property stdset="1"> 168 <property stdset="1">
206 <name>name</name> 169 <name>name</name>
207 <cstring>ipAddressLabel</cstring> 170 <cstring>broadcastLabel</cstring>
208 </property> 171 </property>
209 <property stdset="1"> 172 <property stdset="1">
210 <name>frameShape</name> 173 <name>frameShape</name>
211 <enum>Panel</enum> 174 <enum>Panel</enum>
212 </property> 175 </property>
213 <property stdset="1"> 176 <property stdset="1">
214 <name>frameShadow</name> 177 <name>frameShadow</name>
215 <enum>Sunken</enum> 178 <enum>Sunken</enum>
216 </property> 179 </property>
217 <property stdset="1">
218 <name>text</name>
219 <string>0.0.0.0</string>
220 </property>
221 </widget> 180 </widget>
222 <widget row="4" column="1" > 181 <widget row="5" column="0" rowspan="1" colspan="2" >
223 <class>QLabel</class> 182 <class>QGroupBox</class>
224 <property stdset="1"> 183 <property stdset="1">
225 <name>name</name> 184 <name>name</name>
226 <cstring>subnetMaskLabel</cstring> 185 <cstring>GroupBox2</cstring>
227 </property> 186 </property>
228 <property stdset="1"> 187 <property stdset="1">
229 <name>frameShape</name> 188 <name>title</name>
230 <enum>Panel</enum> 189 <string>DHCP Information</string>
231 </property> 190 </property>
232 <property stdset="1"> 191 <grid>
233 <name>frameShadow</name> 192 <property stdset="1">
234 <enum>Sunken</enum> 193 <name>margin</name>
235 </property> 194 <number>11</number>
236 <property stdset="1"> 195 </property>
237 <name>text</name> 196 <property stdset="1">
238 <string>0.0.0.0</string> 197 <name>spacing</name>
239 </property> 198 <number>6</number>
199 </property>
200 <widget row="0" column="0" >
201 <class>QLabel</class>
202 <property stdset="1">
203 <name>name</name>
204 <cstring>TextLabel6</cstring>
205 </property>
206 <property stdset="1">
207 <name>text</name>
208 <string>DHCP Server</string>
209 </property>
210 </widget>
211 <widget row="2" column="1" >
212 <class>QLabel</class>
213 <property stdset="1">
214 <name>name</name>
215 <cstring>leaseExpiresLabel</cstring>
216 </property>
217 <property stdset="1">
218 <name>frameShape</name>
219 <enum>Panel</enum>
220 </property>
221 <property stdset="1">
222 <name>frameShadow</name>
223 <enum>Sunken</enum>
224 </property>
225 <property stdset="1">
226 <name>text</name>
227 <string></string>
228 </property>
229 </widget>
230 <widget row="1" column="1" >
231 <class>QLabel</class>
232 <property stdset="1">
233 <name>name</name>
234 <cstring>leaseObtainedLabel</cstring>
235 </property>
236 <property stdset="1">
237 <name>frameShape</name>
238 <enum>Panel</enum>
239 </property>
240 <property stdset="1">
241 <name>frameShadow</name>
242 <enum>Sunken</enum>
243 </property>
244 <property stdset="1">
245 <name>text</name>
246 <string></string>
247 </property>
248 </widget>
249 <widget row="2" column="0" >
250 <class>QLabel</class>
251 <property stdset="1">
252 <name>name</name>
253 <cstring>TextLabel9</cstring>
254 </property>
255 <property stdset="1">
256 <name>text</name>
257 <string>Lease Expires</string>
258 </property>
259 </widget>
260 <widget row="1" column="0" >
261 <class>QLabel</class>
262 <property stdset="1">
263 <name>name</name>
264 <cstring>TextLabel8</cstring>
265 </property>
266 <property stdset="1">
267 <name>text</name>
268 <string>Lease Obtained</string>
269 </property>
270 </widget>
271 <widget row="0" column="1" >
272 <class>QLabel</class>
273 <property stdset="1">
274 <name>name</name>
275 <cstring>dhcpServerLabel</cstring>
276 </property>
277 <property stdset="1">
278 <name>frameShape</name>
279 <enum>Panel</enum>
280 </property>
281 <property stdset="1">
282 <name>frameShadow</name>
283 <enum>Sunken</enum>
284 </property>
285 <property stdset="1">
286 <name>text</name>
287 <string></string>
288 </property>
289 </widget>
290 </grid>
240 </widget> 291 </widget>
241 <spacer row="9" column="1" > 292 <spacer row="6" column="1" >
242 <property> 293 <property>
243 <name>name</name> 294 <name>name</name>
244 <cstring>Spacer2</cstring> 295 <cstring>Spacer2</cstring>
245 </property> 296 </property>
246 <property stdset="1"> 297 <property stdset="1">
247 <name>orientation</name> 298 <name>orientation</name>
248 <enum>Vertical</enum> 299 <enum>Vertical</enum>
249 </property> 300 </property>
250 <property stdset="1"> 301 <property stdset="1">
251 <name>sizeType</name> 302 <name>sizeType</name>
252 <enum>Expanding</enum> 303 <enum>Expanding</enum>
253 </property> 304 </property>
254 <property> 305 <property>
255 <name>sizeHint</name> 306 <name>sizeHint</name>
256 <size> 307 <size>
257 <width>20</width> 308 <width>20</width>
258 <height>20</height> 309 <height>20</height>
259 </size> 310 </size>
260 </property> 311 </property>
261 </spacer> 312 </spacer>
262 <widget row="3" column="0" >
263 <class>QLabel</class>
264 <property stdset="1">
265 <name>name</name>
266 <cstring>TextLabel2</cstring>
267 </property>
268 <property stdset="1">
269 <name>text</name>
270 <string>Broadcast</string>
271 </property>
272 </widget>
273 <widget row="3" column="1" >
274 <class>QLabel</class>
275 <property stdset="1">
276 <name>name</name>
277 <cstring>broadcastLabel</cstring>
278 </property>
279 <property stdset="1">
280 <name>frameShape</name>
281 <enum>Panel</enum>
282 </property>
283 <property stdset="1">
284 <name>frameShadow</name>
285 <enum>Sunken</enum>
286 </property>
287 </widget>
288 <widget row="5" column="0" rowspan="1" colspan="2" >
289 <class>Line</class>
290 <property stdset="1">
291 <name>name</name>
292 <cstring>Line2</cstring>
293 </property>
294 <property stdset="1">
295 <name>orientation</name>
296 <enum>Horizontal</enum>
297 </property>
298 </widget>
299 </grid> 313 </grid>
300</widget> 314</widget>
301<customwidgets> 315<customwidgets>
302 <customwidget> 316 <customwidget>
303 <class>QWidget</class> 317 <class>QWidget</class>
304 <header location="local">qwidget.h</header> 318 <header location="local">qwidget.h</header>
305 <sizehint> 319 <sizehint>
306 <width>100</width> 320 <width>100</width>
307 <height>100</height> 321 <height>100</height>
308 </sizehint> 322 </sizehint>
309 <container>0</container> 323 <container>0</container>
310 <sizepolicy> 324 <sizepolicy>
311 <hordata>7</hordata> 325 <hordata>7</hordata>
312 <verdata>7</verdata> 326 <verdata>7</verdata>
313 </sizepolicy> 327 </sizepolicy>
314 <pixmap>image0</pixmap> 328 <pixmap>image0</pixmap>
315 </customwidget> 329 </customwidget>
316</customwidgets> 330</customwidgets>
317<images> 331<images>
318 <image> 332 <image>
319 <name>image0</name> 333 <name>image0</name>
320 <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data> 334 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
321 </image> 335 </image>
322</images> 336</images>
323</UI> 337</UI>
diff --git a/noncore/settings/networksettings/interfaceinformation.ui b/noncore/settings/networksettings/interfaceinformation.ui
index 2a9b3fb..8b6280d 100644
--- a/noncore/settings/networksettings/interfaceinformation.ui
+++ b/noncore/settings/networksettings/interfaceinformation.ui
@@ -1,47 +1,47 @@
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>191</width> 14 <width>203</width>
15 <height>241</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>
@@ -71,174 +71,112 @@
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>
79 <widget row="0" column="0" > 79 <widget row="0" column="0" >
80 <class>QPushButton</class> 80 <class>QPushButton</class>
81 <property stdset="1"> 81 <property stdset="1">
82 <name>name</name> 82 <name>name</name>
83 <cstring>startButton</cstring> 83 <cstring>startButton</cstring>
84 </property> 84 </property>
85 <property stdset="1"> 85 <property stdset="1">
86 <name>text</name> 86 <name>text</name>
87 <string>Start</string> 87 <string>Start</string>
88 </property> 88 </property>
89 </widget> 89 </widget>
90 </grid> 90 </grid>
91 </widget> 91 </widget>
92 <widget row="0" column="0" > 92 <widget row="0" column="0" >
93 <class>Line</class> 93 <class>Line</class>
94 <property stdset="1"> 94 <property stdset="1">
95 <name>name</name> 95 <name>name</name>
96 <cstring>Line1</cstring> 96 <cstring>Line1</cstring>
97 </property> 97 </property>
98 <property stdset="1"> 98 <property stdset="1">
99 <name>orientation</name> 99 <name>orientation</name>
100 <enum>Horizontal</enum> 100 <enum>Horizontal</enum>
101 </property> 101 </property>
102 </widget> 102 </widget>
103 <spacer row="6" column="1" >
104 <property>
105 <name>name</name>
106 <cstring>Spacer18</cstring>
107 </property>
108 <property stdset="1">
109 <name>orientation</name>
110 <enum>Vertical</enum>
111 </property>
112 <property stdset="1">
113 <name>sizeType</name>
114 <enum>Expanding</enum>
115 </property>
116 <property>
117 <name>sizeHint</name>
118 <size>
119 <width>20</width>
120 <height>20</height>
121 </size>
122 </property>
123 </spacer>
124 <widget row="5" column="0" rowspan="1" colspan="2" >
125 <class>QLayoutWidget</class>
126 <property stdset="1">
127 <name>name</name>
128 <cstring>Layout2</cstring>
129 </property>
130 <hbox>
131 <property stdset="1">
132 <name>margin</name>
133 <number>0</number>
134 </property>
135 <property stdset="1">
136 <name>spacing</name>
137 <number>6</number>
138 </property>
139 <spacer>
140 <property>
141 <name>name</name>
142 <cstring>Spacer10</cstring>
143 </property>
144 <property stdset="1">
145 <name>orientation</name>
146 <enum>Horizontal</enum>
147 </property>
148 <property stdset="1">
149 <name>sizeType</name>
150 <enum>Expanding</enum>
151 </property>
152 <property>
153 <name>sizeHint</name>
154 <size>
155 <width>20</width>
156 <height>20</height>
157 </size>
158 </property>
159 </spacer>
160 <widget>
161 <class>QPushButton</class>
162 <property stdset="1">
163 <name>name</name>
164 <cstring>advancedButton</cstring>
165 </property>
166 <property stdset="1">
167 <name>text</name>
168 <string>View Advanced Information</string>
169 </property>
170 </widget>
171 </hbox>
172 </widget>
173 <widget row="0" column="0" > 103 <widget row="0" column="0" >
174 <class>QLabel</class> 104 <class>QLabel</class>
175 <property stdset="1"> 105 <property stdset="1">
176 <name>name</name> 106 <name>name</name>
177 <cstring>TextLabel22</cstring> 107 <cstring>TextLabel22</cstring>
178 </property> 108 </property>
179 <property stdset="1"> 109 <property stdset="1">
180 <name>text</name> 110 <name>text</name>
181 <string>IP Address</string> 111 <string>IP Address</string>
182 </property> 112 </property>
183 </widget> 113 </widget>
184 <widget row="1" column="0" > 114 <widget row="1" column="0" >
185 <class>QLabel</class> 115 <class>QLabel</class>
186 <property stdset="1"> 116 <property stdset="1">
187 <name>name</name> 117 <name>name</name>
188 <cstring>TextLabel23</cstring> 118 <cstring>TextLabel23</cstring>
189 </property> 119 </property>
190 <property stdset="1"> 120 <property stdset="1">
191 <name>text</name> 121 <name>text</name>
192 <string>Subnet Mask</string> 122 <string>Subnet Mask</string>
193 </property> 123 </property>
194 </widget> 124 </widget>
195 <widget row="2" column="0" > 125 <widget row="2" column="0" >
196 <class>QLabel</class> 126 <class>QLabel</class>
197 <property stdset="1"> 127 <property stdset="1">
198 <name>name</name> 128 <name>name</name>
199 <cstring>TextLabel21</cstring> 129 <cstring>TextLabel21</cstring>
200 </property> 130 </property>
201 <property stdset="1"> 131 <property stdset="1">
202 <name>text</name> 132 <name>text</name>
203 <string>MAC Address</string> 133 <string>MAC Address</string>
204 </property> 134 </property>
205 </widget> 135 </widget>
206 <widget row="3" column="0" > 136 <widget row="3" column="0" >
207 <class>QLabel</class> 137 <class>QLabel</class>
208 <property stdset="1"> 138 <property stdset="1">
209 <name>name</name> 139 <name>name</name>
210 <cstring>TextLabel24</cstring> 140 <cstring>TextLabel24</cstring>
211 </property> 141 </property>
212 <property stdset="1"> 142 <property stdset="1">
143 <name>frameShape</name>
144 <enum>MShape</enum>
145 </property>
146 <property stdset="1">
147 <name>frameShadow</name>
148 <enum>MShadow</enum>
149 </property>
150 <property stdset="1">
213 <name>text</name> 151 <name>text</name>
214 <string>Broadcast</string> 152 <string>Broadcast</string>
215 </property> 153 </property>
216 </widget> 154 </widget>
217 <widget row="1" column="1" > 155 <widget row="1" column="1" >
218 <class>QLabel</class> 156 <class>QLabel</class>
219 <property stdset="1"> 157 <property stdset="1">
220 <name>name</name> 158 <name>name</name>
221 <cstring>subnetMaskLabel</cstring> 159 <cstring>subnetMaskLabel</cstring>
222 </property> 160 </property>
223 <property stdset="1"> 161 <property stdset="1">
224 <name>frameShape</name> 162 <name>frameShape</name>
225 <enum>Panel</enum> 163 <enum>Panel</enum>
226 </property> 164 </property>
227 <property stdset="1"> 165 <property stdset="1">
228 <name>frameShadow</name> 166 <name>frameShadow</name>
229 <enum>Sunken</enum> 167 <enum>Sunken</enum>
230 </property> 168 </property>
231 <property stdset="1"> 169 <property stdset="1">
232 <name>text</name> 170 <name>text</name>
233 <string>0.0.0.0</string> 171 <string>0.0.0.0</string>
234 </property> 172 </property>
235 </widget> 173 </widget>
236 <widget row="2" column="1" > 174 <widget row="2" column="1" >
237 <class>QLabel</class> 175 <class>QLabel</class>
238 <property stdset="1"> 176 <property stdset="1">
239 <name>name</name> 177 <name>name</name>
240 <cstring>macAddressLabel</cstring> 178 <cstring>macAddressLabel</cstring>
241 </property> 179 </property>
242 <property stdset="1"> 180 <property stdset="1">
243 <name>frameShape</name> 181 <name>frameShape</name>
244 <enum>Panel</enum> 182 <enum>Panel</enum>
@@ -261,57 +199,140 @@
261 <property stdset="1"> 199 <property stdset="1">
262 <name>frameShape</name> 200 <name>frameShape</name>
263 <enum>Panel</enum> 201 <enum>Panel</enum>
264 </property> 202 </property>
265 <property stdset="1"> 203 <property stdset="1">
266 <name>frameShadow</name> 204 <name>frameShadow</name>
267 <enum>Sunken</enum> 205 <enum>Sunken</enum>
268 </property> 206 </property>
269 <property stdset="1"> 207 <property stdset="1">
270 <name>text</name> 208 <name>text</name>
271 <string></string> 209 <string></string>
272 </property> 210 </property>
273 </widget> 211 </widget>
274 <widget row="0" column="1" > 212 <widget row="0" column="1" >
275 <class>QLabel</class> 213 <class>QLabel</class>
276 <property stdset="1"> 214 <property stdset="1">
277 <name>name</name> 215 <name>name</name>
278 <cstring>ipAddressLabel</cstring> 216 <cstring>ipAddressLabel</cstring>
279 </property> 217 </property>
280 <property stdset="1"> 218 <property stdset="1">
281 <name>frameShape</name> 219 <name>frameShape</name>
282 <enum>Panel</enum> 220 <enum>Panel</enum>
283 </property> 221 </property>
284 <property stdset="1"> 222 <property stdset="1">
285 <name>frameShadow</name> 223 <name>frameShadow</name>
286 <enum>Sunken</enum> 224 <enum>Sunken</enum>
287 </property> 225 </property>
288 <property stdset="1"> 226 <property stdset="1">
289 <name>text</name> 227 <name>text</name>
290 <string>0.0.0.0</string> 228 <string>0.0.0.0</string>
291 </property> 229 </property>
292 </widget> 230 </widget>
231 <spacer row="7" column="1" >
232 <property>
233 <name>name</name>
234 <cstring>Spacer18</cstring>
235 </property>
236 <property stdset="1">
237 <name>orientation</name>
238 <enum>Vertical</enum>
239 </property>
240 <property stdset="1">
241 <name>sizeType</name>
242 <enum>Expanding</enum>
243 </property>
244 <property>
245 <name>sizeHint</name>
246 <size>
247 <width>20</width>
248 <height>20</height>
249 </size>
250 </property>
251 </spacer>
252 <widget row="6" column="0" rowspan="1" colspan="2" >
253 <class>QLayoutWidget</class>
254 <property stdset="1">
255 <name>name</name>
256 <cstring>Layout2</cstring>
257 </property>
258 <hbox>
259 <property stdset="1">
260 <name>margin</name>
261 <number>0</number>
262 </property>
263 <property stdset="1">
264 <name>spacing</name>
265 <number>6</number>
266 </property>
267 <spacer>
268 <property>
269 <name>name</name>
270 <cstring>Spacer10</cstring>
271 </property>
272 <property stdset="1">
273 <name>orientation</name>
274 <enum>Horizontal</enum>
275 </property>
276 <property stdset="1">
277 <name>sizeType</name>
278 <enum>Expanding</enum>
279 </property>
280 <property>
281 <name>sizeHint</name>
282 <size>
283 <width>20</width>
284 <height>20</height>
285 </size>
286 </property>
287 </spacer>
288 <widget>
289 <class>QPushButton</class>
290 <property stdset="1">
291 <name>name</name>
292 <cstring>advancedButton</cstring>
293 </property>
294 <property stdset="1">
295 <name>text</name>
296 <string>View Advanced Information</string>
297 </property>
298 </widget>
299 </hbox>
300 </widget>
301 <widget row="5" column="0" rowspan="1" colspan="2" >
302 <class>Line</class>
303 <property stdset="1">
304 <name>name</name>
305 <cstring>Line5</cstring>
306 </property>
307 <property stdset="1">
308 <name>orientation</name>
309 <enum>Horizontal</enum>
310 </property>
311 </widget>
293 </grid> 312 </grid>
294</widget> 313</widget>
295<customwidgets> 314<customwidgets>
296 <customwidget> 315 <customwidget>
297 <class>QWidget</class> 316 <class>QWidget</class>
298 <header location="local">qwidget.h</header> 317 <header location="local">qwidget.h</header>
299 <sizehint> 318 <sizehint>
300 <width>100</width> 319 <width>100</width>
301 <height>100</height> 320 <height>100</height>
302 </sizehint> 321 </sizehint>
303 <container>0</container> 322 <container>0</container>
304 <sizepolicy> 323 <sizepolicy>
305 <hordata>7</hordata> 324 <hordata>7</hordata>
306 <verdata>7</verdata> 325 <verdata>7</verdata>
307 </sizepolicy> 326 </sizepolicy>
308 <pixmap>image0</pixmap> 327 <pixmap>image0</pixmap>
309 </customwidget> 328 </customwidget>
310</customwidgets> 329</customwidgets>
311<images> 330<images>
312 <image> 331 <image>
313 <name>image0</name> 332 <name>image0</name>
314 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> 333 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
315 </image> 334 </image>
316</images> 335</images>
336<connections>
337</connections>
317</UI> 338</UI>
diff --git a/noncore/settings/networksettings/interfacesetup.ui b/noncore/settings/networksettings/interfacesetup.ui
index 698422c..ff9810e 100644
--- a/noncore/settings/networksettings/interfacesetup.ui
+++ b/noncore/settings/networksettings/interfacesetup.ui
@@ -1,274 +1,284 @@
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>193</width> 14 <width>177</width>
15 <height>310</height> 15 <height>320</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 <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="1" column="0" rowspan="1" colspan="2" > 31 <widget row="1" column="0" rowspan="1" colspan="2" >
32 <class>Line</class> 32 <class>Line</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>Line1</cstring> 35 <cstring>Line1</cstring>
36 </property> 36 </property>
37 <property stdset="1"> 37 <property stdset="1">
38 <name>orientation</name> 38 <name>orientation</name>
39 <enum>Horizontal</enum> 39 <enum>Horizontal</enum>
40 </property> 40 </property>
41 </widget> 41 </widget>
42 <widget row="6" column="0" >
43 <class>QLabel</class>
44 <property stdset="1">
45 <name>name</name>
46 <cstring>TextLabel4</cstring>
47 </property>
48 <property stdset="1">
49 <name>text</name>
50 <string>IP Address</string>
51 </property>
52 </widget>
53 <widget row="0" column="0" rowspan="1" colspan="2" > 42 <widget row="0" column="0" rowspan="1" colspan="2" >
54 <class>QCheckBox</class> 43 <class>QCheckBox</class>
55 <property stdset="1"> 44 <property stdset="1">
56 <name>name</name> 45 <name>name</name>
57 <cstring>autoStart</cstring> 46 <cstring>autoStart</cstring>
58 </property> 47 </property>
59 <property stdset="1"> 48 <property stdset="1">
60 <name>text</name> 49 <name>text</name>
61 <string>Automaticly bring up</string> 50 <string>Automaticly bring up</string>
62 </property> 51 </property>
63 </widget> 52 </widget>
64 <widget row="2" column="1" > 53 <widget row="2" column="1" >
65 <class>QComboBox</class> 54 <class>QComboBox</class>
66 <item> 55 <item>
67 <property> 56 <property>
68 <name>text</name> 57 <name>text</name>
69 <string>All</string> 58 <string>All</string>
70 </property> 59 </property>
71 </item> 60 </item>
72 <property stdset="1"> 61 <property stdset="1">
73 <name>name</name> 62 <name>name</name>
74 <cstring>profileCombo</cstring> 63 <cstring>profileCombo</cstring>
75 </property> 64 </property>
76 </widget> 65 </widget>
77 <widget row="5" column="0" rowspan="1" colspan="2" >
78 <class>QGroupBox</class>
79 <property stdset="1">
80 <name>name</name>
81 <cstring>staticGroupBox</cstring>
82 </property>
83 <property stdset="1">
84 <name>enabled</name>
85 <bool>false</bool>
86 </property>
87 <property stdset="1">
88 <name>title</name>
89 <string>Static Ip Configuration</string>
90 </property>
91 </widget>
92 <widget row="6" column="1" >
93 <class>QLineEdit</class>
94 <property stdset="1">
95 <name>name</name>
96 <cstring>ipAddressEdit</cstring>
97 </property>
98 </widget>
99 <widget row="4" column="0" > 66 <widget row="4" column="0" >
100 <class>QLabel</class> 67 <class>QLabel</class>
101 <property stdset="1"> 68 <property stdset="1">
102 <name>name</name> 69 <name>name</name>
103 <cstring>leaseHoursLabel</cstring> 70 <cstring>leaseHoursLabel</cstring>
104 </property> 71 </property>
105 <property stdset="1"> 72 <property stdset="1">
106 <name>text</name> 73 <name>text</name>
107 <string>Requested Lease</string> 74 <string>Requested Lease</string>
108 </property> 75 </property>
109 </widget> 76 </widget>
110 <widget row="3" column="0" rowspan="1" colspan="2" > 77 <widget row="3" column="0" rowspan="1" colspan="2" >
111 <class>QCheckBox</class> 78 <class>QCheckBox</class>
112 <property stdset="1"> 79 <property stdset="1">
113 <name>name</name> 80 <name>name</name>
114 <cstring>dhcpCheckBox</cstring> 81 <cstring>dhcpCheckBox</cstring>
115 </property> 82 </property>
116 <property stdset="1"> 83 <property stdset="1">
117 <name>text</name> 84 <name>text</name>
118 <string>DHCP</string> 85 <string>DHCP</string>
119 </property> 86 </property>
120 <property stdset="1"> 87 <property stdset="1">
121 <name>checked</name> 88 <name>checked</name>
122 <bool>true</bool> 89 <bool>true</bool>
123 </property> 90 </property>
124 </widget> 91 </widget>
125 <widget row="7" column="0" >
126 <class>QLabel</class>
127 <property stdset="1">
128 <name>name</name>
129 <cstring>TextLabel5</cstring>
130 </property>
131 <property stdset="1">
132 <name>text</name>
133 <string>Subnet Mask</string>
134 </property>
135 </widget>
136 <widget row="2" column="0" > 92 <widget row="2" column="0" >
137 <class>QLabel</class> 93 <class>QLabel</class>
138 <property stdset="1"> 94 <property stdset="1">
139 <name>name</name> 95 <name>name</name>
140 <cstring>TextLabel1</cstring> 96 <cstring>TextLabel1</cstring>
141 </property> 97 </property>
142 <property stdset="1"> 98 <property stdset="1">
143 <name>text</name> 99 <name>text</name>
144 <string>Profile:</string> 100 <string>Profile:</string>
145 </property> 101 </property>
146 </widget> 102 </widget>
147 <widget row="4" column="1" > 103 <widget row="4" column="1" >
148 <class>QSpinBox</class> 104 <class>QSpinBox</class>
149 <property stdset="1"> 105 <property stdset="1">
150 <name>name</name> 106 <name>name</name>
151 <cstring>leaseTime</cstring> 107 <cstring>leaseTime</cstring>
152 </property> 108 </property>
153 <property stdset="1"> 109 <property stdset="1">
154 <name>suffix</name> 110 <name>suffix</name>
155 <string> hours</string> 111 <string> hours</string>
156 </property> 112 </property>
157 <property stdset="1"> 113 <property stdset="1">
158 <name>maxValue</name> 114 <name>maxValue</name>
159 <number>336</number> 115 <number>336</number>
160 </property> 116 </property>
161 <property stdset="1"> 117 <property stdset="1">
162 <name>minValue</name> 118 <name>minValue</name>
163 <number>1</number> 119 <number>1</number>
164 </property> 120 </property>
165 <property stdset="1"> 121 <property stdset="1">
166 <name>value</name> 122 <name>value</name>
167 <number>24</number> 123 <number>24</number>
168 </property> 124 </property>
169 </widget> 125 </widget>
170 <spacer row="11" column="1" > 126 <spacer row="6" column="1" >
171 <property> 127 <property>
172 <name>name</name> 128 <name>name</name>
173 <cstring>Spacer9</cstring> 129 <cstring>Spacer9</cstring>
174 </property> 130 </property>
175 <property stdset="1"> 131 <property stdset="1">
176 <name>orientation</name> 132 <name>orientation</name>
177 <enum>Vertical</enum> 133 <enum>Vertical</enum>
178 </property> 134 </property>
179 <property stdset="1"> 135 <property stdset="1">
180 <name>sizeType</name> 136 <name>sizeType</name>
181 <enum>Expanding</enum> 137 <enum>Expanding</enum>
182 </property> 138 </property>
183 <property> 139 <property>
184 <name>sizeHint</name> 140 <name>sizeHint</name>
185 <size> 141 <size>
186 <width>20</width> 142 <width>20</width>
187 <height>20</height> 143 <height>20</height>
188 </size> 144 </size>
189 </property> 145 </property>
190 </spacer> 146 </spacer>
191 <widget row="10" column="1" > 147 <widget row="5" column="0" rowspan="1" colspan="2" >
192 <class>QLineEdit</class> 148 <class>QGroupBox</class>
193 <property stdset="1">
194 <name>name</name>
195 <cstring>secondDNSLineEdit</cstring>
196 </property>
197 </widget>
198 <widget row="10" column="0" >
199 <class>QLabel</class>
200 <property stdset="1">
201 <name>name</name>
202 <cstring>TextLabel3</cstring>
203 </property>
204 <property stdset="1">
205 <name>text</name>
206 <string>Second DNS</string>
207 </property>
208 </widget>
209 <widget row="9" column="0" >
210 <class>QLabel</class>
211 <property stdset="1">
212 <name>name</name>
213 <cstring>TextLabel2</cstring>
214 </property>
215 <property stdset="1">
216 <name>text</name>
217 <string>First DNS</string>
218 </property>
219 </widget>
220 <widget row="9" column="1" >
221 <class>QLineEdit</class>
222 <property stdset="1">
223 <name>name</name>
224 <cstring>firstDNSLineEdit</cstring>
225 </property>
226 </widget>
227 <widget row="8" column="0" >
228 <class>QLabel</class>
229 <property stdset="1"> 149 <property stdset="1">
230 <name>name</name> 150 <name>name</name>
231 <cstring>TextLabel1_2</cstring> 151 <cstring>staticGroupBox</cstring>
232 </property>
233 <property stdset="1">
234 <name>text</name>
235 <string>Gateway</string>
236 </property> 152 </property>
237 </widget>
238 <widget row="7" column="1" >
239 <class>QLineEdit</class>
240 <property stdset="1"> 153 <property stdset="1">
241 <name>name</name> 154 <name>enabled</name>
242 <cstring>subnetMaskEdit</cstring> 155 <bool>false</bool>
243 </property> 156 </property>
244 </widget>
245 <widget row="8" column="1" >
246 <class>QLineEdit</class>
247 <property stdset="1"> 157 <property stdset="1">
248 <name>name</name> 158 <name>title</name>
249 <cstring>gatewayEdit</cstring> 159 <string>Static Ip Configuration</string>
250 </property> 160 </property>
161 <grid>
162 <property stdset="1">
163 <name>margin</name>
164 <number>11</number>
165 </property>
166 <property stdset="1">
167 <name>spacing</name>
168 <number>6</number>
169 </property>
170 <widget row="3" column="1" >
171 <class>QLineEdit</class>
172 <property stdset="1">
173 <name>name</name>
174 <cstring>firstDNSLineEdit</cstring>
175 </property>
176 </widget>
177 <widget row="1" column="0" >
178 <class>QLabel</class>
179 <property stdset="1">
180 <name>name</name>
181 <cstring>TextLabel5</cstring>
182 </property>
183 <property stdset="1">
184 <name>text</name>
185 <string>Subnet Mask</string>
186 </property>
187 </widget>
188 <widget row="2" column="1" >
189 <class>QLineEdit</class>
190 <property stdset="1">
191 <name>name</name>
192 <cstring>gatewayEdit</cstring>
193 </property>
194 </widget>
195 <widget row="1" column="1" >
196 <class>QLineEdit</class>
197 <property stdset="1">
198 <name>name</name>
199 <cstring>subnetMaskEdit</cstring>
200 </property>
201 </widget>
202 <widget row="0" column="1" >
203 <class>QLineEdit</class>
204 <property stdset="1">
205 <name>name</name>
206 <cstring>ipAddressEdit</cstring>
207 </property>
208 </widget>
209 <widget row="3" column="0" >
210 <class>QLabel</class>
211 <property stdset="1">
212 <name>name</name>
213 <cstring>TextLabel2</cstring>
214 </property>
215 <property stdset="1">
216 <name>text</name>
217 <string>First DNS</string>
218 </property>
219 </widget>
220 <widget row="4" column="1" >
221 <class>QLineEdit</class>
222 <property stdset="1">
223 <name>name</name>
224 <cstring>secondDNSLineEdit</cstring>
225 </property>
226 </widget>
227 <widget row="0" column="0" >
228 <class>QLabel</class>
229 <property stdset="1">
230 <name>name</name>
231 <cstring>TextLabel4</cstring>
232 </property>
233 <property stdset="1">
234 <name>text</name>
235 <string>IP Address</string>
236 </property>
237 </widget>
238 <widget row="2" column="0" >
239 <class>QLabel</class>
240 <property stdset="1">
241 <name>name</name>
242 <cstring>TextLabel1_2</cstring>
243 </property>
244 <property stdset="1">
245 <name>text</name>
246 <string>Gateway</string>
247 </property>
248 </widget>
249 <widget row="4" column="0" >
250 <class>QLabel</class>
251 <property stdset="1">
252 <name>name</name>
253 <cstring>TextLabel3</cstring>
254 </property>
255 <property stdset="1">
256 <name>text</name>
257 <string>Second DNS</string>
258 </property>
259 </widget>
260 </grid>
251 </widget> 261 </widget>
252 </grid> 262 </grid>
253</widget> 263</widget>
254<connections> 264<connections>
255 <connection> 265 <connection>
256 <sender>dhcpCheckBox</sender> 266 <sender>dhcpCheckBox</sender>
257 <signal>toggled(bool)</signal> 267 <signal>toggled(bool)</signal>
258 <receiver>leaseHoursLabel</receiver> 268 <receiver>leaseHoursLabel</receiver>
259 <slot>setEnabled(bool)</slot> 269 <slot>setEnabled(bool)</slot>
260 </connection> 270 </connection>
261 <connection> 271 <connection>
262 <sender>dhcpCheckBox</sender> 272 <sender>dhcpCheckBox</sender>
263 <signal>toggled(bool)</signal> 273 <signal>toggled(bool)</signal>
264 <receiver>leaseTime</receiver> 274 <receiver>leaseTime</receiver>
265 <slot>setEnabled(bool)</slot> 275 <slot>setEnabled(bool)</slot>
266 </connection> 276 </connection>
267 <connection> 277 <connection>
268 <sender>dhcpCheckBox</sender> 278 <sender>dhcpCheckBox</sender>
269 <signal>toggled(bool)</signal> 279 <signal>toggled(bool)</signal>
270 <receiver>staticGroupBox</receiver> 280 <receiver>staticGroupBox</receiver>
271 <slot>setDisabled(bool)</slot> 281 <slot>setDisabled(bool)</slot>
272 </connection> 282 </connection>
273</connections> 283</connections>
274</UI> 284</UI>
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow.ui
index f7efe99..c1fa101 100644
--- a/noncore/settings/networksettings/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow.ui
@@ -242,65 +242,65 @@
242 </property> 242 </property>
243 <property stdset="1"> 243 <property stdset="1">
244 <name>orientation</name> 244 <name>orientation</name>
245 <enum>Vertical</enum> 245 <enum>Vertical</enum>
246 </property> 246 </property>
247 <property stdset="1"> 247 <property stdset="1">
248 <name>sizeType</name> 248 <name>sizeType</name>
249 <enum>Expanding</enum> 249 <enum>Expanding</enum>
250 </property> 250 </property>
251 <property> 251 <property>
252 <name>sizeHint</name> 252 <name>sizeHint</name>
253 <size> 253 <size>
254 <width>20</width> 254 <width>20</width>
255 <height>20</height> 255 <height>20</height>
256 </size> 256 </size>
257 </property> 257 </property>
258 </spacer> 258 </spacer>
259 <widget row="2" column="0" rowspan="3" colspan="1" > 259 <widget row="2" column="0" rowspan="3" colspan="1" >
260 <class>QListBox</class> 260 <class>QListBox</class>
261 <property stdset="1"> 261 <property stdset="1">
262 <name>name</name> 262 <name>name</name>
263 <cstring>profilesList</cstring> 263 <cstring>profilesList</cstring>
264 </property> 264 </property>
265 </widget> 265 </widget>
266 <widget row="4" column="1" rowspan="1" colspan="2" > 266 <widget row="4" column="1" rowspan="1" colspan="2" >
267 <class>QPushButton</class> 267 <class>QPushButton</class>
268 <property stdset="1"> 268 <property stdset="1">
269 <name>name</name> 269 <name>name</name>
270 <cstring>PushButton7</cstring> 270 <cstring>PushButton7</cstring>
271 </property> 271 </property>
272 <property stdset="1"> 272 <property stdset="1">
273 <name>text</name> 273 <name>text</name>
274 <string>Set Current</string> 274 <string>&amp;Set Current</string>
275 </property> 275 </property>
276 </widget> 276 </widget>
277 <widget row="3" column="1" rowspan="1" colspan="2" > 277 <widget row="3" column="1" rowspan="1" colspan="2" >
278 <class>QPushButton</class> 278 <class>QPushButton</class>
279 <property stdset="1"> 279 <property stdset="1">
280 <name>name</name> 280 <name>name</name>
281 <cstring>removeProfileButton</cstring> 281 <cstring>removeProfileButton</cstring>
282 </property> 282 </property>
283 <property stdset="1"> 283 <property stdset="1">
284 <name>text</name> 284 <name>text</name>
285 <string>&amp;Remove</string> 285 <string>&amp;Remove</string>
286 </property> 286 </property>
287 </widget> 287 </widget>
288 <widget row="2" column="1" rowspan="1" colspan="2" > 288 <widget row="2" column="1" rowspan="1" colspan="2" >
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>newProfileButton</cstring> 292 <cstring>newProfileButton</cstring>
293 </property> 293 </property>
294 <property stdset="1"> 294 <property stdset="1">
295 <name>text</name> 295 <name>text</name>
296 <string>&amp;New</string> 296 <string>&amp;New</string>
297 </property> 297 </property>
298 </widget> 298 </widget>
299 </grid> 299 </grid>
300 </widget> 300 </widget>
301 </widget> 301 </widget>
302 </vbox> 302 </vbox>
303</widget> 303</widget>
304<customwidgets> 304<customwidgets>
305 <customwidget> 305 <customwidget>
306 <class>QWidget</class> 306 <class>QWidget</class>
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 2f821a9..0f48a4b 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -1,233 +1,227 @@
1#include "mainwindowimp.h" 1#include "mainwindowimp.h"
2#include "addserviceimp.h" 2#include "addserviceimp.h"
3#include "interfaceinformationimp.h" 3#include "interfaceinformationimp.h"
4#include "interfacesetupimp.h" 4#include "interfacesetupimp.h"
5#include "interface.h"
6#include "kprocess.h" 5#include "kprocess.h"
7#include "module.h" 6#include "module.h"
8 7
8
9#include <qpushbutton.h> 9#include <qpushbutton.h>
10#include <qtabwidget.h> 10#include <qtabwidget.h>
11#include <qlistbox.h> 11#include <qlistbox.h>
12#include <qlistview.h> 12#include <qlistview.h>
13#include <qheader.h> 13#include <qheader.h>
14#include <qlabel.h> 14#include <qlabel.h>
15 15
16#include <qmainwindow.h> 16#include <qmainwindow.h>
17#include <qmessagebox.h> 17#include <qmessagebox.h>
18 18
19#include <qpe/config.h> 19#include <qpe/config.h>
20#include <qpe/qlibrary.h> 20#include <qpe/qlibrary.h>
21#include <qpe/resource.h> 21#include <qpe/resource.h>
22 22
23#include <qlist.h> 23#include <qlist.h>
24#include <qdir.h> 24#include <qdir.h>
25#include <qfile.h> 25#include <qfile.h>
26#include <qtextstream.h> 26#include <qtextstream.h>
27 27
28// For library loading. 28// For library loading.
29#include <dlfcn.h> 29#include <dlfcn.h>
30 30
31#define TEMP_ALL "/tmp/ifconfig-a" 31#define TEMP_ALL "/tmp/ifconfig-a"
32#define TEMP_UP "/tmp/ifconfig" 32#define TEMP_UP "/tmp/ifconfig"
33 33
34#define NO_SELECT_ERROR_AND_RETURN { \
35 QMessageBox::information(this, "Error","Please select an interface.", "Ok"); \
36 return; \
37}
38
39MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true) { 34MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true) {
40 connect(addServiceButton, SIGNAL(clicked()), this, SLOT(addClicked())); 35 connect(addServiceButton, SIGNAL(clicked()), this, SLOT(addClicked()));
41 connect(removeServiceButton, SIGNAL(clicked()), this, SLOT(removeClicked())); 36 connect(removeServiceButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
42 connect(informationServiceButton, SIGNAL(clicked()), this, SLOT(informationClicked())); 37 connect(informationServiceButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
43 connect(configureServiceButton, SIGNAL(clicked()), this, SLOT(configureClicked())); 38 connect(configureServiceButton, SIGNAL(clicked()), this, SLOT(configureClicked()));
44 39
45 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); 40 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
46 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); 41 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
47 connect(profilesList, SIGNAL(highlighted(const QString&)), this, SLOT(changeProfile(const QString&))); 42 connect(profilesList, SIGNAL(highlighted(const QString&)), this, SLOT(changeProfile(const QString&)));
48 43
49 // Make sure we have a plugin directory to scan. 44 // Make sure we have a plugin directory to scan.
50 QString DirStr = QDir::homeDirPath() + "/.networksetup/" ; 45 QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;
51 QDir pluginDir( DirStr ); 46 QDir pluginDir( DirStr );
52 pluginDir.mkdir( DirStr ); 47 pluginDir.mkdir( DirStr );
53 pluginDir.mkdir( ( DirStr + "plugins/" ) ); 48 pluginDir.mkdir( ( DirStr + "plugins/" ) );
54 QString path = DirStr + "plugins"; 49 QString path = DirStr + "plugins";
55 pluginDir.setPath(path); 50 pluginDir.setPath(path);
56 if(!pluginDir.exists()){ 51 if(!pluginDir.exists()){
57 qDebug(QString("MainWindowImp: ERROR: %1 %2").arg(__FILE__).arg(__LINE__).latin1()); 52 qDebug(QString("MainWindowImp: ERROR: %1 %2").arg(__FILE__).arg(__LINE__).latin1());
58 return; 53 return;
59 } 54 }
60 55
61 // Load any saved services. 56 // Load any saved services.
62 loadModules(path); 57 loadModules(path);
63 getInterfaceList(); 58 getInterfaceList();
64 serviceList->header()->hide(); 59 serviceList->header()->hide();
65 60
66 61
67 Config cfg("NetworkSetup"); 62 Config cfg("NetworkSetup");
68 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); 63 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));
69 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) 64 for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)
70 profilesList->insertItem((*it)); 65 profilesList->insertItem((*it));
71} 66}
72 67
73/** 68/**
74 * Deconstructor. Unload libraries and save profile list. 69 * Deconstructor. Unload libraries and save profile list.
75 */ 70 */
76MainWindowImp::~MainWindowImp(){ 71MainWindowImp::~MainWindowImp(){
77 if(profiles.count() > 1){ 72 if(profiles.count() > 1){
78 Config cfg("NetworkSetup"); 73 Config cfg("NetworkSetup");
79 cfg.writeEntry("Profiles", profiles.join(" ")); 74 cfg.writeEntry("Profiles", profiles.join(" "));
80 } 75 }
81} 76}
82 77
83void MainWindowImp::loadModules(QString path){ 78void MainWindowImp::loadModules(QString path){
79 qDebug(path.latin1());
80 QDir d;
81 d.setPath(path);
82 if(!d.exists()){
83 qDebug("MainWindowImp:: Path doesn't exists");
84 return;
85 }
86 d.setFilter( QDir::Files | QDir::NoSymLinks );
87 const QFileInfoList *list = d.entryInfoList();
88 QFileInfoListIterator it( *list );
89 QFileInfo *fi;
90 while ( (fi=it.current()) ) {
91 if(fi->fileName().contains(".so")){
92 qDebug("Found");
93 Module *foo = loadPlugin(path + "/" + fi->fileName());
94 }
95 ++it;
96 }
84} 97}
85 98
86/** 99/**
87 * Attempt to load a function and resolve a function. 100 * Attempt to load a function and resolve a function.
88 * @param pluginFileName - the name of the file in which to attempt to load 101 * @param pluginFileName - the name of the file in which to attempt to load
89 * @param resolveString - function pointer to resolve 102 * @param resolveString - function pointer to resolve
90 * @return pointer to the function with name resolveString or NULL 103 * @return pointer to the function with name resolveString or NULL
91 */ 104 */
92Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){ 105Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
93 //qDebug(pluginFileName.latin1()); 106 qDebug(pluginFileName.latin1());
94 QLibrary *lib = new QLibrary(pluginFileName); 107 QLibrary *lib = new QLibrary(pluginFileName);
95 void *functionPointer = lib->resolve(resolveString); 108 void *functionPointer = lib->resolve(resolveString);
96 if( !functionPointer ){ 109 if( !functionPointer ){
97 qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1()); 110 qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());
98 delete lib; 111 delete lib;
99 return NULL; 112 return NULL;
100 } 113 }
101 114
102 // Try to get an object. 115 // Try to get an object.
103 Module *object = ((Module* (*)()) functionPointer)(); 116 Module *object = ((Module* (*)()) functionPointer)();
104 if(object == NULL){ 117 if(object == NULL){
105 qDebug("MainWindowImp: Couldn't create object, but did load library!"); 118 qDebug("MainWindowImp: Couldn't create object, but did load library!");
106 delete lib; 119 delete lib;
107 return NULL; 120 return NULL;
108 } 121 }
109 122
110 // Store for reference 123 // Store for reference
111 libraries.insert(object, lib); 124 libraries.insert(object, lib);
112 return object; 125 return object;
113} 126}
114 127
115/*
116QList<QString> MainWindowImp::retrieveUnloadedPluginList(){
117 QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;
118 QString path = DirStr + "plugins";
119 QDir d(path);
120 d.setFilter( QDir::Files | QDir::Hidden );
121
122 QMap<QObject*, QLibrary*>::Iterator libraryIt;
123 QList<QString> rlist;
124 rlist.setAutoDelete(false);
125
126 const QFileInfoList *list = d.entryInfoList();
127 QFileInfoListIterator it( *list );
128 QFileInfo *fi;
129 while ( (fi=it.current()) ) {
130 if(fi->fileName().contains(".so")){
131 for( libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt )
132 if((path + "/" + fi->fileName()) != (libraryIt.data())->library()){
133 QString *s = new QString(path + "/" + fi->fileName());
134 rlist.append(s);
135 }
136 }
137 ++it;
138 }
139 return rlist;
140}
141*/
142
143/** 128/**
144 * The Add button was clicked. Bring up the add dialog and if OK is hit 129 * The Add button was clicked. Bring up the add dialog and if OK is hit
145 * load the plugin and append it to the list 130 * load the plugin and append it to the list
146 */ 131 */
147void MainWindowImp::addClicked(){ 132void MainWindowImp::addClicked(){
148 // Now that we have a list of all of the protocals, list them. 133 // Now that we have a list of all of the protocals, list them.
149 { 134 {
150 QMessageBox::information(this, "No Modules", "Nothing to add.", "Ok"); 135 QMessageBox::information(this, "No Modules", "Nothing to add.", "Ok");
151 return; 136 return;
152 } 137 }
153 AddServiceImp service(this, "AddService", true); 138 AddServiceImp service(this, "AddService", true);
154 service.showMaximized(); 139 service.showMaximized();
155 service.exec(); 140 service.exec();
156} 141}
157 142
158/** 143/**
159 * Prompt the user to see if they really want to do this. 144 * Prompt the user to see if they really want to do this.
160 * If they do then remove from the list and unload. 145 * If they do then remove from the list and unload.
161 */ 146 */
162void MainWindowImp::removeClicked(){ 147void MainWindowImp::removeClicked(){
163 QListViewItem *item = serviceList->currentItem(); 148 QListViewItem *item = serviceList->currentItem();
164 if(item == NULL) NO_SELECT_ERROR_AND_RETURN 149 if(item == NULL) {
150 QMessageBox::information(this, "Error","Please select an interface.", "Ok");
151 return;
152 }
165 153
166 if(modules.find(interfaceItems[item]) == modules.end()){ 154 if(modules.find(interfaceItems[item]) == modules.end()){
167 QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok"); 155 QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");
168 } 156 }
169 else{ 157 else{
170 // Try to remove. 158 // Try to remove.
171 } 159 }
172 160
173} 161}
174 162
175/** 163/**
176 * See if there is a configuration for the selected protocal. 164 * See if there is a configuration for the selected protocal.
177 * Prompt with errors. 165 * Prompt with errors.
178 */ 166 */
179void MainWindowImp::configureClicked(){ 167void MainWindowImp::configureClicked(){
180 QListViewItem *item = serviceList->currentItem(); 168 QListViewItem *item = serviceList->currentItem();
181 if(item == NULL) NO_SELECT_ERROR_AND_RETURN 169 if(item == NULL){
170 QMessageBox::information(this, "Error","Please select an interface.", "Ok");
171 return;
172 }
182 173
183 if(modules.find(interfaceItems[item]) == modules.end()){ 174 if(modules.find(interfaceItems[item]) == modules.end()){
184 InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]); 175 InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]);
185 conf->showMaximized(); 176 conf->showMaximized();
186 conf->show(); 177 conf->show();
187 } 178 }
188 else{ 179 else{
189 InterfaceSetupImp *conf = new InterfaceSetupImp(this, "InterfaceConfiguration"); 180 InterfaceSetupImp *conf = new InterfaceSetupImp(this, "InterfaceConfiguration");
190 conf->show(); 181 conf->show();
191 } 182 }
192} 183}
193 184
194/** 185/**
195 * Pull up the information about the selected interface 186 * Pull up the information about the selected interface
196 * Report an error 187 * Report an error
197 */ 188 */
198void MainWindowImp::informationClicked(){ 189void MainWindowImp::informationClicked(){
199 QListViewItem *item = serviceList->currentItem(); 190 QListViewItem *item = serviceList->currentItem();
200 if(item == NULL)NO_SELECT_ERROR_AND_RETURN 191 if(item == NULL){
201 192 QMessageBox::information(this, "Error","Please select an interface.", "Ok");
193 return;
194 }
195
202 if(modules.find(interfaceItems[item]) == modules.end()){ 196 if(modules.find(interfaceItems[item]) == modules.end()){
203 InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]); 197 InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);
204 i->showMaximized(); 198 i->showMaximized();
205 i->show(); 199 i->show();
206 } 200 }
207 else{ 201 else{
208 QTabWidget *t = new QTabWidget(this, "InterfaceInformationTAB"); 202 QTabWidget *t = new QTabWidget(this, "InterfaceInformationTAB");
209 InterfaceInformationImp *i = new InterfaceInformationImp(t, "TCPIPInformation", interfaceItems[item], true); 203 InterfaceInformationImp *i = new InterfaceInformationImp(t, "TCPIPInformation", interfaceItems[item], true);
210 t->insertTab(i, "TCP/IP"); 204 t->insertTab(i, "TCP/IP");
211 t->show(); 205 t->show();
212 } 206 }
213} 207}
214 208
215/** 209/**
216 * Aquire the list of active interfaces from ifconfig 210 * Aquire the list of active interfaces from ifconfig
217 * Call ifconfig and ifconfig -a 211 * Call ifconfig and ifconfig -a
218 */ 212 */
219void MainWindowImp::getInterfaceList(){ 213void MainWindowImp::getInterfaceList(){
220 KShellProcess *processAll = new KShellProcess(); 214 KShellProcess *processAll = new KShellProcess();
221 *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL; 215 *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL;
222 connect(processAll, SIGNAL(processExited(KProcess *)), 216 connect(processAll, SIGNAL(processExited(KProcess *)),
223 this, SLOT(jobDone(KProcess *))); 217 this, SLOT(jobDone(KProcess *)));
224 threads.insert(processAll, TEMP_ALL); 218 threads.insert(processAll, TEMP_ALL);
225 processAll->start(KShellProcess::NotifyOnExit); 219 processAll->start(KShellProcess::NotifyOnExit);
226 220
227 KShellProcess *process = new KShellProcess(); 221 KShellProcess *process = new KShellProcess();
228 *process << "/sbin/ifconfig" << " > " TEMP_UP; 222 *process << "/sbin/ifconfig" << " > " TEMP_UP;
229 connect(process, SIGNAL(processExited(KProcess *)), 223 connect(process, SIGNAL(processExited(KProcess *)),
230 this, SLOT(jobDone(KProcess *))); 224 this, SLOT(jobDone(KProcess *)));
231 threads.insert(process, TEMP_UP); 225 threads.insert(process, TEMP_UP);
232 process->start(KShellProcess::NotifyOnExit); 226 process->start(KShellProcess::NotifyOnExit);
233} 227}
@@ -282,64 +276,68 @@ void MainWindowImp::jobDone(KProcess *process){
282 } 276 }
283 } 277 }
284 file.close(); 278 file.close();
285 QFile::remove(fileName); 279 QFile::remove(fileName);
286} 280}
287 281
288void MainWindowImp::updateInterface(Interface *i){ 282void MainWindowImp::updateInterface(Interface *i){
289 QListViewItem *item = NULL; 283 QListViewItem *item = NULL;
290 284
291 // See if we already have it 285 // See if we already have it
292 if(items.find(i) == items.end()){ 286 if(items.find(i) == items.end()){
293 item = new QListViewItem(serviceList, "", "", ""); 287 item = new QListViewItem(serviceList, "", "", "");
294 // See if you can't find a module owner for this interface 288 // See if you can't find a module owner for this interface
295 //EmployeeMap::Iterator it; 289 //EmployeeMap::Iterator it;
296 //for( it = map.begin(); it != map.end(); ++it ) 290 //for( it = map.begin(); it != map.end(); ++it )
297 // printf( "%s, %s earns %d\n", it.key().latin1(), it.data().name().latin1(), it.data().salary() ); 291 // printf( "%s, %s earns %d\n", it.key().latin1(), it.data().name().latin1(), it.data().salary() );
298 292
299 items.insert(i, item); 293 items.insert(i, item);
300 interfaceItems.insert(item, i); 294 interfaceItems.insert(item, i);
301 } 295 }
302 else 296 else
303 item = items[i]; 297 item = items[i];
304 298
305 QString statusImage = "down"; 299 QString statusImage = "down";
306 if(i->getStatus()) 300 if(i->getStatus())
307 statusImage = "up"; 301 statusImage = "up";
308 QPixmap status = (Resource::loadPixmap(statusImage)); 302 QPixmap status = (Resource::loadPixmap(statusImage));
309 item->setPixmap(0, status); 303 item->setPixmap(0, status);
310 304
311 QString typeName = "lan"; 305 QString typeName = "lan";
312 if(i->getHardwareName().contains("Local Loopback")) 306 if(i->getHardwareName().contains("Local Loopback"))
313 typeName = "lo"; 307 typeName = "lo";
308 if(i->getInterfaceName().contains("irda"))
309 typeName = "irda";
310 if(i->getInterfaceName().contains("wlan"))
311 typeName = "wlan";
314 QPixmap type = (Resource::loadPixmap(typeName)); 312 QPixmap type = (Resource::loadPixmap(typeName));
315 item->setPixmap(1, type); 313 item->setPixmap(1, type);
316 314
317 item->setText(2, i->getHardwareName()); 315 item->setText(2, i->getHardwareName());
318 316
319} 317}
320 318
321/** 319/**
322 * Adds a new profile to the list of profiles. 320 * Adds a new profile to the list of profiles.
323 * Don't add profiles that already exists. 321 * Don't add profiles that already exists.
324 * Appends to the combo and QStringList 322 * Appends to the combo and QStringList
325 */ 323 */
326void MainWindowImp::addProfile(){ 324void MainWindowImp::addProfile(){
327 QString newProfileName = "New"; 325 QString newProfileName = "New";
328 if(profiles.grep(newProfileName).count() > 0){ 326 if(profiles.grep(newProfileName).count() > 0){
329 QMessageBox::information(this, "Can't Add.","Profile already exists.", "Ok"); 327 QMessageBox::information(this, "Can't Add.","Profile already exists.", "Ok");
330 return; 328 return;
331 } 329 }
332 profiles.append(newProfileName); 330 profiles.append(newProfileName);
333 profilesList->insertItem(newProfileName); 331 profilesList->insertItem(newProfileName);
334 332
335} 333}
336 334
337/** 335/**
338 * Removes the currently selected profile in the combo. 336 * Removes the currently selected profile in the combo.
339 * Doesn't delete if there are less then 2 profiles. 337 * Doesn't delete if there are less then 2 profiles.
340 */ 338 */
341void MainWindowImp::removeProfile(){ 339void MainWindowImp::removeProfile(){
342 if(profilesList->count() <= 1){ 340 if(profilesList->count() <= 1){
343 QMessageBox::information(this, "Can't remove anything.","Need One Profile.", "Ok"); 341 QMessageBox::information(this, "Can't remove anything.","Need One Profile.", "Ok");
344 return; 342 return;
345 } 343 }
diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index f146d8c..13fd523 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -1,33 +1,33 @@
1#ifndef MODULE_H 1#ifndef NETCONF_MODULE_H
2#define MODULE_H 2#define NETCONF_MODULE_H
3 3
4#include <qobject.h> 4#include <qobject.h>
5#include <qlist.h> 5#include <qlist.h>
6#include <qmap.h> 6#include <qmap.h>
7#include "interface.h" 7#include "interface.h"
8 8
9class QWidget; 9class QWidget;
10 10
11class Module : QObject{ 11class Module : QObject{
12 12
13signals: 13signals:
14 void updateInterface(Interface *i); 14 void updateInterface(Interface *i);
15 15
16public: 16public:
17 Module(){}; 17 Module(){};
18 18
19 virtual bool isOwner(Interface *){ return false; }; 19 virtual bool isOwner(Interface *){ return false; };
20 virtual QWidget *configure(){ return NULL; } ; 20 virtual QWidget *configure(){ return NULL; } ;
21 virtual QWidget *information(){ return NULL; }; 21 virtual QWidget *information(){ return NULL; };
22 virtual QList<Interface> getInterfaces() = 0; 22 virtual QList<Interface> getInterfaces() = 0;
23 virtual QMap<QString, QString> possibleNewInterfaces() = 0; 23 virtual QMap<QString, QString> possibleNewInterfaces() = 0;
24 virtual Interface *addNewInterface(QString name) = 0; 24 virtual Interface *addNewInterface(QString name) = 0;
25 virtual bool remove(Interface* i) = 0; 25 virtual bool remove(Interface* i) = 0;
26 26
27 27
28}; 28};
29 29
30#endif 30#endif
31 31
32// module.h 32// module.h
33 33
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro
index 7d9918b..a01b050 100644
--- a/noncore/settings/networksettings/networksetup.pro
+++ b/noncore/settings/networksettings/networksetup.pro
@@ -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 addserviceimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h 4 HEADERS = mainwindowimp.h addserviceimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h
5 SOURCES = main.cpp mainwindowimp.cpp addserviceimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp 5 SOURCES = main.cpp mainwindowimp.cpp addserviceimp.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 addservice.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui 9 INTERFACES= mainwindow.ui addservice.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
10 TARGET = networksetup 10 TARGET = networksetup