summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-03-05 21:39:40 (UTC)
committer mickeyl <mickeyl>2004-03-05 21:39:40 (UTC)
commita12943ccab6b39dda5cf8561efb10eeec856f13e (patch) (unidiff)
treeb22cd5c74bd4daad201eea5e485ea9856471d1f2
parent8851dc992ab535bde6cb417cafc44658953f495d (diff)
downloadopie-a12943ccab6b39dda5cf8561efb10eeec856f13e.zip
opie-a12943ccab6b39dda5cf8561efb10eeec856f13e.tar.gz
opie-a12943ccab6b39dda5cf8561efb10eeec856f13e.tar.bz2
change copyright notice
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/ChangeLog4
-rw-r--r--noncore/net/wellenreiter/TODO2
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui94
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.h4
-rw-r--r--noncore/net/wellenreiter/gui/gps.cpp2
-rw-r--r--noncore/net/wellenreiter/gui/gps.h2
-rw-r--r--noncore/net/wellenreiter/gui/graphwindow.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/graphwindow.h4
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro2
-rw-r--r--noncore/net/wellenreiter/gui/hexwindow.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/hexwindow.h4
-rw-r--r--noncore/net/wellenreiter/gui/logwindow.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/logwindow.h4
-rw-r--r--noncore/net/wellenreiter/gui/main.cpp2
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp32
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.h7
-rw-r--r--noncore/net/wellenreiter/gui/protolistview.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/protolistview.h4
-rw-r--r--noncore/net/wellenreiter/gui/resource.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/resource.h4
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp5
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.h4
-rw-r--r--noncore/net/wellenreiter/gui/statwindow.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/statwindow.h4
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp8
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.h4
28 files changed, 175 insertions, 53 deletions
diff --git a/noncore/net/wellenreiter/ChangeLog b/noncore/net/wellenreiter/ChangeLog
index 6c2e52b..fdc8aa7 100644
--- a/noncore/net/wellenreiter/ChangeLog
+++ b/noncore/net/wellenreiter/ChangeLog
@@ -1,28 +1,30 @@
1 2004-??-?? Michael Lauer <mickey@Vanille.de> 1 2004-??-?? Michael Lauer <mickey@Vanille.de>
2 2
3 * Added sanity check isPresent(interface) before starting the engine.
4 * Added a View submenu. Added actions to expand and collapse all items.
3 * Switched to a (hopefully) more reliable method reading from gpsd. 5 * Switched to a (hopefully) more reliable method reading from gpsd.
4 * Added parsing of named ProbeRequests. Display only-probed-yet SSIDs in a different network color. 6 * Added parsing of named ProbeRequests. Display only-probed-yet SSIDs in a different network color.
5 * Rewrote the simple actions on new {Network, Client, Station}. Besides playing a sound or 7 * Rewrote the simple actions on new {Network, Client, Station}. Besides playing a sound or
6 blinking a LED, a user customizable script can now be executed, if something has been 8 blinking a LED, a user customizable script can now be executed, if something has been
7 detected. This opens up many possibilities, i.e. a qcop to qpegps or exec'ing flite (speech). 9 detected. This opens up many possibilities, i.e. a qcop to qpegps or exec'ing flite (speech).
8 * Added decloaking of cloaked ESSIDs (length != 0, but essid[0] == \0). 10 * Added decloaking of cloaked ESSIDs (length != 0, but essid[0] == \0).
9 * Hided the 'Parse' Tab in the configuration window. Not functional now and may come later 11 * Hided the 'Parse' Tab in the configuration window. Not functional now and may come later
10 * Added parsing of control frames. Display stations sending them SSID "<unknown>" for now. 12 * Added parsing of control frames. Display stations sending them SSID "<unknown>" for now.
11 * Added command line option "-nocheck" to skip non-root and dhcp tests. 13 * Added command line option "-nocheck" to skip non-root and dhcp tests.
12 * Improved the speed reading the manufacturer list. 14 * Improved the speed of and user feedback during reading the manufacturer list.
13 * GPS coordinates are now presented in the DMS (as opposed to decimal) format. 15 * GPS coordinates are now presented in the DMS (as opposed to decimal) format.
14 16
15 2003-12-18 Michael Lauer <mickey@Vanille.de> 17 2003-12-18 Michael Lauer <mickey@Vanille.de>
16 18
17 * Released as Version 1.0.2 (Development Snapshot) 19 * Released as Version 1.0.2 (Development Snapshot)
18 * Added automatic uploading of capture files to "The Capture Dump" site at 20 * Added automatic uploading of capture files to "The Capture Dump" site at
19 http://www.Vanille.de/projects/capturedump.spy 21 http://www.Vanille.de/projects/capturedump.spy
20 * Initial reading of the manufacturer database happens now in background 22 * Initial reading of the manufacturer database happens now in background
21 * Removed deprecated setMonitorMode() API ==> Use setMode( "monitor" ) now. 23 * Removed deprecated setMonitorMode() API ==> Use setMode( "monitor" ) now.
22 The monitor mode now tries to use the standard IW_MODE_MONITOR first. If that 24 The monitor mode now tries to use the standard IW_MODE_MONITOR first. If that
23 doesn't work, it falls back to using the proprietary iwpriv commands 25 doesn't work, it falls back to using the proprietary iwpriv commands
24 26
25 2003-11-30 Michael Lauer <mickey@Vanille.de> 27 2003-11-30 Michael Lauer <mickey@Vanille.de>
26 28
27 * Released as Version 1.0.1 (Development Snapshot) 29 * Released as Version 1.0.1 (Development Snapshot)
28 * Fixed ARP decoding for wired networks. 30 * Fixed ARP decoding for wired networks.
diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO
index 01e731f..f3fd205 100644
--- a/noncore/net/wellenreiter/TODO
+++ b/noncore/net/wellenreiter/TODO
@@ -27,34 +27,32 @@ ENGINE
27- adaptive hopping scheme ! 27- adaptive hopping scheme !
28 28
29- gather interface capabilities 29- gather interface capabilities
30 30
31- enable sniffing in wired networks 31- enable sniffing in wired networks
32 32
33- fix autodetection (interface name) 33- fix autodetection (interface name)
34 34
35--------- 35---------
36 UI 36 UI
37--------- 37---------
38 38
39- display interface capabilities (or rewrite networksettings?) 39- display interface capabilities (or rewrite networksettings?)
40 40
41- distinguish wireless bridges (WDS traffic) 41- distinguish wireless bridges (WDS traffic)
42 42
43- expand/collapse all
44
45- add configuration for scrollback buffer in hex window and log window 43- add configuration for scrollback buffer in hex window and log window
46 44
47- revamp hex window, make it more sophisticated than just a QMultiLineEdit 45- revamp hex window, make it more sophisticated than just a QMultiLineEdit
48 - tree view 46 - tree view
49 47
50- beep over headphone / customizable 48- beep over headphone / customizable
51 49
52- count/display number of wireless networks / APs since last start/stop 50- count/display number of wireless networks / APs since last start/stop
53 51
54--------- 52---------
55 FILES 53 FILES
56--------- 54---------
57 55
58- write kismet-like .network format and format to be importable into AutoRoute 56- write kismet-like .network format and format to be importable into AutoRoute
59 57
60- implement beacon stripping (the first beacon is enough to detect a 58- implement beacon stripping (the first beacon is enough to detect a
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index 469effe..113e783 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -1,30 +1,30 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>WellenreiterConfigBase</class> 2<class>WellenreiterConfigBase</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>WellenreiterConfigBase</cstring> 7 <cstring>WellenreiterConfigBase</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>250</width> 14 <width>246</width>
15 <height>371</height> 15 <height>371</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>Wellenreiter II COnfiguration Dialog</string> 20 <string>Wellenreiter II COnfiguration Dialog</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
28 <grid> 28 <grid>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
@@ -33,32 +33,36 @@
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>3</number> 35 <number>3</number>
36 </property> 36 </property>
37 <widget row="0" column="0" > 37 <widget row="0" column="0" >
38 <class>QTabWidget</class> 38 <class>QTabWidget</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>tab</cstring> 41 <cstring>tab</cstring>
42 </property> 42 </property>
43 <property> 43 <property>
44 <name>layoutMargin</name> 44 <name>layoutMargin</name>
45 </property> 45 </property>
46 <property> 46 <property>
47 <name>layoutSpacing</name> 47 <name>layoutSpacing</name>
48 </property> 48 </property>
49 <property>
50 <name>whatsThis</name>
51 <string></string>
52 </property>
49 <widget> 53 <widget>
50 <class>QWidget</class> 54 <class>QWidget</class>
51 <property stdset="1"> 55 <property stdset="1">
52 <name>name</name> 56 <name>name</name>
53 <cstring>tab</cstring> 57 <cstring>tab</cstring>
54 </property> 58 </property>
55 <attribute> 59 <attribute>
56 <name>title</name> 60 <name>title</name>
57 <string>Interface</string> 61 <string>Interface</string>
58 </attribute> 62 </attribute>
59 <vbox> 63 <vbox>
60 <property stdset="1"> 64 <property stdset="1">
61 <name>margin</name> 65 <name>margin</name>
62 <number>6</number> 66 <number>6</number>
63 </property> 67 </property>
64 <property stdset="1"> 68 <property stdset="1">
@@ -214,45 +218,53 @@
214 <number>0</number> 218 <number>0</number>
215 </property> 219 </property>
216 <property stdset="1"> 220 <property stdset="1">
217 <name>spacing</name> 221 <name>spacing</name>
218 <number>6</number> 222 <number>6</number>
219 </property> 223 </property>
220 <widget> 224 <widget>
221 <class>QPushButton</class> 225 <class>QPushButton</class>
222 <property stdset="1"> 226 <property stdset="1">
223 <name>name</name> 227 <name>name</name>
224 <cstring>autodetect</cstring> 228 <cstring>autodetect</cstring>
225 </property> 229 </property>
226 <property stdset="1"> 230 <property stdset="1">
227 <name>text</name> 231 <name>text</name>
228 <string>Perform Autodetection</string> 232 <string>Perform Autodetection</string>
229 </property> 233 </property>
234 <property>
235 <name>whatsThis</name>
236 <string>Retrigger the autodetection algorithm</string>
237 </property>
230 </widget> 238 </widget>
231 </hbox> 239 </hbox>
232 </widget> 240 </widget>
233 <widget> 241 <widget>
234 <class>QCheckBox</class> 242 <class>QCheckBox</class>
235 <property stdset="1"> 243 <property stdset="1">
236 <name>name</name> 244 <name>name</name>
237 <cstring>prismHeader</cstring> 245 <cstring>prismHeader</cstring>
238 </property> 246 </property>
239 <property stdset="1"> 247 <property stdset="1">
240 <name>text</name> 248 <name>text</name>
241 <string>Use additional PRISM header</string> 249 <string>Use additional PRISM header</string>
242 </property> 250 </property>
251 <property>
252 <name>whatsThis</name>
253 <string>Use additional PRISM headers, if available.</string>
254 </property>
243 </widget> 255 </widget>
244 <spacer> 256 <spacer>
245 <property> 257 <property>
246 <name>name</name> 258 <name>name</name>
247 <cstring>Spacer4</cstring> 259 <cstring>Spacer4</cstring>
248 </property> 260 </property>
249 <property stdset="1"> 261 <property stdset="1">
250 <name>orientation</name> 262 <name>orientation</name>
251 <enum>Vertical</enum> 263 <enum>Vertical</enum>
252 </property> 264 </property>
253 <property stdset="1"> 265 <property stdset="1">
254 <name>sizeType</name> 266 <name>sizeType</name>
255 <enum>Expanding</enum> 267 <enum>Expanding</enum>
256 </property> 268 </property>
257 <property> 269 <property>
258 <name>sizeHint</name> 270 <name>sizeHint</name>
@@ -278,32 +290,36 @@
278 <number>6</number> 290 <number>6</number>
279 </property> 291 </property>
280 <widget> 292 <widget>
281 <class>QCheckBox</class> 293 <class>QCheckBox</class>
282 <property stdset="1"> 294 <property stdset="1">
283 <name>name</name> 295 <name>name</name>
284 <cstring>hopChannels</cstring> 296 <cstring>hopChannels</cstring>
285 </property> 297 </property>
286 <property stdset="1"> 298 <property stdset="1">
287 <name>text</name> 299 <name>text</name>
288 <string>Hop Channels</string> 300 <string>Hop Channels</string>
289 </property> 301 </property>
290 <property stdset="1"> 302 <property stdset="1">
291 <name>checked</name> 303 <name>checked</name>
292 <bool>true</bool> 304 <bool>true</bool>
293 </property> 305 </property>
306 <property>
307 <name>whatsThis</name>
308 <string>Check this, if you want to start a channel hopper.</string>
309 </property>
294 </widget> 310 </widget>
295 <widget> 311 <widget>
296 <class>QLabel</class> 312 <class>QLabel</class>
297 <property stdset="1"> 313 <property stdset="1">
298 <name>name</name> 314 <name>name</name>
299 <cstring>TextLabel1</cstring> 315 <cstring>TextLabel1</cstring>
300 </property> 316 </property>
301 <property stdset="1"> 317 <property stdset="1">
302 <name>text</name> 318 <name>text</name>
303 <string>every</string> 319 <string>every</string>
304 </property> 320 </property>
305 </widget> 321 </widget>
306 <widget> 322 <widget>
307 <class>QSpinBox</class> 323 <class>QSpinBox</class>
308 <property stdset="1"> 324 <property stdset="1">
309 <name>name</name> 325 <name>name</name>
@@ -341,53 +357,61 @@
341 </hbox> 357 </hbox>
342 </widget> 358 </widget>
343 <widget> 359 <widget>
344 <class>QCheckBox</class> 360 <class>QCheckBox</class>
345 <property stdset="1"> 361 <property stdset="1">
346 <name>name</name> 362 <name>name</name>
347 <cstring>adaptiveHopping</cstring> 363 <cstring>adaptiveHopping</cstring>
348 </property> 364 </property>
349 <property stdset="1"> 365 <property stdset="1">
350 <name>enabled</name> 366 <name>enabled</name>
351 <bool>false</bool> 367 <bool>false</bool>
352 </property> 368 </property>
353 <property stdset="1"> 369 <property stdset="1">
354 <name>text</name> 370 <name>text</name>
355 <string>Use Adaptive(TM) Hop Scheme</string> 371 <string>Use Adaptive(TM) Hop Scheme</string>
356 </property> 372 </property>
373 <property>
374 <name>whatsThis</name>
375 <string>An adaptive hopping interval dynamically changes the channel hopping parameters to listen longer on channels where traffic comes in.</string>
376 </property>
357 </widget> 377 </widget>
358 <widget> 378 <widget>
359 <class>QGroupBox</class> 379 <class>QGroupBox</class>
360 <property stdset="1"> 380 <property stdset="1">
361 <name>name</name> 381 <name>name</name>
362 <cstring>GroupBox1</cstring> 382 <cstring>GroupBox1</cstring>
363 </property> 383 </property>
364 <property stdset="1"> 384 <property stdset="1">
365 <name>enabled</name> 385 <name>enabled</name>
366 <bool>false</bool> 386 <bool>false</bool>
367 </property> 387 </property>
368 <property stdset="1"> 388 <property stdset="1">
369 <name>title</name> 389 <name>title</name>
370 <string>Scan on channel</string> 390 <string>Scan on channel</string>
371 </property> 391 </property>
372 <property> 392 <property>
373 <name>layoutMargin</name> 393 <name>layoutMargin</name>
374 </property> 394 </property>
375 <property> 395 <property>
376 <name>layoutSpacing</name> 396 <name>layoutSpacing</name>
377 </property> 397 </property>
398 <property>
399 <name>whatsThis</name>
400 <string>Check the channels which should be included in the channel hopping scheme. Note that due to the 802.11 channel overlay scheme you may receive data on neighbour channels of channels, even if they're not checked here.</string>
401 </property>
378 <grid> 402 <grid>
379 <property stdset="1"> 403 <property stdset="1">
380 <name>margin</name> 404 <name>margin</name>
381 <number>4</number> 405 <number>4</number>
382 </property> 406 </property>
383 <property stdset="1"> 407 <property stdset="1">
384 <name>spacing</name> 408 <name>spacing</name>
385 <number>2</number> 409 <number>2</number>
386 </property> 410 </property>
387 <widget row="1" column="1" > 411 <widget row="1" column="1" >
388 <class>QCheckBox</class> 412 <class>QCheckBox</class>
389 <property stdset="1"> 413 <property stdset="1">
390 <name>name</name> 414 <name>name</name>
391 <cstring>channel6</cstring> 415 <cstring>channel6</cstring>
392 </property> 416 </property>
393 <property stdset="1"> 417 <property stdset="1">
@@ -591,47 +615,55 @@
591 </property> 615 </property>
592 </widget> 616 </widget>
593 <widget row="1" column="0" rowspan="1" colspan="3" > 617 <widget row="1" column="0" rowspan="1" colspan="3" >
594 <class>QLineEdit</class> 618 <class>QLineEdit</class>
595 <property stdset="1"> 619 <property stdset="1">
596 <name>name</name> 620 <name>name</name>
597 <cstring>captureFileName</cstring> 621 <cstring>captureFileName</cstring>
598 </property> 622 </property>
599 <property stdset="1"> 623 <property stdset="1">
600 <name>enabled</name> 624 <name>enabled</name>
601 <bool>false</bool> 625 <bool>false</bool>
602 </property> 626 </property>
603 <property stdset="1"> 627 <property stdset="1">
604 <name>text</name> 628 <name>text</name>
605 <string>/tmp/capture</string> 629 <string>/tmp/capture</string>
606 </property> 630 </property>
631 <property>
632 <name>whatsThis</name>
633 <string>Configure the name of the capture file.</string>
634 </property>
607 </widget> 635 </widget>
608 <widget row="0" column="2" > 636 <widget row="0" column="2" >
609 <class>QToolButton</class> 637 <class>QToolButton</class>
610 <property stdset="1"> 638 <property stdset="1">
611 <name>name</name> 639 <name>name</name>
612 <cstring>getCaptureFileName</cstring> 640 <cstring>getCaptureFileName</cstring>
613 </property> 641 </property>
614 <property stdset="1"> 642 <property stdset="1">
615 <name>enabled</name> 643 <name>enabled</name>
616 <bool>false</bool> 644 <bool>false</bool>
617 </property> 645 </property>
618 <property stdset="1"> 646 <property stdset="1">
619 <name>text</name> 647 <name>text</name>
620 <string>Browse</string> 648 <string>Browse</string>
621 </property> 649 </property>
650 <property>
651 <name>whatsThis</name>
652 <string>Click to open a file requester to choose a capture file name.</string>
653 </property>
622 </widget> 654 </widget>
623 <spacer row="0" column="1" > 655 <spacer row="0" column="1" >
624 <property> 656 <property>
625 <name>name</name> 657 <name>name</name>
626 <cstring>Spacer2</cstring> 658 <cstring>Spacer2</cstring>
627 </property> 659 </property>
628 <property stdset="1"> 660 <property stdset="1">
629 <name>orientation</name> 661 <name>orientation</name>
630 <enum>Horizontal</enum> 662 <enum>Horizontal</enum>
631 </property> 663 </property>
632 <property stdset="1"> 664 <property stdset="1">
633 <name>sizeType</name> 665 <name>sizeType</name>
634 <enum>Expanding</enum> 666 <enum>Expanding</enum>
635 </property> 667 </property>
636 <property> 668 <property>
637 <name>sizeHint</name> 669 <name>sizeHint</name>
@@ -642,32 +674,36 @@
642 </property> 674 </property>
643 </spacer> 675 </spacer>
644 <widget row="0" column="0" > 676 <widget row="0" column="0" >
645 <class>QCheckBox</class> 677 <class>QCheckBox</class>
646 <property stdset="1"> 678 <property stdset="1">
647 <name>name</name> 679 <name>name</name>
648 <cstring>writeCaptureFile</cstring> 680 <cstring>writeCaptureFile</cstring>
649 </property> 681 </property>
650 <property stdset="1"> 682 <property stdset="1">
651 <name>enabled</name> 683 <name>enabled</name>
652 <bool>true</bool> 684 <bool>true</bool>
653 </property> 685 </property>
654 <property stdset="1"> 686 <property stdset="1">
655 <name>text</name> 687 <name>text</name>
656 <string>Write Capture Files To</string> 688 <string>Write Capture Files To</string>
657 </property> 689 </property>
690 <property>
691 <name>whatsThis</name>
692 <string>Check this to write an ethereal compatible capture file.</string>
693 </property>
658 </widget> 694 </widget>
659 </grid> 695 </grid>
660 </widget> 696 </widget>
661 <widget> 697 <widget>
662 <class>QWidget</class> 698 <class>QWidget</class>
663 <property stdset="1"> 699 <property stdset="1">
664 <name>name</name> 700 <name>name</name>
665 <cstring>tab</cstring> 701 <cstring>tab</cstring>
666 </property> 702 </property>
667 <attribute> 703 <attribute>
668 <name>title</name> 704 <name>title</name>
669 <string>Parse</string> 705 <string>Parse</string>
670 </attribute> 706 </attribute>
671 <grid> 707 <grid>
672 <property stdset="1"> 708 <property stdset="1">
673 <name>margin</name> 709 <name>margin</name>
@@ -709,54 +745,66 @@
709 <number>5</number> 745 <number>5</number>
710 </property> 746 </property>
711 <property stdset="1"> 747 <property stdset="1">
712 <name>spacing</name> 748 <name>spacing</name>
713 <number>3</number> 749 <number>3</number>
714 </property> 750 </property>
715 <widget> 751 <widget>
716 <class>QCheckBox</class> 752 <class>QCheckBox</class>
717 <property stdset="1"> 753 <property stdset="1">
718 <name>name</name> 754 <name>name</name>
719 <cstring>lookupVendor</cstring> 755 <cstring>lookupVendor</cstring>
720 </property> 756 </property>
721 <property stdset="1"> 757 <property stdset="1">
722 <name>text</name> 758 <name>text</name>
723 <string>Lookup MAC vendor names</string> 759 <string>Lookup MAC vendor names</string>
724 </property> 760 </property>
761 <property>
762 <name>whatsThis</name>
763 <string>Check this to lookup MAC vendor names.</string>
764 </property>
725 </widget> 765 </widget>
726 <widget> 766 <widget>
727 <class>QCheckBox</class> 767 <class>QCheckBox</class>
728 <property stdset="1"> 768 <property stdset="1">
729 <name>name</name> 769 <name>name</name>
730 <cstring>openTree</cstring> 770 <cstring>openTree</cstring>
731 </property> 771 </property>
732 <property stdset="1"> 772 <property stdset="1">
733 <name>text</name> 773 <name>text</name>
734 <string>Open Tree On New Station</string> 774 <string>Open Tree On New Station</string>
735 </property> 775 </property>
776 <property>
777 <name>whatsThis</name>
778 <string>Check this to automatically make a tree visible when a new station is detected.</string>
779 </property>
736 </widget> 780 </widget>
737 <widget> 781 <widget>
738 <class>QCheckBox</class> 782 <class>QCheckBox</class>
739 <property stdset="1"> 783 <property stdset="1">
740 <name>name</name> 784 <name>name</name>
741 <cstring>disablePM</cstring> 785 <cstring>disablePM</cstring>
742 </property> 786 </property>
743 <property stdset="1"> 787 <property stdset="1">
744 <name>text</name> 788 <name>text</name>
745 <string>Disable Power Management</string> 789 <string>Disable Power Management</string>
746 </property> 790 </property>
791 <property>
792 <name>whatsThis</name>
793 <string>Check this to disable power management while scanning.</string>
794 </property>
747 </widget> 795 </widget>
748 <spacer> 796 <spacer>
749 <property> 797 <property>
750 <name>name</name> 798 <name>name</name>
751 <cstring>Spacer3</cstring> 799 <cstring>Spacer3</cstring>
752 </property> 800 </property>
753 <property stdset="1"> 801 <property stdset="1">
754 <name>orientation</name> 802 <name>orientation</name>
755 <enum>Vertical</enum> 803 <enum>Vertical</enum>
756 </property> 804 </property>
757 <property stdset="1"> 805 <property stdset="1">
758 <name>sizeType</name> 806 <name>sizeType</name>
759 <enum>Expanding</enum> 807 <enum>Expanding</enum>
760 </property> 808 </property>
761 <property> 809 <property>
762 <name>sizeHint</name> 810 <name>sizeHint</name>
@@ -868,43 +916,51 @@
868 <property> 916 <property>
869 <name>text</name> 917 <name>text</name>
870 <string>Run Script</string> 918 <string>Run Script</string>
871 </property> 919 </property>
872 </item> 920 </item>
873 <property stdset="1"> 921 <property stdset="1">
874 <name>name</name> 922 <name>name</name>
875 <cstring>newClientAction</cstring> 923 <cstring>newClientAction</cstring>
876 </property> 924 </property>
877 <property stdset="1"> 925 <property stdset="1">
878 <name>sizePolicy</name> 926 <name>sizePolicy</name>
879 <sizepolicy> 927 <sizepolicy>
880 <hsizetype>7</hsizetype> 928 <hsizetype>7</hsizetype>
881 <vsizetype>0</vsizetype> 929 <vsizetype>0</vsizetype>
882 </sizepolicy> 930 </sizepolicy>
883 </property> 931 </property>
932 <property>
933 <name>whatsThis</name>
934 <string>Choose an action to perform when a new wireless station is detected.</string>
935 </property>
884 </widget> 936 </widget>
885 <widget row="3" column="0" rowspan="1" colspan="2" > 937 <widget row="3" column="0" rowspan="1" colspan="2" >
886 <class>QLineEdit</class> 938 <class>QLineEdit</class>
887 <property stdset="1"> 939 <property stdset="1">
888 <name>name</name> 940 <name>name</name>
889 <cstring>newClientScript</cstring> 941 <cstring>newClientScript</cstring>
890 </property> 942 </property>
891 <property stdset="1"> 943 <property stdset="1">
892 <name>enabled</name> 944 <name>enabled</name>
893 <bool>true</bool> 945 <bool>true</bool>
894 </property> 946 </property>
947 <property>
948 <name>whatsThis</name>
949 <string>The command line to execute when a script action is performed.</string>
950 </property>
895 </widget> 951 </widget>
896 <widget row="2" column="0" > 952 <widget row="2" column="0" >
897 <class>QLabel</class> 953 <class>QLabel</class>
898 <property stdset="1"> 954 <property stdset="1">
899 <name>name</name> 955 <name>name</name>
900 <cstring>TextLabel2</cstring> 956 <cstring>TextLabel2</cstring>
901 </property> 957 </property>
902 <property stdset="1"> 958 <property stdset="1">
903 <name>text</name> 959 <name>text</name>
904 <string>Wireless Station:</string> 960 <string>Wireless Station:</string>
905 </property> 961 </property>
906 </widget> 962 </widget>
907 <widget row="4" column="1" > 963 <widget row="4" column="1" >
908 <class>QComboBox</class> 964 <class>QComboBox</class>
909 <item> 965 <item>
910 <property> 966 <property>
@@ -934,32 +990,36 @@
934 <property> 990 <property>
935 <name>text</name> 991 <name>text</name>
936 <string>Run Script</string> 992 <string>Run Script</string>
937 </property> 993 </property>
938 </item> 994 </item>
939 <property stdset="1"> 995 <property stdset="1">
940 <name>name</name> 996 <name>name</name>
941 <cstring>newStationAction</cstring> 997 <cstring>newStationAction</cstring>
942 </property> 998 </property>
943 <property stdset="1"> 999 <property stdset="1">
944 <name>sizePolicy</name> 1000 <name>sizePolicy</name>
945 <sizepolicy> 1001 <sizepolicy>
946 <hsizetype>7</hsizetype> 1002 <hsizetype>7</hsizetype>
947 <vsizetype>0</vsizetype> 1003 <vsizetype>0</vsizetype>
948 </sizepolicy> 1004 </sizepolicy>
949 </property> 1005 </property>
1006 <property>
1007 <name>whatsThis</name>
1008 <string>Choose the action to perform when a new wired station is detected.</string>
1009 </property>
950 </widget> 1010 </widget>
951 <widget row="0" column="1" > 1011 <widget row="0" column="1" >
952 <class>QComboBox</class> 1012 <class>QComboBox</class>
953 <item> 1013 <item>
954 <property> 1014 <property>
955 <name>text</name> 1015 <name>text</name>
956 <string>&lt;Ignore&gt;</string> 1016 <string>&lt;Ignore&gt;</string>
957 </property> 1017 </property>
958 </item> 1018 </item>
959 <item> 1019 <item>
960 <property> 1020 <property>
961 <name>text</name> 1021 <name>text</name>
962 <string>Play Alarm</string> 1022 <string>Play Alarm</string>
963 </property> 1023 </property>
964 </item> 1024 </item>
965 <item> 1025 <item>
@@ -982,54 +1042,66 @@
982 </item> 1042 </item>
983 <property stdset="1"> 1043 <property stdset="1">
984 <name>name</name> 1044 <name>name</name>
985 <cstring>newNetworkAction</cstring> 1045 <cstring>newNetworkAction</cstring>
986 </property> 1046 </property>
987 <property stdset="1"> 1047 <property stdset="1">
988 <name>sizePolicy</name> 1048 <name>sizePolicy</name>
989 <sizepolicy> 1049 <sizepolicy>
990 <hsizetype>7</hsizetype> 1050 <hsizetype>7</hsizetype>
991 <vsizetype>0</vsizetype> 1051 <vsizetype>0</vsizetype>
992 </sizepolicy> 1052 </sizepolicy>
993 </property> 1053 </property>
994 <property stdset="1"> 1054 <property stdset="1">
995 <name>editable</name> 1055 <name>editable</name>
996 <bool>false</bool> 1056 <bool>false</bool>
997 </property> 1057 </property>
1058 <property>
1059 <name>whatsThis</name>
1060 <string>Choose an action to perform when a new network is detected.</string>
1061 </property>
998 </widget> 1062 </widget>
999 <widget row="1" column="0" rowspan="1" colspan="2" > 1063 <widget row="1" column="0" rowspan="1" colspan="2" >
1000 <class>QLineEdit</class> 1064 <class>QLineEdit</class>
1001 <property stdset="1"> 1065 <property stdset="1">
1002 <name>name</name> 1066 <name>name</name>
1003 <cstring>newNetworkScript</cstring> 1067 <cstring>newNetworkScript</cstring>
1004 </property> 1068 </property>
1005 <property stdset="1"> 1069 <property stdset="1">
1006 <name>enabled</name> 1070 <name>enabled</name>
1007 <bool>true</bool> 1071 <bool>true</bool>
1008 </property> 1072 </property>
1073 <property>
1074 <name>whatsThis</name>
1075 <string>The command line to execute when a script action is performed.</string>
1076 </property>
1009 </widget> 1077 </widget>
1010 <widget row="5" column="0" rowspan="1" colspan="2" > 1078 <widget row="5" column="0" rowspan="1" colspan="2" >
1011 <class>QLineEdit</class> 1079 <class>QLineEdit</class>
1012 <property stdset="1"> 1080 <property stdset="1">
1013 <name>name</name> 1081 <name>name</name>
1014 <cstring>newStationScript</cstring> 1082 <cstring>newStationScript</cstring>
1015 </property> 1083 </property>
1016 <property stdset="1"> 1084 <property stdset="1">
1017 <name>enabled</name> 1085 <name>enabled</name>
1018 <bool>true</bool> 1086 <bool>true</bool>
1019 </property> 1087 </property>
1088 <property>
1089 <name>whatsThis</name>
1090 <string>Choose an action to perform when a new wireless station is detected.</string>
1091 </property>
1020 </widget> 1092 </widget>
1021 </grid> 1093 </grid>
1022 </widget> 1094 </widget>
1023 </grid> 1095 </grid>
1024 </widget> 1096 </widget>
1025 </vbox> 1097 </vbox>
1026 </widget> 1098 </widget>
1027 <widget> 1099 <widget>
1028 <class>QWidget</class> 1100 <class>QWidget</class>
1029 <property stdset="1"> 1101 <property stdset="1">
1030 <name>name</name> 1102 <name>name</name>
1031 <cstring>tab</cstring> 1103 <cstring>tab</cstring>
1032 </property> 1104 </property>
1033 <attribute> 1105 <attribute>
1034 <name>title</name> 1106 <name>title</name>
1035 <string>Intrusion</string> 1107 <string>Intrusion</string>
@@ -1268,32 +1340,36 @@
1268 <number>0</number> 1340 <number>0</number>
1269 </property> 1341 </property>
1270 <property stdset="1"> 1342 <property stdset="1">
1271 <name>spacing</name> 1343 <name>spacing</name>
1272 <number>6</number> 1344 <number>6</number>
1273 </property> 1345 </property>
1274 <widget> 1346 <widget>
1275 <class>QCheckBox</class> 1347 <class>QCheckBox</class>
1276 <property stdset="1"> 1348 <property stdset="1">
1277 <name>name</name> 1349 <name>name</name>
1278 <cstring>enableGPS</cstring> 1350 <cstring>enableGPS</cstring>
1279 </property> 1351 </property>
1280 <property stdset="1"> 1352 <property stdset="1">
1281 <name>text</name> 1353 <name>text</name>
1282 <string>Enable GPS logging w/ gpsd</string> 1354 <string>Enable GPS logging w/ gpsd</string>
1283 </property> 1355 </property>
1356 <property>
1357 <name>whatsThis</name>
1358 <string>Check this to log GPS coordinates.</string>
1359 </property>
1284 </widget> 1360 </widget>
1285 <widget> 1361 <widget>
1286 <class>QLayoutWidget</class> 1362 <class>QLayoutWidget</class>
1287 <property stdset="1"> 1363 <property stdset="1">
1288 <name>name</name> 1364 <name>name</name>
1289 <cstring>Layout1</cstring> 1365 <cstring>Layout1</cstring>
1290 </property> 1366 </property>
1291 <hbox> 1367 <hbox>
1292 <property stdset="1"> 1368 <property stdset="1">
1293 <name>margin</name> 1369 <name>margin</name>
1294 <number>0</number> 1370 <number>0</number>
1295 </property> 1371 </property>
1296 <property stdset="1"> 1372 <property stdset="1">
1297 <name>spacing</name> 1373 <name>spacing</name>
1298 <number>6</number> 1374 <number>6</number>
1299 </property> 1375 </property>
@@ -1319,32 +1395,36 @@
1319 <property stdset="1"> 1395 <property stdset="1">
1320 <name>name</name> 1396 <name>name</name>
1321 <cstring>gpsdHost</cstring> 1397 <cstring>gpsdHost</cstring>
1322 </property> 1398 </property>
1323 <property stdset="1"> 1399 <property stdset="1">
1324 <name>enabled</name> 1400 <name>enabled</name>
1325 <bool>false</bool> 1401 <bool>false</bool>
1326 </property> 1402 </property>
1327 <property stdset="1"> 1403 <property stdset="1">
1328 <name>editable</name> 1404 <name>editable</name>
1329 <bool>true</bool> 1405 <bool>true</bool>
1330 </property> 1406 </property>
1331 <property stdset="1"> 1407 <property stdset="1">
1332 <name>currentItem</name> 1408 <name>currentItem</name>
1333 <number>0</number> 1409 <number>0</number>
1334 </property> 1410 </property>
1411 <property>
1412 <name>whatsThis</name>
1413 <string>Hostadress where the gps daemon listens on.</string>
1414 </property>
1335 </widget> 1415 </widget>
1336 <widget> 1416 <widget>
1337 <class>QLabel</class> 1417 <class>QLabel</class>
1338 <property stdset="1"> 1418 <property stdset="1">
1339 <name>name</name> 1419 <name>name</name>
1340 <cstring>TextLabel2_2</cstring> 1420 <cstring>TextLabel2_2</cstring>
1341 </property> 1421 </property>
1342 <property stdset="1"> 1422 <property stdset="1">
1343 <name>text</name> 1423 <name>text</name>
1344 <string>:</string> 1424 <string>:</string>
1345 </property> 1425 </property>
1346 </widget> 1426 </widget>
1347 <widget> 1427 <widget>
1348 <class>QSpinBox</class> 1428 <class>QSpinBox</class>
1349 <property stdset="1"> 1429 <property stdset="1">
1350 <name>name</name> 1430 <name>name</name>
@@ -1353,60 +1433,72 @@
1353 <property stdset="1"> 1433 <property stdset="1">
1354 <name>enabled</name> 1434 <name>enabled</name>
1355 <bool>false</bool> 1435 <bool>false</bool>
1356 </property> 1436 </property>
1357 <property stdset="1"> 1437 <property stdset="1">
1358 <name>maxValue</name> 1438 <name>maxValue</name>
1359 <number>65535</number> 1439 <number>65535</number>
1360 </property> 1440 </property>
1361 <property stdset="1"> 1441 <property stdset="1">
1362 <name>minValue</name> 1442 <name>minValue</name>
1363 <number>1024</number> 1443 <number>1024</number>
1364 </property> 1444 </property>
1365 <property stdset="1"> 1445 <property stdset="1">
1366 <name>value</name> 1446 <name>value</name>
1367 <number>2947</number> 1447 <number>2947</number>
1368 </property> 1448 </property>
1449 <property>
1450 <name>whatsThis</name>
1451 <string>Port number where the gps daemon listens on.</string>
1452 </property>
1369 </widget> 1453 </widget>
1370 </hbox> 1454 </hbox>
1371 </widget> 1455 </widget>
1372 <widget> 1456 <widget>
1373 <class>QCheckBox</class> 1457 <class>QCheckBox</class>
1374 <property stdset="1"> 1458 <property stdset="1">
1375 <name>name</name> 1459 <name>name</name>
1376 <cstring>startGPS</cstring> 1460 <cstring>startGPS</cstring>
1377 </property> 1461 </property>
1378 <property stdset="1"> 1462 <property stdset="1">
1379 <name>text</name> 1463 <name>text</name>
1380 <string>Start gpsd on localhost</string> 1464 <string>Start gpsd on localhost</string>
1381 </property> 1465 </property>
1466 <property>
1467 <name>whatsThis</name>
1468 <string>Check to start the GPS daemon on localhost.</string>
1469 </property>
1382 </widget> 1470 </widget>
1383 <widget> 1471 <widget>
1384 <class>QLineEdit</class> 1472 <class>QLineEdit</class>
1385 <property stdset="1"> 1473 <property stdset="1">
1386 <name>name</name> 1474 <name>name</name>
1387 <cstring>commandGPS</cstring> 1475 <cstring>commandGPS</cstring>
1388 </property> 1476 </property>
1389 <property stdset="1"> 1477 <property stdset="1">
1390 <name>enabled</name> 1478 <name>enabled</name>
1391 <bool>false</bool> 1479 <bool>false</bool>
1392 </property> 1480 </property>
1393 <property stdset="1"> 1481 <property stdset="1">
1394 <name>text</name> 1482 <name>text</name>
1395 <string>gpsd -p /dev/ttyS3 -s 4800</string> 1483 <string>gpsd -p /dev/ttyS3 -s 4800</string>
1396 </property> 1484 </property>
1485 <property>
1486 <name>whatsThis</name>
1487 <string>Command line to start the gps daemon.</string>
1488 </property>
1397 </widget> 1489 </widget>
1398 <spacer> 1490 <spacer>
1399 <property> 1491 <property>
1400 <name>name</name> 1492 <name>name</name>
1401 <cstring>Spacer4_2</cstring> 1493 <cstring>Spacer4_2</cstring>
1402 </property> 1494 </property>
1403 <property stdset="1"> 1495 <property stdset="1">
1404 <name>orientation</name> 1496 <name>orientation</name>
1405 <enum>Vertical</enum> 1497 <enum>Vertical</enum>
1406 </property> 1498 </property>
1407 <property stdset="1"> 1499 <property stdset="1">
1408 <name>sizeType</name> 1500 <name>sizeType</name>
1409 <enum>Expanding</enum> 1501 <enum>Expanding</enum>
1410 </property> 1502 </property>
1411 <property> 1503 <property>
1412 <name>sizeHint</name> 1504 <name>sizeHint</name>
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 48fe89c..95b03d0 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16/* LOCAL */ 16/* LOCAL */
17#include "configwindow.h" 17#include "configwindow.h"
18#include "mainwindow.h" 18#include "mainwindow.h"
19 19
20/* OPIE */ 20/* OPIE */
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h
index d31d1e8..0a5b3bd 100644
--- a/noncore/net/wellenreiter/gui/configwindow.h
+++ b/noncore/net/wellenreiter/gui/configwindow.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef WELLENREITERCONFIGWINDOW_H 16#ifndef WELLENREITERCONFIGWINDOW_H
17#define WELLENREITERCONFIGWINDOW_H 17#define WELLENREITERCONFIGWINDOW_H
18 18
19#include "configbase.h" 19#include "configbase.h"
20#include "gps.h" 20#include "gps.h"
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp
index b845aa1..a47b4ec 100644
--- a/noncore/net/wellenreiter/gui/gps.cpp
+++ b/noncore/net/wellenreiter/gui/gps.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "gps.h" 16#include "gps.h"
17 17
18/* QT */ 18/* QT */
19#include <qtextstream.h> 19#include <qtextstream.h>
20 20
diff --git a/noncore/net/wellenreiter/gui/gps.h b/noncore/net/wellenreiter/gui/gps.h
index cfe1cdb..5629fec 100644
--- a/noncore/net/wellenreiter/gui/gps.h
+++ b/noncore/net/wellenreiter/gui/gps.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef GPS_H 16#ifndef GPS_H
17#define GPS_H 17#define GPS_H
18 18
19#include <qobject.h> 19#include <qobject.h>
20#include <qsocket.h> 20#include <qsocket.h>
diff --git a/noncore/net/wellenreiter/gui/graphwindow.cpp b/noncore/net/wellenreiter/gui/graphwindow.cpp
index b116b91..b4174d3 100644
--- a/noncore/net/wellenreiter/gui/graphwindow.cpp
+++ b/noncore/net/wellenreiter/gui/graphwindow.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "graphwindow.h" 16#include "graphwindow.h"
17 17
18#include <qpainter.h> 18#include <qpainter.h>
19#include <qpixmap.h> 19#include <qpixmap.h>
20#include <qtimer.h> 20#include <qtimer.h>
diff --git a/noncore/net/wellenreiter/gui/graphwindow.h b/noncore/net/wellenreiter/gui/graphwindow.h
index 1e00ae7..fafcab1 100644
--- a/noncore/net/wellenreiter/gui/graphwindow.h
+++ b/noncore/net/wellenreiter/gui/graphwindow.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef GRAPHWINDOW_H 16#ifndef GRAPHWINDOW_H
17#define GRAPHWINDOW_H 17#define GRAPHWINDOW_H
18 18
19#include <qwidget.h> 19#include <qwidget.h>
20#include <qvbox.h> 20#include <qvbox.h>
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 7957d4c..cfb9873 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,42 +1,44 @@
1DESTDIR = $(OPIEDIR)/bin 1DESTDIR = $(OPIEDIR)/bin
2TEMPLATE = app 2TEMPLATE = app
3CONFIG = qt warn_on debug 3CONFIG = qt warn_on debug
4 4
5HEADERS = wellenreiterbase.h \ 5HEADERS = wellenreiterbase.h \
6 mainwindow.h \ 6 mainwindow.h \
7 wellenreiter.h \ 7 wellenreiter.h \
8 scanlist.h \ 8 scanlist.h \
9 logwindow.h \ 9 logwindow.h \
10 hexwindow.h \ 10 hexwindow.h \
11 statwindow.h \ 11 statwindow.h \
12 configwindow.h \ 12 configwindow.h \
13 graphwindow.h \ 13 graphwindow.h \
14 packetview.h \
14 protolistview.h \ 15 protolistview.h \
15 gps.h 16 gps.h
16 17
17SOURCES = main.cpp \ 18SOURCES = main.cpp \
18 mainwindow.cpp \ 19 mainwindow.cpp \
19 wellenreiterbase.cpp \ 20 wellenreiterbase.cpp \
20 wellenreiter.cpp \ 21 wellenreiter.cpp \
21 scanlist.cpp \ 22 scanlist.cpp \
22 logwindow.cpp \ 23 logwindow.cpp \
23 hexwindow.cpp \ 24 hexwindow.cpp \
24 statwindow.cpp \ 25 statwindow.cpp \
25 configwindow.cpp \ 26 configwindow.cpp \
26 graphwindow.cpp \ 27 graphwindow.cpp \
28 packetview.cpp \
27 protolistview.cpp \ 29 protolistview.cpp \
28 gps.cpp 30 gps.cpp
29 31
30INCLUDEPATH += $(OPIEDIR)/include 32INCLUDEPATH += $(OPIEDIR)/include
31DEPENDPATH += $(OPIEDIR)/include 33DEPENDPATH += $(OPIEDIR)/include
32INTERFACES = configbase.ui 34INTERFACES = configbase.ui
33TARGET = wellenreiter 35TARGET = wellenreiter
34 36
35!contains( platform, x11 ) { 37!contains( platform, x11 ) {
36 message( qws ) 38 message( qws )
37 include ( $(OPIEDIR)/include.pro ) 39 include ( $(OPIEDIR)/include.pro )
38 LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2 40 LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2
39} 41}
40 42
41contains( platform, x11 ) { 43contains( platform, x11 ) {
42 LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter 44 LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter
diff --git a/noncore/net/wellenreiter/gui/hexwindow.cpp b/noncore/net/wellenreiter/gui/hexwindow.cpp
index 2f011ca..cbf3217 100644
--- a/noncore/net/wellenreiter/gui/hexwindow.cpp
+++ b/noncore/net/wellenreiter/gui/hexwindow.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "hexwindow.h" 16#include "hexwindow.h"
17#include <qmultilineedit.h> 17#include <qmultilineedit.h>
18 18
19MHexWindow::MHexWindow( QWidget * parent, const char * name, WFlags f ) 19MHexWindow::MHexWindow( QWidget * parent, const char * name, WFlags f )
20 :QVBox( parent, name, f ) 20 :QVBox( parent, name, f )
diff --git a/noncore/net/wellenreiter/gui/hexwindow.h b/noncore/net/wellenreiter/gui/hexwindow.h
index 3d4ec0f..71c6f25 100644
--- a/noncore/net/wellenreiter/gui/hexwindow.h
+++ b/noncore/net/wellenreiter/gui/hexwindow.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef HEXWINDOW_H 16#ifndef HEXWINDOW_H
17#define HEXWINDOW_H 17#define HEXWINDOW_H
18 18
19#include <qvbox.h> 19#include <qvbox.h>
20 20
diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp
index 6078fa2..1c72cf4 100644
--- a/noncore/net/wellenreiter/gui/logwindow.cpp
+++ b/noncore/net/wellenreiter/gui/logwindow.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "logwindow.h" 16#include "logwindow.h"
17#include <qmultilineedit.h> 17#include <qmultilineedit.h>
18#include <qdatetime.h> 18#include <qdatetime.h>
19 19
20MLogWindow* MLogWindow::_instance; 20MLogWindow* MLogWindow::_instance;
diff --git a/noncore/net/wellenreiter/gui/logwindow.h b/noncore/net/wellenreiter/gui/logwindow.h
index da8c274..7877003 100644
--- a/noncore/net/wellenreiter/gui/logwindow.h
+++ b/noncore/net/wellenreiter/gui/logwindow.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef LOGWINDOW_H 16#ifndef LOGWINDOW_H
17#define LOGWINDOW_H 17#define LOGWINDOW_H
18 18
19#include <qvbox.h> 19#include <qvbox.h>
20 20
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index 8ef62e9..be7a528 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "mainwindow.h" 16#include "mainwindow.h"
17#ifdef QWS 17#ifdef QWS
18#include <opie2/oapplication.h> 18#include <opie2/oapplication.h>
19#include <opie2/oprocess.h> 19#include <opie2/oprocess.h>
20#else 20#else
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 95a8294..6f57a7f 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "configwindow.h" 16#include "configwindow.h"
17#include "gps.h" 17#include "gps.h"
18#include "logwindow.h" 18#include "logwindow.h"
19#include "hexwindow.h" 19#include "hexwindow.h"
20#include "mainwindow.h" 20#include "mainwindow.h"
@@ -24,136 +24,144 @@
24#include <qcombobox.h> 24#include <qcombobox.h>
25#include <qdatastream.h> 25#include <qdatastream.h>
26#include <qfile.h> 26#include <qfile.h>
27#include <qfileinfo.h> 27#include <qfileinfo.h>
28#include <qlabel.h> 28#include <qlabel.h>
29#include <qlayout.h> 29#include <qlayout.h>
30#include <qlineedit.h> 30#include <qlineedit.h>
31#include <qiconset.h> 31#include <qiconset.h>
32#include <qmenubar.h> 32#include <qmenubar.h>
33#include <qmessagebox.h> 33#include <qmessagebox.h>
34#include <qpopupmenu.h> 34#include <qpopupmenu.h>
35#include <qpushbutton.h> 35#include <qpushbutton.h>
36#include <qstatusbar.h> 36#include <qstatusbar.h>
37#include <qspinbox.h> 37#include <qspinbox.h>
38#include <qtextstream.h> 38#include <qtextstream.h>
39#include <qtoolbutton.h> 39#include <qtoolbutton.h>
40#include <qwhatsthis.h>
40 41
41#ifdef QWS 42#ifdef QWS
42#include <qpe/resource.h> 43#include <qpe/resource.h>
43#include <opie2/ofiledialog.h> 44#include <opie2/ofiledialog.h>
44using namespace Opie; 45using namespace Opie;
45#else 46#else
46#include "resource.h" 47#include "resource.h"
47#include <qapplication.h> 48#include <qapplication.h>
48#include <qfiledialog.h> 49#include <qfiledialog.h>
49#endif 50#endif
50 51
51#include <unistd.h> 52#include <unistd.h>
52 53
53WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) 54WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
54 :QMainWindow( parent, name, f ) 55 :QMainWindow( parent, name, f )
55{ 56{
56 cw = new WellenreiterConfigWindow( this ); 57 cw = new WellenreiterConfigWindow( this );
57 mw = new Wellenreiter( this ); 58 mw = new Wellenreiter( this );
58 mw->setConfigWindow( cw ); 59 mw->setConfigWindow( cw );
59 setCentralWidget( mw ); 60 setCentralWidget( mw );
60 61
61 // setup application icon 62 // setup application icon
62 63
63 #ifndef QWS
64 setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) ); 64 setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) );
65 #ifndef QWS
65 setIconText( "Wellenreiter/X11" ); 66 setIconText( "Wellenreiter/X11" );
66 #endif 67 #endif
67 68
68 // setup tool buttons 69 // setup tool buttons
69 70
70 startButton = new QToolButton( 0 ); 71 startButton = new QToolButton( 0 );
72 QWhatsThis::add( startButton, tr( "Click here to start scanning." ) );
71 #ifdef QWS 73 #ifdef QWS
72 startButton->setAutoRaise( true ); 74 startButton->setAutoRaise( true );
73 #endif 75 #endif
74 startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) ); 76 startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) );
75 startButton->setEnabled( false ); 77 startButton->setEnabled( false );
76 connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) ); 78 connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) );
77 79
78 stopButton = new QToolButton( 0 ); 80 stopButton = new QToolButton( 0 );
81 QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) );
79 #ifdef QWS 82 #ifdef QWS
80 stopButton->setAutoRaise( true ); 83 stopButton->setAutoRaise( true );
81 #endif 84 #endif
82 stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) ); 85 stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) );
83 stopButton->setEnabled( false ); 86 stopButton->setEnabled( false );
84 connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) ); 87 connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) );
85 88
86 QToolButton* d = new QToolButton( 0 ); 89 QToolButton* d = new QToolButton( 0 );
90 QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ),
87 #ifdef QWS 91 #ifdef QWS
88 d->setAutoRaise( true ); 92 d->setAutoRaise( true );
89 #endif 93 #endif
90 d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) ); 94 d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) );
91 connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); 95 connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
92 96
93 uploadButton = new QToolButton( 0 ); 97 uploadButton = new QToolButton( 0 );
98 QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) );
94 #ifdef QWS 99 #ifdef QWS
95 uploadButton->setAutoRaise( true ); 100 uploadButton->setAutoRaise( true );
96 #endif 101 #endif
97 uploadButton->setIconSet( Resource::loadIconSet( "up" ) ); 102 uploadButton->setIconSet( Resource::loadIconSet( "up" ) );
98 uploadButton->setEnabled( false ); 103 uploadButton->setEnabled( false );
99 //uploadButton->setEnabled( true ); // DEBUGGING 104 //uploadButton->setEnabled( true ); // DEBUGGING
100 connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) ); 105 connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) );
101 106
102 // setup menu bar 107 // setup menu bar
103 108
104 int id; 109 int id;
105 110
106 QMenuBar* mb = menuBar(); 111 QMenuBar* mb = menuBar();
107 112
108 QPopupMenu* fileSave = new QPopupMenu( mb ); 113 QPopupMenu* fileSave = new QPopupMenu( mb );
109 fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) ); 114 fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) );
110 fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) ); 115 fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) );
111 fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) ); 116 fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) );
112 117
113 QPopupMenu* fileLoad = new QPopupMenu( mb ); 118 QPopupMenu* fileLoad = new QPopupMenu( mb );
114 fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) ); 119 fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) );
115 //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); 120 //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
116 121
117 QPopupMenu* file = new QPopupMenu( mb ); 122 QPopupMenu* file = new QPopupMenu( mb );
118 file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) ); 123 file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) );
119 id = file->insertItem( tr( "&Load" ), fileLoad ); 124 id = file->insertItem( tr( "&Load" ), fileLoad );
120 file->insertItem( tr( "&Save" ), fileSave ); 125 file->insertItem( tr( "&Save" ), fileSave );
121 file->insertSeparator(); 126 file->insertSeparator();
122 uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) ); 127 uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) );
123 file->insertSeparator(); 128 file->insertSeparator();
124 file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) ); 129 file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
125 130
126 QPopupMenu* view = new QPopupMenu( mb );
127 view->insertItem( tr( "&Configure..." ) );
128
129 QPopupMenu* sniffer = new QPopupMenu( mb ); 131 QPopupMenu* sniffer = new QPopupMenu( mb );
130 sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) ); 132 sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
131 sniffer->insertSeparator(); 133 sniffer->insertSeparator();
132 startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) ); 134 startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) );
133 sniffer->setItemEnabled( startID, false ); 135 sniffer->setItemEnabled( startID, false );
134 stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) ); 136 stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) );
135 sniffer->setItemEnabled( stopID, false ); 137 sniffer->setItemEnabled( stopID, false );
136 138
139 QPopupMenu* view = new QPopupMenu( mb );
140 view->insertItem( tr( "&Expand All" ), this, SLOT( viewExpandAll() ) );
141 view->insertItem( tr( "&Collapse All" ), this, SLOT( viewCollapseAll() ) );
142
137 QPopupMenu* demo = new QPopupMenu( mb ); 143 QPopupMenu* demo = new QPopupMenu( mb );
138 demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); 144 demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
139 //demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) ); 145 //demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) );
140 146
141 id = mb->insertItem( tr( "&File" ), file ); 147 id = mb->insertItem( tr( "&File" ), file );
142 //id = mb->insertItem( tr( "&View" ), view ); 148
149 id = mb->insertItem( tr( "&View" ), view );
143 //mb->setItemEnabled( id, false ); 150 //mb->setItemEnabled( id, false );
151
144 id = mb->insertItem( tr( "&Sniffer" ), sniffer ); 152 id = mb->insertItem( tr( "&Sniffer" ), sniffer );
145 153
146 id = mb->insertItem( tr( "&Demo" ), demo ); 154 id = mb->insertItem( tr( "&Demo" ), demo );
147 mb->setItemEnabled( id, true ); 155 mb->setItemEnabled( id, true );
148 mb->setItemEnabled( uploadID, false ); 156 mb->setItemEnabled( uploadID, false );
149 157
150 #ifdef QWS 158 #ifdef QWS
151 mb->insertItem( startButton ); 159 mb->insertItem( startButton );
152 mb->insertItem( stopButton ); 160 mb->insertItem( stopButton );
153 mb->insertItem( uploadButton ); 161 mb->insertItem( uploadButton );
154 mb->insertItem( d ); 162 mb->insertItem( d );
155 #else // Qt3 changed the insertion order. It's now totally random :( 163 #else // Qt3 changed the insertion order. It's now totally random :(
156 mb->insertItem( d ); 164 mb->insertItem( d );
157 mb->insertItem( uploadButton ); 165 mb->insertItem( uploadButton );
158 mb->insertItem( stopButton ); 166 mb->insertItem( stopButton );
159 mb->insertItem( startButton ); 167 mb->insertItem( startButton );
@@ -540,16 +548,26 @@ void WellenreiterMainWindow::uploadSession()
540 548
541 // done! 549 // done!
542 550
543 ok = true; 551 ok = true;
544 } 552 }
545 } 553 }
546 ::close ( sock ); 554 ::close ( sock );
547 } 555 }
548 if ( ok ) 556 if ( ok )
549 QMessageBox::information( 0, tr( "Success" ), 557 QMessageBox::information( 0, tr( "Success" ),
550 QString ( "<p>%1</p>" ).arg( tr( "Capture Dump was uploaded to %1" ) ).arg( CAP_hostname ) ); 558 QString ( "<p>%1</p>" ).arg( tr( "Capture Dump was uploaded to %1" ) ).arg( CAP_hostname ) );
551 else 559 else
552 QMessageBox::warning( 0, tr( "Error" ), 560 QMessageBox::warning( 0, tr( "Error" ),
553 QString ( "<p>%1</p>" ).arg ( tr( "Connection to %1 failed" ) ).arg( CAP_hostname ) ); 561 QString ( "<p>%1</p>" ).arg ( tr( "Connection to %1 failed" ) ).arg( CAP_hostname ) );
554} 562}
555 563
564
565void WellenreiterMainWindow::viewExpandAll()
566{
567 mw->netView()->expand();
568}
569
570void WellenreiterMainWindow::viewCollapseAll()
571{
572 mw->netView()->collapse();
573}
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
index a5cb7a5..9593241 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.h
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef MAINWINDOW_H 16#ifndef MAINWINDOW_H
17#define MAINWINDOW_H 17#define MAINWINDOW_H
18 18
19#include <qmainwindow.h> 19#include <qmainwindow.h>
20 20
@@ -45,19 +45,22 @@ class WellenreiterMainWindow: public QMainWindow
45 45
46 protected: 46 protected:
47 virtual void closeEvent( QCloseEvent* ); 47 virtual void closeEvent( QCloseEvent* );
48 void updateToolButtonState(); 48 void updateToolButtonState();
49 49
50 public slots: 50 public slots:
51 void showConfigure(); 51 void showConfigure();
52 void demoAddStations(); 52 void demoAddStations();
53 void demoReadFromGps(); 53 void demoReadFromGps();
54 void fileSaveLog(); 54 void fileSaveLog();
55 void fileSaveHex(); 55 void fileSaveHex();
56 void fileSaveSession(); 56 void fileSaveSession();
57 void fileLoadSession(); 57 void fileLoadSession();
58 void fileNew(); 58 void fileNew();
59 void uploadSession(); 59 void uploadSession();
60 void changedSniffingState(); 60 void changedSniffingState();
61
62 void viewExpandAll();
63 void viewCollapseAll();
61}; 64};
62 65
63#endif 66#endif
diff --git a/noncore/net/wellenreiter/gui/protolistview.cpp b/noncore/net/wellenreiter/gui/protolistview.cpp
index ed22bdd..635e174 100644
--- a/noncore/net/wellenreiter/gui/protolistview.cpp
+++ b/noncore/net/wellenreiter/gui/protolistview.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16/* LOCAL */ 16/* LOCAL */
17#include "protolistview.h" 17#include "protolistview.h"
18 18
19#include <qcheckbox.h> 19#include <qcheckbox.h>
20#include <qcombobox.h> 20#include <qcombobox.h>
diff --git a/noncore/net/wellenreiter/gui/protolistview.h b/noncore/net/wellenreiter/gui/protolistview.h
index 8b460cb..11f4375 100644
--- a/noncore/net/wellenreiter/gui/protolistview.h
+++ b/noncore/net/wellenreiter/gui/protolistview.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef PROTOLISTVIEW_H 16#ifndef PROTOLISTVIEW_H
17#define PROTOLISTVIEW_H 17#define PROTOLISTVIEW_H
18 18
19#include <qscrollview.h> 19#include <qscrollview.h>
20#include <qdict.h> 20#include <qdict.h>
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp
index 5e5ddc6..d98ef0b 100644
--- a/noncore/net/wellenreiter/gui/resource.cpp
+++ b/noncore/net/wellenreiter/gui/resource.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "resource.h" 16#include "resource.h"
17 17
18#define PIXMAPPATH "/usr/local/share" 18#define PIXMAPPATH "/usr/local/share"
19 19
20#include <qiconset.h> 20#include <qiconset.h>
diff --git a/noncore/net/wellenreiter/gui/resource.h b/noncore/net/wellenreiter/gui/resource.h
index 8788c6e..85490b3 100644
--- a/noncore/net/wellenreiter/gui/resource.h
+++ b/noncore/net/wellenreiter/gui/resource.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef RESOURCE_H 16#ifndef RESOURCE_H
17#define RESOURCE_H 17#define RESOURCE_H
18 18
19#include <qstring.h> 19#include <qstring.h>
20 20
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index c75f9b1..6005818 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "scanlist.h" 16#include "scanlist.h"
17#include "configwindow.h" 17#include "configwindow.h"
18#include "logwindow.h" 18#include "logwindow.h"
19 19
20#include <assert.h> 20#include <assert.h>
@@ -36,33 +36,32 @@
36const int col_type = 0; 36const int col_type = 0;
37const int col_essid = 0; 37const int col_essid = 0;
38const int col_sig = 1; 38const int col_sig = 1;
39const int col_ap = 2; 39const int col_ap = 2;
40const int col_channel = 3; 40const int col_channel = 3;
41const int col_wep = 4; 41const int col_wep = 4;
42const int col_traffic = 5; 42const int col_traffic = 5;
43const int col_ip = 6; 43const int col_ip = 6;
44const int col_manuf = 7; 44const int col_manuf = 7;
45const int col_firstseen = 8; 45const int col_firstseen = 8;
46const int col_lastseen = 9; 46const int col_lastseen = 9;
47const int col_location = 10; 47const int col_location = 10;
48 48
49MScanListView::MScanListView( QWidget* parent, const char* name ) 49MScanListView::MScanListView( QWidget* parent, const char* name )
50 :OListView( parent, name ) 50 :OListView( parent, name )
51{ 51{
52
53 setFrameShape( QListView::StyledPanel ); 52 setFrameShape( QListView::StyledPanel );
54 setFrameShadow( QListView::Sunken ); 53 setFrameShadow( QListView::Sunken );
55 54
56 addColumn( tr( "Net/Station" ) ); 55 addColumn( tr( "Net/Station" ) );
57 setColumnAlignment( col_essid, AlignLeft || AlignVCenter ); 56 setColumnAlignment( col_essid, AlignLeft || AlignVCenter );
58 addColumn( tr( "#" ) ); 57 addColumn( tr( "#" ) );
59 setColumnAlignment( col_sig, AlignCenter ); 58 setColumnAlignment( col_sig, AlignCenter );
60 addColumn( tr( "MAC" ) ); 59 addColumn( tr( "MAC" ) );
61 setColumnAlignment( col_ap, AlignCenter ); 60 setColumnAlignment( col_ap, AlignCenter );
62 addColumn( tr( "Chn" ) ); 61 addColumn( tr( "Chn" ) );
63 setColumnAlignment( col_channel, AlignCenter ); 62 setColumnAlignment( col_channel, AlignCenter );
64 addColumn( tr( "W" ) ); 63 addColumn( tr( "W" ) );
65 setColumnAlignment( col_wep, AlignCenter ); 64 setColumnAlignment( col_wep, AlignCenter );
66 addColumn( tr( "T" ) ); 65 addColumn( tr( "T" ) );
67 setColumnAlignment( col_traffic, AlignCenter ); 66 setColumnAlignment( col_traffic, AlignCenter );
68 addColumn( tr( "IP" ) ); 67 addColumn( tr( "IP" ) );
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index cbacdee..ab870c2 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef SCANLIST_H 16#ifndef SCANLIST_H
17#define SCANLIST_H 17#define SCANLIST_H
18 18
19#include "gps.h" 19#include "gps.h"
20 20
diff --git a/noncore/net/wellenreiter/gui/statwindow.cpp b/noncore/net/wellenreiter/gui/statwindow.cpp
index a9ae661..48e4847 100644
--- a/noncore/net/wellenreiter/gui/statwindow.cpp
+++ b/noncore/net/wellenreiter/gui/statwindow.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "statwindow.h" 16#include "statwindow.h"
17#include <opie2/olistview.h> 17#include <opie2/olistview.h>
18 18
19MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f ) 19MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f )
20 :QVBox( parent, name, f ) 20 :QVBox( parent, name, f )
diff --git a/noncore/net/wellenreiter/gui/statwindow.h b/noncore/net/wellenreiter/gui/statwindow.h
index 0ab4b50..b9057e7 100644
--- a/noncore/net/wellenreiter/gui/statwindow.h
+++ b/noncore/net/wellenreiter/gui/statwindow.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef STATWINDOW_H 16#ifndef STATWINDOW_H
17#define STATWINDOW_H 17#define STATWINDOW_H
18 18
19#include <qvbox.h> 19#include <qvbox.h>
20 20
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index db68e5b..67e3940 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -499,33 +499,41 @@ void Wellenreiter::startClicked()
499 const QString& interface = configwindow->interfaceName->currentText(); 499 const QString& interface = configwindow->interfaceName->currentText();
500 const int cardtype = configwindow->driverType(); 500 const int cardtype = configwindow->driverType();
501 const int interval = configwindow->hoppingInterval(); 501 const int interval = configwindow->hoppingInterval();
502 502
503 if ( ( interface == "" ) || ( cardtype == 0 ) ) 503 if ( ( interface == "" ) || ( cardtype == 0 ) )
504 { 504 {
505 QMessageBox::information( this, "Wellenreiter II", 505 QMessageBox::information( this, "Wellenreiter II",
506 tr( "Your device is not\nproperly configured. Please reconfigure!" ) ); 506 tr( "Your device is not\nproperly configured. Please reconfigure!" ) );
507 return; 507 return;
508 } 508 }
509 509
510 // configure device 510 // configure device
511 ONetwork* net = ONetwork::instance(); 511 ONetwork* net = ONetwork::instance();
512 512
513 // TODO: check if interface is wireless and support sniffing for non-wireless interfaces 513 // TODO: check if interface is wireless and support sniffing for non-wireless interfaces
514 514
515 if ( !net->isPresent( interface ) )
516 {
517 QMessageBox::information( this, "Wellenreiter II",
518 tr( "The configured device (%1)\nis not available on this system\n. Please reconfigure!" ).arg( interface ) );
519 return;
520 }
521
515 iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless! 522 iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless!
523 assert( iface );
516 524
517 // bring device UP 525 // bring device UP
518 if ( cardtype != DEVTYPE_FILE ) 526 if ( cardtype != DEVTYPE_FILE )
519 { 527 {
520 iface->setUp( true ); 528 iface->setUp( true );
521 if ( !iface->isUp() ) 529 if ( !iface->isUp() )
522 { 530 {
523 QMessageBox::warning( this, "Wellenreiter II", 531 QMessageBox::warning( this, "Wellenreiter II",
524 tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) ); 532 tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) );
525 return; 533 return;
526 } 534 }
527 } 535 }
528 // set monitor mode 536 // set monitor mode
529 bool usePrism = configwindow->usePrismHeader(); 537 bool usePrism = configwindow->usePrismHeader();
530 538
531 switch ( cardtype ) 539 switch ( cardtype )
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index b8b6730..f57dba2 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14***********************************************************************/ 14***********************************************************************/
15 15
16#include "wellenreiterbase.h" 16#include "wellenreiterbase.h"
17 17
18#include <qlabel.h> 18#include <qlabel.h>
19#include <qlayout.h> 19#include <qlayout.h>
20 20
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h
index 2cc273e..5e00ddc 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.h
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h
@@ -1,20 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Wellenreiter II.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef WELLENREITERBASE_H 16#ifndef WELLENREITERBASE_H
17#define WELLENREITERBASE_H 17#define WELLENREITERBASE_H
18 18
19#include <qvariant.h> 19#include <qvariant.h>
20#include <qwidget.h> 20#include <qwidget.h>