author | benmeyer <benmeyer> | 2002-12-11 19:39:18 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-12-11 19:39:18 (UTC) |
commit | f55158aac4a23cbdca20145634886b2b757d4465 (patch) (unidiff) | |
tree | a1cdcc5365f7ebdbeacc955c87b3a03be3e46f60 | |
parent | b3373b77e12e4b138848110884aedc37b56384e1 (diff) | |
download | opie-f55158aac4a23cbdca20145634886b2b757d4465.zip opie-f55158aac4a23cbdca20145634886b2b757d4465.tar.gz opie-f55158aac4a23cbdca20145634886b2b757d4465.tar.bz2 |
Cleaned up ui files so tab is in correct order
-rw-r--r-- | noncore/net/networksetup/TODO | 58 | ||||
-rw-r--r-- | noncore/net/networksetup/addconnection.ui | 7 | ||||
-rw-r--r-- | noncore/net/networksetup/ppp/ppp.ui | 4 | ||||
-rw-r--r-- | noncore/net/networksetup/systemadvanced.ui | 396 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlan.ui | 5 | ||||
-rw-r--r-- | noncore/settings/networksettings/TODO | 58 | ||||
-rw-r--r-- | noncore/settings/networksettings/addconnection.ui | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/ppp.ui | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/systemadvanced.ui | 396 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlan.ui | 5 |
10 files changed, 140 insertions, 800 deletions
diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO index 020339f..862d681 100644 --- a/noncore/net/networksetup/TODO +++ b/noncore/net/networksetup/TODO | |||
@@ -12,3 +12,61 @@ PPP module needs to scan pppd.tdb to see what is currently active | |||
12 | WLAN - add possiblity to input text or hex without knowing "s:" | 12 | WLAN - add possiblity to input text or hex without knowing "s:" |
13 | 13 | ||
14 | Interface setupimp needs to use kernel calls. | 14 | Interface setupimp needs to use kernel calls. |
15 | |||
16 | Automaticly update the main list of interfaces: | ||
17 | > That would be me. :-D netlink, can you point me in the right | ||
18 | > direction where I can get more info on it? (I figured there was some | ||
19 | > kenel call) | ||
20 | |||
21 | You can look up the meaning of the packets you receive, or you can just go | ||
22 | poll for changes you might be interested in each time you receive _any_ | ||
23 | packet. Anything's better than periodic polling. | ||
24 | |||
25 | Note that you can't do this as non-root on some kernels. There's a patch | ||
26 | which can go into the hh.org kernel if it's not already there. | ||
27 | cf. http://marc.theaimsgroup.com/?l=linux-kernel&m=103520821605353&w=2 | ||
28 | |||
29 | |||
30 | #include <asm/types.h> | ||
31 | #include <sys/socket.h> | ||
32 | #include <linux/netlink.h> | ||
33 | #include <linux/rtnetlink.h> | ||
34 | |||
35 | int main(int argc, char **argv) | ||
36 | { | ||
37 | int fd; | ||
38 | unsigned char buf[4096]; | ||
39 | int ret; | ||
40 | int i, j; | ||
41 | struct sockaddr_nl snl; | ||
42 | |||
43 | fd = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE); | ||
44 | if (fd < 0) { | ||
45 | perror("socket"); | ||
46 | exit(1); | ||
47 | } | ||
48 | |||
49 | snl.nl_family = AF_NETLINK; | ||
50 | snl.nl_pad = 0; | ||
51 | snl.nl_pid = getpid(); | ||
52 | snl.nl_groups = RTM_NEWLINK|RTM_DELLINK; | ||
53 | |||
54 | if (bind(fd, &snl, sizeof(snl)) < 0) { | ||
55 | perror("bind"); | ||
56 | exit(1); | ||
57 | } | ||
58 | while (1) { | ||
59 | ret = recv(fd, buf, 4096, 0); | ||
60 | if (ret < 0) { | ||
61 | perror("recv"); | ||
62 | exit(1); | ||
63 | } | ||
64 | for (i=0; i<ret; i++) { | ||
65 | printf("%02x ", buf[i]); | ||
66 | } | ||
67 | printf("\n"); | ||
68 | } | ||
69 | |||
70 | } | ||
71 | -- | ||
72 | |||
diff --git a/noncore/net/networksetup/addconnection.ui b/noncore/net/networksetup/addconnection.ui index a349804..da6cf06 100644 --- a/noncore/net/networksetup/addconnection.ui +++ b/noncore/net/networksetup/addconnection.ui | |||
@@ -11,7 +11,7 @@ | |||
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>233</width> | 14 | <width>229</width> |
15 | <height>268</height> | 15 | <height>268</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
@@ -150,4 +150,9 @@ | |||
150 | <slot>accept()</slot> | 150 | <slot>accept()</slot> |
151 | </connection> | 151 | </connection> |
152 | </connections> | 152 | </connections> |
153 | <tabstops> | ||
154 | <tabstop>registeredServicesList</tabstop> | ||
155 | <tabstop>addButton</tabstop> | ||
156 | <tabstop>cancelButton</tabstop> | ||
157 | </tabstops> | ||
153 | </UI> | 158 | </UI> |
diff --git a/noncore/net/networksetup/ppp/ppp.ui b/noncore/net/networksetup/ppp/ppp.ui index 67d6735..56e1621 100644 --- a/noncore/net/networksetup/ppp/ppp.ui +++ b/noncore/net/networksetup/ppp/ppp.ui | |||
@@ -757,8 +757,6 @@ | |||
757 | <tabstop>speed</tabstop> | 757 | <tabstop>speed</tabstop> |
758 | <tabstop>crtscts</tabstop> | 758 | <tabstop>crtscts</tabstop> |
759 | <tabstop>connectdelay</tabstop> | 759 | <tabstop>connectdelay</tabstop> |
760 | <tabstop>dial_manual</tabstop> | ||
761 | <tabstop>dial_idle</tabstop> | ||
762 | <tabstop>dial_demand</tabstop> | 760 | <tabstop>dial_demand</tabstop> |
763 | <tabstop>idletime</tabstop> | 761 | <tabstop>idletime</tabstop> |
764 | <tabstop>defaultroute</tabstop> | 762 | <tabstop>defaultroute</tabstop> |
@@ -766,5 +764,7 @@ | |||
766 | <tabstop>usepeerdns</tabstop> | 764 | <tabstop>usepeerdns</tabstop> |
767 | <tabstop>dns1</tabstop> | 765 | <tabstop>dns1</tabstop> |
768 | <tabstop>dns2</tabstop> | 766 | <tabstop>dns2</tabstop> |
767 | <tabstop>dial_manual</tabstop> | ||
768 | <tabstop>dial_idle</tabstop> | ||
769 | </tabstops> | 769 | </tabstops> |
770 | </UI> | 770 | </UI> |
diff --git a/noncore/net/networksetup/systemadvanced.ui b/noncore/net/networksetup/systemadvanced.ui deleted file mode 100644 index cd7ac61..0000000 --- a/noncore/net/networksetup/systemadvanced.ui +++ b/dev/null | |||
@@ -1,396 +0,0 @@ | |||
1 | <!DOCTYPE UI><UI> | ||
2 | <class>SystemNetworking</class> | ||
3 | <widget> | ||
4 | <class>QWidget</class> | ||
5 | <property stdset="1"> | ||
6 | <name>name</name> | ||
7 | <cstring>SystemNetworking</cstring> | ||
8 | </property> | ||
9 | <property stdset="1"> | ||
10 | <name>geometry</name> | ||
11 | <rect> | ||
12 | <x>0</x> | ||
13 | <y>0</y> | ||
14 | <width>218</width> | ||
15 | <height>289</height> | ||
16 | </rect> | ||
17 | </property> | ||
18 | <property stdset="1"> | ||
19 | <name>caption</name> | ||
20 | <string>System Networking</string> | ||
21 | </property> | ||
22 | <vbox> | ||
23 | <property stdset="1"> | ||
24 | <name>margin</name> | ||
25 | <number>0</number> | ||
26 | </property> | ||
27 | <property stdset="1"> | ||
28 | <name>spacing</name> | ||
29 | <number>6</number> | ||
30 | </property> | ||
31 | <widget> | ||
32 | <class>QTabWidget</class> | ||
33 | <property stdset="1"> | ||
34 | <name>name</name> | ||
35 | <cstring>tabWidget</cstring> | ||
36 | </property> | ||
37 | <property> | ||
38 | <name>layoutMargin</name> | ||
39 | </property> | ||
40 | <widget> | ||
41 | <class>QWidget</class> | ||
42 | <property stdset="1"> | ||
43 | <name>name</name> | ||
44 | <cstring>tab</cstring> | ||
45 | </property> | ||
46 | <attribute> | ||
47 | <name>title</name> | ||
48 | <string>DNS</string> | ||
49 | </attribute> | ||
50 | <grid> | ||
51 | <property stdset="1"> | ||
52 | <name>margin</name> | ||
53 | <number>11</number> | ||
54 | </property> | ||
55 | <property stdset="1"> | ||
56 | <name>spacing</name> | ||
57 | <number>6</number> | ||
58 | </property> | ||
59 | <widget row="0" column="0" > | ||
60 | <class>QLabel</class> | ||
61 | <property stdset="1"> | ||
62 | <name>name</name> | ||
63 | <cstring>TextLabel6</cstring> | ||
64 | </property> | ||
65 | <property stdset="1"> | ||
66 | <name>text</name> | ||
67 | <string>Hostname</string> | ||
68 | </property> | ||
69 | </widget> | ||
70 | <widget row="1" column="0" > | ||
71 | <class>QLabel</class> | ||
72 | <property stdset="1"> | ||
73 | <name>name</name> | ||
74 | <cstring>TextLabel5</cstring> | ||
75 | </property> | ||
76 | <property stdset="1"> | ||
77 | <name>text</name> | ||
78 | <string>DNS</string> | ||
79 | </property> | ||
80 | <property stdset="1"> | ||
81 | <name>alignment</name> | ||
82 | <set>AlignTop|AlignLeft</set> | ||
83 | </property> | ||
84 | <property> | ||
85 | <name>vAlign</name> | ||
86 | </property> | ||
87 | </widget> | ||
88 | <widget row="1" column="1" > | ||
89 | <class>QListBox</class> | ||
90 | <property stdset="1"> | ||
91 | <name>name</name> | ||
92 | <cstring>ListBox5</cstring> | ||
93 | </property> | ||
94 | </widget> | ||
95 | <widget row="0" column="1" > | ||
96 | <class>QLineEdit</class> | ||
97 | <property stdset="1"> | ||
98 | <name>name</name> | ||
99 | <cstring>LineEdit7</cstring> | ||
100 | </property> | ||
101 | </widget> | ||
102 | <widget row="3" column="0" > | ||
103 | <class>QLabel</class> | ||
104 | <property stdset="1"> | ||
105 | <name>name</name> | ||
106 | <cstring>TextLabel7</cstring> | ||
107 | </property> | ||
108 | <property stdset="1"> | ||
109 | <name>text</name> | ||
110 | <string>Hosts</string> | ||
111 | </property> | ||
112 | </widget> | ||
113 | <widget row="3" column="1" > | ||
114 | <class>QLabel</class> | ||
115 | <property stdset="1"> | ||
116 | <name>name</name> | ||
117 | <cstring>TextLabel9</cstring> | ||
118 | </property> | ||
119 | <property stdset="1"> | ||
120 | <name>text</name> | ||
121 | <string>List here....</string> | ||
122 | </property> | ||
123 | </widget> | ||
124 | <widget row="2" column="0" > | ||
125 | <class>QPushButton</class> | ||
126 | <property stdset="1"> | ||
127 | <name>name</name> | ||
128 | <cstring>PushButton15</cstring> | ||
129 | </property> | ||
130 | <property stdset="1"> | ||
131 | <name>text</name> | ||
132 | <string>&Add</string> | ||
133 | </property> | ||
134 | </widget> | ||
135 | <widget row="2" column="1" > | ||
136 | <class>QPushButton</class> | ||
137 | <property stdset="1"> | ||
138 | <name>name</name> | ||
139 | <cstring>PushButton16</cstring> | ||
140 | </property> | ||
141 | <property stdset="1"> | ||
142 | <name>text</name> | ||
143 | <string>&Delete</string> | ||
144 | </property> | ||
145 | </widget> | ||
146 | <spacer row="4" column="1" > | ||
147 | <property> | ||
148 | <name>name</name> | ||
149 | <cstring>Spacer14</cstring> | ||
150 | </property> | ||
151 | <property stdset="1"> | ||
152 | <name>orientation</name> | ||
153 | <enum>Vertical</enum> | ||
154 | </property> | ||
155 | <property stdset="1"> | ||
156 | <name>sizeType</name> | ||
157 | <enum>Expanding</enum> | ||
158 | </property> | ||
159 | <property> | ||
160 | <name>sizeHint</name> | ||
161 | <size> | ||
162 | <width>20</width> | ||
163 | <height>20</height> | ||
164 | </size> | ||
165 | </property> | ||
166 | </spacer> | ||
167 | </grid> | ||
168 | </widget> | ||
169 | <widget> | ||
170 | <class>QWidget</class> | ||
171 | <property stdset="1"> | ||
172 | <name>name</name> | ||
173 | <cstring>tab</cstring> | ||
174 | </property> | ||
175 | <attribute> | ||
176 | <name>title</name> | ||
177 | <string>Routing</string> | ||
178 | </attribute> | ||
179 | <grid> | ||
180 | <property stdset="1"> | ||
181 | <name>margin</name> | ||
182 | <number>11</number> | ||
183 | </property> | ||
184 | <property stdset="1"> | ||
185 | <name>spacing</name> | ||
186 | <number>6</number> | ||
187 | </property> | ||
188 | <widget row="0" column="0" rowspan="1" colspan="2" > | ||
189 | <class>QListView</class> | ||
190 | <column> | ||
191 | <property> | ||
192 | <name>text</name> | ||
193 | <string>Destination</string> | ||
194 | </property> | ||
195 | <property> | ||
196 | <name>clickable</name> | ||
197 | <bool>true</bool> | ||
198 | </property> | ||
199 | <property> | ||
200 | <name>resizeable</name> | ||
201 | <bool>true</bool> | ||
202 | </property> | ||
203 | </column> | ||
204 | <column> | ||
205 | <property> | ||
206 | <name>text</name> | ||
207 | <string>Gateway</string> | ||
208 | </property> | ||
209 | <property> | ||
210 | <name>clickable</name> | ||
211 | <bool>true</bool> | ||
212 | </property> | ||
213 | <property> | ||
214 | <name>resizeable</name> | ||
215 | <bool>true</bool> | ||
216 | </property> | ||
217 | </column> | ||
218 | <column> | ||
219 | <property> | ||
220 | <name>text</name> | ||
221 | <string>Genmask</string> | ||
222 | </property> | ||
223 | <property> | ||
224 | <name>clickable</name> | ||
225 | <bool>true</bool> | ||
226 | </property> | ||
227 | <property> | ||
228 | <name>resizeable</name> | ||
229 | <bool>true</bool> | ||
230 | </property> | ||
231 | </column> | ||
232 | <column> | ||
233 | <property> | ||
234 | <name>text</name> | ||
235 | <string>Flags</string> | ||
236 | </property> | ||
237 | <property> | ||
238 | <name>clickable</name> | ||
239 | <bool>true</bool> | ||
240 | </property> | ||
241 | <property> | ||
242 | <name>resizeable</name> | ||
243 | <bool>true</bool> | ||
244 | </property> | ||
245 | </column> | ||
246 | <column> | ||
247 | <property> | ||
248 | <name>text</name> | ||
249 | <string>Metric</string> | ||
250 | </property> | ||
251 | <property> | ||
252 | <name>clickable</name> | ||
253 | <bool>true</bool> | ||
254 | </property> | ||
255 | <property> | ||
256 | <name>resizeable</name> | ||
257 | <bool>true</bool> | ||
258 | </property> | ||
259 | </column> | ||
260 | <column> | ||
261 | <property> | ||
262 | <name>text</name> | ||
263 | <string>Ref</string> | ||
264 | </property> | ||
265 | <property> | ||
266 | <name>clickable</name> | ||
267 | <bool>true</bool> | ||
268 | </property> | ||
269 | <property> | ||
270 | <name>resizeable</name> | ||
271 | <bool>true</bool> | ||
272 | </property> | ||
273 | </column> | ||
274 | <column> | ||
275 | <property> | ||
276 | <name>text</name> | ||
277 | <string>Use</string> | ||
278 | </property> | ||
279 | <property> | ||
280 | <name>clickable</name> | ||
281 | <bool>true</bool> | ||
282 | </property> | ||
283 | <property> | ||
284 | <name>resizeable</name> | ||
285 | <bool>true</bool> | ||
286 | </property> | ||
287 | </column> | ||
288 | <column> | ||
289 | <property> | ||
290 | <name>text</name> | ||
291 | <string>Iface</string> | ||
292 | </property> | ||
293 | <property> | ||
294 | <name>clickable</name> | ||
295 | <bool>true</bool> | ||
296 | </property> | ||
297 | <property> | ||
298 | <name>resizeable</name> | ||
299 | <bool>true</bool> | ||
300 | </property> | ||
301 | </column> | ||
302 | <item> | ||
303 | <property> | ||
304 | <name>text</name> | ||
305 | <string>192.168.1.0</string> | ||
306 | </property> | ||
307 | <property> | ||
308 | <name>text</name> | ||
309 | <string>*</string> | ||
310 | </property> | ||
311 | <property> | ||
312 | <name>text</name> | ||
313 | <string>255.255.255.0</string> | ||
314 | </property> | ||
315 | <property> | ||
316 | <name>text</name> | ||
317 | <string>U</string> | ||
318 | </property> | ||
319 | <property> | ||
320 | <name>text</name> | ||
321 | <string>0</string> | ||
322 | </property> | ||
323 | <property> | ||
324 | <name>text</name> | ||
325 | <string>0</string> | ||
326 | </property> | ||
327 | <property> | ||
328 | <name>text</name> | ||
329 | <string>0</string> | ||
330 | </property> | ||
331 | <property> | ||
332 | <name>text</name> | ||
333 | <string>eth0</string> | ||
334 | </property> | ||
335 | <property> | ||
336 | <name>pixmap</name> | ||
337 | <pixmap></pixmap> | ||
338 | </property> | ||
339 | <property> | ||
340 | <name>pixmap</name> | ||
341 | <pixmap></pixmap> | ||
342 | </property> | ||
343 | <property> | ||
344 | <name>pixmap</name> | ||
345 | <pixmap></pixmap> | ||
346 | </property> | ||
347 | <property> | ||
348 | <name>pixmap</name> | ||
349 | <pixmap></pixmap> | ||
350 | </property> | ||
351 | <property> | ||
352 | <name>pixmap</name> | ||
353 | <pixmap></pixmap> | ||
354 | </property> | ||
355 | <property> | ||
356 | <name>pixmap</name> | ||
357 | <pixmap></pixmap> | ||
358 | </property> | ||
359 | <property> | ||
360 | <name>pixmap</name> | ||
361 | <pixmap></pixmap> | ||
362 | </property> | ||
363 | <property> | ||
364 | <name>pixmap</name> | ||
365 | <pixmap></pixmap> | ||
366 | </property> | ||
367 | </item> | ||
368 | <property stdset="1"> | ||
369 | <name>name</name> | ||
370 | <cstring>ListView4</cstring> | ||
371 | </property> | ||
372 | </widget> | ||
373 | <widget row="1" column="0" > | ||
374 | <class>QPushButton</class> | ||
375 | <property stdset="1"> | ||
376 | <name>name</name> | ||
377 | <cstring>PushButton17</cstring> | ||
378 | </property> | ||
379 | <property stdset="1"> | ||
380 | <name>text</name> | ||
381 | <string>&Add</string> | ||
382 | </property> | ||
383 | </widget> | ||
384 | <widget row="1" column="1" > | ||
385 | <class>QPushButton</class> | ||
386 | <property stdset="1"> | ||
387 | <name>name</name> | ||
388 | <cstring>PushButton18</cstring> | ||
389 | </property> | ||
390 | <property stdset="1"> | ||
391 | <name>text</name> | ||
392 | <string>Remove</string> | ||
393 | </property> | ||
394 | </widget> | ||
395 | <spacer row="2" column="1" > | ||
396 | \ No newline at end of file | ||
diff --git a/noncore/net/networksetup/wlan/wlan.ui b/noncore/net/networksetup/wlan/wlan.ui index 1b29a3e..47d6db6 100644 --- a/noncore/net/networksetup/wlan/wlan.ui +++ b/noncore/net/networksetup/wlan/wlan.ui | |||
@@ -11,7 +11,7 @@ | |||
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>238</width> | 14 | <width>237</width> |
15 | <height>286</height> | 15 | <height>286</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
@@ -500,9 +500,12 @@ | |||
500 | <tabstops> | 500 | <tabstops> |
501 | <tabstop>tabWidget</tabstop> | 501 | <tabstop>tabWidget</tabstop> |
502 | <tabstop>essNon</tabstop> | 502 | <tabstop>essNon</tabstop> |
503 | <tabstop>essSpecific</tabstop> | ||
503 | <tabstop>essSpecificLineEdit</tabstop> | 504 | <tabstop>essSpecificLineEdit</tabstop> |
504 | <tabstop>networkInfrastructure</tabstop> | 505 | <tabstop>networkInfrastructure</tabstop> |
506 | <tabstop>network802</tabstop> | ||
505 | <tabstop>networkChannel</tabstop> | 507 | <tabstop>networkChannel</tabstop> |
508 | <tabstop>wepEnabled</tabstop> | ||
506 | <tabstop>authOpen</tabstop> | 509 | <tabstop>authOpen</tabstop> |
507 | <tabstop>authShared</tabstop> | 510 | <tabstop>authShared</tabstop> |
508 | <tabstop>keyRadio0</tabstop> | 511 | <tabstop>keyRadio0</tabstop> |
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO index 020339f..862d681 100644 --- a/noncore/settings/networksettings/TODO +++ b/noncore/settings/networksettings/TODO | |||
@@ -12,3 +12,61 @@ PPP module needs to scan pppd.tdb to see what is currently active | |||
12 | WLAN - add possiblity to input text or hex without knowing "s:" | 12 | WLAN - add possiblity to input text or hex without knowing "s:" |
13 | 13 | ||
14 | Interface setupimp needs to use kernel calls. | 14 | Interface setupimp needs to use kernel calls. |
15 | |||
16 | Automaticly update the main list of interfaces: | ||
17 | > That would be me. :-D netlink, can you point me in the right | ||
18 | > direction where I can get more info on it? (I figured there was some | ||
19 | > kenel call) | ||
20 | |||
21 | You can look up the meaning of the packets you receive, or you can just go | ||
22 | poll for changes you might be interested in each time you receive _any_ | ||
23 | packet. Anything's better than periodic polling. | ||
24 | |||
25 | Note that you can't do this as non-root on some kernels. There's a patch | ||
26 | which can go into the hh.org kernel if it's not already there. | ||
27 | cf. http://marc.theaimsgroup.com/?l=linux-kernel&m=103520821605353&w=2 | ||
28 | |||
29 | |||
30 | #include <asm/types.h> | ||
31 | #include <sys/socket.h> | ||
32 | #include <linux/netlink.h> | ||
33 | #include <linux/rtnetlink.h> | ||
34 | |||
35 | int main(int argc, char **argv) | ||
36 | { | ||
37 | int fd; | ||
38 | unsigned char buf[4096]; | ||
39 | int ret; | ||
40 | int i, j; | ||
41 | struct sockaddr_nl snl; | ||
42 | |||
43 | fd = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE); | ||
44 | if (fd < 0) { | ||
45 | perror("socket"); | ||
46 | exit(1); | ||
47 | } | ||
48 | |||
49 | snl.nl_family = AF_NETLINK; | ||
50 | snl.nl_pad = 0; | ||
51 | snl.nl_pid = getpid(); | ||
52 | snl.nl_groups = RTM_NEWLINK|RTM_DELLINK; | ||
53 | |||
54 | if (bind(fd, &snl, sizeof(snl)) < 0) { | ||
55 | perror("bind"); | ||
56 | exit(1); | ||
57 | } | ||
58 | while (1) { | ||
59 | ret = recv(fd, buf, 4096, 0); | ||
60 | if (ret < 0) { | ||
61 | perror("recv"); | ||
62 | exit(1); | ||
63 | } | ||
64 | for (i=0; i<ret; i++) { | ||
65 | printf("%02x ", buf[i]); | ||
66 | } | ||
67 | printf("\n"); | ||
68 | } | ||
69 | |||
70 | } | ||
71 | -- | ||
72 | |||
diff --git a/noncore/settings/networksettings/addconnection.ui b/noncore/settings/networksettings/addconnection.ui index a349804..da6cf06 100644 --- a/noncore/settings/networksettings/addconnection.ui +++ b/noncore/settings/networksettings/addconnection.ui | |||
@@ -11,7 +11,7 @@ | |||
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>233</width> | 14 | <width>229</width> |
15 | <height>268</height> | 15 | <height>268</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
@@ -150,4 +150,9 @@ | |||
150 | <slot>accept()</slot> | 150 | <slot>accept()</slot> |
151 | </connection> | 151 | </connection> |
152 | </connections> | 152 | </connections> |
153 | <tabstops> | ||
154 | <tabstop>registeredServicesList</tabstop> | ||
155 | <tabstop>addButton</tabstop> | ||
156 | <tabstop>cancelButton</tabstop> | ||
157 | </tabstops> | ||
153 | </UI> | 158 | </UI> |
diff --git a/noncore/settings/networksettings/ppp/ppp.ui b/noncore/settings/networksettings/ppp/ppp.ui index 67d6735..56e1621 100644 --- a/noncore/settings/networksettings/ppp/ppp.ui +++ b/noncore/settings/networksettings/ppp/ppp.ui | |||
@@ -757,8 +757,6 @@ | |||
757 | <tabstop>speed</tabstop> | 757 | <tabstop>speed</tabstop> |
758 | <tabstop>crtscts</tabstop> | 758 | <tabstop>crtscts</tabstop> |
759 | <tabstop>connectdelay</tabstop> | 759 | <tabstop>connectdelay</tabstop> |
760 | <tabstop>dial_manual</tabstop> | ||
761 | <tabstop>dial_idle</tabstop> | ||
762 | <tabstop>dial_demand</tabstop> | 760 | <tabstop>dial_demand</tabstop> |
763 | <tabstop>idletime</tabstop> | 761 | <tabstop>idletime</tabstop> |
764 | <tabstop>defaultroute</tabstop> | 762 | <tabstop>defaultroute</tabstop> |
@@ -766,5 +764,7 @@ | |||
766 | <tabstop>usepeerdns</tabstop> | 764 | <tabstop>usepeerdns</tabstop> |
767 | <tabstop>dns1</tabstop> | 765 | <tabstop>dns1</tabstop> |
768 | <tabstop>dns2</tabstop> | 766 | <tabstop>dns2</tabstop> |
767 | <tabstop>dial_manual</tabstop> | ||
768 | <tabstop>dial_idle</tabstop> | ||
769 | </tabstops> | 769 | </tabstops> |
770 | </UI> | 770 | </UI> |
diff --git a/noncore/settings/networksettings/systemadvanced.ui b/noncore/settings/networksettings/systemadvanced.ui deleted file mode 100644 index cd7ac61..0000000 --- a/noncore/settings/networksettings/systemadvanced.ui +++ b/dev/null | |||
@@ -1,396 +0,0 @@ | |||
1 | <!DOCTYPE UI><UI> | ||
2 | <class>SystemNetworking</class> | ||
3 | <widget> | ||
4 | <class>QWidget</class> | ||
5 | <property stdset="1"> | ||
6 | <name>name</name> | ||
7 | <cstring>SystemNetworking</cstring> | ||
8 | </property> | ||
9 | <property stdset="1"> | ||
10 | <name>geometry</name> | ||
11 | <rect> | ||
12 | <x>0</x> | ||
13 | <y>0</y> | ||
14 | <width>218</width> | ||
15 | <height>289</height> | ||
16 | </rect> | ||
17 | </property> | ||
18 | <property stdset="1"> | ||
19 | <name>caption</name> | ||
20 | <string>System Networking</string> | ||
21 | </property> | ||
22 | <vbox> | ||
23 | <property stdset="1"> | ||
24 | <name>margin</name> | ||
25 | <number>0</number> | ||
26 | </property> | ||
27 | <property stdset="1"> | ||
28 | <name>spacing</name> | ||
29 | <number>6</number> | ||
30 | </property> | ||
31 | <widget> | ||
32 | <class>QTabWidget</class> | ||
33 | <property stdset="1"> | ||
34 | <name>name</name> | ||
35 | <cstring>tabWidget</cstring> | ||
36 | </property> | ||
37 | <property> | ||
38 | <name>layoutMargin</name> | ||
39 | </property> | ||
40 | <widget> | ||
41 | <class>QWidget</class> | ||
42 | <property stdset="1"> | ||
43 | <name>name</name> | ||
44 | <cstring>tab</cstring> | ||
45 | </property> | ||
46 | <attribute> | ||
47 | <name>title</name> | ||
48 | <string>DNS</string> | ||
49 | </attribute> | ||
50 | <grid> | ||
51 | <property stdset="1"> | ||
52 | <name>margin</name> | ||
53 | <number>11</number> | ||
54 | </property> | ||
55 | <property stdset="1"> | ||
56 | <name>spacing</name> | ||
57 | <number>6</number> | ||
58 | </property> | ||
59 | <widget row="0" column="0" > | ||
60 | <class>QLabel</class> | ||
61 | <property stdset="1"> | ||
62 | <name>name</name> | ||
63 | <cstring>TextLabel6</cstring> | ||
64 | </property> | ||
65 | <property stdset="1"> | ||
66 | <name>text</name> | ||
67 | <string>Hostname</string> | ||
68 | </property> | ||
69 | </widget> | ||
70 | <widget row="1" column="0" > | ||
71 | <class>QLabel</class> | ||
72 | <property stdset="1"> | ||
73 | <name>name</name> | ||
74 | <cstring>TextLabel5</cstring> | ||
75 | </property> | ||
76 | <property stdset="1"> | ||
77 | <name>text</name> | ||
78 | <string>DNS</string> | ||
79 | </property> | ||
80 | <property stdset="1"> | ||
81 | <name>alignment</name> | ||
82 | <set>AlignTop|AlignLeft</set> | ||
83 | </property> | ||
84 | <property> | ||
85 | <name>vAlign</name> | ||
86 | </property> | ||
87 | </widget> | ||
88 | <widget row="1" column="1" > | ||
89 | <class>QListBox</class> | ||
90 | <property stdset="1"> | ||
91 | <name>name</name> | ||
92 | <cstring>ListBox5</cstring> | ||
93 | </property> | ||
94 | </widget> | ||
95 | <widget row="0" column="1" > | ||
96 | <class>QLineEdit</class> | ||
97 | <property stdset="1"> | ||
98 | <name>name</name> | ||
99 | <cstring>LineEdit7</cstring> | ||
100 | </property> | ||
101 | </widget> | ||
102 | <widget row="3" column="0" > | ||
103 | <class>QLabel</class> | ||
104 | <property stdset="1"> | ||
105 | <name>name</name> | ||
106 | <cstring>TextLabel7</cstring> | ||
107 | </property> | ||
108 | <property stdset="1"> | ||
109 | <name>text</name> | ||
110 | <string>Hosts</string> | ||
111 | </property> | ||
112 | </widget> | ||
113 | <widget row="3" column="1" > | ||
114 | <class>QLabel</class> | ||
115 | <property stdset="1"> | ||
116 | <name>name</name> | ||
117 | <cstring>TextLabel9</cstring> | ||
118 | </property> | ||
119 | <property stdset="1"> | ||
120 | <name>text</name> | ||
121 | <string>List here....</string> | ||
122 | </property> | ||
123 | </widget> | ||
124 | <widget row="2" column="0" > | ||
125 | <class>QPushButton</class> | ||
126 | <property stdset="1"> | ||
127 | <name>name</name> | ||
128 | <cstring>PushButton15</cstring> | ||
129 | </property> | ||
130 | <property stdset="1"> | ||
131 | <name>text</name> | ||
132 | <string>&Add</string> | ||
133 | </property> | ||
134 | </widget> | ||
135 | <widget row="2" column="1" > | ||
136 | <class>QPushButton</class> | ||
137 | <property stdset="1"> | ||
138 | <name>name</name> | ||
139 | <cstring>PushButton16</cstring> | ||
140 | </property> | ||
141 | <property stdset="1"> | ||
142 | <name>text</name> | ||
143 | <string>&Delete</string> | ||
144 | </property> | ||
145 | </widget> | ||
146 | <spacer row="4" column="1" > | ||
147 | <property> | ||
148 | <name>name</name> | ||
149 | <cstring>Spacer14</cstring> | ||
150 | </property> | ||
151 | <property stdset="1"> | ||
152 | <name>orientation</name> | ||
153 | <enum>Vertical</enum> | ||
154 | </property> | ||
155 | <property stdset="1"> | ||
156 | <name>sizeType</name> | ||
157 | <enum>Expanding</enum> | ||
158 | </property> | ||
159 | <property> | ||
160 | <name>sizeHint</name> | ||
161 | <size> | ||
162 | <width>20</width> | ||
163 | <height>20</height> | ||
164 | </size> | ||
165 | </property> | ||
166 | </spacer> | ||
167 | </grid> | ||
168 | </widget> | ||
169 | <widget> | ||
170 | <class>QWidget</class> | ||
171 | <property stdset="1"> | ||
172 | <name>name</name> | ||
173 | <cstring>tab</cstring> | ||
174 | </property> | ||
175 | <attribute> | ||
176 | <name>title</name> | ||
177 | <string>Routing</string> | ||
178 | </attribute> | ||
179 | <grid> | ||
180 | <property stdset="1"> | ||
181 | <name>margin</name> | ||
182 | <number>11</number> | ||
183 | </property> | ||
184 | <property stdset="1"> | ||
185 | <name>spacing</name> | ||
186 | <number>6</number> | ||
187 | </property> | ||
188 | <widget row="0" column="0" rowspan="1" colspan="2" > | ||
189 | <class>QListView</class> | ||
190 | <column> | ||
191 | <property> | ||
192 | <name>text</name> | ||
193 | <string>Destination</string> | ||
194 | </property> | ||
195 | <property> | ||
196 | <name>clickable</name> | ||
197 | <bool>true</bool> | ||
198 | </property> | ||
199 | <property> | ||
200 | <name>resizeable</name> | ||
201 | <bool>true</bool> | ||
202 | </property> | ||
203 | </column> | ||
204 | <column> | ||
205 | <property> | ||
206 | <name>text</name> | ||
207 | <string>Gateway</string> | ||
208 | </property> | ||
209 | <property> | ||
210 | <name>clickable</name> | ||
211 | <bool>true</bool> | ||
212 | </property> | ||
213 | <property> | ||
214 | <name>resizeable</name> | ||
215 | <bool>true</bool> | ||
216 | </property> | ||
217 | </column> | ||
218 | <column> | ||
219 | <property> | ||
220 | <name>text</name> | ||
221 | <string>Genmask</string> | ||
222 | </property> | ||
223 | <property> | ||
224 | <name>clickable</name> | ||
225 | <bool>true</bool> | ||
226 | </property> | ||
227 | <property> | ||
228 | <name>resizeable</name> | ||
229 | <bool>true</bool> | ||
230 | </property> | ||
231 | </column> | ||
232 | <column> | ||
233 | <property> | ||
234 | <name>text</name> | ||
235 | <string>Flags</string> | ||
236 | </property> | ||
237 | <property> | ||
238 | <name>clickable</name> | ||
239 | <bool>true</bool> | ||
240 | </property> | ||
241 | <property> | ||
242 | <name>resizeable</name> | ||
243 | <bool>true</bool> | ||
244 | </property> | ||
245 | </column> | ||
246 | <column> | ||
247 | <property> | ||
248 | <name>text</name> | ||
249 | <string>Metric</string> | ||
250 | </property> | ||
251 | <property> | ||
252 | <name>clickable</name> | ||
253 | <bool>true</bool> | ||
254 | </property> | ||
255 | <property> | ||
256 | <name>resizeable</name> | ||
257 | <bool>true</bool> | ||
258 | </property> | ||
259 | </column> | ||
260 | <column> | ||
261 | <property> | ||
262 | <name>text</name> | ||
263 | <string>Ref</string> | ||
264 | </property> | ||
265 | <property> | ||
266 | <name>clickable</name> | ||
267 | <bool>true</bool> | ||
268 | </property> | ||
269 | <property> | ||
270 | <name>resizeable</name> | ||
271 | <bool>true</bool> | ||
272 | </property> | ||
273 | </column> | ||
274 | <column> | ||
275 | <property> | ||
276 | <name>text</name> | ||
277 | <string>Use</string> | ||
278 | </property> | ||
279 | <property> | ||
280 | <name>clickable</name> | ||
281 | <bool>true</bool> | ||
282 | </property> | ||
283 | <property> | ||
284 | <name>resizeable</name> | ||
285 | <bool>true</bool> | ||
286 | </property> | ||
287 | </column> | ||
288 | <column> | ||
289 | <property> | ||
290 | <name>text</name> | ||
291 | <string>Iface</string> | ||
292 | </property> | ||
293 | <property> | ||
294 | <name>clickable</name> | ||
295 | <bool>true</bool> | ||
296 | </property> | ||
297 | <property> | ||
298 | <name>resizeable</name> | ||
299 | <bool>true</bool> | ||
300 | </property> | ||
301 | </column> | ||
302 | <item> | ||
303 | <property> | ||
304 | <name>text</name> | ||
305 | <string>192.168.1.0</string> | ||
306 | </property> | ||
307 | <property> | ||
308 | <name>text</name> | ||
309 | <string>*</string> | ||
310 | </property> | ||
311 | <property> | ||
312 | <name>text</name> | ||
313 | <string>255.255.255.0</string> | ||
314 | </property> | ||
315 | <property> | ||
316 | <name>text</name> | ||
317 | <string>U</string> | ||
318 | </property> | ||
319 | <property> | ||
320 | <name>text</name> | ||
321 | <string>0</string> | ||
322 | </property> | ||
323 | <property> | ||
324 | <name>text</name> | ||
325 | <string>0</string> | ||
326 | </property> | ||
327 | <property> | ||
328 | <name>text</name> | ||
329 | <string>0</string> | ||
330 | </property> | ||
331 | <property> | ||
332 | <name>text</name> | ||
333 | <string>eth0</string> | ||
334 | </property> | ||
335 | <property> | ||
336 | <name>pixmap</name> | ||
337 | <pixmap></pixmap> | ||
338 | </property> | ||
339 | <property> | ||
340 | <name>pixmap</name> | ||
341 | <pixmap></pixmap> | ||
342 | </property> | ||
343 | <property> | ||
344 | <name>pixmap</name> | ||
345 | <pixmap></pixmap> | ||
346 | </property> | ||
347 | <property> | ||
348 | <name>pixmap</name> | ||
349 | <pixmap></pixmap> | ||
350 | </property> | ||
351 | <property> | ||
352 | <name>pixmap</name> | ||
353 | <pixmap></pixmap> | ||
354 | </property> | ||
355 | <property> | ||
356 | <name>pixmap</name> | ||
357 | <pixmap></pixmap> | ||
358 | </property> | ||
359 | <property> | ||
360 | <name>pixmap</name> | ||
361 | <pixmap></pixmap> | ||
362 | </property> | ||
363 | <property> | ||
364 | <name>pixmap</name> | ||
365 | <pixmap></pixmap> | ||
366 | </property> | ||
367 | </item> | ||
368 | <property stdset="1"> | ||
369 | <name>name</name> | ||
370 | <cstring>ListView4</cstring> | ||
371 | </property> | ||
372 | </widget> | ||
373 | <widget row="1" column="0" > | ||
374 | <class>QPushButton</class> | ||
375 | <property stdset="1"> | ||
376 | <name>name</name> | ||
377 | <cstring>PushButton17</cstring> | ||
378 | </property> | ||
379 | <property stdset="1"> | ||
380 | <name>text</name> | ||
381 | <string>&Add</string> | ||
382 | </property> | ||
383 | </widget> | ||
384 | <widget row="1" column="1" > | ||
385 | <class>QPushButton</class> | ||
386 | <property stdset="1"> | ||
387 | <name>name</name> | ||
388 | <cstring>PushButton18</cstring> | ||
389 | </property> | ||
390 | <property stdset="1"> | ||
391 | <name>text</name> | ||
392 | <string>Remove</string> | ||
393 | </property> | ||
394 | </widget> | ||
395 | <spacer row="2" column="1" > | ||
396 | \ No newline at end of file | ||
diff --git a/noncore/settings/networksettings/wlan/wlan.ui b/noncore/settings/networksettings/wlan/wlan.ui index 1b29a3e..47d6db6 100644 --- a/noncore/settings/networksettings/wlan/wlan.ui +++ b/noncore/settings/networksettings/wlan/wlan.ui | |||
@@ -11,7 +11,7 @@ | |||
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>238</width> | 14 | <width>237</width> |
15 | <height>286</height> | 15 | <height>286</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
@@ -500,9 +500,12 @@ | |||
500 | <tabstops> | 500 | <tabstops> |
501 | <tabstop>tabWidget</tabstop> | 501 | <tabstop>tabWidget</tabstop> |
502 | <tabstop>essNon</tabstop> | 502 | <tabstop>essNon</tabstop> |
503 | <tabstop>essSpecific</tabstop> | ||
503 | <tabstop>essSpecificLineEdit</tabstop> | 504 | <tabstop>essSpecificLineEdit</tabstop> |
504 | <tabstop>networkInfrastructure</tabstop> | 505 | <tabstop>networkInfrastructure</tabstop> |
506 | <tabstop>network802</tabstop> | ||
505 | <tabstop>networkChannel</tabstop> | 507 | <tabstop>networkChannel</tabstop> |
508 | <tabstop>wepEnabled</tabstop> | ||
506 | <tabstop>authOpen</tabstop> | 509 | <tabstop>authOpen</tabstop> |
507 | <tabstop>authShared</tabstop> | 510 | <tabstop>authShared</tabstop> |
508 | <tabstop>keyRadio0</tabstop> | 511 | <tabstop>keyRadio0</tabstop> |