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
@@ -8,14 +8,14 @@
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>
@@ -96,152 +96,203 @@
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>
@@ -256,49 +307,12 @@
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>
@@ -314,10 +328,10 @@
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
@@ -8,14 +8,14 @@
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>
@@ -97,82 +97,12 @@
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>
@@ -207,12 +137,20 @@
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>
@@ -287,12 +225,93 @@
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>
@@ -311,7 +330,9 @@
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
@@ -8,14 +8,14 @@
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>
@@ -36,23 +36,12 @@
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>
@@ -71,34 +60,12 @@
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>
@@ -119,23 +86,12 @@
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>
@@ -164,13 +120,13 @@
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>
@@ -185,72 +141,126 @@
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>
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
@@ -268,13 +268,13 @@
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>
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,14 +1,14 @@
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>
@@ -28,17 +28,12 @@
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
@@ -78,22 +73,40 @@ MainWindowImp::~MainWindowImp(){
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;
@@ -109,40 +122,12 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
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.
@@ -158,13 +143,16 @@ void MainWindowImp::addClicked(){
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.
@@ -175,13 +163,16 @@ void MainWindowImp::removeClicked(){
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 }
@@ -194,14 +185,17 @@ void MainWindowImp::configureClicked(){
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{
@@ -308,12 +302,16 @@ void MainWindowImp::updateInterface(Interface *i){
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}
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,8 +1,8 @@
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
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
@@ -8,14 +8,14 @@
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>
@@ -96,152 +96,203 @@
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>
@@ -256,49 +307,12 @@
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>
@@ -314,10 +328,10 @@
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
@@ -8,14 +8,14 @@
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>
@@ -97,82 +97,12 @@
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>
@@ -207,12 +137,20 @@
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>
@@ -287,12 +225,93 @@
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>
@@ -311,7 +330,9 @@
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
@@ -8,14 +8,14 @@
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>
@@ -36,23 +36,12 @@
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>
@@ -71,34 +60,12 @@
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>
@@ -119,23 +86,12 @@
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>
@@ -164,13 +120,13 @@
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>
@@ -185,72 +141,126 @@
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>
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
@@ -268,13 +268,13 @@
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>
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,14 +1,14 @@
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>
@@ -28,17 +28,12 @@
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
@@ -78,22 +73,40 @@ MainWindowImp::~MainWindowImp(){
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;
@@ -109,40 +122,12 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
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.
@@ -158,13 +143,16 @@ void MainWindowImp::addClicked(){
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.
@@ -175,13 +163,16 @@ void MainWindowImp::removeClicked(){
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 }
@@ -194,14 +185,17 @@ void MainWindowImp::configureClicked(){
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{
@@ -308,12 +302,16 @@ void MainWindowImp::updateInterface(Interface *i){
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}
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,8 +1,8 @@
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
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